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

Signed-off-by: ClSlaid <cailue@bupt.edu.cn>

src/ui/header.tis

@@ -298,10 +298,11 @@ class Header: Reactor.Component {
         recording = !recording;
         header.update();
         handler.record_status(recording);
+        // 0 is just a dummy value. It will be ignored by the handler.
         if (recording)
-            handler.refresh_video();
+            handler.refresh_video(0);
         else
-            handler.record_screen(false, display_width, display_height);
+            handler.record_screen(false, 0, display_width, display_height);
     }
 
     event click $(#screen) (_, me) {
@@ -370,7 +371,8 @@ class Header: Reactor.Component {
     }
     
     event click $(#refresh) {
-        handler.refresh_video();
+        // 0 is just a dummy value. It will be ignored by the handler.
+        handler.refresh_video(0);
     }
 
     event click $(#block-input) {

src/ui/index.tis

@@ -210,6 +210,7 @@ class Enhancements: Reactor.Component {
 
     function render() {
         var has_hwcodec = handler.has_hwcodec();
+        var support_remove_wallpaper = handler.support_remove_wallpaper();
         var me = this;
         self.timer(1ms, function() { me.toggleMenuState() });
         return <li>{translate('Enhancements')}
@@ -217,6 +218,7 @@ class Enhancements: Reactor.Component {
                 {has_hwcodec ? <li #enable-hwcodec><span>{svg_checkmark}</span>{translate("Hardware Codec")} (beta)</li> : ""}
                 <li #enable-abr><span>{svg_checkmark}</span>{translate("Adaptive bitrate")} (beta)</li>
                 <li #screen-recording>{translate("Recording")}</li>
+                {support_remove_wallpaper ? <li #allow-remove-wallpaper><span>{svg_checkmark}</span>{translate("Remove wallpaper during incoming sessions")}</li> : ""}
             </menu>
         </li>;
     }
@@ -226,6 +228,9 @@ class Enhancements: Reactor.Component {
             if (el.id && el.id.indexOf("enable-") == 0) {
                 var enabled = handler.get_option(el.id) != "N";
                 el.attributes.toggleClass("selected", enabled);
+            } else if (el.id && el.id.indexOf("allow-") == 0) {
+                var enabled = handler.get_option(el.id) == "Y";
+                el.attributes.toggleClass("selected", enabled);
             }
         }
 
@@ -235,6 +240,8 @@ class Enhancements: Reactor.Component {
         var v = me.id;
         if (v.indexOf("enable-") == 0) {
             handler.set_option(v, handler.get_option(v) != 'N' ? 'N' : '');
+        } else if (v.indexOf("allow-") == 0) {
+            handler.set_option(v, handler.get_option(v) == 'Y' ? '' : 'Y');
         } else if (v == 'screen-recording') {
             var dir = handler.get_option("video-save-directory");
             if (!dir) dir = handler.default_video_save_directory();

src/ui/remote.rs

@@ -122,7 +122,11 @@ impl InvokeUiSession for SciterHandler {
             "updateQualityStatus",
             &make_args!(
                 status.speed.map_or(Value::null(), |it| it.into()),
-                status.fps.map_or(Value::null(), |it| it.into()),
+                status
+                    .fps
+                    .iter()
+                    .next()
+                    .map_or(Value::null(), |(_, v)| (*v).into()),
                 status.delay.map_or(Value::null(), |it| it.into()),
                 status.target_bitrate.map_or(Value::null(), |it| it.into()),
                 status
@@ -223,7 +227,7 @@ impl InvokeUiSession for SciterHandler {
         self.call("adaptSize", &make_args!());
     }
 
-    fn on_rgba(&self, rgba: &mut scrap::ImageRgb) {
+    fn on_rgba(&self, _display: usize, rgba: &mut scrap::ImageRgb) {
         VIDEO
             .lock()
             .unwrap()
@@ -304,11 +308,11 @@ impl InvokeUiSession for SciterHandler {
     }
 
     /// RGBA is directly rendered by [on_rgba]. No need to store the rgba for the sciter ui.
-    fn get_rgba(&self) -> *const u8 {
+    fn get_rgba(&self, _display: usize) -> *const u8 {
         std::ptr::null()
     }
 
-    fn next_rgba(&self) {}
+    fn next_rgba(&self, _display: usize) {}
 }
 
 pub struct SciterSession(Session<SciterHandler>);
@@ -449,8 +453,8 @@ impl sciter::EventHandler for SciterSession {
         fn save_view_style(String);
         fn save_image_quality(String);
         fn save_custom_image_quality(i32);
-        fn refresh_video();
-        fn record_screen(bool, i32, i32);
+        fn refresh_video(i32);
+        fn record_screen(bool, i32, i32, i32);
         fn record_status(bool);
         fn get_toggle_option(String);
         fn is_privacy_mode_supported();

src/ui/remote.tis

@@ -23,7 +23,7 @@ handler.setDisplay = function(x, y, w, h, cursor_embedded) {
     display_origin_y = y;
     display_cursor_embedded = cursor_embedded;
     adaptDisplay();
-    if (recording) handler.record_screen(true, w, h);
+    if (recording) handler.record_screen(true, 0, w, h);
 }
 
 // in case toolbar not shown correctly
@@ -478,7 +478,7 @@ function self.closing() {
     var (x, y, w, h) = view.box(#rectw, #border, #screen);
     if (is_file_transfer) save_file_transfer_close_state();
     if (is_file_transfer || is_port_forward || size_adapted) handler.save_size(x, y, w, h);
-    if (recording) handler.record_screen(false, display_width, display_height);
+    if (recording) handler.record_screen(false, 0, display_width, display_height);
 }
 
 var qualityMonitor;