diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2015-07-20 01:50:26 +0200 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-11-15 23:46:39 +0100 |
commit | a507bb283782ee3adb1fc9ba0c6f094108ef558c (patch) | |
tree | acae6cf04f8e34172375061b6fbdc11b6ffb84cb /apps/plugins/imageviewer/imageviewer_button.h | |
parent | a8758c953d50fb020b245d5739c41de113638b49 (diff) | |
download | rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.tar.gz rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.zip |
YH8xx,YH9xx: Keymap improvement
The main "innovation" in this patch are two "virtual buttons"
for the record switch on YH92x targets. When the switch state
changes, a single BUTTON_REC_SW_ON or .._OFF button event will
be generated. Thus keymap code can react on switching, but
not on the actual state of the switch.
Wherever sensible, the following user scheme is applied:
- use PLAY as confirm button
- use REW button or Long REW to exit
- use REC (YH820) or FFWD (YH92X) as modifier key for button combos
Change-Id: Ic8d1db9cc6869daed8dda98990dfdf7f6fd5d5a1
Diffstat (limited to 'apps/plugins/imageviewer/imageviewer_button.h')
-rw-r--r-- | apps/plugins/imageviewer/imageviewer_button.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index c5fb9730c1..5c16ad28d8 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -314,8 +314,7 @@ | |||
314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
316 | 316 | ||
317 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 317 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
318 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
319 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) | 318 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) |
320 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) | 319 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) |
321 | #define IMGVIEW_UP BUTTON_UP | 320 | #define IMGVIEW_UP BUTTON_UP |
@@ -324,9 +323,29 @@ | |||
324 | #define IMGVIEW_RIGHT BUTTON_RIGHT | 323 | #define IMGVIEW_RIGHT BUTTON_RIGHT |
325 | #define IMGVIEW_NEXT BUTTON_FFWD | 324 | #define IMGVIEW_NEXT BUTTON_FFWD |
326 | #define IMGVIEW_PREVIOUS BUTTON_REW | 325 | #define IMGVIEW_PREVIOUS BUTTON_REW |
326 | #define IMGVIEW_NEXT_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) | ||
327 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_REW|BUTTON_REPEAT) | ||
327 | #define IMGVIEW_MENU_PRE BUTTON_PLAY | 328 | #define IMGVIEW_MENU_PRE BUTTON_PLAY |
328 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) | 329 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) |
329 | #define IMGVIEW_QUIT BUTTON_REC | 330 | #define IMGVIEW_SLIDE_SHOW BUTTON_REC_SW_ON |
331 | #define IMGVIEW_SLIDE_SHOW2 BUTTON_REC_SW_OFF | ||
332 | |||
333 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
334 | #define IMGVIEW_ZOOM_IN (BUTTON_REC|BUTTON_UP) | ||
335 | #define IMGVIEW_ZOOM_OUT (BUTTON_REC|BUTTON_DOWN) | ||
336 | #define IMGVIEW_UP BUTTON_UP | ||
337 | #define IMGVIEW_DOWN BUTTON_DOWN | ||
338 | #define IMGVIEW_LEFT BUTTON_LEFT | ||
339 | #define IMGVIEW_RIGHT BUTTON_RIGHT | ||
340 | #define IMGVIEW_NEXT BUTTON_FFWD | ||
341 | #define IMGVIEW_PREVIOUS BUTTON_REW | ||
342 | #define IMGVIEW_NEXT_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) | ||
343 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_REW|BUTTON_REPEAT) | ||
344 | #define IMGVIEW_MENU_PRE BUTTON_PLAY | ||
345 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) | ||
346 | #define IMGVIEW_SLIDE_SHOW (BUTTON_PLAY|BUTTON_REPEAT) | ||
347 | #define IMGVIEW_SLIDE_SHOW_PRE BUTTON_PLAY | ||
348 | #define IMGVIEW_QUIT (BUTTON_REC|BUTTON_PLAY) | ||
330 | 349 | ||
331 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 350 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
332 | #define IMGVIEW_ZOOM_IN (BUTTON_REC | BUTTON_UP) | 351 | #define IMGVIEW_ZOOM_IN (BUTTON_REC | BUTTON_UP) |