diff options
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-yh8xx_yh9xx.c | 68 |
1 files changed, 39 insertions, 29 deletions
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 03f6f8bcff..eb5c969cac 100644 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -29,17 +29,17 @@ | |||
29 | #include "button.h" | 29 | #include "button.h" |
30 | #include "settings.h" | 30 | #include "settings.h" |
31 | 31 | ||
32 | /* | 32 | /* |
33 | * The format of the list is as follows | 33 | * The format of the list is as follows |
34 | * { Action Code, Button code, Prereq button code } | 34 | * { Action Code, Button code, Prereq button code } |
35 | * if there's no need to check the previous button's value, use BUTTON_NONE | 35 | * if there's no need to check the previous button's value, use BUTTON_NONE |
36 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 36 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
37 | */ | 37 | */ |
38 | 38 | ||
39 | /* CONTEXT_CUSTOM's used in this file... | 39 | /* CONTEXT_CUSTOM's used in this file... |
40 | 40 | ||
41 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) | 41 | CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions) |
42 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens | 42 | CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens |
43 | i.e where up/down is inc/dec | 43 | i.e where up/down is inc/dec |
44 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec | 44 | CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec |
45 | 45 | ||
@@ -61,7 +61,7 @@ static const struct button_mapping button_context_standard[] = { | |||
61 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | 61 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, |
62 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | 62 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, |
63 | 63 | ||
64 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 64 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
65 | 65 | ||
66 | LAST_ITEM_IN_LIST | 66 | LAST_ITEM_IN_LIST |
67 | }; /* button_context_standard */ | 67 | }; /* button_context_standard */ |
@@ -83,7 +83,7 @@ static const struct button_mapping button_context_wps[] = { | |||
83 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, | 83 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, |
84 | 84 | ||
85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, | 86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
87 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 87 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
89 | 89 | ||
@@ -99,14 +99,14 @@ static const struct button_mapping button_context_wps[] = { | |||
99 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 99 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
100 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 100 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
101 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 101 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
102 | 102 | ||
103 | LAST_ITEM_IN_LIST | 103 | LAST_ITEM_IN_LIST |
104 | }; /* button_context_wps */ | 104 | }; /* button_context_wps */ |
105 | 105 | ||
106 | static const struct button_mapping button_context_list[] = { | 106 | static const struct button_mapping button_context_list[] = { |
107 | #ifdef SAMSUNG_YH820 | 107 | #ifdef SAMSUNG_YH820 |
108 | { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_UP, BUTTON_REC }, | 108 | { ACTION_LISTTREE_PGUP, BUTTON_REC|BUTTON_UP, BUTTON_NONE }, |
109 | { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_DOWN, BUTTON_REC }, | 109 | { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_DOWN, BUTTON_NONE }, |
110 | #else | 110 | #else |
111 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD, BUTTON_NONE }, | 111 | { ACTION_LISTTREE_PGUP, BUTTON_FFWD, BUTTON_NONE }, |
112 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW, BUTTON_NONE }, | 112 | { ACTION_LISTTREE_PGDOWN, BUTTON_REW, BUTTON_NONE }, |
@@ -156,7 +156,7 @@ static const struct button_mapping button_context_settings[] = { | |||
156 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 156 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
157 | 157 | ||
158 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 158 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
159 | 159 | ||
160 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 160 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
161 | }; /* button_context_settings */ | 161 | }; /* button_context_settings */ |
162 | 162 | ||
@@ -244,6 +244,9 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
244 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 244 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
245 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 245 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
246 | 246 | ||
247 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
248 | { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
249 | |||
247 | { ACTION_PS_TOGGLE_MODE, BUTTON_FFWD, BUTTON_NONE }, | 250 | { ACTION_PS_TOGGLE_MODE, BUTTON_FFWD, BUTTON_NONE }, |
248 | { ACTION_PS_RESET, BUTTON_REW, BUTTON_NONE }, | 251 | { ACTION_PS_RESET, BUTTON_REW, BUTTON_NONE }, |
249 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, | 252 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, |
@@ -255,9 +258,9 @@ static const struct button_mapping button_context_recscreen[] = { | |||
255 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 258 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
256 | { ACTION_REC_NEWFILE, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, | 259 | { ACTION_REC_NEWFILE, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, |
257 | 260 | ||
258 | { ACTION_STD_MENU, BUTTON_REC, BUTTON_NONE }, | 261 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, |
259 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 262 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, |
260 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | 263 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
261 | 264 | ||
262 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 265 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
263 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 266 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -280,18 +283,25 @@ static const struct button_mapping button_context_keyboard[] = { | |||
280 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 283 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
281 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 284 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
282 | 285 | ||
283 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REW|BUTTON_REL, BUTTON_FFWD }, | 286 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT, BUTTON_NONE }, |
284 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 287 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
285 | 288 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, | |
286 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 289 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, |
287 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
288 | 290 | ||
289 | { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 291 | { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
290 | { ACTION_KBD_PAGE_FLIP, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_NONE }, | 292 | { ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
291 | 293 | ||
292 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 294 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
293 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_PLAY, BUTTON_FFWD }, | 295 | { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_PLAY, BUTTON_NONE }, |
294 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_FFWD }, | 296 | |
297 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_NONE }, | ||
298 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | ||
299 | |||
300 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | ||
301 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
302 | |||
303 | { ACTION_KBD_MORSE_INPUT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, | ||
304 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | ||
295 | 305 | ||
296 | LAST_ITEM_IN_LIST | 306 | LAST_ITEM_IN_LIST |
297 | }; /* button_context_keyboard */ | 307 | }; /* button_context_keyboard */ |
@@ -325,34 +335,34 @@ const struct button_mapping* get_context_mapping(int context) | |||
325 | return button_context_standard; | 335 | return button_context_standard; |
326 | case CONTEXT_WPS: | 336 | case CONTEXT_WPS: |
327 | return button_context_wps; | 337 | return button_context_wps; |
328 | 338 | ||
329 | case CONTEXT_LIST: | 339 | case CONTEXT_LIST: |
330 | return button_context_list; | 340 | return button_context_list; |
331 | case CONTEXT_TREE: | 341 | case CONTEXT_TREE: |
332 | case CONTEXT_MAINMENU: | 342 | case CONTEXT_MAINMENU: |
333 | if (global_settings.hold_lr_for_scroll_in_list) | 343 | if (global_settings.hold_lr_for_scroll_in_list) |
334 | return button_context_listtree_scroll_without_combo; | 344 | return button_context_listtree_scroll_without_combo; |
335 | else | 345 | else |
336 | return button_context_listtree_scroll_with_combo; | 346 | return button_context_listtree_scroll_with_combo; |
337 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 347 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
338 | return button_context_tree; | 348 | return button_context_tree; |
339 | 349 | ||
340 | case CONTEXT_SETTINGS: | 350 | case CONTEXT_SETTINGS: |
341 | return button_context_settings; | 351 | return button_context_settings; |
342 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | 352 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: |
343 | case CONTEXT_SETTINGS_RECTRIGGER: | 353 | case CONTEXT_SETTINGS_RECTRIGGER: |
344 | return button_context_settings_right_is_inc; | 354 | return button_context_settings_right_is_inc; |
345 | 355 | ||
346 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 356 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
347 | return button_context_colorchooser; | 357 | return button_context_colorchooser; |
348 | case CONTEXT_SETTINGS_EQ: | 358 | case CONTEXT_SETTINGS_EQ: |
349 | return button_context_eq; | 359 | return button_context_eq; |
350 | 360 | ||
351 | case CONTEXT_SETTINGS_TIME: | 361 | case CONTEXT_SETTINGS_TIME: |
352 | return button_context_time; | 362 | return button_context_time; |
353 | 363 | ||
354 | case CONTEXT_YESNOSCREEN: | 364 | case CONTEXT_YESNOSCREEN: |
355 | return button_context_yesno; | 365 | return button_context_yesno; |
356 | case CONTEXT_BOOKMARKSCREEN: | 366 | case CONTEXT_BOOKMARKSCREEN: |
357 | return button_context_bmark; | 367 | return button_context_bmark; |
358 | case CONTEXT_QUICKSCREEN: | 368 | case CONTEXT_QUICKSCREEN: |