From 2e32d428352c7017b6f5a737fb89de3d06c475b9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 26 May 2018 06:41:20 +0000 Subject: [PATCH] don't try to process pointer location data if input devices are disabled git-svn-id: https://xpra.org/svn/Xpra/trunk@19467 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/x11/desktop_server.py | 3 ++- src/xpra/x11/server.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/xpra/x11/desktop_server.py b/src/xpra/x11/desktop_server.py index 7316e71b3c..1a1a6ce562 100644 --- a/src/xpra/x11/desktop_server.py +++ b/src/xpra/x11/desktop_server.py @@ -16,6 +16,7 @@ from xpra.scripts.config import parse_bool, parse_number from xpra.platform.paths import get_icon from xpra.platform.gui import get_wm_name +from xpra.server import server_features from xpra.server.rfb.rfb_server import RFBServer from xpra.gtk_common.gobject_util import one_arg_signal, no_arg_signal from xpra.gtk_common.gobject_compat import import_glib @@ -507,7 +508,7 @@ def _process_unmap_window(self, proto, packet): def _process_configure_window(self, proto, packet): wid, x, y, w, h = packet[1:6] - if len(packet)>=13 and not self.readonly: + if len(packet)>=13 and server_features.input_devices and not self.readonly: pwid = packet[10] pointer = packet[11] modifiers = packet[12] diff --git a/src/xpra/x11/server.py b/src/xpra/x11/server.py index 3b9555f1ec..24e61bd511 100644 --- a/src/xpra/x11/server.py +++ b/src/xpra/x11/server.py @@ -18,6 +18,7 @@ from xpra.version_util import XPRA_VERSION from xpra.util import updict, rindex, envbool, envint from xpra.os_util import memoryview_to_bytes, monotonic_time +from xpra.server import server_features from xpra.gtk_common.gobject_util import one_arg_signal from xpra.gtk_common.gtk_util import get_default_root_window, get_xwindow from xpra.x11.common import Unmanageable @@ -249,7 +250,6 @@ def x11_init(self): ### Create the WM object self._wm = Wm(self.clobber, self.wm_name) - from xpra.server import server_features if server_features.windows: self._wm.connect("new-window", self._new_window_signaled) self._wm.connect("quit", lambda _: self.clean_quit(True)) @@ -897,7 +897,7 @@ def _process_configure_window(self, proto, packet): size_changed = oww!=w or owh!=h if is_ui_driver or size_changed or not shown: damage = False - if is_ui_driver and len(packet)>=13 and not self.readonly: + if is_ui_driver and len(packet)>=13 and server_features.input_devices and not self.readonly: pwid = packet[10] pointer = packet[11] modifiers = packet[12]