diff options
Diffstat (limited to 'apps/keymaps/keymap-fiiom3k.c')
-rw-r--r-- | apps/keymaps/keymap-fiiom3k.c | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c index 4cd2691d33..f4c7c6dd44 100644 --- a/apps/keymaps/keymap-fiiom3k.c +++ b/apps/keymaps/keymap-fiiom3k.c | |||
@@ -40,39 +40,41 @@ static const struct button_mapping button_context_standard[] = { | |||
40 | {ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 40 | {ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
41 | {ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, | 41 | {ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, |
42 | {ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, | 42 | {ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, |
43 | {ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU}, | 43 | {ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REL, BUTTON_MENU}, |
44 | {ACTION_STD_MENU, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK}, | 44 | {ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, |
45 | {ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, | ||
46 | {ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, | 45 | {ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, |
47 | {ACTION_STD_HOTKEY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | ||
48 | LAST_ITEM_IN_LIST | 46 | LAST_ITEM_IN_LIST |
49 | }; /* button_context_standard */ | 47 | }; /* button_context_standard */ |
50 | 48 | ||
51 | static const struct button_mapping button_context_wps[] = { | 49 | static const struct button_mapping button_context_wps[] = { |
52 | {ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 50 | {ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
53 | {ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 51 | {ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
54 | {ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER}, | 52 | {ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER}, |
55 | {ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE}, | 53 | {ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE}, |
56 | {ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 54 | {ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
57 | {ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE}, | 55 | {ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE}, |
58 | {ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 56 | {ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
57 | {ACTION_WPS_VOLUP, BUTTON_SCROLL_BACK, BUTTON_NONE}, | ||
58 | {ACTION_WPS_VOLUP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, | ||
59 | {ACTION_WPS_VOLDOWN, BUTTON_SCROLL_FWD, BUTTON_NONE}, | ||
60 | {ACTION_WPS_VOLDOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, | ||
61 | {ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REL, BUTTON_UP}, | ||
62 | {ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN}, | ||
59 | {ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, | 63 | {ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, |
60 | {ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT}, | 64 | {ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT}, |
61 | {ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 65 | {ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
62 | {ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT}, | 66 | {ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT}, |
63 | {ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 67 | {ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
64 | {ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT}, | 68 | {ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT}, |
65 | {ACTION_WPS_BROWSE, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK}, | 69 | {ACTION_WPS_BROWSE, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, |
66 | {ACTION_WPS_MENU, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, | 70 | {ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REL, BUTTON_MENU}, |
67 | {ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU}, | 71 | {ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, |
68 | {ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, | ||
69 | {ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, | 72 | {ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, |
70 | {ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, | 73 | {ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, |
71 | {ACTION_WPS_VIEW_PLAYLIST, BUTTON_SCROLL_FWD, BUTTON_NONE}, | 74 | {ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, |
72 | {ACTION_WPS_VIEW_PLAYLIST, BUTTON_SCROLL_BACK, BUTTON_NONE}, | ||
73 | {ACTION_WPS_ABSETA_PREVDIR, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP}, | 75 | {ACTION_WPS_ABSETA_PREVDIR, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP}, |
74 | {ACTION_WPS_ABSETB_NEXTDIR, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN}, | 76 | {ACTION_WPS_ABSETB_NEXTDIR, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN}, |
75 | {ACTION_WPS_ABRESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, | 77 | {ACTION_WPS_ABRESET, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK}, |
76 | LAST_ITEM_IN_LIST | 78 | LAST_ITEM_IN_LIST |
77 | }; /* button_context_wps */ | 79 | }; /* button_context_wps */ |
78 | 80 | ||
@@ -87,11 +89,20 @@ static const struct button_mapping button_context_wps_locked[] = { | |||
87 | }; /* button_context_wps_locked */ | 89 | }; /* button_context_wps_locked */ |
88 | 90 | ||
89 | static const struct button_mapping button_context_tree[] = { | 91 | static const struct button_mapping button_context_tree[] = { |
90 | {ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, | 92 | {ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
91 | {ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK}, | 93 | {ACTION_TREE_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, |
94 | {ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER}, | ||
92 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 95 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
93 | }; /* button_context_tree */ | 96 | }; /* button_context_tree */ |
94 | 97 | ||
98 | |||
99 | static const struct button_mapping button_context_tree_scroll_lr[] = { | ||
100 | { ACTION_TREE_ROOT_INIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
101 | { ACTION_TREE_PGLEFT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
102 | { ACTION_TREE_PGRIGHT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE }, | ||
103 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | ||
104 | }; /* button_context_tree_scroll_lr */ | ||
105 | |||
95 | static const struct button_mapping button_context_bmark[] = { | 106 | static const struct button_mapping button_context_bmark[] = { |
96 | {ACTION_BMS_DELETE, BUTTON_PLAY, BUTTON_NONE}, | 107 | {ACTION_BMS_DELETE, BUTTON_PLAY, BUTTON_NONE}, |
97 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE), | 108 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE), |
@@ -140,14 +151,25 @@ static const struct button_mapping button_context_settings_eq[] = { | |||
140 | 151 | ||
141 | static const struct button_mapping button_context_quickscreen[] = { | 152 | static const struct button_mapping button_context_quickscreen[] = { |
142 | {ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE}, | 153 | {ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE}, |
154 | {ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE}, | ||
155 | {ACTION_QS_TOP, BUTTON_SCROLL_BACK, BUTTON_NONE}, | ||
156 | {ACTION_QS_TOP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, | ||
143 | {ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE}, | 157 | {ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE}, |
158 | {ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
159 | {ACTION_QS_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE}, | ||
160 | {ACTION_QS_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, | ||
144 | {ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 161 | {ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
162 | {ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | ||
145 | {ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 163 | {ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
164 | {ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | ||
146 | {ACTION_QS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE}, | 165 | {ACTION_QS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE}, |
166 | {ACTION_QS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | ||
147 | {ACTION_QS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE}, | 167 | {ACTION_QS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE}, |
168 | {ACTION_QS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
148 | {ACTION_STD_CANCEL, BUTTON_SELECT, BUTTON_NONE}, | 169 | {ACTION_STD_CANCEL, BUTTON_SELECT, BUTTON_NONE}, |
149 | {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, | 170 | {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, |
150 | {ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE}, | 171 | {ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE}, |
172 | {ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE}, | ||
151 | LAST_ITEM_IN_LIST | 173 | LAST_ITEM_IN_LIST |
152 | }; /* button_context_quickscreen */ | 174 | }; /* button_context_quickscreen */ |
153 | 175 | ||
@@ -279,6 +301,10 @@ const struct button_mapping* get_context_mapping(int context) | |||
279 | return button_context_wps; | 301 | return button_context_wps; |
280 | case CONTEXT_TREE: | 302 | case CONTEXT_TREE: |
281 | case CONTEXT_MAINMENU: | 303 | case CONTEXT_MAINMENU: |
304 | if (global_settings.hold_lr_for_scroll_in_list) | ||
305 | return button_context_tree_scroll_lr; | ||
306 | /* else fall through to CUSTOM|CONTEXT_TREE */ | ||
307 | case CONTEXT_CUSTOM|CONTEXT_TREE: | ||
282 | return button_context_tree; | 308 | return button_context_tree; |
283 | case CONTEXT_BOOKMARKSCREEN: | 309 | case CONTEXT_BOOKMARKSCREEN: |
284 | return button_context_bmark; | 310 | return button_context_bmark; |