Merge remote-tracking branch 'origin/master' into feat/x11/clipboard-file/init

libs/enigo/src/lib.rs

@@ -70,6 +70,8 @@ pub use win::ENIGO_INPUT_EXTRA_VALUE;
 mod macos;
 #[cfg(target_os = "macos")]
 pub use macos::Enigo;
+#[cfg(target_os = "macos")]
+pub use macos::ENIGO_INPUT_EXTRA_VALUE;
 
 #[cfg(target_os = "linux")]
 mod linux;

libs/enigo/src/macos/macos_impl.rs

@@ -37,6 +37,9 @@ const kUCKeyActionDisplay: u16 = 3;
 const kUCKeyTranslateDeadKeysBit: OptionBits = 1 << 31;
 const BUF_LEN: usize = 4;
 
+/// The event source user data value of cgevent.
+pub const ENIGO_INPUT_EXTRA_VALUE: i64 = 100;
+
 #[allow(improper_ctypes)]
 #[allow(non_snake_case)]
 #[link(name = "ApplicationServices", kind = "framework")]
@@ -131,6 +134,7 @@ impl Enigo {
 
     fn post(&self, event: CGEvent) {
         event.set_flags(self.flags);
+        event.set_integer_value_field(EventField::EVENT_SOURCE_USER_DATA, ENIGO_INPUT_EXTRA_VALUE);
         event.post(CGEventTapLocation::HID);
     }
 }

libs/enigo/src/macos/mod.rs

@@ -1,4 +1,4 @@
 mod macos_impl;
 
 pub mod keycodes;
-pub use self::macos_impl::Enigo;
+pub use self::macos_impl::{Enigo, ENIGO_INPUT_EXTRA_VALUE};

libs/enigo/src/win/mod.rs

@@ -1,5 +1,4 @@
 mod win_impl;
 
 pub mod keycodes;
-pub use self::win_impl::Enigo;
-pub use self::win_impl::ENIGO_INPUT_EXTRA_VALUE;
+pub use self::win_impl::{Enigo, ENIGO_INPUT_EXTRA_VALUE};

libs/hbb_common/protos/message.proto

@@ -624,6 +624,8 @@ message BackNotification {
     PrivacyModeState privacy_mode_state = 1;
     BlockInputState block_input_state = 2;
   }
+  // Supplementary message, for "PrvOnFailed" and "PrvOffFailed"
+  string details = 3;
 }
 
 message ElevationRequestWithLogon {

libs/hbb_common/src/config.rs

@@ -230,6 +230,7 @@ pub struct PeerConfig {
         skip_serializing_if = "String::is_empty"
     )]
     pub view_style: String,
+    // Image scroll style, scrollbar or scroll auto
     #[serde(
         default = "PeerConfig::default_scroll_style",
         deserialize_with = "PeerConfig::deserialize_scroll_style",
