refactor: key handling (#4849)

This commit is contained in:
philmoz
2024-05-27 18:33:53 +10:00
committed by GitHub
parent b8a0038c68
commit e807ccbebf
101 changed files with 380 additions and 578 deletions
-1
View File
@@ -22,7 +22,6 @@ KEYS_LUT = [
"KEY_EXIT",
"KEY_ENTER",
"KEY_PAGE",
"KEY_PAGEUP",
"KEY_PAGEDN",
-1
View File
@@ -37,7 +37,6 @@ KEYS = [
{ "name": "EXIT", "key": "KEY_EXIT", "label": "Exit" },
{ "name": "ENTER", "key": "KEY_ENTER", "label": "Enter" },
{ "name": "PAGE", "key": "KEY_PAGE", "label": "Page" },
{ "name": "PAGEUP", "key": "KEY_PAGEUP", "label": "PgUp" },
{ "name": "PAGEDN", "key": "KEY_PAGEDN", "label": "PgDn" },
+18 -21
View File
@@ -6,13 +6,13 @@
{% set key_plus = keys | selectattr("key","==","KEY_PLUS") | first %}
{% set key_up = keys | selectattr("key","==","KEY_UP") | first %}
{% set key_shift = keys | selectattr("key","==","KEY_SHIFT") | first %}
{% set key_page = keys | selectattr("key","==","KEY_PAGE") | first %}
{% set key_pageup = keys | selectattr("key","==","KEY_PAGEUP") | first %}
{% set key_pagedn = keys | selectattr("key","==","KEY_PAGEDN") | first %}
{% set key_model = keys | selectattr("key","==","KEY_MODEL") | first %}
{% set key_menu = keys | selectattr("key","==","KEY_MENU") | first %}
{% set key_tele = keys | selectattr("key","==","KEY_TELE") | first %}
{% set key_sys = keys | selectattr("key","==","KEY_SYS") | first %}
{% set key_hats_as_keys = not key_pagedn and not key_menu and not key_up %}
{% if key_plus %}
LROT_NUMENTRY( EVT_VIRTUAL_PREV, EVT_KEY_FIRST(KEY_PLUS) )
@@ -53,18 +53,10 @@
LROT_NUMENTRY( EVT_VIRTUAL_MENU, EVT_KEY_BREAK(KEY_RIGHT) )
LROT_NUMENTRY( EVT_VIRTUAL_MENU_LONG, EVT_KEY_LONG(KEY_RIGHT) )
{% else %}
{% if key_page %}
LROT_NUMENTRY( EVT_VIRTUAL_PREV_PAGE, EVT_KEY_LONG(KEY_PAGE) )
LROT_NUMENTRY( EVT_VIRTUAL_NEXT_PAGE, EVT_KEY_BREAK(KEY_PAGE) )
{% elif key_pageup %}
LROT_NUMENTRY( EVT_VIRTUAL_PREV_PAGE, EVT_KEY_BREAK(KEY_PAGEUP) )
LROT_NUMENTRY( EVT_VIRTUAL_NEXT_PAGE, EVT_KEY_BREAK(KEY_PAGEDN) )
{% else %}
LROT_NUMENTRY( EVT_VIRTUAL_PREV_PAGE, EVT_KEY_LONG(KEY_PAGEDN) )
LROT_NUMENTRY( EVT_VIRTUAL_NEXT_PAGE, EVT_KEY_BREAK(KEY_PAGEDN) )
{% endif %}
{% if key_model %}
{% if key_model or key_hats_as_keys %}
LROT_NUMENTRY( EVT_VIRTUAL_MENU, EVT_KEY_BREAK(KEY_MODEL) )
LROT_NUMENTRY( EVT_VIRTUAL_MENU_LONG, EVT_KEY_LONG(KEY_MODEL) )
{% else %}
@@ -92,15 +84,15 @@ LROT_NUMENTRY( EVT_EXIT_BREAK, EVT_KEY_BREAK(KEY_EXIT) )
{{ key_event('MENU','KEY_MENU') }}
{% endif %}
{% if key_tele %}
{% if key_tele or key_hats_as_keys %}
{{ key_event('TELEM','KEY_TELE') }}
{% endif %}
{% if key_model %}
{% if key_model or key_hats_as_keys %}
{{ key_event('MODEL','KEY_MODEL') }}
{% endif %}
{% if key_sys %}
{% if key_sys or key_hats_as_keys %}
{{ key_event('SYS','KEY_SYS') }}
{% endif %}
@@ -111,16 +103,21 @@ LROT_NUMENTRY( EVT_EXIT_BREAK, EVT_KEY_BREAK(KEY_EXIT) )
{{ key_event('RIGHT', 'KEY_RIGHT') }}
{% endif %}
{% if key_page %}
{{ key_event('PAGE', 'KEY_PAGE') }}
{% endif %}
{% if key_pageup %}
{% if key_pageup or key_hats_as_keys %}
{{ key_event('PAGEUP', 'KEY_PAGEUP') }}
{% endif %}
{% if key_pagedn %}
{{ key_event('PAGEDN', 'KEY_PAGEDN') }}
{% elif key_pagedn %}
{% if key_menu %}
LROT_NUMENTRY( EVT_PAGE_FIRST, EVT_KEY_FIRST(KEY_PAGEDN) )
LROT_NUMENTRY( EVT_PAGE_BREAK, EVT_KEY_BREAK(KEY_PAGEDN) )
LROT_NUMENTRY( EVT_PAGE_LONG, EVT_KEY_BREAK(KEY_PAGEUP) )
LROT_NUMENTRY( EVT_PAGE_REPT, EVT_KEY_REPT(KEY_PAGEDN) )
{% else %}
LROT_NUMENTRY( EVT_PAGEDN_FIRST, EVT_KEY_FIRST(KEY_PAGEDN) )
LROT_NUMENTRY( EVT_PAGEDN_BREAK, EVT_KEY_BREAK(KEY_PAGEDN) )
LROT_NUMENTRY( EVT_PAGEDN_LONG, EVT_KEY_BREAK(KEY_PAGEUP) )
LROT_NUMENTRY( EVT_PAGEDN_REPT, EVT_KEY_REPT(KEY_PAGEDN) )
{% endif %}
{% endif %}
{% if key_plus %}