diff options
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-sa9200.c | 299 |
1 files changed, 156 insertions, 143 deletions
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c index c77f3e9bb4..bf693600c8 100644 --- a/apps/keymaps/keymap-sa9200.c +++ b/apps/keymaps/keymap-sa9200.c | |||
@@ -53,22 +53,22 @@ static const struct button_mapping button_context_standard[] = { | |||
53 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 53 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
54 | 54 | ||
55 | { ACTION_STD_CANCEL, BUTTON_REW, BUTTON_NONE }, | 55 | { ACTION_STD_CANCEL, BUTTON_REW, BUTTON_NONE }, |
56 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | ||
56 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 57 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
57 | 58 | ||
58 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 59 | { ACTION_STD_OK, BUTTON_FFWD, BUTTON_NONE }, |
60 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
59 | 61 | ||
60 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
61 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 62 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
62 | 63 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | |
63 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 64 | { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
64 | { ACTION_STD_OK, BUTTON_FFWD, BUTTON_NONE }, | ||
65 | 65 | ||
66 | LAST_ITEM_IN_LIST | 66 | LAST_ITEM_IN_LIST |
67 | }; /* button_context_standard */ | 67 | }; /* button_context_standard */ |
68 | 68 | ||
69 | 69 | ||
70 | static const struct button_mapping button_context_wps[] = { | 70 | static const struct button_mapping button_context_wps[] = { |
71 | { ACTION_WPS_PLAY, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 71 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
72 | { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 72 | { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
73 | 73 | ||
74 | { ACTION_WPS_SKIPNEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 74 | { ACTION_WPS_SKIPNEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
@@ -76,45 +76,43 @@ static const struct button_mapping button_context_wps[] = { | |||
76 | 76 | ||
77 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 77 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
78 | { ACTION_WPS_SEEKFWD, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 78 | { ACTION_WPS_SEEKFWD, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
79 | |||
79 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, | 80 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, |
80 | { ACTION_WPS_STOPSEEK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, | 81 | { ACTION_WPS_STOPSEEK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, |
81 | 82 | ||
82 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_RIGHT|BUTTON_FFWD, BUTTON_NONE }, | 83 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, |
83 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE }, | 84 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, |
84 | { ACTION_WPS_ABRESET, BUTTON_RIGHT|BUTTON_SELECT, BUTTON_NONE }, | 85 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, |
85 | 86 | ||
86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 87 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
87 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 88 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
88 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 89 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
89 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 90 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
91 | |||
90 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 92 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
91 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 93 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
92 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 94 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 95 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
94 | 96 | ||
95 | { ACTION_WPS_PITCHSCREEN, BUTTON_RIGHT|BUTTON_UP, BUTTON_RIGHT }, | ||
96 | { ACTION_WPS_PITCHSCREEN, BUTTON_RIGHT|BUTTON_DOWN, BUTTON_RIGHT }, | ||
97 | |||
98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 97 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 98 | { ACTION_WPS_BROWSE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
101 | 99 | ||
102 | { ACTION_WPS_ID3SCREEN, BUTTON_RIGHT|BUTTON_MENU, BUTTON_NONE }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
103 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 101 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
102 | { ACTION_WPS_PITCHSCREEN, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
103 | { ACTION_WPS_ID3SCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
104 | 104 | ||
105 | LAST_ITEM_IN_LIST | 105 | LAST_ITEM_IN_LIST |
106 | }; /* button_context_wps */ | 106 | }; /* button_context_wps */ |
107 | 107 | ||
108 | static const struct button_mapping button_context_list[] = { | 108 | static const struct button_mapping button_context_list[] = { |
109 | { ACTION_LISTTREE_PGUP, BUTTON_RIGHT|BUTTON_UP, BUTTON_RIGHT }, | 109 | { ACTION_LISTTREE_PGUP, BUTTON_VOL_UP|BUTTON_UP, BUTTON_VOL_UP }, |
110 | { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_RIGHT|BUTTON_UP }, | 110 | { ACTION_LISTTREE_PGDOWN, BUTTON_VOL_DOWN|BUTTON_DOWN, BUTTON_VOL_DOWN }, |
111 | { ACTION_LISTTREE_PGUP, BUTTON_RIGHT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 111 | |
112 | { ACTION_LISTTREE_PGDOWN, BUTTON_RIGHT|BUTTON_DOWN, BUTTON_RIGHT }, | ||
113 | { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_RIGHT|BUTTON_DOWN }, | ||
114 | { ACTION_LISTTREE_PGDOWN, BUTTON_RIGHT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
115 | #ifdef HAVE_VOLUME_IN_LIST | 112 | #ifdef HAVE_VOLUME_IN_LIST |
116 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 113 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
117 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 114 | { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
115 | |||
118 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 116 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
119 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 117 | { ACTION_LIST_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
120 | #endif | 118 | #endif |
@@ -123,170 +121,181 @@ static const struct button_mapping button_context_list[] = { | |||
123 | }; /* button_context_list */ | 121 | }; /* button_context_list */ |
124 | 122 | ||
125 | static const struct button_mapping button_context_tree[] = { | 123 | static const struct button_mapping button_context_tree[] = { |
126 | { ACTION_TREE_WPS, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 124 | { ACTION_TREE_WPS, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
127 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 125 | { ACTION_TREE_STOP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
129 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | ||
130 | 126 | ||
131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 127 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
132 | }; /* button_context_tree */ | 128 | }; /* button_context_tree */ |
133 | 129 | ||
134 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 130 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
135 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | 131 | { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
136 | { ACTION_TREE_PGLEFT, BUTTON_RIGHT|BUTTON_REW, BUTTON_RIGHT }, | 132 | |
137 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REL, BUTTON_RIGHT|BUTTON_REW }, | 133 | { ACTION_TREE_PGLEFT, BUTTON_LEFT, BUTTON_NONE }, |
138 | { ACTION_TREE_PGLEFT, BUTTON_RIGHT|BUTTON_REW, BUTTON_REW|BUTTON_REL }, | 134 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
139 | { ACTION_TREE_ROOT_INIT, BUTTON_RIGHT|BUTTON_REW|BUTTON_REPEAT, BUTTON_RIGHT|BUTTON_REW }, | 135 | |
140 | { ACTION_TREE_PGLEFT, BUTTON_RIGHT|BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 136 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
141 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_FFWD, BUTTON_RIGHT }, | 137 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
142 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REL, BUTTON_RIGHT|BUTTON_FFWD }, | 138 | |
143 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_FFWD, BUTTON_FFWD|BUTTON_REL }, | ||
144 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
145 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 139 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
146 | }; | 140 | }; |
147 | 141 | ||
148 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 142 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
149 | { ACTION_NONE, BUTTON_REW, BUTTON_NONE }, | 143 | { ACTION_NONE, BUTTON_REW, BUTTON_NONE }, |
150 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | ||
151 | { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | ||
152 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
153 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, | ||
154 | { ACTION_NONE, BUTTON_FFWD, BUTTON_NONE }, | 144 | { ACTION_NONE, BUTTON_FFWD, BUTTON_NONE }, |
145 | |||
155 | { ACTION_STD_OK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 146 | { ACTION_STD_OK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
156 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 147 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
157 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, | 148 | { ACTION_TREE_ROOT_INIT, BUTTON_MENU, BUTTON_NONE }, |
149 | |||
150 | { ACTION_TREE_PGLEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
151 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | ||
152 | |||
153 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
154 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | ||
155 | |||
158 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 156 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
159 | }; | 157 | }; |
160 | 158 | ||
161 | static const struct button_mapping button_context_settings[] = { | 159 | static const struct button_mapping button_context_settings[] = { |
162 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 160 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
163 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 161 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
164 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 162 | |
165 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 163 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
166 | { ACTION_STD_PREV, BUTTON_REW, BUTTON_NONE }, | 164 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
167 | { ACTION_STD_PREVREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 165 | |
168 | { ACTION_STD_NEXT, BUTTON_FFWD, BUTTON_NONE }, | 166 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
169 | { ACTION_STD_NEXTREPEAT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 167 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
170 | { ACTION_SETTINGS_RESET, BUTTON_RIGHT, BUTTON_NONE }, | 168 | |
169 | { ACTION_STD_PREV, BUTTON_REW, BUTTON_NONE }, | ||
170 | { ACTION_STD_PREVREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
171 | |||
172 | { ACTION_STD_NEXT, BUTTON_FFWD, BUTTON_NONE }, | ||
173 | { ACTION_STD_NEXTREPEAT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
171 | 174 | ||
172 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 175 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
173 | }; /* button_context_settings */ | 176 | }; /* button_context_settings */ |
174 | 177 | ||
175 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 178 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
176 | { ACTION_SETTINGS_INC, BUTTON_FFWD, BUTTON_NONE }, | 179 | { ACTION_SETTINGS_INC, BUTTON_FFWD, BUTTON_NONE }, |
177 | { ACTION_SETTINGS_INCREPEAT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 180 | { ACTION_SETTINGS_INCREPEAT,BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
178 | { ACTION_SETTINGS_DEC, BUTTON_REW, BUTTON_NONE }, | 181 | |
179 | { ACTION_SETTINGS_DECREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 182 | { ACTION_SETTINGS_DEC, BUTTON_REW, BUTTON_NONE }, |
180 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 183 | { ACTION_SETTINGS_DECREPEAT,BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
181 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
182 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | ||
183 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
184 | { ACTION_SETTINGS_RESET, BUTTON_RIGHT, BUTTON_NONE }, | ||
185 | 184 | ||
186 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 185 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
187 | }; /* button_context_settingsgraphical */ | 186 | }; /* button_context_settingsgraphical */ |
188 | 187 | ||
189 | static const struct button_mapping button_context_yesno[] = { | 188 | static const struct button_mapping button_context_yesno[] = { |
190 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 189 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, |
190 | |||
191 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 191 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
192 | }; /* button_context_settings_yesno */ | 192 | }; /* button_context_settings_yesno */ |
193 | 193 | ||
194 | static const struct button_mapping button_context_colorchooser[] = { | ||
195 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | ||
196 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | ||
197 | }; /* button_context_colorchooser */ | ||
198 | |||
199 | static const struct button_mapping button_context_eq[] = { | ||
200 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
201 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | ||
202 | }; /* button_context_eq */ | ||
203 | |||
204 | /** Bookmark Screen **/ | 194 | /** Bookmark Screen **/ |
205 | static const struct button_mapping button_context_bmark[] = { | 195 | static const struct button_mapping button_context_bmark[] = { |
206 | { ACTION_BMS_DELETE, BUTTON_RIGHT, BUTTON_NONE }, | 196 | { ACTION_BMS_DELETE, BUTTON_RIGHT, BUTTON_NONE }, |
207 | 197 | ||
208 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 198 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
209 | }; /* button_context_bmark */ | 199 | }; /* button_context_bmark */ |
210 | 200 | ||
211 | static const struct button_mapping button_context_time[] = { | ||
212 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | ||
213 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | ||
214 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), | ||
215 | }; /* button_context_time */ | ||
216 | |||
217 | static const struct button_mapping button_context_quickscreen[] = { | 201 | static const struct button_mapping button_context_quickscreen[] = { |
218 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, | 202 | { ACTION_NONE, BUTTON_REW, BUTTON_NONE }, |
219 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 203 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, |
220 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
221 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
222 | { ACTION_QS_LEFT, BUTTON_REW, BUTTON_NONE }, | ||
223 | { ACTION_QS_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
224 | { ACTION_QS_RIGHT, BUTTON_FFWD, BUTTON_NONE }, | ||
225 | { ACTION_QS_RIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
226 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | ||
227 | 204 | ||
228 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 205 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, |
206 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
207 | |||
208 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, | ||
209 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
210 | |||
211 | { ACTION_QS_LEFT, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | ||
212 | { ACTION_QS_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
213 | |||
214 | { ACTION_QS_RIGHT, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, | ||
215 | { ACTION_QS_RIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
216 | |||
217 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | ||
229 | }; /* button_context_quickscreen */ | 218 | }; /* button_context_quickscreen */ |
230 | 219 | ||
231 | static const struct button_mapping button_context_pitchscreen[] = { | 220 | static const struct button_mapping button_context_pitchscreen[] = { |
232 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | 221 | { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
233 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 222 | { ACTION_PS_EXIT, BUTTON_MENU, BUTTON_NONE }, |
234 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | 223 | { ACTION_PS_EXIT, BUTTON_LEFT, BUTTON_NONE }, |
235 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 224 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, |
236 | { ACTION_PS_NUDGE_LEFT, BUTTON_REW, BUTTON_NONE }, | ||
237 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | ||
238 | { ACTION_PS_NUDGE_RIGHT, BUTTON_FFWD, BUTTON_NONE }, | ||
239 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, | ||
240 | { ACTION_PS_TOGGLE_MODE, BUTTON_MENU, BUTTON_NONE }, | ||
241 | { ACTION_PS_RESET, BUTTON_RIGHT, BUTTON_NONE }, | ||
242 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, | ||
243 | { ACTION_PS_SLOWER, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
244 | { ACTION_PS_FASTER, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
245 | 225 | ||
246 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 226 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
227 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
228 | |||
229 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | ||
230 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
231 | |||
232 | { ACTION_PS_NUDGE_LEFT, BUTTON_REW, BUTTON_NONE }, | ||
233 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | ||
234 | |||
235 | { ACTION_PS_NUDGE_RIGHT, BUTTON_FFWD, BUTTON_NONE }, | ||
236 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, | ||
237 | |||
238 | { ACTION_PS_SLOWER, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
239 | { ACTION_PS_FASTER, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
240 | |||
241 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | ||
247 | }; /* button_context_pitchcreen */ | 242 | }; /* button_context_pitchcreen */ |
248 | 243 | ||
249 | static const struct button_mapping button_context_keyboard[] = { | 244 | static const struct button_mapping button_context_keyboard[] = { |
250 | { ACTION_KBD_LEFT, BUTTON_REW, BUTTON_NONE }, | 245 | { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
251 | { ACTION_KBD_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 246 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
252 | { ACTION_KBD_RIGHT, BUTTON_FFWD, BUTTON_NONE }, | 247 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, |
253 | { ACTION_KBD_RIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 248 | |
254 | { ACTION_KBD_CURSOR_LEFT, BUTTON_RIGHT|BUTTON_REW, BUTTON_NONE }, | 249 | { ACTION_KBD_LEFT, BUTTON_REW, BUTTON_NONE }, |
255 | { ACTION_KBD_CURSOR_LEFT, BUTTON_RIGHT|BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 250 | { ACTION_KBD_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
256 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_RIGHT|BUTTON_FFWD, BUTTON_NONE }, | 251 | |
257 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_RIGHT|BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 252 | { ACTION_KBD_RIGHT, BUTTON_FFWD, BUTTON_NONE }, |
258 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 253 | { ACTION_KBD_RIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
259 | { ACTION_KBD_PAGE_FLIP, BUTTON_RIGHT|BUTTON_MENU, BUTTON_NONE }, | 254 | |
260 | { ACTION_KBD_DONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 255 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
261 | { ACTION_KBD_ABORT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 256 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
262 | { ACTION_KBD_BACKSPACE, BUTTON_MENU, BUTTON_NONE }, | 257 | |
263 | { ACTION_KBD_BACKSPACE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 258 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
264 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 259 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
265 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 260 | |
266 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 261 | { ACTION_KBD_CURSOR_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
267 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 262 | { ACTION_KBD_CURSOR_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
268 | { ACTION_KBD_MORSE_INPUT, BUTTON_RIGHT|BUTTON_POWER, BUTTON_NONE }, | 263 | |
269 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | 264 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
265 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
266 | |||
267 | { ACTION_KBD_BACKSPACE, BUTTON_VOL_UP, BUTTON_NONE }, | ||
268 | { ACTION_KBD_BACKSPACE, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
269 | |||
270 | { ACTION_KBD_PAGE_FLIP, BUTTON_VOL_DOWN, BUTTON_NONE }, | ||
271 | |||
272 | { ACTION_KBD_MORSE_INPUT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
273 | { ACTION_KBD_MORSE_SELECT, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, | ||
270 | 274 | ||
271 | LAST_ITEM_IN_LIST | 275 | LAST_ITEM_IN_LIST |
272 | }; /* button_context_keyboard */ | 276 | }; /* button_context_keyboard */ |
273 | 277 | ||
274 | #ifdef HAVE_USBSTACK | 278 | #ifdef HAVE_USBSTACK |
275 | static const struct button_mapping button_context_usb_hid[] = { | 279 | static const struct button_mapping button_context_usb_hid[] = { |
276 | { ACTION_USB_HID_PLAY, BUTTON_RIGHT, BUTTON_NONE }, | 280 | { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, |
277 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 281 | { ACTION_USB_HID_STOP, BUTTON_LEFT, BUTTON_NONE }, |
278 | { ACTION_USB_HID_SKIPPREV, BUTTON_REW, BUTTON_NONE }, | 282 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, |
279 | { ACTION_USB_HID_SKIPNEXT, BUTTON_FFWD, BUTTON_NONE }, | 283 | |
280 | { ACTION_USB_HID_VOLUP, BUTTON_UP, BUTTON_NONE }, | 284 | { ACTION_USB_HID_SKIPPREV, BUTTON_REW, BUTTON_NONE }, |
281 | { ACTION_USB_HID_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 285 | { ACTION_USB_HID_SKIPNEXT, BUTTON_FFWD, BUTTON_NONE }, |
282 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 286 | |
283 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 287 | { ACTION_USB_HID_VOLUP, BUTTON_UP, BUTTON_NONE }, |
284 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 288 | { ACTION_USB_HID_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
285 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 289 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
286 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 290 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
287 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 291 | |
288 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 292 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
289 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | 293 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
294 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | ||
295 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
296 | |||
297 | { ACTION_USB_HID_MUTE, BUTTON_RIGHT, BUTTON_NONE }, | ||
298 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | ||
290 | 299 | ||
291 | LAST_ITEM_IN_LIST | 300 | LAST_ITEM_IN_LIST |
292 | }; /* button_context_usb_hid */ | 301 | }; /* button_context_usb_hid */ |
@@ -298,43 +307,47 @@ const struct button_mapping* get_context_mapping(int context) | |||
298 | { | 307 | { |
299 | case CONTEXT_STD: | 308 | case CONTEXT_STD: |
300 | return button_context_standard; | 309 | return button_context_standard; |
310 | |||
301 | case CONTEXT_WPS: | 311 | case CONTEXT_WPS: |
302 | return button_context_wps; | 312 | return button_context_wps; |
303 | 313 | ||
304 | case CONTEXT_LIST: | 314 | case CONTEXT_LIST: |
305 | return button_context_list; | 315 | return button_context_list; |
316 | |||
306 | case CONTEXT_MAINMENU: | 317 | case CONTEXT_MAINMENU: |
307 | case CONTEXT_TREE: | 318 | case CONTEXT_TREE: |
308 | if (global_settings.hold_lr_for_scroll_in_list) | 319 | if (global_settings.hold_lr_for_scroll_in_list) |
309 | return button_context_listtree_scroll_without_combo; | 320 | return button_context_listtree_scroll_without_combo; |
310 | else | 321 | else |
311 | return button_context_listtree_scroll_with_combo; | 322 | return button_context_listtree_scroll_with_combo; |
323 | |||
312 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 324 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
313 | return button_context_tree; | 325 | return button_context_tree; |
314 | 326 | ||
327 | case CONTEXT_SETTINGS_TIME: | ||
315 | case CONTEXT_SETTINGS: | 328 | case CONTEXT_SETTINGS: |
316 | return button_context_settings; | 329 | return button_context_settings; |
317 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | ||
318 | return button_context_settings_right_is_inc; | ||
319 | 330 | ||
331 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | ||
320 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 332 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
321 | return button_context_colorchooser; | ||
322 | case CONTEXT_SETTINGS_EQ: | 333 | case CONTEXT_SETTINGS_EQ: |
323 | return button_context_eq; | 334 | return button_context_settings_right_is_inc; |
324 | |||
325 | case CONTEXT_SETTINGS_TIME: | ||
326 | return button_context_time; | ||
327 | 335 | ||
328 | case CONTEXT_YESNOSCREEN: | 336 | case CONTEXT_YESNOSCREEN: |
329 | return button_context_yesno; | 337 | return button_context_yesno; |
338 | |||
330 | case CONTEXT_BOOKMARKSCREEN: | 339 | case CONTEXT_BOOKMARKSCREEN: |
331 | return button_context_bmark; | 340 | return button_context_bmark; |
341 | |||
332 | case CONTEXT_QUICKSCREEN: | 342 | case CONTEXT_QUICKSCREEN: |
333 | return button_context_quickscreen; | 343 | return button_context_quickscreen; |
344 | |||
334 | case CONTEXT_PITCHSCREEN: | 345 | case CONTEXT_PITCHSCREEN: |
335 | return button_context_pitchscreen; | 346 | return button_context_pitchscreen; |
347 | |||
336 | case CONTEXT_KEYBOARD: | 348 | case CONTEXT_KEYBOARD: |
337 | return button_context_keyboard; | 349 | return button_context_keyboard; |
350 | |||
338 | #ifdef HAVE_USBSTACK | 351 | #ifdef HAVE_USBSTACK |
339 | case CONTEXT_USB_HID: | 352 | case CONTEXT_USB_HID: |
340 | return button_context_usb_hid; | 353 | return button_context_usb_hid; |