RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rules: uinput: Skip barrier for events of the same type 

The barrier means to serialize keyboard and mouse events [1]. It makes
no sense to sleep between events of the same type.

Skip barrier for events of the same type, so that the diversion rules
for some really frequent HID++ notifications will be happy as long as
they don't specify both keyboard and mouse actions. For example, HIRES
WHEEL in freespin mode can emit HID++ notifications at a frequency of
125Hz (the report rate), which is faster than 100Hz (the barrier),
resulting in backlogged HID++ notifications.

Link: https://github.com/pwr-Solaar/Solaar/issues/1020#issuecomment-1086875735 [1]
Signed-off-by: Rongrong <i@rong.moe>
This commit is contained in:
Rongrong 2026-05-25 18:21:01 +08:00
parent 3f72efebc1
commit e2a32cee85
No known key found for this signature in database
GPG Key ID: 1C2D45D45AB7FE94
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/logitech_receiver/diversion.py
View File

@ -18,6 +18,7 @@ from __future__ import annotations
import contextlib
import ctypes
import enum
import logging
import math
import numbers
@ -255,23 +256,33 @@ else:
class UInput:
class EventType(enum.Enum):
KEYBOARD = enum.auto()
MOUSE = enum.auto()
def __init__(self):
self.udevice = None
self.barrier_until = None
self.barrier_type = None
def _wait_barrier(self):
def _wait_barrier(self, event_type: EventType):
if self.barrier_until is None:
return
if event_type == self.barrier_type:
return
remainder = self.barrier_until - time.monotonic()
if remainder > 0:
if logger.isEnabledFor(logging.DEBUG):
logger.debug("wait %.3fs due to barrier", remainder)
logger.debug("wait %.3fs due to %s barrier", remainder, self.barrier_type)
time.sleep(remainder)
self.barrier_until = None
self.barrier_type = None
def barrier(self, margin: float):
def barrier(self, margin: float, event_type: EventType):
self.barrier_type = event_type
self.barrier_until = time.monotonic() + margin
def setup(self):
@ -302,7 +313,7 @@ class UInput:
def key(self, code, event): # X11 keycode but Solaar event code
if evdev:
self._wait_barrier()
self._wait_barrier(self.EventType.KEYBOARD)
if self.simulate(evdev.ecodes.EV_KEY, code - 8, event):
return True
logger.warning("no way to simulate key input")
@ -324,14 +335,14 @@ class UInput:
return True
def click(self, button, count):
self._wait_barrier()
self._wait_barrier(self.EventType.MOUSE)
if self._click(button, count):
return True
logger.warning("no way to simulate mouse click")
return False
def scroll(self, dx, dy):
self._wait_barrier()
self._wait_barrier(self.EventType.MOUSE)
success = True
if dx:
success = self.simulate(evdev.ecodes.EV_REL, evdev.ecodes.REL_HWHEEL, dx)
@ -1230,7 +1241,7 @@ class KeyPress(Action):
self.keyDown(self.key_symbols, current)
if self.action != DEPRESS:
self.keyUp(reversed(self.key_symbols), current)
uinput.barrier(0.01)
uinput.barrier(0.01, uinput.EventType.KEYBOARD)
else:
logger.warning("no keymap so cannot determine which keycode to send")
return None
@ -1269,7 +1280,7 @@ class MouseScroll(Action):
logger.info("MouseScroll action: %s %s %s", self.amounts, last_result, amounts)
dx, dy = amounts
uinput.scroll(dx, dy)
uinput.barrier(0.01)
uinput.barrier(0.01, uinput.EventType.MOUSE)
return None
def data(self):
@ -1308,7 +1319,7 @@ class MouseClick(Action):
logger.info(f"MouseClick action: {str(self.count)} {self.button}")
if self.button and self.count:
uinput.click(buttons[self.button], self.count)
uinput.barrier(0.01)
uinput.barrier(0.01, uinput.EventType.MOUSE)
return None
def data(self):