diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-04-24 14:12:57 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-04-24 14:12:57 +0000 |
commit | 4f4025f94bda24dc27c6f321419666c5682b9d12 (patch) | |
tree | aa4c7f99acb3ea3025af8d559211e841e1a66e01 /apps | |
parent | 7a42bdd82968194b4e70047a04cf1458d458a093 (diff) | |
download | rockbox-4f4025f94bda24dc27c6f321419666c5682b9d12.tar.gz rockbox-4f4025f94bda24dc27c6f321419666c5682b9d12.zip |
Accept FS#8240 - use the wheel in flipit and jewels on the e200 and ipods
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17238 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/flipit.c | 42 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 14 |
2 files changed, 52 insertions, 4 deletions
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 37e49af68e..58948262d9 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -86,10 +86,13 @@ PLUGIN_HEADER | |||
86 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 86 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
87 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 87 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
88 | 88 | ||
89 | #define FLIPIT_SCROLLWHEEL | ||
89 | #define FLIPIT_LEFT BUTTON_LEFT | 90 | #define FLIPIT_LEFT BUTTON_LEFT |
90 | #define FLIPIT_RIGHT BUTTON_RIGHT | 91 | #define FLIPIT_RIGHT BUTTON_RIGHT |
91 | #define FLIPIT_UP BUTTON_MENU | 92 | #define FLIPIT_UP BUTTON_MENU |
92 | #define FLIPIT_DOWN BUTTON_PLAY | 93 | #define FLIPIT_DOWN BUTTON_PLAY |
94 | #define FLIPIT_NEXT BUTTON_SCROLL_FWD | ||
95 | #define FLIPIT_PREV BUTTON_SCROLL_BACK | ||
93 | #define FLIPIT_QUIT (BUTTON_SELECT | BUTTON_MENU) | 96 | #define FLIPIT_QUIT (BUTTON_SELECT | BUTTON_MENU) |
94 | #define FLIPIT_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) | 97 | #define FLIPIT_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) |
95 | #define FLIPIT_SOLVE (BUTTON_SELECT | BUTTON_PLAY) | 98 | #define FLIPIT_SOLVE (BUTTON_SELECT | BUTTON_PLAY) |
@@ -123,8 +126,22 @@ PLUGIN_HEADER | |||
123 | #define FLIPIT_STEP_BY_STEP BUTTON_VOL_DOWN | 126 | #define FLIPIT_STEP_BY_STEP BUTTON_VOL_DOWN |
124 | #define FLIPIT_TOGGLE BUTTON_SELECT | 127 | #define FLIPIT_TOGGLE BUTTON_SELECT |
125 | 128 | ||
126 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 129 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
127 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 130 | |
131 | #define FLIPIT_SCROLLWHEEL | ||
132 | #define FLIPIT_LEFT BUTTON_LEFT | ||
133 | #define FLIPIT_RIGHT BUTTON_RIGHT | ||
134 | #define FLIPIT_UP BUTTON_UP | ||
135 | #define FLIPIT_DOWN BUTTON_DOWN | ||
136 | #define FLIPIT_NEXT BUTTON_SCROLL_FWD | ||
137 | #define FLIPIT_PREV BUTTON_SCROLL_BACK | ||
138 | #define FLIPIT_QUIT BUTTON_POWER | ||
139 | #define FLIPIT_SHUFFLE (BUTTON_REC | BUTTON_LEFT) | ||
140 | #define FLIPIT_SOLVE (BUTTON_REC | BUTTON_RIGHT) | ||
141 | #define FLIPIT_STEP_BY_STEP (BUTTON_REC | BUTTON_SELECT) | ||
142 | #define FLIPIT_TOGGLE BUTTON_SELECT | ||
143 | |||
144 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | ||
128 | 145 | ||
129 | #define FLIPIT_LEFT BUTTON_LEFT | 146 | #define FLIPIT_LEFT BUTTON_LEFT |
130 | #define FLIPIT_RIGHT BUTTON_RIGHT | 147 | #define FLIPIT_RIGHT BUTTON_RIGHT |
@@ -508,7 +525,28 @@ static bool flipit_loop(void) | |||
508 | case FLIPIT_RIGHT: | 525 | case FLIPIT_RIGHT: |
509 | move_cursor(1, 0); | 526 | move_cursor(1, 0); |
510 | break; | 527 | break; |
528 | /*move cursor though the entire field*/ | ||
529 | #ifdef FLIPIT_SCROLLWHEEL | ||
530 | case FLIPIT_PREV: | ||
531 | case FLIPIT_PREV|BUTTON_REPEAT: | ||
532 | if ((cursor_pos)%5 == 0) { | ||
533 | move_cursor(-1, -1); | ||
534 | } | ||
535 | else { | ||
536 | move_cursor(-1, 0); | ||
537 | } | ||
538 | break; | ||
511 | 539 | ||
540 | case FLIPIT_NEXT: | ||
541 | case FLIPIT_NEXT|BUTTON_REPEAT: | ||
542 | if ((cursor_pos+1)%5 == 0) { | ||
543 | move_cursor(1, 1); | ||
544 | } | ||
545 | else { | ||
546 | move_cursor(1, 0); | ||
547 | } | ||
548 | break; | ||
549 | #endif | ||
512 | case FLIPIT_UP: | 550 | case FLIPIT_UP: |
513 | #ifdef FLIPIT_UP_PRE | 551 | #ifdef FLIPIT_UP_PRE |
514 | if (lastbutton != FLIPIT_UP_PRE) | 552 | if (lastbutton != FLIPIT_UP_PRE) |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 7d81476390..f93ea62114 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -95,8 +95,18 @@ PLUGIN_HEADER | |||
95 | #define JEWELS_SELECT BUTTON_SELECT | 95 | #define JEWELS_SELECT BUTTON_SELECT |
96 | #define JEWELS_CANCEL BUTTON_POWER | 96 | #define JEWELS_CANCEL BUTTON_POWER |
97 | 97 | ||
98 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 98 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
99 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 99 | #define JEWELS_SCROLLWHEEL |
100 | #define JEWELS_UP BUTTON_UP | ||
101 | #define JEWELS_DOWN BUTTON_DOWN | ||
102 | #define JEWELS_LEFT BUTTON_LEFT | ||
103 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
104 | #define JEWELS_PREV BUTTON_SCROLL_BACK | ||
105 | #define JEWELS_NEXT BUTTON_SCROLL_FWD | ||
106 | #define JEWELS_SELECT BUTTON_SELECT | ||
107 | #define JEWELS_CANCEL BUTTON_POWER | ||
108 | |||
109 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | ||
100 | #define JEWELS_UP BUTTON_UP | 110 | #define JEWELS_UP BUTTON_UP |
101 | #define JEWELS_DOWN BUTTON_DOWN | 111 | #define JEWELS_DOWN BUTTON_DOWN |
102 | #define JEWELS_LEFT BUTTON_LEFT | 112 | #define JEWELS_LEFT BUTTON_LEFT |