Merge a3ce172bef into 137dd6b2ff

master to use_english

lib/hidapi/hidapi_impl.py

@@ -24,7 +24,6 @@ which is MIT licensed.
 """
 
 from __future__ import annotations
-
 import atexit
 import ctypes
 import logging

lib/logitech_receiver/diversion.py

@@ -28,6 +28,7 @@ import subprocess
 import sys
 import time
 import typing
+import threading
 
 from typing import Any
 from typing import Dict
@@ -46,6 +47,8 @@ if platform.system() in ("Darwin", "Windows"):
 else:
     import evdev
 
+
+from . import language_switcher as _language_switcher
 from .common import NamedInt
 from .hidpp20 import SupportedFeature
 from .special_keys import CONTROL
@@ -57,7 +60,7 @@ if typing.TYPE_CHECKING:
     from .base import HIDPPNotification
 
 logger = logging.getLogger(__name__)
-
+switcher = _language_switcher.LanguageSwitcher()
 #
 # See docs/rules.md for documentation
 #
@@ -1550,7 +1553,22 @@ def process_notification(device, notification: HIDPPNotification, feature) -> No
                 thumb_wheel_displacement = 0
             thumb_wheel_displacement += signed(notification.data[0:2])
 
-    GLib.idle_add(evaluate_rules, feature, notification, device)
+    def switch_and_evaluate(feature, notification, device):
+        done_switching = threading.Event()
+
+        def switch_language():
+            switcher.evaluate()
+            done_switching.set()
+
+        def evaluate_rules():
+            done_switching.wait()  # Wait until the language has been switched
+            rules.evaluate(feature, notification, device, True)
+            switcher.set_previous_language()
+
+        GLib.idle_add(switch_language)
+        GLib.idle_add(evaluate_rules)
+
+    GLib.idle_add(switch_and_evaluate, feature, notification, device)
 
 
 _XDG_CONFIG_HOME = os.environ.get("XDG_CONFIG_HOME") or os.path.expanduser(os.path.join("~", ".config"))

lib/logitech_receiver/language_switcher.py

@@ -0,0 +1,82 @@
+import logging
+import subprocess
+
+from xkbgroup import X11Error
+from xkbgroup import XKeyboard
+
+logger = logging.getLogger(__name__)
+
+
+# it would be better to use xkbgroup to switch language, but I don't know how to work with it
+class LanguageSwitcher:
+    def __init__(self):
+        self.xkb = None
+        try:
+            self.xkb = XKeyboard()
+        except X11Error as e:
+            logger.error(f"Cannot initialize XKeyboard: {e}")
+        self.previous_layout = None
+
+    def get_current_layout(self):
+        """Gets the current keyboard layout (language)."""
+        try:
+            result = subprocess.run(["setxkbmap", "-query"], capture_output=True, text=True)
+            for line in result.stdout.splitlines():
+                if "layout:" in line:
+                    return line.split(":")[1].strip()
+        except Exception as e:
+            logger.error(f"Failed to get current keyboard layout: {e}")
+            return None
+
+    def get_current_language(self):
+        """Gets the current keyboard layout (language)."""
+        try:
+            # xkb used because setxkbmap shows only layout, but not language. So we need to use xkb to check current language
+            return self.xkb.group_symbol
+        except Exception as e:
+            logger.error(f"Failed to get current keyboard layout: {e}")
+            return None
+
+    def remember_layout(self, language):
+        """Remembers the previous language."""
+        self.previous_layout = language
+        logger.debug(f"Remembered language: {self.previous_layout}")
+
+    # switch to english using setxkbmap because xkbgroup switching seems to be asynctounous and I don't know how work with it
+    # you can use xkbgroup to switch to english. just remember previous_language instead of layout
+    # and use self.xkb.group_symbol =  "us", self.xkb.group_symbol = previous_language
+    def switch_language_to_english(self):
+        """Switches the keyboard layout to English."""
+        try:
+            subprocess.run(["setxkbmap", "us"], check=True)
+            logger.debug("Switched keyboard layout to English.")
+        except subprocess.CalledProcessError as e:
+            logger.error(f"Failed to switch to English layout: {e}")
+
+    def set_previous_language(self):
+        """Sets the keyboard layout back to the previously remembered language."""
+        if self.previous_layout:
+            try:
+                subprocess.run(["setxkbmap", self.previous_layout], check=True)
+                logger.debug(f"Restored keyboard layout to {self.previous_layout}.")
+            except subprocess.CalledProcessError as e:
+                logger.error(f"Failed to restore previous layout: {e}")
+            finally:
+                self.previous_layout = None
+        else:
+            logger.warning("No previous language was remembered.")
+
+    def evaluate(self):
+        """Evaluate the current language and switch to English if it's not already English."""
+        if not self.xkb:
+            logger.warning("X11 display not accessible. Skipping get_current_language.")
+            return None
+
+        current_language = self.get_current_language()
+        logger.debug(f"Current language: {current_language}")
+
+        if current_language != "us":
+            current_layout = self.get_current_layout()
+            logger.debug(f"Current layout: {current_layout}")
+            self.remember_layout(current_layout)
+            self.switch_language_to_english()

lib/logitech_receiver/notifications.py

@@ -90,7 +90,6 @@ def process_receiver_notification(receiver: Receiver, notification: HIDPPNotific
         Notification.RAW_INPUT,
         Notification.POWER,
     ]
-
     logger.warning(f"{receiver}: unhandled notification {notification}")
 
 

lib/logitech_receiver/settings.py

@@ -678,7 +678,6 @@ class FeatureRWMap(FeatureRW):
         reply = device.feature_request(self.feature, self.write_fnid, key_bytes, data_bytes, no_reply=self.no_reply)
         return reply if not self.no_reply else True
 
-
 class ActionSettingRW:
     """Special RW class for settings that turn on and off special processing when a key or button is depressed"""
 

setup.py

@@ -77,6 +77,7 @@ setup(
         'dbus-python ; platform_system=="Linux"',
         "PyGObject",
         "typing_extensions",
+        "xkbgroup",
     ],
     extras_require={
         "report-descriptor": ["hid-parser"],