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

rules: check for xtest and disable modifier checking if not available

This commit is contained in:
Peter F. Patel-Schneider 2022-01-16 20:15:39 -05:00
parent 56936a4d0a
commit f6b25a9685
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/logitech_receiver/diversion.py
View File

@ -66,19 +66,23 @@ except Exception:
if x11: if x11:
display = Display() display = Display()
context = display.record_create_context( try:
0, [record.AllClients], [{ context = display.record_create_context(
'core_requests': (0, 0), 0, [record.AllClients], [{
'core_replies': (0, 0), 'core_requests': (0, 0),
'ext_requests': (0, 0, 0, 0), 'core_replies': (0, 0),
'ext_replies': (0, 0, 0, 0), 'ext_requests': (0, 0, 0, 0),
'delivered_events': (0, 0), 'ext_replies': (0, 0, 0, 0),
'device_events': (X.KeyPress, X.KeyRelease), 'delivered_events': (0, 0),
'errors': (0, 0), 'device_events': (X.KeyPress, X.KeyRelease),
'client_started': False, 'errors': (0, 0),
'client_died': False, 'client_started': False,
}] 'client_died': False,
) }]
)
except Exception:
_log.warn('X11 xtest not available - Modifiers and KeyPress will not work correctly', exc_info=_sys.exc_info())
context = None
modifier_keycodes = display.get_modifier_mapping() modifier_keycodes = display.get_modifier_mapping()
current_key_modifiers = 0 current_key_modifiers = 0
@ -104,7 +108,7 @@ def key_press_handler(reply):
current_key_modifiers = event.state & ~(1 << mod) if mod is not None else event.state current_key_modifiers = event.state & ~(1 << mod) if mod is not None else event.state
if x11: if x11 and context is not None:
_thread.start_new_thread(display.record_enable_context, (context, key_press_handler)) _thread.start_new_thread(display.record_enable_context, (context, key_press_handler))
# display.record_free_context(context) when should this be done?? # display.record_free_context(context) when should this be done??