diff options
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-m200.c | 113 |
1 files changed, 60 insertions, 53 deletions
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c index 20c2fb931f..86144c0b0c 100644 --- a/apps/keymaps/keymap-m200.c +++ b/apps/keymaps/keymap-m200.c | |||
@@ -34,18 +34,19 @@ | |||
34 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 34 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
35 | */ | 35 | */ |
36 | static const struct button_mapping button_context_standard[] = { | 36 | static const struct button_mapping button_context_standard[] = { |
37 | { ACTION_STD_PREV, BUTTON_PLAYPAUSE, BUTTON_NONE }, | 37 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
38 | { ACTION_STD_PREVREPEAT, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 38 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
39 | 39 | ||
40 | { ACTION_STD_NEXT, BUTTON_REPEATAB, BUTTON_NONE }, | 40 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
41 | { ACTION_STD_NEXTREPEAT, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, | 41 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
42 | 42 | ||
43 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 43 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
44 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 44 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
46 | 46 | ||
47 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 47 | { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
48 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 48 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
49 | // { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
49 | // { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE }, | 50 | // { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE }, |
50 | 51 | ||
51 | LAST_ITEM_IN_LIST | 52 | LAST_ITEM_IN_LIST |
@@ -53,8 +54,8 @@ static const struct button_mapping button_context_standard[] = { | |||
53 | 54 | ||
54 | 55 | ||
55 | static const struct button_mapping button_context_wps[] = { | 56 | static const struct button_mapping button_context_wps[] = { |
56 | { ACTION_WPS_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, | 57 | { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
57 | { ACTION_WPS_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_PLAYPAUSE }, | 58 | { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
58 | 59 | ||
59 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 60 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
60 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 61 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -64,35 +65,36 @@ static const struct button_mapping button_context_wps[] = { | |||
64 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 65 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
65 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 66 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
66 | 67 | ||
67 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_MENU|BUTTON_RIGHT, BUTTON_MENU }, | 68 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, |
68 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_MENU|BUTTON_LEFT, BUTTON_MENU }, | 69 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, |
69 | { ACTION_WPS_ABRESET, BUTTON_MENU|BUTTON_PLAYPAUSE, BUTTON_MENU }, | 70 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, |
70 | 71 | ||
71 | { ACTION_WPS_VOLUP, BUTTON_VOLUP, BUTTON_NONE }, | 72 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
72 | { ACTION_WPS_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | 73 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
73 | 74 | ||
74 | { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN, BUTTON_NONE }, | 75 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
75 | { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | 76 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
76 | 77 | ||
77 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 78 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
78 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 79 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
79 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_PLAYPAUSE, BUTTON_SELECT }, | 80 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
80 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_REPEATAB, BUTTON_SELECT }, | 81 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
81 | { ACTION_WPS_CONTEXT, BUTTON_REPEATAB|BUTTON_REL, BUTTON_REPEATAB }, | 82 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
82 | { ACTION_WPS_QUICKSCREEN, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_REPEATAB }, | 83 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
84 | // { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
83 | 85 | ||
84 | LAST_ITEM_IN_LIST | 86 | LAST_ITEM_IN_LIST |
85 | }; /* button_context_wps */ | 87 | }; /* button_context_wps */ |
86 | 88 | ||
87 | static const struct button_mapping button_context_settings[] = { | 89 | static const struct button_mapping button_context_settings[] = { |
88 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | 90 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
89 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, | 91 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, |
90 | 92 | ||
91 | { ACTION_SETTINGS_INC, BUTTON_PLAYPAUSE, BUTTON_NONE }, | 93 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
92 | { ACTION_SETTINGS_INCREPEAT,BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 94 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
93 | 95 | ||
94 | { ACTION_SETTINGS_DEC, BUTTON_REPEATAB, BUTTON_NONE }, | 96 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
95 | { ACTION_SETTINGS_DECREPEAT,BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, | 97 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
96 | 98 | ||
97 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 99 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
98 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 100 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -104,6 +106,9 @@ static const struct button_mapping button_context_settings[] = { | |||
104 | }; /* button_context_settings */ | 106 | }; /* button_context_settings */ |
105 | 107 | ||
106 | static const struct button_mapping button_context_list[] = { | 108 | static const struct button_mapping button_context_list[] = { |
109 | // { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_UP, BUTTON_REC }, | ||
110 | // { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_DOWN, BUTTON_REC }, | ||
111 | |||
107 | #ifdef HAVE_VOLUME_IN_LIST | 112 | #ifdef HAVE_VOLUME_IN_LIST |
108 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 113 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
109 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 114 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
@@ -138,7 +143,7 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[ | |||
138 | }; /* button_context_listtree_scroll_without_combo */ | 143 | }; /* button_context_listtree_scroll_without_combo */ |
139 | 144 | ||
140 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 145 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
141 | // { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 146 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
142 | 147 | ||
143 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, | 148 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, |
144 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 149 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -157,13 +162,13 @@ static const struct button_mapping button_context_yesno[] = { | |||
157 | 162 | ||
158 | static const struct button_mapping button_context_quickscreen[] = { | 163 | static const struct button_mapping button_context_quickscreen[] = { |
159 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 164 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
160 | { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, | 165 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, |
161 | 166 | ||
162 | { ACTION_QS_DOWNINV, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_NONE }, | 167 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, |
163 | { ACTION_QS_DOWNINV, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 168 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
164 | 169 | ||
165 | { ACTION_QS_DOWN, BUTTON_REPEATAB|BUTTON_REL, BUTTON_NONE }, | 170 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, |
166 | { ACTION_QS_DOWN, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, | 171 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
167 | 172 | ||
168 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 173 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
169 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 174 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -181,17 +186,17 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { | |||
181 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 186 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
182 | { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 187 | { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
183 | 188 | ||
184 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | 189 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
185 | 190 | ||
186 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 191 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
187 | }; /* button_context_settings_right_is_inc */ | 192 | }; /* button_context_settings_right_is_inc */ |
188 | 193 | ||
189 | static const struct button_mapping button_context_pitchscreen[] = { | 194 | static const struct button_mapping button_context_pitchscreen[] = { |
190 | { ACTION_PS_INC_SMALL, BUTTON_PLAYPAUSE, BUTTON_NONE }, | 195 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
191 | { ACTION_PS_INC_BIG, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 196 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
192 | 197 | ||
193 | { ACTION_PS_DEC_SMALL, BUTTON_REPEATAB, BUTTON_NONE }, | 198 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
194 | { ACTION_PS_DEC_BIG, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, | 199 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
195 | 200 | ||
196 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 201 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
197 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 202 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
@@ -200,7 +205,7 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
200 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 205 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
201 | 206 | ||
202 | { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE }, | 207 | { ACTION_PS_RESET, BUTTON_SELECT, BUTTON_NONE }, |
203 | { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE }, | 208 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, |
204 | 209 | ||
205 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 210 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
206 | }; /* button_context_pitchscreen */ | 211 | }; /* button_context_pitchscreen */ |
@@ -208,10 +213,10 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
208 | /** Recording Screen **/ | 213 | /** Recording Screen **/ |
209 | #ifdef HAVE_RECORDING | 214 | #ifdef HAVE_RECORDING |
210 | static const struct button_mapping button_context_recscreen[] = { | 215 | static const struct button_mapping button_context_recscreen[] = { |
211 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 216 | { ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
212 | { ACTION_REC_PAUSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 217 | { ACTION_REC_PAUSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
213 | { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 218 | { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
214 | { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 219 | // { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
215 | 220 | ||
216 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 221 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
217 | { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 222 | { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -225,13 +230,13 @@ static const struct button_mapping button_context_recscreen[] = { | |||
225 | /** FM Radio Screen **/ | 230 | /** FM Radio Screen **/ |
226 | #if CONFIG_TUNER | 231 | #if CONFIG_TUNER |
227 | static const struct button_mapping button_context_radio[] = { | 232 | static const struct button_mapping button_context_radio[] = { |
228 | { ACTION_NONE, BUTTON_PLAYPAUSE, BUTTON_NONE }, | 233 | { ACTION_NONE, BUTTON_UP, BUTTON_NONE }, |
229 | { ACTION_FM_MENU, BUTTON_REPEATAB, BUTTON_NONE }, | 234 | { ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE }, |
230 | { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE }, | 235 | { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE }, |
231 | { ACTION_FM_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_PLAYPAUSE }, | 236 | { ACTION_FM_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
232 | { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, | 237 | // { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, |
233 | { ACTION_FM_EXIT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 238 | { ACTION_FM_EXIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
234 | { ACTION_FM_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, | 239 | { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
235 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, | 240 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
236 | { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 241 | { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
237 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, | 242 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
@@ -247,15 +252,15 @@ static const struct button_mapping button_context_keyboard[] = { | |||
247 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 252 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
248 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 253 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
249 | 254 | ||
250 | // { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, | 255 | // { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_NONE }, |
251 | // { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE }, | 256 | // { ACTION_KBD_CURSOR_LEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,BUTTON_NONE }, |
252 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, | 257 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, |
253 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | 258 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, |
254 | 259 | ||
255 | { ACTION_KBD_UP, BUTTON_PLAYPAUSE, BUTTON_NONE }, | 260 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
256 | { ACTION_KBD_UP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 261 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
257 | { ACTION_KBD_DOWN, BUTTON_REPEATAB, BUTTON_NONE }, | 262 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
258 | { ACTION_KBD_DOWN, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, | 263 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
259 | 264 | ||
260 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE }, | 265 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE }, |
261 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE }, | 266 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE }, |
@@ -263,8 +268,9 @@ static const struct button_mapping button_context_keyboard[] = { | |||
263 | // { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, | 268 | // { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, |
264 | 269 | ||
265 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 270 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
266 | { ACTION_KBD_DONE, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 271 | { ACTION_KBD_DONE, BUTTON_VOL_UP, BUTTON_NONE }, |
267 | { ACTION_KBD_ABORT, BUTTON_MENU, BUTTON_NONE }, | 272 | { ACTION_KBD_DONE, BUTTON_VOL_DOWN, BUTTON_NONE }, |
273 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, | ||
268 | 274 | ||
269 | LAST_ITEM_IN_LIST | 275 | LAST_ITEM_IN_LIST |
270 | }; /* button_context_keyboard */ | 276 | }; /* button_context_keyboard */ |
@@ -303,6 +309,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
303 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | 309 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: |
304 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 310 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
305 | case CONTEXT_SETTINGS_EQ: | 311 | case CONTEXT_SETTINGS_EQ: |
312 | case CONTEXT_SETTINGS_RECTRIGGER: | ||
306 | return button_context_settings_right_is_inc; | 313 | return button_context_settings_right_is_inc; |
307 | 314 | ||
308 | case CONTEXT_YESNOSCREEN: | 315 | case CONTEXT_YESNOSCREEN: |