diff options
Diffstat (limited to 'apps/keymaps/keymap-touchscreen.c')
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index e7cf87a7a1..ae1857cb46 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -45,9 +45,9 @@ const struct button_mapping* target_get_context_mapping(int context); | |||
45 | 45 | ||
46 | /* touchscreen "buttons" | 46 | /* touchscreen "buttons" |
47 | screen is split into a 3x3 grid for buttons... | 47 | screen is split into a 3x3 grid for buttons... |
48 | BUTTON_TOPLEFT BUTTON_TOPMIDDLE BUTTON_TOPRIGHT | 48 | BUTTON_TOPLEFT BUTTON_TOPMIDDLE BUTTON_TOPRIGHT |
49 | BUTTON_MIDLEFT BUTTON_CENTER BUTTON_MIDRIGHT | 49 | BUTTON_MIDLEFT BUTTON_CENTER BUTTON_MIDRIGHT |
50 | BUTTON_BOTTOMLEFT BUTTON_BOTTOMMIDDLE BUTTON_BOTTOMRIGHT | 50 | BUTTON_BOTTOMLEFT BUTTON_BOTTOMMIDDLE BUTTON_BOTTOMRIGHT |
51 | */ | 51 | */ |
52 | 52 | ||
53 | static const struct button_mapping button_context_standard[] = { | 53 | static const struct button_mapping button_context_standard[] = { |
@@ -58,34 +58,44 @@ static const struct button_mapping button_context_standard[] = { | |||
58 | 58 | ||
59 | { ACTION_STD_OK, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, | 59 | { ACTION_STD_OK, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, |
60 | { ACTION_STD_OK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, | 60 | { ACTION_STD_OK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, |
61 | { ACTION_STD_OK, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, | ||
62 | { ACTION_STD_CANCEL, BUTTON_MIDLEFT, BUTTON_NONE }, | 61 | { ACTION_STD_CANCEL, BUTTON_MIDLEFT, BUTTON_NONE }, |
63 | { ACTION_STD_CANCEL, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 62 | { ACTION_STD_CANCEL, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
64 | 63 | ||
65 | { ACTION_STD_MENU, BUTTON_TOPLEFT, BUTTON_NONE }, | 64 | { ACTION_STD_MENU, BUTTON_TOPLEFT, BUTTON_NONE }, |
66 | { ACTION_STD_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 65 | { ACTION_STD_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
67 | { ACTION_STD_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, | 66 | { ACTION_STD_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, |
68 | 67 | { ACTION_STD_CONTEXT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, | |
68 | |||
69 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_STD) | 69 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_STD) |
70 | }; /* button_context_standard */ | 70 | }; /* button_context_standard */ |
71 | 71 | ||
72 | static const struct button_mapping button_context_wps[] = { | 72 | static const struct button_mapping button_context_wps[] = { |
73 | 73 | ||
74 | { ACTION_WPS_PLAY, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, | 74 | { ACTION_WPS_PLAY, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, |
75 | { ACTION_WPS_STOP, BUTTON_TOPRIGHT|BUTTON_REPEAT, BUTTON_TOPRIGHT }, | 75 | { ACTION_WPS_STOP, BUTTON_TOPRIGHT|BUTTON_REPEAT, BUTTON_TOPRIGHT }, |
76 | { ACTION_WPS_SKIPNEXT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, | ||
77 | { ACTION_WPS_SKIPPREV, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT }, | ||
78 | 76 | ||
77 | { ACTION_WPS_SKIPPREV, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT }, | ||
79 | { ACTION_WPS_SEEKBACK, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 78 | { ACTION_WPS_SEEKBACK, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
80 | { ACTION_WPS_SEEKFWD, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
81 | { ACTION_WPS_STOPSEEK, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT|BUTTON_REPEAT }, | 79 | { ACTION_WPS_STOPSEEK, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT|BUTTON_REPEAT }, |
80 | |||
81 | { ACTION_WPS_SKIPNEXT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, | ||
82 | { ACTION_WPS_SEEKFWD, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
82 | { ACTION_WPS_STOPSEEK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT|BUTTON_REPEAT }, | 83 | { ACTION_WPS_STOPSEEK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT|BUTTON_REPEAT }, |
83 | 84 | ||
85 | { ACTION_WPS_VOLUP, BUTTON_TOPMIDDLE, BUTTON_NONE }, | ||
86 | { ACTION_WPS_VOLUP, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
87 | { ACTION_WPS_VOLDOWN, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, | ||
88 | { ACTION_WPS_VOLDOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
89 | |||
84 | { ACTION_WPS_BROWSE, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, | 90 | { ACTION_WPS_BROWSE, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, |
85 | { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, | 91 | { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, |
92 | |||
86 | { ACTION_WPS_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, | 93 | { ACTION_WPS_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, |
87 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, | 94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, |
88 | 95 | ||
96 | { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, | ||
97 | { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, | ||
98 | |||
89 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) | 99 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) |
90 | }; /* button_context_wps */ | 100 | }; /* button_context_wps */ |
91 | 101 | ||
@@ -110,7 +120,7 @@ static const struct button_mapping button_context_list[] = { | |||
110 | 120 | ||
111 | static const struct button_mapping button_context_tree[] = { | 121 | static const struct button_mapping button_context_tree[] = { |
112 | { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, | 122 | { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, |
113 | 123 | ||
114 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM2|CONTEXT_TREE) | 124 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM2|CONTEXT_TREE) |
115 | }; /* button_context_tree */ | 125 | }; /* button_context_tree */ |
116 | 126 | ||
@@ -141,7 +151,7 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { | |||
141 | { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE }, | 151 | { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE }, |
142 | { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 152 | { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
143 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, | 153 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, |
144 | 154 | ||
145 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) | 155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) |
146 | }; /* button_context_settingsgraphical */ | 156 | }; /* button_context_settingsgraphical */ |
147 | 157 | ||
@@ -218,7 +228,7 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
218 | static const struct button_mapping button_context_keyboard[] = { | 228 | static const struct button_mapping button_context_keyboard[] = { |
219 | 229 | ||
220 | { ACTION_KBD_LEFT, BUTTON_MIDLEFT, BUTTON_NONE }, | 230 | { ACTION_KBD_LEFT, BUTTON_MIDLEFT, BUTTON_NONE }, |
221 | { ACTION_KBD_LEFT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 231 | { ACTION_KBD_LEFT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
222 | { ACTION_KBD_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE }, | 232 | { ACTION_KBD_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE }, |
223 | { ACTION_KBD_RIGHT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 233 | { ACTION_KBD_RIGHT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
224 | { ACTION_KBD_CURSOR_LEFT, BUTTON_TOPLEFT, BUTTON_NONE }, | 234 | { ACTION_KBD_CURSOR_LEFT, BUTTON_TOPLEFT, BUTTON_NONE }, |
@@ -341,7 +351,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
341 | #endif | 351 | #endif |
342 | ) | 352 | ) |
343 | return target_get_context_mapping(context & ~CONTEXT_CUSTOM2); | 353 | return target_get_context_mapping(context & ~CONTEXT_CUSTOM2); |
344 | 354 | ||
345 | switch (context) | 355 | switch (context) |
346 | { | 356 | { |
347 | case CONTEXT_STD: | 357 | case CONTEXT_STD: |