@@ -276,6 +277,13 @@ pub struct PeerConfig {
     pub keyboard_mode: String,
     #[serde(flatten)]
     pub view_only: ViewOnly,
+    // Mouse wheel or touchpad scroll mode
+    #[serde(
+        default = "PeerConfig::default_reverse_mouse_wheel",
+        deserialize_with = "PeerConfig::deserialize_reverse_mouse_wheel",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub reverse_mouse_wheel: String,
 
     #[serde(
         default,
@@ -319,6 +327,7 @@ impl Default for PeerConfig {
             show_quality_monitor: Default::default(),
             keyboard_mode: Default::default(),
             view_only: Default::default(),
+            reverse_mouse_wheel: Self::default_reverse_mouse_wheel(),
             custom_resolutions: Default::default(),
             options: Self::default_options(),
             ui_flutter: Default::default(),
@@ -1130,6 +1139,11 @@ impl PeerConfig {
         deserialize_image_quality,
         UserDefaultConfig::read().get("image_quality")
     );
+    serde_field_string!(
+        default_reverse_mouse_wheel,
+        deserialize_reverse_mouse_wheel,
+        UserDefaultConfig::read().get("reverse_mouse_wheel")
+    );
 
     fn default_custom_image_quality() -> Vec<i32> {
         let f: f64 = UserDefaultConfig::read()
@@ -1483,7 +1497,11 @@ impl UserDefaultConfig {
     }
 
     pub fn set(&mut self, key: String, value: String) {
-        self.options.insert(key, value);
+        if value.is_empty() {
+            self.options.remove(&key);
+        } else {
+            self.options.insert(key, value);
+        }
         self.store();
     }
 
@@ -1632,6 +1650,106 @@ macro_rules! deserialize_default {
     };
 }
 
+#[derive(Debug, Default, Serialize, Deserialize, Clone)]
+pub struct GroupPeer {
+    #[serde(
+        default,
+        deserialize_with = "deserialize_string",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub id: String,
+    #[serde(
+        default,
+        deserialize_with = "deserialize_string",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub username: String,
+    #[serde(
+        default,
+        deserialize_with = "deserialize_string",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub hostname: String,
+    #[serde(
+        default,
+        deserialize_with = "deserialize_string",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub platform: String,
+    #[serde(
+        default,
+        deserialize_with = "deserialize_string",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub login_name: String,
+}
+
+#[derive(Debug, Default, Serialize, Deserialize, Clone)]
+pub struct GroupUser {
+    #[serde(
+        default,
+        deserialize_with = "deserialize_string",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub name: String,
+}
+
+#[derive(Debug, Default, Serialize, Deserialize, Clone)]
+pub struct Group {
+    #[serde(
+        default,
+        deserialize_with = "deserialize_string",
+        skip_serializing_if = "String::is_empty"
+    )]
+    pub access_token: String,
+    #[serde(default, deserialize_with = "deserialize_vec_groupuser")]
+    pub users: Vec<GroupUser>,
+    #[serde(default, deserialize_with = "deserialize_vec_grouppeer")]
+    pub peers: Vec<GroupPeer>,
+}
+
+impl Group {
+    fn path() -> PathBuf {
+        let filename = format!("{}_group", APP_NAME.read().unwrap().clone());
+        Config::path(filename)
+    }
+
+    pub fn store(json: String) {
+        if let Ok(mut file) = std::fs::File::create(Self::path()) {
+            let data = compress(json.as_bytes());
+            let max_len = 64 * 1024 * 1024;
+            if data.len() > max_len {
+                // maxlen of function decompress
+                return;
+            }
+            if let Ok(data) = symmetric_crypt(&data, true) {
+                file.write_all(&data).ok();
+            }
+        };
+    }
+
+    pub fn load() -> Self {
+        if let Ok(mut file) = std::fs::File::open(Self::path()) {
+            let mut data = vec![];
+            if file.read_to_end(&mut data).is_ok() {
+                if let Ok(data) = symmetric_crypt(&data, false) {
+                    let data = decompress(&data);
+                    if let Ok(group) = serde_json::from_str::<Self>(&String::from_utf8_lossy(&data))
+                    {
+                        return group;
+                    }
+                }
+            }
+        };
+        Self::remove();
+        Self::default()
+    }
+
+    pub fn remove() {
+        std::fs::remove_file(Self::path()).ok();
+    }
+}
+
 deserialize_default!(deserialize_string, String);
 deserialize_default!(deserialize_bool, bool);
 deserialize_default!(deserialize_i32, i32);
@@ -1640,6 +1758,8 @@ deserialize_default!(deserialize_vec_string, Vec<String>);
 deserialize_default!(deserialize_vec_i32_string_i32, Vec<(i32, String, i32)>);
 deserialize_default!(deserialize_vec_discoverypeer, Vec<DiscoveryPeer>);
 deserialize_default!(deserialize_vec_abpeer, Vec<AbPeer>);
+deserialize_default!(deserialize_vec_groupuser, Vec<GroupUser>);
+deserialize_default!(deserialize_vec_grouppeer, Vec<GroupPeer>);
 deserialize_default!(deserialize_keypair, KeyPair);
 deserialize_default!(deserialize_size, Size);
 deserialize_default!(deserialize_hashmap_string_string, HashMap<String, String>);