Skip to content

Commit

Permalink
don't try to process pointer location data if input devices are disabled
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@19467 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 26, 2018
1 parent aa649cf commit 2e32d42
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/xpra/x11/desktop_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions src/xpra/x11/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit 2e32d42

Please sign in to comment.