From 27070431650bfebad82393031b06b26078e5d182 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Jul 2023 17:44:24 +0200 Subject: [PATCH] #3592 assume randr_notify is available --- xpra/client/mixins/display.py | 1 - xpra/server/source/display.py | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/xpra/client/mixins/display.py b/xpra/client/mixins/display.py index a252e7f1c3..f67990ef21 100644 --- a/xpra/client/mixins/display.py +++ b/xpra/client/mixins/display.py @@ -108,7 +108,6 @@ def get_info(self): # hello: def get_caps(self) -> Dict[str,Any]: caps = { - "randr_notify" : True, "show-desktop" : True, "vrefresh" : self.get_vrefresh(), } diff --git a/xpra/server/source/display.py b/xpra/server/source/display.py index fd31875f29..82aa993ff3 100644 --- a/xpra/server/source/display.py +++ b/xpra/server/source/display.py @@ -27,7 +27,6 @@ def init_state(self) -> None: self.vrefresh : int = -1 self.icc : Dict = {} self.display_icc : Dict = {} - self.randr_notify : bool = False self.desktop_size : Optional[Tuple[int, int]] = None self.desktop_mode_size : Optional[Tuple[int, int]] = None self.desktop_size_unscaled : Optional[Tuple[int, int]] = None @@ -47,7 +46,6 @@ def get_info(self) -> Dict[str,Any]: "desktop_size" : self.desktop_size or "", "desktops" : self.desktops, "desktop_names" : self.desktop_names, - "randr_notify" : self.randr_notify, "opengl" : self.opengl_props, "monitors" : self.monitors, "screens" : len(self.screen_sizes), @@ -61,7 +59,6 @@ def get_info(self) -> Dict[str,Any]: def parse_client_caps(self, c : typedict) -> None: self.vrefresh = c.intget("vrefresh", -1) - self.randr_notify = c.boolget("randr_notify") self.desktop_size = c.intpair("desktop_size") if self.desktop_size is not None: w, h = self.desktop_size @@ -165,11 +162,10 @@ def set_desktops(self, desktops:int, desktop_names) -> None: self.desktop_names = tuple(net_utf8(d) for d in (desktop_names or ())) def updated_desktop_size(self, root_w:int, root_h:int, max_w:int, max_h:int) -> bool: - log("updated_desktop_size%s randr_notify=%s, desktop_size=%s", - (root_w, root_h, max_w, max_h), self.randr_notify, self.desktop_size) + log("updated_desktop_size%s desktop_size=%s", (root_w, root_h, max_w, max_h), self.desktop_size) if not self.hello_sent: return False - if self.randr_notify and (not self.desktop_size_server or tuple(self.desktop_size_server)!=(root_w, root_h)): + if not self.desktop_size_server or tuple(self.desktop_size_server)!=(root_w, root_h): self.desktop_size_server = root_w, root_h self.send("desktop_size", root_w, root_h, max_w, max_h) return True