#3813 add 'icc' data to 'configure-display' packet

Xpra-org · Apr 2, 2023 · 8decace · 8decace
1 parent 8b151a0
commit 8decace
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/xpra/client/mixins/display.py b/xpra/client/mixins/display.py
@@ -525,6 +525,13 @@ def update_screen_size(self):
                 "monitors"              : monitors,
                 "dpi"                   : {"x" : xdpi, "y" : ydpi},
                 }
+            icc = self.get_icc_info()
+            dicc = self.get_display_icc_info()
+            if icc or dicc:
+                attrs["icc"] = {
+                    "global"    : icc,
+                    "display"   : dicc,
+                    }
             if ndesktops:
                 attrs["desktops"] = ndesktops,
                 attrs["desktop-names"] = desktop_names or ()

diff --git a/xpra/server/mixins/display_manager.py b/xpra/server/mixins/display_manager.py
@@ -383,6 +383,12 @@ def _process_configure_display(self, proto, packet):
         if desktop_names:
             ss.set_desktops(attrs.intget("desktops", len(desktop_names)), desktop_names)
             self.calculate_desktops()
+        iccd = attrs.dictget("icc")
+        if iccd:
+            iccd = typedict(iccd)
+            ss.icc = iccd.get("global", ss.icc)
+            ss.display_icc = iccd.get("display", ss.display_icc)
+            self.set_icc_profile()
         #don't bother with screen-sizes?
         bigger = ss.screen_resize_bigger
         width, height = desktop_size