diff options
| author | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-24 21:38:15 +0000 |
|---|---|---|
| committer | Tomer Shalev <shalev.tomer@gmail.com> | 2010-02-24 21:38:15 +0000 |
| commit | 04e3eb0c54bf3b395912d44e767aa43964d810e1 (patch) | |
| tree | 76ca3b700ee145ede0bf912d52f635c82b7e3436 /apps/plugins | |
| parent | 83d589dad1a0a96f3844d68b24d29c9b0f31e650 (diff) | |
| download | rockbox-04e3eb0c54bf3b395912d44e767aa43964d810e1.zip rockbox-04e3eb0c54bf3b395912d44e767aa43964d810e1.tar.gz rockbox-04e3eb0c54bf3b395912d44e767aa43964d810e1.tar.bz2 rockbox-04e3eb0c54bf3b395912d44e767aa43964d810e1.tar.xz | |
FS#10552 - Cowon D2: pgup/pgdn on minus/plus buttons in text viewer
Author: Nemtsev Alexey
Changes that were not part of the original patch:
- Updated corresponding manual entry
- Added support for having both buttons and touchscreen mapping to the same action
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24896 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/viewer.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 299c392..c4197a3 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c @@ -292,6 +292,8 @@ PLUGIN_HEADER #elif CONFIG_KEYPAD == COWON_D2_PAD #define VIEWER_QUIT BUTTON_POWER #define VIEWER_MENU BUTTON_MENU +#define VIEWER_PAGE_UP BUTTON_MINUS +#define VIEWER_PAGE_DOWN BUTTON_PLUS #elif CONFIG_KEYPAD == IAUDIO67_PAD #define VIEWER_QUIT BUTTON_POWER @@ -369,13 +371,19 @@ PLUGIN_HEADER #endif #ifdef HAVE_TOUCHSCREEN -#ifndef VIEWER_QUIT +#ifdef VIEWER_QUIT +#define VIEWER_QUIT2 BUTTON_TOPLEFT +#else #define VIEWER_QUIT BUTTON_TOPLEFT #endif -#ifndef VIEWER_PAGE_UP +#ifdef VIEWER_PAGE_UP +#define VIEWER_PAGE_UP2 BUTTON_TOPMIDDLE +#else #define VIEWER_PAGE_UP BUTTON_TOPMIDDLE #endif -#ifndef VIEWER_PAGE_DOWN +#ifdef VIEWER_PAGE_DOWN +#define VIEWER_PAGE_DOWN2 BUTTON_BOTTOMMIDDLE +#else #define VIEWER_PAGE_DOWN BUTTON_BOTTOMMIDDLE #endif #ifndef VIEWER_SCREEN_LEFT @@ -384,7 +392,9 @@ PLUGIN_HEADER #ifndef VIEWER_SCREEN_RIGHT #define VIEWER_SCREEN_RIGHT BUTTON_MIDRIGHT #endif -#ifndef VIEWER_MENU +#ifdef VIEWER_MENU +#define VIEWER_MENU2 BUTTON_TOPRIGHT +#else #define VIEWER_MENU BUTTON_TOPRIGHT #endif #ifndef VIEWER_AUTOSCROLL @@ -1591,6 +1601,7 @@ enum plugin_status plugin_start(const void* file) button = rb->button_get_w_tmo(HZ/10); switch (button) { case VIEWER_MENU: + case VIEWER_MENU2: viewer_menu(); break; @@ -1603,7 +1614,9 @@ enum plugin_status plugin_start(const void* file) break; case VIEWER_PAGE_UP: + case VIEWER_PAGE_UP2: case VIEWER_PAGE_UP | BUTTON_REPEAT: + case VIEWER_PAGE_UP2 | BUTTON_REPEAT: if (prefs.scroll_mode == PAGE) { /* Page up */ @@ -1621,7 +1634,9 @@ enum plugin_status plugin_start(const void* file) break; case VIEWER_PAGE_DOWN: + case VIEWER_PAGE_DOWN2: case VIEWER_PAGE_DOWN | BUTTON_REPEAT: + case VIEWER_PAGE_DOWN2 | BUTTON_REPEAT: if (prefs.scroll_mode == PAGE) { /* Page down */ @@ -1708,6 +1723,7 @@ enum plugin_status plugin_start(const void* file) case VIEWER_RC_QUIT: #endif case VIEWER_QUIT: + case VIEWER_QUIT2: viewer_exit(NULL); done = true; break; |