devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#10552 - Cowon D2: pgup/pgdn on minus/plus buttons in text viewer

Browse source 
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
This commit is contained in:
Tomer Shalev 2010-02-24 21:38:15 +00:00
parent 83d589dad1
commit 04e3eb0c54
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/plugins/viewer.c
View file

@ -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;