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/solitaire.c | |
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/solitaire.c')
-rw-r--r-- | apps/plugins/solitaire.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index d71847120b..c06e767a37 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -452,23 +452,40 @@ | |||
452 | CONFIG_KEYPAD == MROBE500_PAD | 452 | CONFIG_KEYPAD == MROBE500_PAD |
453 | # define SOL_QUIT BUTTON_POWER | 453 | # define SOL_QUIT BUTTON_POWER |
454 | 454 | ||
455 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 455 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
456 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 456 | # define SOL_QUIT BUTTON_REW |
457 | # define SOL_QUIT BUTTON_REC | ||
458 | # define SOL_UP BUTTON_UP | 457 | # define SOL_UP BUTTON_UP |
459 | # define SOL_DOWN BUTTON_DOWN | 458 | # define SOL_DOWN BUTTON_DOWN |
460 | # define SOL_LEFT BUTTON_LEFT | 459 | # define SOL_LEFT BUTTON_LEFT |
461 | # define SOL_RIGHT BUTTON_RIGHT | 460 | # define SOL_RIGHT BUTTON_RIGHT |
462 | # define SOL_MOVE BUTTON_PLAY | 461 | # define SOL_MOVE BUTTON_PLAY |
463 | # define SOL_DRAW BUTTON_FFWD | 462 | # define SOL_DRAW BUTTON_FFWD |
464 | # define SOL_REM2CUR (BUTTON_FFWD | BUTTON_LEFT) | 463 | # define SOL_REM2CUR (BUTTON_REC | BUTTON_DOWN) |
465 | # define SOL_CUR2STACK BUTTON_REW | 464 | # define SOL_CUR2STACK (BUTTON_REC | BUTTON_UP) |
466 | # define SOL_REM2STACK (BUTTON_REW | BUTTON_LEFT) | 465 | # define SOL_REM2STACK (BUTTON_REC | BUTTON_RIGHT) |
467 | # define HK_MOVE "PLAY" | 466 | # define HK_MOVE "PLAY" |
468 | # define HK_DRAW "REW.." | 467 | # define HK_DRAW "FFWD" |
469 | # define HK_REM2CUR "FFWD" | 468 | # define HK_REM2CUR "REC+DOWN" |
470 | # define HK_CUR2STACK "REW" | 469 | # define HK_CUR2STACK "REC+UP" |
471 | # define HK_REM2STACK "FFWD.." | 470 | # define HK_REM2STACK "REC+RIGHT" |
471 | |||
472 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
473 | # define SOL_QUIT BUTTON_REW | ||
474 | # define SOL_UP BUTTON_UP | ||
475 | # define SOL_DOWN BUTTON_DOWN | ||
476 | # define SOL_LEFT BUTTON_LEFT | ||
477 | # define SOL_RIGHT BUTTON_RIGHT | ||
478 | # define SOL_MOVE_PRE BUTTON_PLAY | ||
479 | # define SOL_MOVE (BUTTON_PLAY | BUTTON_REL) | ||
480 | # define SOL_DRAW BUTTON_FFWD | ||
481 | # define SOL_REM2CUR (BUTTON_PLAY | BUTTON_DOWN) | ||
482 | # define SOL_CUR2STACK (BUTTON_PLAY | BUTTON_UP) | ||
483 | # define SOL_REM2STACK (BUTTON_PLAY | BUTTON_RIGHT) | ||
484 | # define HK_MOVE "PLAY" | ||
485 | # define HK_DRAW "FFWD" | ||
486 | # define HK_REM2CUR "PLAY+DOWN" | ||
487 | # define HK_CUR2STACK "PLAY+UP" | ||
488 | # define HK_REM2STACK "PLAY+RIGHT" | ||
472 | 489 | ||
473 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 490 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
474 | # define SOL_QUIT BUTTON_REC | 491 | # define SOL_QUIT BUTTON_REC |