Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions tuxbox/gui/control_editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
# Build reverse lookup: evdev keycode int -> KEY_* name string
_EVDEV_CODE_TO_NAME = {}
for _code, _name in e.bytype[e.EV_KEY].items():
if isinstance(_name, tuple):
_name = _name[0]
if isinstance(_name, (tuple, list)):
_name = sorted(list(_name), key=len)[0]
if _name.startswith('KEY_'):
_EVDEV_CODE_TO_NAME[_code] = _name
Comment on lines 87 to 93
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Build reverse lookup: evdev keycode int -> KEY_* name string
_EVDEV_CODE_TO_NAME = {}
for _code, _name in e.bytype[e.EV_KEY].items():
if isinstance(_name, tuple):
_name = _name[0]
if isinstance(_name, (tuple, list)):
_name = sorted(list(_name), key=len)[0]
if _name.startswith('KEY_'):
_EVDEV_CODE_TO_NAME[_code] = _name
# Preferred KEY_* name for codes that evdev exposes under multiple aliases.
# config_loader.KEY_NAMES is the parse whitelist, so the alias chosen here
# must match the name listed there (e.g. KEY_MUTE, not KEY_MIN_INTERESTING).
_PREFERRED_CODE_NAMES = {
e.KEY_MUTE: 'KEY_MUTE',
}
# Build reverse lookup: evdev keycode int -> KEY_* name string
_EVDEV_CODE_TO_NAME = {}
for _code, _name in e.bytype[e.EV_KEY].items():
if _code in _PREFERRED_CODE_NAMES:
_name = _PREFERRED_CODE_NAMES[_code]
elif isinstance(_name, tuple):
_name = _name[0]
if _name.startswith('KEY_'):
_EVDEV_CODE_TO_NAME[_code] = _name


Expand Down Expand Up @@ -644,10 +644,9 @@ def get_action(self) -> str:
elif self.special_key_combo.currentText() != "None":
key_name = self.special_key_combo.currentText()
if SPECIAL_KEYS.get(key_name):
for name, code in e.__dict__.items():
if name.startswith('KEY_') and code == SPECIAL_KEYS[key_name]:
parts.append(name)
break
code = SPECIAL_KEYS[key_name]
if code in _EVDEV_CODE_TO_NAME:
parts.append(_EVDEV_CODE_TO_NAME[code])

return "+".join(parts) if parts else "none"

Expand Down Expand Up @@ -913,10 +912,9 @@ def get_action(self) -> str:
elif self.special_key_combo.currentText() != "None":
key_name = self.special_key_combo.currentText()
if SPECIAL_KEYS.get(key_name):
for name, code in e.__dict__.items():
if name.startswith('KEY_') and code == SPECIAL_KEYS[key_name]:
parts.append(name)
break
code = SPECIAL_KEYS[key_name]
if code in _EVDEV_CODE_TO_NAME:
parts.append(_EVDEV_CODE_TO_NAME[code])

return "+".join(parts) if parts else ""

Expand Down Expand Up @@ -1716,10 +1714,9 @@ def _build_action_string(self) -> str:
elif self.special_key_combo.currentText() != "None":
key_name = self.special_key_combo.currentText()
if SPECIAL_KEYS.get(key_name):
for name, code in e.__dict__.items():
if name.startswith('KEY_') and code == SPECIAL_KEYS[key_name]:
parts.append(name)
break
code = SPECIAL_KEYS[key_name]
if code in _EVDEV_CODE_TO_NAME:
parts.append(_EVDEV_CODE_TO_NAME[code])

return "+".join(parts) if parts else "none"

Expand Down