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) | |
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) if (lastbutton != TV_AUTOSCROLL_PRE) break; #endif +#ifdef TV_AUTOSCROLL2 + /* fallthrough */ + case TV_AUTOSCROLL2: +#endif autoscroll = !autoscroll; break; 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 @@ #define TV_QUIT BUTTON_POWER #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER) -/* SAMSUNG YH-820 / YH-920 / YH-925 keys */ -#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ - (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) -#define TV_QUIT BUTTON_REC +/* SAMSUNG YH-920 / YH-925 keys */ +#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD +#define TV_QUIT (BUTTON_REW|BUTTON_REPEAT) #define TV_SCROLL_UP BUTTON_UP #define TV_SCROLL_DOWN BUTTON_DOWN #define TV_SCREEN_LEFT BUTTON_LEFT #define TV_SCREEN_RIGHT BUTTON_RIGHT -#define TV_MENU BUTTON_PLAY -#define TV_AUTOSCROLL BUTTON_REW -#define TV_BOOKMARK BUTTON_FFWD +#define TV_MENU BUTTON_REW +#define TV_AUTOSCROLL BUTTON_REC_SW_ON +#define TV_AUTOSCROLL2 BUTTON_REC_SW_OFF +#define TV_BOOKMARK BUTTON_PLAY +#define TV_LINE_UP (BUTTON_FFWD|BUTTON_UP) +#define TV_LINE_DOWN (BUTTON_FFWD|BUTTON_DOWN) +#define TV_COLUMN_LEFT (BUTTON_FFWD|BUTTON_LEFT) +#define TV_COLUMN_RIGHT (BUTTON_FFWD|BUTTON_RIGHT) + +/* SAMSUNG YH-820 keys */ +#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD +#define TV_QUIT (BUTTON_REW|BUTTON_REPEAT) +#define TV_SCROLL_UP BUTTON_UP +#define TV_SCROLL_DOWN BUTTON_DOWN +#define TV_SCREEN_LEFT BUTTON_LEFT +#define TV_SCREEN_RIGHT BUTTON_RIGHT +#define TV_MENU BUTTON_REW +#define TV_AUTOSCROLL BUTTON_FFWD +#define TV_BOOKMARK BUTTON_PLAY +#define TV_LINE_UP (BUTTON_REC|BUTTON_UP) +#define TV_LINE_DOWN (BUTTON_REC|BUTTON_DOWN) +#define TV_COLUMN_LEFT (BUTTON_REC|BUTTON_LEFT) +#define TV_COLUMN_RIGHT (BUTTON_REC|BUTTON_RIGHT) /* Packard Bell Vibe 500 keys */ #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |