Pass XDG_SESSION_TYPE with tox.ini

This environment variable was not passed with tox, meaning that it wasn't
exposed to the environment in Python. Now it is, and now you can use it
to determine x11 from Wayland.

Author: NijeboerFrank

plover/gui_qt/machine_options.py

@@ -23,6 +23,7 @@
 from plover import _
 from plover.oslayer.serial import patch_ports_info
 from plover.oslayer.config import PLATFORM
+from plover.oslayer.linux.display_server import DISPLAY_SERVER
 
 from plover.gui_qt.config_keyboard_widget_ui import Ui_KeyboardWidget
 from plover.gui_qt.config_serial_widget_ui import Ui_SerialWidget
@@ -204,7 +205,7 @@ def __init__(self):
             )
         )
         self._value = {}
-        if PLATFORM == "linux":
+        if PLATFORM == "linux" and DISPLAY_SERVER == "wayland":
             self.setup_keyboard_selection()
 
     def setValue(self, value):

plover/machine/keyboard.py

@@ -9,6 +9,7 @@
 from plover.misc import boolean
 from plover.oslayer.keyboardcontrol import KeyboardCapture
 from plover.oslayer.config import PLATFORM
+from plover.oslayer.linux.display_server import DISPLAY_SERVER
 
 
 # i18n: Machine name.
@@ -91,7 +92,7 @@ def start_capture(self):
         self._initializing()
         try:
             self._keyboard_capture = KeyboardCapture()
-            if PLATFORM == "linux":
+            if PLATFORM == "linux" and DISPLAY_SERVER == "wayland":
                 self._keyboard_capture.set_keyboard_selection(self._keyboard_selection)
             self._keyboard_capture.key_down = self._key_down
             self._keyboard_capture.key_up = self._key_up

plover/oslayer/linux/display_server.py

@@ -6,4 +6,5 @@
     - wayland
     - tty
 """
+print(os.environ.items())
 DISPLAY_SERVER = os.environ.get("XDG_SESSION_TYPE", None)

test/test_keyboard.py

@@ -5,6 +5,7 @@
 from plover.machine.keymap import Keymap
 from plover.oslayer.keyboardcontrol import KeyboardCapture
 from plover.oslayer.config import PLATFORM
+from plover.oslayer.linux.display_server import DISPLAY_SERVER
 
 from unittest import mock
 
@@ -66,7 +67,7 @@ def strokes(machine):
 def test_lifecycle(capture, machine, strokes):
     # Start machine.
     machine.start_capture()
-    if PLATFORM == "linux":
+    if PLATFORM == "linux" and DISPLAY_SERVER == "wayland":
         assert capture.mock_calls == [
             mock.call.set_keyboard_selection(""),
             mock.call.start(),

tox.ini

@@ -60,6 +60,9 @@ setenv =
     # Linux: add to library path so ctypes can find hidapi libraries
     LD_LIBRARY_PATH = {env:HIDAPI_DEV_LIB_LNX}{:}{env:LD_LIBRARY_PATH:}
 
+	# Linux: pass XDG_SESSION_TYPE to distinguish between X and Wayland
+	XDG_SESSION_TYPE = {env:XDG_SESSION_TYPE}
+
 	# Windows: not done via path; see dev/write_hidapi_pth.py
 
 # Lightweight tests only environments.