use a looser coupling with display and cursor modules

Xpra-org · Feb 17, 2025 · 0db1474 · 0db1474
1 parent 8c76df9
commit 0db1474
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/xpra/x11/server/base.py b/xpra/x11/server/base.py
@@ -311,9 +311,14 @@ def update_all_server_settings(self, reset=False) -> None:
     def update_server_settings(self, settings=None, reset=False) -> None:
         if not features.display:
             return
+        cursor_size = getattr(self, "cursor_size", 0)
+        dpi = getattr(self, "dpi", 0)
+        antialias = getattr(self, "antialias", {})
+        double_click_time = getattr(self, "double_click_time", 0)
+        double_click_distance = getattr(self, "double_click_distance", (-1, -1))
         self.do_update_server_settings(settings or self._settings, reset,
-                                       self.dpi, self.double_click_time, self.double_click_distance,
-                                       self.antialias, self.cursor_size)
+                                       dpi, double_click_time, double_click_distance,
+                                       antialias, cursor_size)
 
     def do_update_server_settings(self, settings, reset=False,
                                   dpi=0, double_click_time=0, double_click_distance=(-1, -1),

diff --git a/xpra/x11/server/core.py b/xpra/x11/server/core.py
@@ -815,7 +815,8 @@ def fake_key(self, keycode, press) -> None:
             X11Keyboard.xtest_fake_key(keycode, press)
 
     def do_x11_cursor_event(self, event) -> None:
-        if not self.cursors:
+        cursors = getattr(self, "cursors", False)
+        if not cursors:
             return
         if self.last_cursor_serial == event.cursor_serial:
             cursorlog("ignoring cursor event %s with the same serial number %s", event, self.last_cursor_serial)