diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-agptekrocker.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-erosq.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-fiiom3k.c | 13 | ||||
-rw-r--r-- | apps/keymaps/keymap-fiiom3klinux.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-fuzeplus.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-ma.c | 4 | ||||
-rw-r--r-- | apps/keymaps/keymap-nwz.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-ondavx777.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-rk27xx-generic.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-shanlingq1.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-xduoox20.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-xduoox3ii.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-ypr0.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-ypr1.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-zenxfi2.c | 3 | ||||
-rw-r--r-- | apps/plugins/keyremap.c | 4 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 2 |
18 files changed, 49 insertions, 15 deletions
diff --git a/apps/action.c b/apps/action.c index 392f2c344c..20145a5bc1 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -595,7 +595,7 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur) | |||
595 | int context = cur->context; | 595 | int context = cur->context; |
596 | cur->is_prebutton = false; | 596 | cur->is_prebutton = false; |
597 | 597 | ||
598 | #if defined(HAVE_LOCKED_ACTIONS) && !defined(HAS_BUTTON_HOLD) | 598 | #if !defined(HAS_BUTTON_HOLD) && !defined(BOOTLOADER) |
599 | /* This only applies to the first context, to allow locked contexts to | 599 | /* This only applies to the first context, to allow locked contexts to |
600 | * specify a fall through to their non-locked version */ | 600 | * specify a fall through to their non-locked version */ |
601 | if (is_keys_locked()) | 601 | if (is_keys_locked()) |
diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c index d016b3b323..158de8d3c8 100644 --- a/apps/keymaps/keymap-agptekrocker.c +++ b/apps/keymaps/keymap-agptekrocker.c | |||
@@ -223,12 +223,15 @@ const struct button_mapping* get_context_mapping(int context) | |||
223 | { | 223 | { |
224 | switch (context) | 224 | switch (context) |
225 | { | 225 | { |
226 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
226 | case CONTEXT_STD: | 227 | case CONTEXT_STD: |
227 | return button_context_standard; | 228 | return button_context_standard; |
228 | 229 | ||
230 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
229 | case CONTEXT_WPS: | 231 | case CONTEXT_WPS: |
230 | return button_context_wps; | 232 | return button_context_wps; |
231 | 233 | ||
234 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
232 | case CONTEXT_MAINMENU: | 235 | case CONTEXT_MAINMENU: |
233 | return button_context_mainmenu; | 236 | return button_context_mainmenu; |
234 | case CONTEXT_TREE: | 237 | case CONTEXT_TREE: |
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c index c69e4babdb..7e2643a318 100644 --- a/apps/keymaps/keymap-erosq.c +++ b/apps/keymaps/keymap-erosq.c | |||
@@ -196,12 +196,15 @@ const struct button_mapping* get_context_mapping(int context) | |||
196 | { | 196 | { |
197 | switch (context) | 197 | switch (context) |
198 | { | 198 | { |
199 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
199 | case CONTEXT_STD: | 200 | case CONTEXT_STD: |
200 | return button_context_standard; | 201 | return button_context_standard; |
201 | 202 | ||
203 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
202 | case CONTEXT_WPS: | 204 | case CONTEXT_WPS: |
203 | return button_context_wps; | 205 | return button_context_wps; |
204 | 206 | ||
207 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
205 | case CONTEXT_MAINMENU: | 208 | case CONTEXT_MAINMENU: |
206 | return button_context_mainmenu; | 209 | return button_context_mainmenu; |
207 | 210 | ||
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c index a9744b908b..8b9cce2493 100644 --- a/apps/keymaps/keymap-fiiom3k.c +++ b/apps/keymaps/keymap-fiiom3k.c | |||
@@ -326,21 +326,16 @@ const struct button_mapping* get_context_mapping(int context) | |||
326 | { | 326 | { |
327 | switch (context) | 327 | switch (context) |
328 | { | 328 | { |
329 | case CONTEXT_WPS|CONTEXT_LOCKED: | ||
330 | return button_context_wps_locked; | ||
331 | default: | ||
332 | context &= ~CONTEXT_LOCKED; | ||
333 | break; | ||
334 | } | ||
335 | |||
336 | switch (context) | ||
337 | { | ||
338 | default: | 329 | default: |
330 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
339 | case CONTEXT_STD: | 331 | case CONTEXT_STD: |
340 | return button_context_standard; | 332 | return button_context_standard; |
333 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
334 | return button_context_wps_locked; | ||
341 | case CONTEXT_WPS: | 335 | case CONTEXT_WPS: |
342 | return button_context_wps; | 336 | return button_context_wps; |
343 | case CONTEXT_TREE: | 337 | case CONTEXT_TREE: |
338 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
344 | case CONTEXT_MAINMENU: | 339 | case CONTEXT_MAINMENU: |
345 | if (global_settings.hold_lr_for_scroll_in_list) | 340 | if (global_settings.hold_lr_for_scroll_in_list) |
346 | return button_context_tree_scroll_lr; | 341 | return button_context_tree_scroll_lr; |
diff --git a/apps/keymaps/keymap-fiiom3klinux.c b/apps/keymaps/keymap-fiiom3klinux.c index e404d8bfb0..98aef7be41 100644 --- a/apps/keymaps/keymap-fiiom3klinux.c +++ b/apps/keymaps/keymap-fiiom3klinux.c | |||
@@ -196,6 +196,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
196 | { | 196 | { |
197 | case CONTEXT_LIST: | 197 | case CONTEXT_LIST: |
198 | return button_context_list; | 198 | return button_context_list; |
199 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
199 | case CONTEXT_STD: | 200 | case CONTEXT_STD: |
200 | return button_context_standard; | 201 | return button_context_standard; |
201 | case CONTEXT_BOOKMARKSCREEN: | 202 | case CONTEXT_BOOKMARKSCREEN: |
@@ -214,8 +215,10 @@ const struct button_mapping* get_context_mapping(int context) | |||
214 | case CONTEXT_SETTINGS_RECTRIGGER: | 215 | case CONTEXT_SETTINGS_RECTRIGGER: |
215 | return button_context_settings_vol_is_inc; | 216 | return button_context_settings_vol_is_inc; |
216 | case CONTEXT_TREE: | 217 | case CONTEXT_TREE: |
218 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
217 | case CONTEXT_MAINMENU: | 219 | case CONTEXT_MAINMENU: |
218 | return button_context_tree; | 220 | return button_context_tree; |
221 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
219 | case CONTEXT_WPS: | 222 | case CONTEXT_WPS: |
220 | return button_context_wps; | 223 | return button_context_wps; |
221 | case CONTEXT_YESNOSCREEN: | 224 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c index 9ce5a79fc2..01032ddf07 100644 --- a/apps/keymaps/keymap-fuzeplus.c +++ b/apps/keymaps/keymap-fuzeplus.c | |||
@@ -409,12 +409,15 @@ const struct button_mapping* get_context_mapping(int context) | |||
409 | { | 409 | { |
410 | switch (context) | 410 | switch (context) |
411 | { | 411 | { |
412 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
412 | case CONTEXT_STD: | 413 | case CONTEXT_STD: |
413 | return button_context_standard; | 414 | return button_context_standard; |
415 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
414 | case CONTEXT_MAINMENU: | 416 | case CONTEXT_MAINMENU: |
415 | return button_context_tree; | 417 | return button_context_tree; |
416 | case CONTEXT_SETTINGS: | 418 | case CONTEXT_SETTINGS: |
417 | return button_context_settings; | 419 | return button_context_settings; |
420 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
418 | case CONTEXT_WPS: | 421 | case CONTEXT_WPS: |
419 | return button_context_wps; | 422 | return button_context_wps; |
420 | case CONTEXT_YESNOSCREEN: | 423 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-ma.c b/apps/keymaps/keymap-ma.c index aaf7df0c01..84d8edd7c4 100644 --- a/apps/keymaps/keymap-ma.c +++ b/apps/keymaps/keymap-ma.c | |||
@@ -192,6 +192,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
192 | { | 192 | { |
193 | /* anything that uses button_context_standard */ | 193 | /* anything that uses button_context_standard */ |
194 | case CONTEXT_LIST: | 194 | case CONTEXT_LIST: |
195 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
195 | case CONTEXT_STD: | 196 | case CONTEXT_STD: |
196 | default: | 197 | default: |
197 | return button_context_standard; | 198 | return button_context_standard; |
@@ -220,13 +221,14 @@ const struct button_mapping* get_context_mapping(int context) | |||
220 | return button_context_settings_r_is_inc; | 221 | return button_context_settings_r_is_inc; |
221 | 222 | ||
222 | case CONTEXT_TREE: | 223 | case CONTEXT_TREE: |
224 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
223 | case CONTEXT_MAINMENU: | 225 | case CONTEXT_MAINMENU: |
224 | if (global_settings.hold_lr_for_scroll_in_list) | 226 | if (global_settings.hold_lr_for_scroll_in_list) |
225 | return button_context_tree_scroll_lr; | 227 | return button_context_tree_scroll_lr; |
226 | /* else fall through to CONTEXT_TREE|CONTEXT_CUSTOM */ | 228 | /* else fall through to CONTEXT_TREE|CONTEXT_CUSTOM */ |
227 | case CONTEXT_TREE|CONTEXT_CUSTOM: | 229 | case CONTEXT_TREE|CONTEXT_CUSTOM: |
228 | return button_context_tree; | 230 | return button_context_tree; |
229 | 231 | case CONTEXT_WPS | CONTEXT_LOCKED: | |
230 | case CONTEXT_WPS: | 232 | case CONTEXT_WPS: |
231 | return button_context_wps; | 233 | return button_context_wps; |
232 | 234 | ||
diff --git a/apps/keymaps/keymap-nwz.c b/apps/keymaps/keymap-nwz.c index 1fae8d3594..3901645eb2 100644 --- a/apps/keymaps/keymap-nwz.c +++ b/apps/keymaps/keymap-nwz.c | |||
@@ -359,12 +359,15 @@ const struct button_mapping* get_context_mapping(int context) | |||
359 | { | 359 | { |
360 | switch (context) | 360 | switch (context) |
361 | { | 361 | { |
362 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
362 | case CONTEXT_STD: | 363 | case CONTEXT_STD: |
363 | return button_context_standard; | 364 | return button_context_standard; |
365 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
364 | case CONTEXT_MAINMENU: | 366 | case CONTEXT_MAINMENU: |
365 | return button_context_tree; | 367 | return button_context_tree; |
366 | case CONTEXT_SETTINGS: | 368 | case CONTEXT_SETTINGS: |
367 | return button_context_settings; | 369 | return button_context_settings; |
370 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
368 | case CONTEXT_WPS: | 371 | case CONTEXT_WPS: |
369 | return button_context_wps; | 372 | return button_context_wps; |
370 | case CONTEXT_YESNOSCREEN: | 373 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-ondavx777.c b/apps/keymaps/keymap-ondavx777.c index ed23350666..468ad4b354 100644 --- a/apps/keymaps/keymap-ondavx777.c +++ b/apps/keymaps/keymap-ondavx777.c | |||
@@ -129,13 +129,16 @@ const struct button_mapping* target_get_context_mapping(int context) | |||
129 | { | 129 | { |
130 | switch (context) | 130 | switch (context) |
131 | { | 131 | { |
132 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
132 | case CONTEXT_STD: | 133 | case CONTEXT_STD: |
133 | return button_context_standard; | 134 | return button_context_standard; |
135 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
134 | case CONTEXT_WPS: | 136 | case CONTEXT_WPS: |
135 | return button_context_wps; | 137 | return button_context_wps; |
136 | 138 | ||
137 | case CONTEXT_LIST: | 139 | case CONTEXT_LIST: |
138 | return button_context_list; | 140 | return button_context_list; |
141 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
139 | case CONTEXT_MAINMENU: | 142 | case CONTEXT_MAINMENU: |
140 | case CONTEXT_TREE: | 143 | case CONTEXT_TREE: |
141 | if (global_settings.hold_lr_for_scroll_in_list) | 144 | if (global_settings.hold_lr_for_scroll_in_list) |
diff --git a/apps/keymaps/keymap-rk27xx-generic.c b/apps/keymaps/keymap-rk27xx-generic.c index d837c608fc..5be8762af3 100644 --- a/apps/keymaps/keymap-rk27xx-generic.c +++ b/apps/keymaps/keymap-rk27xx-generic.c | |||
@@ -166,8 +166,10 @@ const struct button_mapping* get_context_mapping(int context) | |||
166 | { | 166 | { |
167 | switch (context) | 167 | switch (context) |
168 | { | 168 | { |
169 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
169 | case CONTEXT_STD: | 170 | case CONTEXT_STD: |
170 | return button_context_standard; | 171 | return button_context_standard; |
172 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
171 | case CONTEXT_WPS: | 173 | case CONTEXT_WPS: |
172 | return button_context_wps; | 174 | return button_context_wps; |
173 | #ifdef CONFIG_TUNER | 175 | #ifdef CONFIG_TUNER |
@@ -190,6 +192,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
190 | #endif | 192 | #endif |
191 | case CONTEXT_TREE: | 193 | case CONTEXT_TREE: |
192 | case CONTEXT_LIST: | 194 | case CONTEXT_LIST: |
195 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
193 | case CONTEXT_MAINMENU: | 196 | case CONTEXT_MAINMENU: |
194 | 197 | ||
195 | case CONTEXT_SETTINGS: | 198 | case CONTEXT_SETTINGS: |
diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c index 4caaa36fd2..2708266d18 100644 --- a/apps/keymaps/keymap-shanlingq1.c +++ b/apps/keymaps/keymap-shanlingq1.c | |||
@@ -72,12 +72,15 @@ const struct button_mapping* target_get_context_mapping(int context) | |||
72 | switch (context) | 72 | switch (context) |
73 | { | 73 | { |
74 | default: | 74 | default: |
75 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
75 | case CONTEXT_STD: | 76 | case CONTEXT_STD: |
76 | return button_context_standard; | 77 | return button_context_standard; |
78 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
77 | case CONTEXT_WPS: | 79 | case CONTEXT_WPS: |
78 | return button_context_wps; | 80 | return button_context_wps; |
79 | case CONTEXT_TREE: | 81 | case CONTEXT_TREE: |
80 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 82 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
83 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
81 | case CONTEXT_MAINMENU: | 84 | case CONTEXT_MAINMENU: |
82 | case CONTEXT_BOOKMARKSCREEN: | 85 | case CONTEXT_BOOKMARKSCREEN: |
83 | case CONTEXT_LIST: | 86 | case CONTEXT_LIST: |
diff --git a/apps/keymaps/keymap-xduoox20.c b/apps/keymaps/keymap-xduoox20.c index b08db90cfd..04d57949a1 100644 --- a/apps/keymaps/keymap-xduoox20.c +++ b/apps/keymaps/keymap-xduoox20.c | |||
@@ -188,6 +188,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
188 | { | 188 | { |
189 | case CONTEXT_LIST: | 189 | case CONTEXT_LIST: |
190 | return button_context_list; | 190 | return button_context_list; |
191 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
191 | case CONTEXT_STD: | 192 | case CONTEXT_STD: |
192 | return button_context_standard; | 193 | return button_context_standard; |
193 | case CONTEXT_BOOKMARKSCREEN: | 194 | case CONTEXT_BOOKMARKSCREEN: |
@@ -206,8 +207,10 @@ const struct button_mapping* get_context_mapping(int context) | |||
206 | case CONTEXT_SETTINGS_RECTRIGGER: | 207 | case CONTEXT_SETTINGS_RECTRIGGER: |
207 | return button_context_settings_vol_is_inc; | 208 | return button_context_settings_vol_is_inc; |
208 | case CONTEXT_TREE: | 209 | case CONTEXT_TREE: |
210 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
209 | case CONTEXT_MAINMENU: | 211 | case CONTEXT_MAINMENU: |
210 | return button_context_tree; | 212 | return button_context_tree; |
213 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
211 | case CONTEXT_WPS: | 214 | case CONTEXT_WPS: |
212 | return button_context_wps; | 215 | return button_context_wps; |
213 | case CONTEXT_YESNOSCREEN: | 216 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-xduoox3ii.c b/apps/keymaps/keymap-xduoox3ii.c index d99c8240a1..b25eacd732 100644 --- a/apps/keymaps/keymap-xduoox3ii.c +++ b/apps/keymaps/keymap-xduoox3ii.c | |||
@@ -188,6 +188,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
188 | { | 188 | { |
189 | case CONTEXT_LIST: | 189 | case CONTEXT_LIST: |
190 | return button_context_list; | 190 | return button_context_list; |
191 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
191 | case CONTEXT_STD: | 192 | case CONTEXT_STD: |
192 | return button_context_standard; | 193 | return button_context_standard; |
193 | case CONTEXT_BOOKMARKSCREEN: | 194 | case CONTEXT_BOOKMARKSCREEN: |
@@ -206,8 +207,10 @@ const struct button_mapping* get_context_mapping(int context) | |||
206 | case CONTEXT_SETTINGS_RECTRIGGER: | 207 | case CONTEXT_SETTINGS_RECTRIGGER: |
207 | return button_context_settings_vol_is_inc; | 208 | return button_context_settings_vol_is_inc; |
208 | case CONTEXT_TREE: | 209 | case CONTEXT_TREE: |
210 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
209 | case CONTEXT_MAINMENU: | 211 | case CONTEXT_MAINMENU: |
210 | return button_context_tree; | 212 | return button_context_tree; |
213 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
211 | case CONTEXT_WPS: | 214 | case CONTEXT_WPS: |
212 | return button_context_wps; | 215 | return button_context_wps; |
213 | case CONTEXT_YESNOSCREEN: | 216 | case CONTEXT_YESNOSCREEN: |
diff --git a/apps/keymaps/keymap-ypr0.c b/apps/keymaps/keymap-ypr0.c index 2d6be5b7ec..e6d3bf8868 100644 --- a/apps/keymaps/keymap-ypr0.c +++ b/apps/keymaps/keymap-ypr0.c | |||
@@ -257,13 +257,16 @@ const struct button_mapping* get_context_mapping(int context) | |||
257 | { | 257 | { |
258 | switch (context) | 258 | switch (context) |
259 | { | 259 | { |
260 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
260 | case CONTEXT_STD: | 261 | case CONTEXT_STD: |
261 | return button_context_standard; | 262 | return button_context_standard; |
263 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
262 | case CONTEXT_WPS: | 264 | case CONTEXT_WPS: |
263 | return button_context_wps; | 265 | return button_context_wps; |
264 | 266 | ||
265 | case CONTEXT_LIST: | 267 | case CONTEXT_LIST: |
266 | return button_context_list; | 268 | return button_context_list; |
269 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
267 | case CONTEXT_MAINMENU: | 270 | case CONTEXT_MAINMENU: |
268 | return button_context_mainmenu; | 271 | return button_context_mainmenu; |
269 | 272 | ||
diff --git a/apps/keymaps/keymap-ypr1.c b/apps/keymaps/keymap-ypr1.c index d47047912b..0f991a881d 100644 --- a/apps/keymaps/keymap-ypr1.c +++ b/apps/keymaps/keymap-ypr1.c | |||
@@ -134,13 +134,16 @@ const struct button_mapping* target_get_context_mapping(int context) | |||
134 | { | 134 | { |
135 | switch (context) | 135 | switch (context) |
136 | { | 136 | { |
137 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
137 | case CONTEXT_STD: | 138 | case CONTEXT_STD: |
138 | return button_context_standard; | 139 | return button_context_standard; |
140 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
139 | case CONTEXT_WPS: | 141 | case CONTEXT_WPS: |
140 | return button_context_wps; | 142 | return button_context_wps; |
141 | 143 | ||
142 | case CONTEXT_LIST: | 144 | case CONTEXT_LIST: |
143 | return button_context_list; | 145 | return button_context_list; |
146 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
144 | case CONTEXT_MAINMENU: | 147 | case CONTEXT_MAINMENU: |
145 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 148 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
146 | return button_context_tree; | 149 | return button_context_tree; |
diff --git a/apps/keymaps/keymap-zenxfi2.c b/apps/keymaps/keymap-zenxfi2.c index c98a4a8405..43e65ce5d7 100644 --- a/apps/keymaps/keymap-zenxfi2.c +++ b/apps/keymaps/keymap-zenxfi2.c | |||
@@ -139,13 +139,16 @@ const struct button_mapping* target_get_context_mapping(int context) | |||
139 | { | 139 | { |
140 | switch (context) | 140 | switch (context) |
141 | { | 141 | { |
142 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
142 | case CONTEXT_STD: | 143 | case CONTEXT_STD: |
143 | return button_context_standard; | 144 | return button_context_standard; |
145 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
144 | case CONTEXT_WPS: | 146 | case CONTEXT_WPS: |
145 | return button_context_wps; | 147 | return button_context_wps; |
146 | 148 | ||
147 | case CONTEXT_LIST: | 149 | case CONTEXT_LIST: |
148 | return button_context_list; | 150 | return button_context_list; |
151 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
149 | case CONTEXT_MAINMENU: | 152 | case CONTEXT_MAINMENU: |
150 | case CONTEXT_TREE: | 153 | case CONTEXT_TREE: |
151 | if (global_settings.hold_lr_for_scroll_in_list) | 154 | if (global_settings.hold_lr_for_scroll_in_list) |
diff --git a/apps/plugins/keyremap.c b/apps/plugins/keyremap.c index cb19fcf92c..f0b36a735e 100644 --- a/apps/plugins/keyremap.c +++ b/apps/plugins/keyremap.c | |||
@@ -53,13 +53,13 @@ struct context_flags { | |||
53 | /* flags added to context_name[] */ | 53 | /* flags added to context_name[] */ |
54 | static struct context_flags context_flags[] = { | 54 | static struct context_flags context_flags[] = { |
55 | {"UNKNOWN", 0},/* index 0 is an Error */ | 55 | {"UNKNOWN", 0},/* index 0 is an Error */ |
56 | #ifdef HAVE_LOCKED_ACTIONS | 56 | #ifndef HAS_BUTTON_HOLD |
57 | {"LOCKED", CONTEXT_LOCKED}, | 57 | {"LOCKED", CONTEXT_LOCKED}, |
58 | #endif | 58 | #endif |
59 | /*{"PLUGIN", CONTEXT_PLUGIN}, need a custom action list and a way to supply */ | 59 | /*{"PLUGIN", CONTEXT_PLUGIN}, need a custom action list and a way to supply */ |
60 | #if BUTTON_REMOTE != 0 | 60 | #if BUTTON_REMOTE != 0 |
61 | {"REMOTE", CONTEXT_REMOTE}, | 61 | {"REMOTE", CONTEXT_REMOTE}, |
62 | #ifdef HAVE_LOCKED_ACTIONS | 62 | #ifndef HAS_BUTTON_HOLD |
63 | {"REMOTE_LOCKED", CONTEXT_REMOTE | CONTEXT_LOCKED}, | 63 | {"REMOTE_LOCKED", CONTEXT_REMOTE | CONTEXT_LOCKED}, |
64 | #endif | 64 | #endif |
65 | #endif /* BUTTON_REMOTE != 0 */ | 65 | #endif /* BUTTON_REMOTE != 0 */ |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index a7a0031391..54497d8306 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -967,9 +967,7 @@ const struct custom_format format_transposed = { | |||
967 | 967 | ||
968 | static const struct button_mapping* get_context_map(int context) | 968 | static const struct button_mapping* get_context_map(int context) |
969 | { | 969 | { |
970 | #ifdef HAVE_LOCKED_ACTIONS | ||
971 | context &= ~CONTEXT_LOCKED; | 970 | context &= ~CONTEXT_LOCKED; |
972 | #endif | ||
973 | return pf_contexts[context & ~CONTEXT_PLUGIN]; | 971 | return pf_contexts[context & ~CONTEXT_PLUGIN]; |
974 | } | 972 | } |
975 | 973 | ||