linux x11 resolution

Signed-off-by: 21pages <pages21@163.com>

Cargo.lock

@@ -1159,14 +1159,38 @@ dependencies = [
  "zvariant",
 ]
 
+[[package]]
+name = "darling"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
+dependencies = [
+ "darling_core 0.10.2",
+ "darling_macro 0.10.2",
+]
+
 [[package]]
 name = "darling"
 version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.13.4",
+ "darling_macro 0.13.4",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2 1.0.47",
+ "quote 1.0.21",
+ "strsim 0.9.3",
+ "syn 1.0.105",
 ]
 
 [[package]]
@@ -1183,13 +1207,24 @@ dependencies = [
  "syn 1.0.105",
 ]
 
+[[package]]
+name = "darling_macro"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
+dependencies = [
+ "darling_core 0.10.2",
+ "quote 1.0.21",
+ "syn 1.0.105",
+]
+
 [[package]]
 name = "darling_macro"
 version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
- "darling_core",
+ "darling_core 0.13.4",
  "quote 1.0.21",
  "syn 1.0.105",
 ]
@@ -1389,6 +1424,18 @@ dependencies = [
  "syn 1.0.105",
 ]
 
+[[package]]
+name = "derive_setters"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1cf41b4580a37cca5ef2ada2cc43cf5d6be3983f4522e83010d67ab6925e84b"
+dependencies = [
+ "darling 0.10.2",
+ "proc-macro2 1.0.47",
+ "quote 1.0.21",
+ "syn 1.0.105",
+]
+
 [[package]]
 name = "detect-desktop-environment"
 version = "0.2.0"
@@ -3585,7 +3632,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
 dependencies = [
- "darling",
+ "darling 0.13.4",
  "proc-macro-crate 1.2.1",
  "proc-macro2 1.0.47",
  "quote 1.0.21",
@@ -4944,6 +4991,7 @@ dependencies = [
  "winreg 0.10.1",
  "winres",
  "wol-rs",
+ "xrandr-parser",
 ]
 
 [[package]]
@@ -5469,6 +5517,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
+[[package]]
+name = "strsim"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -6965,6 +7019,16 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
 
+[[package]]
+name = "xrandr-parser"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5af43ba661cee58bd86b9f81a899e45a15ac7f42fa4401340f73c0c2950030c1"
+dependencies = [
+ "derive_setters",
+ "serde 1.0.149",
+]
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"

Cargo.toml

@@ -121,6 +121,7 @@ mouce = { git="https://github.com/fufesou/mouce.git" }
 evdev = { git="https://github.com/fufesou/evdev" }
 dbus = "0.9"
 dbus-crossroads = "0.5"
+xrandr-parser = "0.3.0"
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.11"

libs/scrap/src/common/x11.rs

@@ -1,4 +1,4 @@
-use crate::{x11, common::TraitCapturer};
+use crate::{common::TraitCapturer, x11};
 use std::{io, ops, time::Duration};
 
 pub struct Capturer(x11::Capturer);
@@ -90,6 +90,6 @@ impl Display {
     }
 
     pub fn name(&self) -> String {
-        "".to_owned()
+        self.0.name()
     }
 }

libs/scrap/src/x11/display.rs

@@ -9,6 +9,7 @@ pub struct Display {
     default: bool,
     rect: Rect,
     root: xcb_window_t,
+    name: String,
 }
 
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
@@ -25,12 +26,14 @@ impl Display {
         default: bool,
         rect: Rect,
         root: xcb_window_t,
+        name: String,
     ) -> Display {
         Display {
             server,
             default,
             rect,
             root,
+            name,
         }
     }
 
@@ -52,4 +55,8 @@ impl Display {
     pub fn root(&self) -> xcb_window_t {
         self.root
     }
+
+    pub fn name(&self) -> String {
+        self.name.clone()
+    }
 }

libs/scrap/src/x11/ffi.rs

@@ -65,6 +65,21 @@ extern "C" {
     ) -> xcb_randr_monitor_info_iterator_t;
 
     pub fn xcb_randr_monitor_info_next(i: *mut xcb_randr_monitor_info_iterator_t);
+
+    pub fn xcb_get_atom_name(
+        c: *mut xcb_connection_t,
+        atom: xcb_atom_t,
+    ) -> xcb_get_atom_name_cookie_t;
+
+    pub fn xcb_get_atom_name_reply(
+        c: *mut xcb_connection_t,
+        cookie: xcb_get_atom_name_cookie_t,
+        e: *mut *mut xcb_generic_error_t,
+    ) -> *const xcb_get_atom_name_reply_t;
+
+    pub fn xcb_get_atom_name_name(reply: *const xcb_get_atom_name_request_t) -> *const u8;
+
+    pub fn xcb_get_atom_name_name_length(reply: *const xcb_get_atom_name_reply_t) -> i32;
 }
 
 pub const XCB_IMAGE_FORMAT_Z_PIXMAP: u8 = 2;
