Merge branch 'master' into nothing

pwr-Solaar · Aug 2, 2023 · 8a56716 · 8a56716
2 parents 52652ec + 0e8e052
commit 8a56716
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/docs/capabilities.md b/docs/capabilities.md
@@ -140,7 +140,6 @@ change the speed of some thumb wheels.  These notifications are only sent
 for actions that are set in Solaar to their HID++ setting (also known as diverted).
 For more information on this capability of Solaar see
 [the rules page](https://pwr-solaar.github.io/Solaar/rules).
-Some features of rules do not work under Wayland.
 
 Users can edit rules using a GUI by clicking on the `Rule Editor` button in the Solaar main window.
 

diff --git a/docs/rules.md b/docs/rules.md
@@ -11,7 +11,9 @@ Rule processing is an experimental feature.  Significant changes might be made i
 Note that rule processing only fully works under X11.
 When running under Wayland with X11 libraries loaded some features will not be available.
 When running under Wayland without X11 libraries loaded even more features will not be available.
-Rule features known not to work under Wayland include process and mouse process conditions.
+Rule features known not to work under Wayland include process and mouse process conditions,
+although on GNOME desktop under Wayland, you can use those with the Solaar Gnome extension installed,
+You can install it from `https://extensions.gnome.org/extension/6162/solaar-extension`.
 Under Wayland using keyboard groups may result in incorrect symbols being input for simulated input.
 Under Wayland simulating inputs when modifier keys are pressed may result in incorrect symbols being sent.
 Simulated input uses Xtest if available under X11 or uinput if the user has write access to /dev/uinput.

diff --git a/lib/logitech_receiver/diversion.py b/lib/logitech_receiver/diversion.py
@@ -215,7 +215,7 @@ def setup_uinput():
         _log.warn('cannot create uinput device: %s', e)
 
 
-if wayland:  # wayland can't use xtest so may as well set up uinput now
+if wayland:  # Wayland can't use xtest so may as well set up uinput now
     setup_uinput()
 
 
@@ -603,7 +603,7 @@ def __init__(self, process, warn=True):
         if (not wayland and not x11_setup()) or (wayland and not gnome_dbus_interface_setup()):
             if warn:
                 _log.warn(
-                    'rules can only access active process in X11 or in wayland under GNOME with Solaar Gnome extension - %s',
+                    'rules can only access active process in X11 or in Wayland under GNOME with Solaar Gnome extension - %s',
                     self
                 )
         if not isinstance(process, str):
@@ -635,7 +635,7 @@ def __init__(self, process, warn=True):
             if warn:
                 _log.warn(
                     'rules cannot access active mouse process '
-                    'in X11 or in wayland under GNOME with Solaar Gnome extension - %s', self
+                    'in X11 or in Wayland under GNOME with Solaar Extension for GNOME - %s', self
                 )
         if not isinstance(process, str):
             if warn:

diff --git a/rules.d-uinput/42-logitech-unify-permissions.rules b/rules.d-uinput/42-logitech-unify-permissions.rules
@@ -23,8 +23,7 @@ LABEL="solaar_apply"
 
 # Allow any seated user to access the receiver.
 # uaccess: modern ACL-enabled udev
-# udev-acl: for Ubuntu 12.10 and older
-TAG+="uaccess", TAG+="udev-acl"
+TAG+="uaccess"
 
 # Grant members of the "plugdev" group access to receiver (useful for SSH users)
 #MODE="0660", GROUP="plugdev"

diff --git a/rules.d/42-logitech-unify-permissions.rules b/rules.d/42-logitech-unify-permissions.rules
@@ -22,8 +22,7 @@ LABEL="solaar_apply"
 
 # Allow any seated user to access the receiver.
 # uaccess: modern ACL-enabled udev
-# udev-acl: for Ubuntu 12.10 and older
-TAG+="uaccess", TAG+="udev-acl"
+TAG+="uaccess"
 
 # Grant members of the "plugdev" group access to receiver (useful for SSH users)
 #MODE="0660", GROUP="plugdev"