minimum backport of cc58a0d

Xpra-org · Feb 24, 2023 · 06b9d90 · 06b9d90
1 parent 0b9801d
commit 06b9d90
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/xpra/platform/darwin/gui.py b/xpra/platform/darwin/gui.py
@@ -46,6 +46,7 @@
 
 OSX_FOCUS_WORKAROUND = envint("XPRA_OSX_FOCUS_WORKAROUND", 2000)
 SLEEP_HANDLER = envbool("XPRA_OSX_SLEEP_HANDLER", True)
+EVENT_LISTENER = envbool("XPRA_OSX_EVENT_LISTENER", False)
 OSX_WHEEL_MULTIPLIER = envint("XPRA_OSX_WHEEL_MULTIPLIER", 100)
 OSX_WHEEL_PRECISE_MULTIPLIER = envint("XPRA_OSX_WHEEL_PRECISE_MULTIPLIER", 1)
 OSX_WHEEL_DIVISOR = envint("XPRA_OSX_WHEEL_DIVISOR", 10)
@@ -708,10 +709,11 @@ def cleanup(self):
         self.client = None
 
     def ready(self):
-        try:
-            self.setup_event_listener()
-        except Exception:
-            log.error("Error setting up OSX event listener", exc_info=True)
+        if EVENT_LISTENER:
+            try:
+                self.setup_event_listener()
+            except:
+                log.error("Error setting up OSX event listener", exc_info=True)
 
     def setup_event_listener(self):
         log("setup_event_listener()")