@@ -78,6 +93,9 @@ pub type xcb_timestamp_t = u32;
 pub type xcb_colormap_t = u32;
 pub type xcb_shm_seg_t = u32;
 pub type xcb_drawable_t = u32;
+pub type xcb_get_atom_name_cookie_t = u32;
+pub type xcb_get_atom_name_reply_t = u32;
+pub type xcb_get_atom_name_request_t = xcb_get_atom_name_reply_t;
 
 #[repr(C)]
 pub struct xcb_setup_t {

libs/scrap/src/x11/iter.rs

@@ -1,3 +1,4 @@
+use std::ffi::CString;
 use std::ptr;
 use std::rc::Rc;
 
@@ -64,6 +65,7 @@ impl Iterator for DisplayIter {
                 if inner.rem != 0 {
                     unsafe {
                         let data = &*inner.data;
+                        let name = get_atom_name(self.server.raw(), data.name);
 
                         let display = Display::new(
                             self.server.clone(),
@@ -75,6 +77,7 @@ impl Iterator for DisplayIter {
                                 h: data.height,
                             },
                             root,
+                            name,
                         );
 
                         xcb_randr_monitor_info_next(inner);
@@ -91,3 +94,30 @@ impl Iterator for DisplayIter {
         }
     }
 }
+
+fn get_atom_name(conn: *mut xcb_connection_t, atom: xcb_atom_t) -> String {
+    let empty = "".to_owned();
+    if atom == 0 {
+        return empty;
+    }
+    unsafe {
+        let mut e: xcb_generic_error_t = std::mem::zeroed();
+        let reply = xcb_get_atom_name_reply(
+            conn,
+            xcb_get_atom_name(conn, atom),
+            &mut ((&mut e) as *mut xcb_generic_error_t) as _,
+        );
+        if reply == std::ptr::null() {
+            return empty;
+        }
+        let length = xcb_get_atom_name_name_length(reply);
+        let name = xcb_get_atom_name_name(reply);
+        let mut v = vec![0u8; length as _];
+        std::ptr::copy_nonoverlapping(name as _, v.as_mut_ptr(), length as _);
+        libc::free(reply as *mut _);
+        if let Ok(s) = CString::new(v) {
+            return s.to_string_lossy().to_string();
+        }
+        empty
+    }
+}

src/platform/linux.rs

@@ -1,7 +1,7 @@
 use super::{CursorData, ResultType};
 use hbb_common::libc::{c_char, c_int, c_long, c_void};
 pub use hbb_common::platform::linux::*;
-use hbb_common::{allow_err, bail, log};
+use hbb_common::{allow_err, anyhow::anyhow, bail, log, message_proto::Resolution};
 use std::{
     cell::RefCell,
     path::PathBuf,
@@ -10,6 +10,7 @@ use std::{
         Arc,
     },
 };
+use xrandr_parser::Parser;
 
 type Xdo = *const c_void;
 
@@ -641,3 +642,55 @@ pub fn get_double_click_time() -> u32 {
         double_click_time
     }
 }
+
+pub fn resolutions(name: &str) -> Vec<Resolution> {
+    let mut v = vec![];
+    let mut parser = Parser::new();
+    if parser.parse().is_ok() {
+        if let Ok(connector) = parser.get_connector(name) {
+            if let Ok(resolutions) = &connector.available_resolutions() {
+                for r in resolutions {
+                    if let Ok(width) = r.horizontal.parse::<i32>() {
+                        if let Ok(height) = r.vertical.parse::<i32>() {
+                            let resolution = Resolution {
+                                width,
+                                height,
+                                ..Default::default()
+                            };
+                            if !v.contains(&resolution) {
+                                v.push(resolution);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    v
+}
+
+pub fn current_resolution(name: &str) -> ResultType<Resolution> {
+    let mut parser = Parser::new();
+    parser.parse().map_err(|e| anyhow!(e))?;
+    let connector = parser.get_connector(name).map_err(|e| anyhow!(e))?;
+    let r = connector.current_resolution();
+    let width = r.horizontal.parse::<i32>()?;
+    let height = r.vertical.parse::<i32>()?;
+    Ok(Resolution {
+        width,
+        height,
+        ..Default::default()
+    })
+}
+
+pub fn change_resolution(name: &str, width: usize, height: usize) -> ResultType<()> {
+    std::process::Command::new("xrandr")
+        .args(vec![
+            "--output",
+            name,
+            "--mode",
+            &format!("{}x{}", width, height),
+        ])
+        .spawn()?;
+    Ok(())
+}