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/text_viewer | |
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/text_viewer')
-rw-r--r-- | apps/plugins/text_viewer/text_viewer.c | 4 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_button.h | 33 |
2 files changed, 30 insertions, 7 deletions
diff --git a/apps/plugins/text_viewer/text_viewer.c b/apps/plugins/text_viewer/text_viewer.c index 29a2e6d12a..c8102eb6d2 100644 --- a/apps/plugins/text_viewer/text_viewer.c +++ b/apps/plugins/text_viewer/text_viewer.c | |||
@@ -98,6 +98,10 @@ enum plugin_status plugin_start(const void* file) | |||
98 | if (lastbutton != TV_AUTOSCROLL_PRE) | 98 | if (lastbutton != TV_AUTOSCROLL_PRE) |
99 | break; | 99 | break; |
100 | #endif | 100 | #endif |
101 | #ifdef TV_AUTOSCROLL2 | ||
102 | /* fallthrough */ | ||
103 | case TV_AUTOSCROLL2: | ||
104 | #endif | ||
101 | autoscroll = !autoscroll; | 105 | autoscroll = !autoscroll; |
102 | break; | 106 | break; |
103 | 107 | ||
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index 7c0cfab519..f476316ef9 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -380,17 +380,36 @@ | |||
380 | #define TV_QUIT BUTTON_POWER | 380 | #define TV_QUIT BUTTON_POWER |
381 | #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER) | 381 | #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER) |
382 | 382 | ||
383 | /* SAMSUNG YH-820 / YH-920 / YH-925 keys */ | 383 | /* SAMSUNG YH-920 / YH-925 keys */ |
384 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 384 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
385 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 385 | #define TV_QUIT (BUTTON_REW|BUTTON_REPEAT) |
386 | #define TV_QUIT BUTTON_REC | ||
387 | #define TV_SCROLL_UP BUTTON_UP | 386 | #define TV_SCROLL_UP BUTTON_UP |
388 | #define TV_SCROLL_DOWN BUTTON_DOWN | 387 | #define TV_SCROLL_DOWN BUTTON_DOWN |
389 | #define TV_SCREEN_LEFT BUTTON_LEFT | 388 | #define TV_SCREEN_LEFT BUTTON_LEFT |
390 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | 389 | #define TV_SCREEN_RIGHT BUTTON_RIGHT |
391 | #define TV_MENU BUTTON_PLAY | 390 | #define TV_MENU BUTTON_REW |
392 | #define TV_AUTOSCROLL BUTTON_REW | 391 | #define TV_AUTOSCROLL BUTTON_REC_SW_ON |
393 | #define TV_BOOKMARK BUTTON_FFWD | 392 | #define TV_AUTOSCROLL2 BUTTON_REC_SW_OFF |
393 | #define TV_BOOKMARK BUTTON_PLAY | ||
394 | #define TV_LINE_UP (BUTTON_FFWD|BUTTON_UP) | ||
395 | #define TV_LINE_DOWN (BUTTON_FFWD|BUTTON_DOWN) | ||
396 | #define TV_COLUMN_LEFT (BUTTON_FFWD|BUTTON_LEFT) | ||
397 | #define TV_COLUMN_RIGHT (BUTTON_FFWD|BUTTON_RIGHT) | ||
398 | |||
399 | /* SAMSUNG YH-820 keys */ | ||
400 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
401 | #define TV_QUIT (BUTTON_REW|BUTTON_REPEAT) | ||
402 | #define TV_SCROLL_UP BUTTON_UP | ||
403 | #define TV_SCROLL_DOWN BUTTON_DOWN | ||
404 | #define TV_SCREEN_LEFT BUTTON_LEFT | ||
405 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | ||
406 | #define TV_MENU BUTTON_REW | ||
407 | #define TV_AUTOSCROLL BUTTON_FFWD | ||
408 | #define TV_BOOKMARK BUTTON_PLAY | ||
409 | #define TV_LINE_UP (BUTTON_REC|BUTTON_UP) | ||
410 | #define TV_LINE_DOWN (BUTTON_REC|BUTTON_DOWN) | ||
411 | #define TV_COLUMN_LEFT (BUTTON_REC|BUTTON_LEFT) | ||
412 | #define TV_COLUMN_RIGHT (BUTTON_REC|BUTTON_RIGHT) | ||
394 | 413 | ||
395 | /* Packard Bell Vibe 500 keys */ | 414 | /* Packard Bell Vibe 500 keys */ |
396 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 415 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |