diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2015-04-23 00:07:27 +0200 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-09-30 16:13:55 +0200 |
commit | f01fb3ca594933b6c193ee4bb23fcfbcfc72d9c8 (patch) | |
tree | 02abef65de15e593c45c31b23dfccce7349e8199 | |
parent | bc25437448c0642a8ea22e3f513ef1ca658dd737 (diff) | |
download | rockbox-f01fb3ca594933b6c193ee4bb23fcfbcfc72d9c8.tar.gz rockbox-f01fb3ca594933b6c193ee4bb23fcfbcfc72d9c8.zip |
Fix chessbox keymap handling
Let's give the defined, yet unused keymaps some sense :)
Change-Id: I372217351f7edc35c69c8c29fba782d32c895d5b
-rw-r--r-- | apps/plugins/chessbox/chessbox.c | 25 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.h | 95 |
2 files changed, 85 insertions, 35 deletions
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 3bd9593e3a..906cc5d4c8 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -432,6 +432,11 @@ static struct cb_command cb_get_viewer_command (void) { | |||
432 | result.type = COMMAND_QUIT; | 432 | result.type = COMMAND_QUIT; |
433 | return result; | 433 | return result; |
434 | #endif | 434 | #endif |
435 | #ifdef CB_RESTART | ||
436 | case CB_RESTART: | ||
437 | result.type = COMMAND_RESTART; | ||
438 | return result; | ||
439 | #endif | ||
435 | case CB_MENU: | 440 | case CB_MENU: |
436 | result.type = cb_menu_viewer(); | 441 | result.type = cb_menu_viewer(); |
437 | return result; | 442 | return result; |
@@ -575,6 +580,7 @@ static void cb_start_viewer(char* filename){ | |||
575 | GNUChess_Initialize(); | 580 | GNUChess_Initialize(); |
576 | cb_drawboard(); | 581 | cb_drawboard(); |
577 | curr_ply = selected_game->first_ply; | 582 | curr_ply = selected_game->first_ply; |
583 | break; | ||
578 | case COMMAND_SELECT: | 584 | case COMMAND_SELECT: |
579 | exit_game = true; | 585 | exit_game = true; |
580 | break; | 586 | break; |
@@ -659,6 +665,11 @@ static struct cb_command cb_getcommand (void) { | |||
659 | result.type = COMMAND_QUIT; | 665 | result.type = COMMAND_QUIT; |
660 | return result; | 666 | return result; |
661 | #endif | 667 | #endif |
668 | #ifdef CB_RESTART | ||
669 | case CB_RESTART: | ||
670 | result.type = COMMAND_RESTART; | ||
671 | return result; | ||
672 | #endif | ||
662 | case CB_MENU: | 673 | case CB_MENU: |
663 | result.type = cb_menu(); | 674 | result.type = cb_menu(); |
664 | return result; | 675 | return result; |
@@ -673,6 +684,9 @@ static struct cb_command cb_getcommand (void) { | |||
673 | result.type = COMMAND_PLAY; | 684 | result.type = COMMAND_PLAY; |
674 | return result; | 685 | return result; |
675 | case CB_UP: | 686 | case CB_UP: |
687 | #ifdef CB_SCROLL_UP | ||
688 | case CB_SCROLL_UP: | ||
689 | #endif | ||
676 | if ( !from_marked ) cb_switch ( x , y ); | 690 | if ( !from_marked ) cb_switch ( x , y ); |
677 | y++; | 691 | y++; |
678 | if ( y == 8 ) { | 692 | if ( y == 8 ) { |
@@ -688,6 +702,9 @@ static struct cb_command cb_getcommand (void) { | |||
688 | } | 702 | } |
689 | break; | 703 | break; |
690 | case CB_DOWN: | 704 | case CB_DOWN: |
705 | #ifdef CB_SCROLL_DOWN | ||
706 | case CB_SCROLL_DOWN: | ||
707 | #endif | ||
691 | if ( !from_marked ) cb_switch ( x , y ); | 708 | if ( !from_marked ) cb_switch ( x , y ); |
692 | y--; | 709 | y--; |
693 | if ( y < 0 ) { | 710 | if ( y < 0 ) { |
@@ -703,6 +720,9 @@ static struct cb_command cb_getcommand (void) { | |||
703 | } | 720 | } |
704 | break; | 721 | break; |
705 | case CB_LEFT: | 722 | case CB_LEFT: |
723 | #ifdef CB_SCROLL_LEFT | ||
724 | case CB_SCROLL_LEFT: | ||
725 | #endif | ||
706 | if ( !from_marked ) cb_switch ( x , y ); | 726 | if ( !from_marked ) cb_switch ( x , y ); |
707 | x--; | 727 | x--; |
708 | if ( x < 0 ) { | 728 | if ( x < 0 ) { |
@@ -718,6 +738,9 @@ static struct cb_command cb_getcommand (void) { | |||
718 | } | 738 | } |
719 | break; | 739 | break; |
720 | case CB_RIGHT: | 740 | case CB_RIGHT: |
741 | #ifdef CB_SCROLL_RIGHT | ||
742 | case CB_SCROLL_RIGHT: | ||
743 | #endif | ||
721 | if ( !from_marked ) cb_switch ( x , y ); | 744 | if ( !from_marked ) cb_switch ( x , y ); |
722 | x++; | 745 | x++; |
723 | if ( x == 8 ) { | 746 | if ( x == 8 ) { |
@@ -842,13 +865,11 @@ static void cb_play_game(void) { | |||
842 | cb_drawboard(); | 865 | cb_drawboard(); |
843 | } | 866 | } |
844 | break; | 867 | break; |
845 | #ifdef COMMAND_RESTART | ||
846 | case COMMAND_RESTART: | 868 | case COMMAND_RESTART: |
847 | GNUChess_Initialize(); | 869 | GNUChess_Initialize(); |
848 | game = pgn_init_game(); | 870 | game = pgn_init_game(); |
849 | cb_drawboard(); | 871 | cb_drawboard(); |
850 | break; | 872 | break; |
851 | #endif | ||
852 | case COMMAND_RESUME: | 873 | case COMMAND_RESUME: |
853 | cb_drawboard(); | 874 | cb_drawboard(); |
854 | break; | 875 | break; |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 2d28c1d85a..159bdf13a7 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -34,7 +34,6 @@ | |||
34 | #define CB_LEVEL (BUTTON_SELECT | BUTTON_RIGHT) | 34 | #define CB_LEVEL (BUTTON_SELECT | BUTTON_RIGHT) |
35 | #define CB_RESTART (BUTTON_SELECT | BUTTON_LEFT) | 35 | #define CB_RESTART (BUTTON_SELECT | BUTTON_LEFT) |
36 | #define CB_MENU (BUTTON_SELECT | BUTTON_MENU) | 36 | #define CB_MENU (BUTTON_SELECT | BUTTON_MENU) |
37 | |||
38 | #define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) | 37 | #define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) |
39 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_BACK|BUTTON_REPEAT) | 38 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
40 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 39 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -50,7 +49,6 @@ | |||
50 | #define CB_LEVEL BUTTON_REC | 49 | #define CB_LEVEL BUTTON_REC |
51 | #define CB_RESTART (BUTTON_SELECT | BUTTON_PLAY) | 50 | #define CB_RESTART (BUTTON_SELECT | BUTTON_PLAY) |
52 | #define CB_MENU BUTTON_POWER | 51 | #define CB_MENU BUTTON_POWER |
53 | |||
54 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 52 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
55 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 53 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
56 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 54 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -66,9 +64,7 @@ | |||
66 | #define CB_LEVEL BUTTON_MODE | 64 | #define CB_LEVEL BUTTON_MODE |
67 | #define CB_RESTART BUTTON_REC | 65 | #define CB_RESTART BUTTON_REC |
68 | #define CB_MENU BUTTON_OFF | 66 | #define CB_MENU BUTTON_OFF |
69 | |||
70 | #define CB_RC_QUIT BUTTON_RC_STOP | 67 | #define CB_RC_QUIT BUTTON_RC_STOP |
71 | |||
72 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 68 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
73 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 69 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
74 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 70 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -83,7 +79,6 @@ | |||
83 | #define CB_PLAY BUTTON_PLAY | 79 | #define CB_PLAY BUTTON_PLAY |
84 | #define CB_LEVEL BUTTON_EQ | 80 | #define CB_LEVEL BUTTON_EQ |
85 | #define CB_MENU BUTTON_MODE | 81 | #define CB_MENU BUTTON_MODE |
86 | |||
87 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 82 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
88 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 83 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
89 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 84 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -99,7 +94,6 @@ | |||
99 | #define CB_LEVEL BUTTON_F1 | 94 | #define CB_LEVEL BUTTON_F1 |
100 | #define CB_RESTART BUTTON_F3 | 95 | #define CB_RESTART BUTTON_F3 |
101 | #define CB_MENU BUTTON_OFF | 96 | #define CB_MENU BUTTON_OFF |
102 | |||
103 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 97 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
104 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 98 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
105 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 99 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -115,7 +109,6 @@ | |||
115 | #define CB_LEVEL BUTTON_F1 | 109 | #define CB_LEVEL BUTTON_F1 |
116 | #define CB_RESTART BUTTON_F3 | 110 | #define CB_RESTART BUTTON_F3 |
117 | #define CB_MENU BUTTON_OFF | 111 | #define CB_MENU BUTTON_OFF |
118 | |||
119 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 112 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
120 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 113 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
121 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 114 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -133,7 +126,6 @@ | |||
133 | #define CB_LEVEL (BUTTON_MENU|BUTTON_OFF) | 126 | #define CB_LEVEL (BUTTON_MENU|BUTTON_OFF) |
134 | #define CB_RESTART (BUTTON_MENU|BUTTON_LEFT) | 127 | #define CB_RESTART (BUTTON_MENU|BUTTON_LEFT) |
135 | #define CB_MENU BUTTON_OFF | 128 | #define CB_MENU BUTTON_OFF |
136 | |||
137 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 129 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
138 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 130 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
139 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 131 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -148,7 +140,6 @@ | |||
148 | #define CB_PLAY BUTTON_A | 140 | #define CB_PLAY BUTTON_A |
149 | #define CB_LEVEL BUTTON_MENU | 141 | #define CB_LEVEL BUTTON_MENU |
150 | #define CB_MENU BUTTON_POWER | 142 | #define CB_MENU BUTTON_POWER |
151 | |||
152 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 143 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
153 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 144 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
154 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 145 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -163,7 +154,6 @@ | |||
163 | #define CB_PLAY BUTTON_PLAY | 154 | #define CB_PLAY BUTTON_PLAY |
164 | #define CB_LEVEL BUTTON_MENU | 155 | #define CB_LEVEL BUTTON_MENU |
165 | #define CB_MENU BUTTON_POWER | 156 | #define CB_MENU BUTTON_POWER |
166 | |||
167 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 157 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
168 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 158 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
169 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 159 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -179,9 +169,8 @@ | |||
179 | #define CB_LEVEL BUTTON_FF | 169 | #define CB_LEVEL BUTTON_FF |
180 | #define CB_RESTART (BUTTON_REW | BUTTON_PLAY) | 170 | #define CB_RESTART (BUTTON_REW | BUTTON_PLAY) |
181 | #define CB_MENU BUTTON_POWER | 171 | #define CB_MENU BUTTON_POWER |
182 | 172 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | |
183 | #define CB_SCROLL_UP (BUTTON_SCROLL_BACK|BUTTON_REPEAT) | 173 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) |
184 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_FWD|BUTTON_REPEAT) | ||
185 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 174 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
186 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 175 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
187 | 176 | ||
@@ -195,9 +184,8 @@ | |||
195 | #define CB_LEVEL BUTTON_REC | 184 | #define CB_LEVEL BUTTON_REC |
196 | #define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) | 185 | #define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) |
197 | #define CB_MENU BUTTON_POWER | 186 | #define CB_MENU BUTTON_POWER |
198 | 187 | #define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) | |
199 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | 188 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
200 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | ||
201 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 189 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
202 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 190 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
203 | 191 | ||
@@ -211,9 +199,8 @@ | |||
211 | #define CB_LEVEL (BUTTON_SELECT|BUTTON_LEFT) | 199 | #define CB_LEVEL (BUTTON_SELECT|BUTTON_LEFT) |
212 | #define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) | 200 | #define CB_RESTART (BUTTON_SELECT | BUTTON_REPEAT) |
213 | #define CB_MENU (BUTTON_HOME|BUTTON_REPEAT) | 201 | #define CB_MENU (BUTTON_HOME|BUTTON_REPEAT) |
214 | 202 | #define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) | |
215 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | 203 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
216 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | ||
217 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 204 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
218 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 205 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
219 | 206 | ||
@@ -226,7 +213,6 @@ | |||
226 | #define CB_PLAY BUTTON_VOL_UP | 213 | #define CB_PLAY BUTTON_VOL_UP |
227 | #define CB_LEVEL BUTTON_HOME | 214 | #define CB_LEVEL BUTTON_HOME |
228 | #define CB_MENU BUTTON_POWER | 215 | #define CB_MENU BUTTON_POWER |
229 | |||
230 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 216 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
231 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 217 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
232 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 218 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -241,7 +227,6 @@ | |||
241 | #define CB_PLAY BUTTON_VOL_UP | 227 | #define CB_PLAY BUTTON_VOL_UP |
242 | #define CB_LEVEL (BUTTON_SELECT | BUTTON_UP) | 228 | #define CB_LEVEL (BUTTON_SELECT | BUTTON_UP) |
243 | #define CB_MENU BUTTON_POWER | 229 | #define CB_MENU BUTTON_POWER |
244 | |||
245 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 230 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
246 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 231 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
247 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 232 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -256,7 +241,6 @@ | |||
256 | #define CB_PLAY BUTTON_VOL_UP | 241 | #define CB_PLAY BUTTON_VOL_UP |
257 | #define CB_LEVEL BUTTON_REC | 242 | #define CB_LEVEL BUTTON_REC |
258 | #define CB_MENU BUTTON_POWER | 243 | #define CB_MENU BUTTON_POWER |
259 | |||
260 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 244 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
261 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 245 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
262 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 246 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -273,7 +257,6 @@ | |||
273 | #define CB_PLAY BUTTON_PLAY | 257 | #define CB_PLAY BUTTON_PLAY |
274 | #define CB_LEVEL BUTTON_DISPLAY | 258 | #define CB_LEVEL BUTTON_DISPLAY |
275 | #define CB_MENU BUTTON_POWER | 259 | #define CB_MENU BUTTON_POWER |
276 | |||
277 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 260 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
278 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 261 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
279 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 262 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
@@ -289,12 +272,10 @@ | |||
289 | #define CB_LEVEL BUTTON_RC_MENU | 272 | #define CB_LEVEL BUTTON_RC_MENU |
290 | #define CB_RESTART (BUTTON_RC_PLAY|BUTTON_REPEAT) | 273 | #define CB_RESTART (BUTTON_RC_PLAY|BUTTON_REPEAT) |
291 | #define CB_MENU BUTTON_RC_REC | 274 | #define CB_MENU BUTTON_RC_REC |
292 | |||
293 | #define CB_SCROLL_UP (BUTTON_RC_VOL_UP|BUTTON_REPEAT) | 275 | #define CB_SCROLL_UP (BUTTON_RC_VOL_UP|BUTTON_REPEAT) |
294 | #define CB_SCROLL_DOWN (BUTTON_RC_VOL_DOWN|BUTTON_REPEAT) | 276 | #define CB_SCROLL_DOWN (BUTTON_RC_VOL_DOWN|BUTTON_REPEAT) |
295 | #define CB_SCROLL_LEFT (BUTTON_RC_REW|BUTTON_REPEAT) | 277 | #define CB_SCROLL_LEFT (BUTTON_RC_REW|BUTTON_REPEAT) |
296 | #define CB_SCROLL_RIGHT (BUTTON_RC_FF|BUTTON_REPEAT) | 278 | #define CB_SCROLL_RIGHT (BUTTON_RC_FF|BUTTON_REPEAT) |
297 | |||
298 | #define CB_RC_QUIT BUTTON_REC | 279 | #define CB_RC_QUIT BUTTON_REC |
299 | 280 | ||
300 | #elif CONFIG_KEYPAD == COWON_D2_PAD | 281 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
@@ -303,7 +284,6 @@ | |||
303 | #define CB_MENU (BUTTON_MENU|BUTTON_REL) | 284 | #define CB_MENU (BUTTON_MENU|BUTTON_REL) |
304 | 285 | ||
305 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 286 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
306 | |||
307 | #define CB_SELECT BUTTON_PLAY | 287 | #define CB_SELECT BUTTON_PLAY |
308 | #define CB_UP BUTTON_UP | 288 | #define CB_UP BUTTON_UP |
309 | #define CB_DOWN BUTTON_DOWN | 289 | #define CB_DOWN BUTTON_DOWN |
@@ -312,6 +292,10 @@ | |||
312 | #define CB_PLAY BUTTON_SELECT | 292 | #define CB_PLAY BUTTON_SELECT |
313 | #define CB_LEVEL BUTTON_CUSTOM | 293 | #define CB_LEVEL BUTTON_CUSTOM |
314 | #define CB_MENU BUTTON_MENU | 294 | #define CB_MENU BUTTON_MENU |
295 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
296 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
297 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
298 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
315 | 299 | ||
316 | #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD | 300 | #elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD |
317 | #define CB_SELECT (BUTTON_PLAY|BUTTON_REL) | 301 | #define CB_SELECT (BUTTON_PLAY|BUTTON_REL) |
@@ -332,6 +316,10 @@ | |||
332 | #define CB_PLAY BUTTON_VIEW | 316 | #define CB_PLAY BUTTON_VIEW |
333 | #define CB_LEVEL BUTTON_PLAYLIST | 317 | #define CB_LEVEL BUTTON_PLAYLIST |
334 | #define CB_MENU BUTTON_MENU | 318 | #define CB_MENU BUTTON_MENU |
319 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
320 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
321 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
322 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
335 | 323 | ||
336 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | 324 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD |
337 | #define CB_SELECT BUTTON_PLAY | 325 | #define CB_SELECT BUTTON_PLAY |
@@ -342,6 +330,10 @@ | |||
342 | #define CB_PLAY BUTTON_RIGHT | 330 | #define CB_PLAY BUTTON_RIGHT |
343 | #define CB_LEVEL BUTTON_LEFT | 331 | #define CB_LEVEL BUTTON_LEFT |
344 | #define CB_MENU BUTTON_MENU | 332 | #define CB_MENU BUTTON_MENU |
333 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
334 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
335 | #define CB_SCROLL_LEFT (BUTTON_PREV|BUTTON_REPEAT) | ||
336 | #define CB_SCROLL_RIGHT (BUTTON_NEXT|BUTTON_REPEAT) | ||
345 | 337 | ||
346 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 338 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
347 | #define CB_SELECT BUTTON_PLAY | 339 | #define CB_SELECT BUTTON_PLAY |
@@ -352,11 +344,10 @@ | |||
352 | #define CB_PLAY BUTTON_RIGHT | 344 | #define CB_PLAY BUTTON_RIGHT |
353 | #define CB_LEVEL BUTTON_LEFT | 345 | #define CB_LEVEL BUTTON_LEFT |
354 | #define CB_MENU BUTTON_MENU | 346 | #define CB_MENU BUTTON_MENU |
355 | |||
356 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 347 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
357 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 348 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
358 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 349 | #define CB_SCROLL_LEFT (BUTTON_PREV|BUTTON_REPEAT) |
359 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 350 | #define CB_SCROLL_RIGHT (BUTTON_NEXT|BUTTON_REPEAT) |
360 | 351 | ||
361 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 352 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
362 | #define CB_LEVEL BUTTON_VOL_UP | 353 | #define CB_LEVEL BUTTON_VOL_UP |
@@ -376,6 +367,10 @@ | |||
376 | #define CB_PLAY BUTTON_PLAY | 367 | #define CB_PLAY BUTTON_PLAY |
377 | #define CB_LEVEL (BUTTON_REW|BUTTON_RIGHT) | 368 | #define CB_LEVEL (BUTTON_REW|BUTTON_RIGHT) |
378 | #define CB_MENU (BUTTON_REW|BUTTON_LEFT) | 369 | #define CB_MENU (BUTTON_REW|BUTTON_LEFT) |
370 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
371 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
372 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
373 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
379 | 374 | ||
380 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 375 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
381 | #define CB_SELECT BUTTON_OK | 376 | #define CB_SELECT BUTTON_OK |
@@ -386,6 +381,10 @@ | |||
386 | #define CB_PLAY BUTTON_PLAY | 381 | #define CB_PLAY BUTTON_PLAY |
387 | #define CB_LEVEL BUTTON_CANCEL | 382 | #define CB_LEVEL BUTTON_CANCEL |
388 | #define CB_MENU BUTTON_MENU | 383 | #define CB_MENU BUTTON_MENU |
384 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
385 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
386 | #define CB_SCROLL_LEFT (BUTTON_PREV|BUTTON_REPEAT) | ||
387 | #define CB_SCROLL_RIGHT (BUTTON_NEXT|BUTTON_REPEAT) | ||
389 | 388 | ||
390 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 389 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
391 | #define CB_SELECT BUTTON_FUNC | 390 | #define CB_SELECT BUTTON_FUNC |
@@ -396,6 +395,10 @@ | |||
396 | #define CB_PLAY BUTTON_PLAY | 395 | #define CB_PLAY BUTTON_PLAY |
397 | #define CB_LEVEL BUTTON_REC | 396 | #define CB_LEVEL BUTTON_REC |
398 | #define CB_MENU (BUTTON_FUNC | BUTTON_REPEAT) | 397 | #define CB_MENU (BUTTON_FUNC | BUTTON_REPEAT) |
398 | #define CB_SCROLL_UP (BUTTON_REW|BUTTON_REPEAT) | ||
399 | #define CB_SCROLL_DOWN (BUTTON_FF|BUTTON_REPEAT) | ||
400 | #define CB_SCROLL_LEFT (BUTTON_VOL_DOWN|BUTTON_REPEAT) | ||
401 | #define CB_SCROLL_RIGHT (BUTTON_VOL_UP|BUTTON_REPEAT) | ||
399 | 402 | ||
400 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 403 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
401 | #define CB_SELECT BUTTON_ENTER | 404 | #define CB_SELECT BUTTON_ENTER |
@@ -406,6 +409,10 @@ | |||
406 | #define CB_PLAY BUTTON_PLAY | 409 | #define CB_PLAY BUTTON_PLAY |
407 | #define CB_LEVEL BUTTON_REC | 410 | #define CB_LEVEL BUTTON_REC |
408 | #define CB_MENU BUTTON_MENU | 411 | #define CB_MENU BUTTON_MENU |
412 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
413 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
414 | #define CB_SCROLL_LEFT (BUTTON_REW|BUTTON_REPEAT) | ||
415 | #define CB_SCROLL_RIGHT (BUTTON_FF|BUTTON_REPEAT) | ||
409 | 416 | ||
410 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 417 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
411 | #define CB_SELECT BUTTON_SELECT | 418 | #define CB_SELECT BUTTON_SELECT |
@@ -417,6 +424,10 @@ | |||
417 | #define CB_LEVEL BUTTON_BOTTOMRIGHT | 424 | #define CB_LEVEL BUTTON_BOTTOMRIGHT |
418 | #define CB_RESTART (BUTTON_BACK | BUTTON_REPEAT) | 425 | #define CB_RESTART (BUTTON_BACK | BUTTON_REPEAT) |
419 | #define CB_MENU BUTTON_POWER | 426 | #define CB_MENU BUTTON_POWER |
427 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
428 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
429 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
430 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
420 | 431 | ||
421 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 432 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
422 | #define CB_SELECT BUTTON_SELECT | 433 | #define CB_SELECT BUTTON_SELECT |
@@ -428,9 +439,8 @@ | |||
428 | #define CB_LEVEL BUTTON_VOL_DOWN | 439 | #define CB_LEVEL BUTTON_VOL_DOWN |
429 | #define CB_RESTART BUTTON_PREV | 440 | #define CB_RESTART BUTTON_PREV |
430 | #define CB_MENU BUTTON_POWER | 441 | #define CB_MENU BUTTON_POWER |
431 | 442 | #define CB_SCROLL_UP (BUTTON_SCROLL_FWD|BUTTON_REPEAT) | |
432 | #define CB_SCROLL_UP (BUTTON_SCROLL_UP|BUTTON_REPEAT) | 443 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_BACK|BUTTON_REPEAT) |
433 | #define CB_SCROLL_DOWN (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | ||
434 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 444 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
435 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 445 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
436 | 446 | ||
@@ -443,6 +453,10 @@ | |||
443 | #define CB_PLAY BUTTON_USER | 453 | #define CB_PLAY BUTTON_USER |
444 | #define CB_LEVEL BUTTON_BACK | 454 | #define CB_LEVEL BUTTON_BACK |
445 | #define CB_MENU BUTTON_MENU | 455 | #define CB_MENU BUTTON_MENU |
456 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
457 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
458 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
459 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
446 | 460 | ||
447 | #elif CONFIG_KEYPAD == HM60X_PAD | 461 | #elif CONFIG_KEYPAD == HM60X_PAD |
448 | #define CB_SELECT BUTTON_SELECT | 462 | #define CB_SELECT BUTTON_SELECT |
@@ -453,6 +467,10 @@ | |||
453 | #define CB_PLAY (BUTTON_POWER | BUTTON_SELECT) | 467 | #define CB_PLAY (BUTTON_POWER | BUTTON_SELECT) |
454 | #define CB_LEVEL (BUTTON_POWER | BUTTON_LEFT) | 468 | #define CB_LEVEL (BUTTON_POWER | BUTTON_LEFT) |
455 | #define CB_MENU (BUTTON_POWER | BUTTON_RIGHT) | 469 | #define CB_MENU (BUTTON_POWER | BUTTON_RIGHT) |
470 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
471 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
472 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
473 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
456 | 474 | ||
457 | #elif CONFIG_KEYPAD == HM801_PAD | 475 | #elif CONFIG_KEYPAD == HM801_PAD |
458 | #define CB_SELECT BUTTON_SELECT | 476 | #define CB_SELECT BUTTON_SELECT |
@@ -463,7 +481,10 @@ | |||
463 | #define CB_PLAY BUTTON_PLAY | 481 | #define CB_PLAY BUTTON_PLAY |
464 | #define CB_LEVEL BUTTON_PREV | 482 | #define CB_LEVEL BUTTON_PREV |
465 | #define CB_MENU BUTTON_POWER | 483 | #define CB_MENU BUTTON_POWER |
466 | 484 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | |
485 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
486 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
487 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
467 | 488 | ||
468 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | 489 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD |
469 | #define CB_SELECT BUTTON_PLAY | 490 | #define CB_SELECT BUTTON_PLAY |
@@ -474,6 +495,10 @@ | |||
474 | #define CB_PLAY (BUTTON_REPEAT|BUTTON_PLAY) | 495 | #define CB_PLAY (BUTTON_REPEAT|BUTTON_PLAY) |
475 | #define CB_MENU BUTTON_BACK | 496 | #define CB_MENU BUTTON_BACK |
476 | #define CB_LEVEL BUTTON_POWER | 497 | #define CB_LEVEL BUTTON_POWER |
498 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
499 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
500 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
501 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
477 | 502 | ||
478 | #elif CONFIG_KEYPAD == CREATIVE_ZEN_PAD | 503 | #elif CONFIG_KEYPAD == CREATIVE_ZEN_PAD |
479 | #define CB_SELECT BUTTON_SELECT | 504 | #define CB_SELECT BUTTON_SELECT |
@@ -484,6 +509,10 @@ | |||
484 | #define CB_PLAY BUTTON_PLAYPAUSE | 509 | #define CB_PLAY BUTTON_PLAYPAUSE |
485 | #define CB_MENU BUTTON_MENU | 510 | #define CB_MENU BUTTON_MENU |
486 | #define CB_LEVEL BUTTON_BACK | 511 | #define CB_LEVEL BUTTON_BACK |
512 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
513 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
514 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
515 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
487 | 516 | ||
488 | #elif CONFIG_KEYPAD == DX50_PAD | 517 | #elif CONFIG_KEYPAD == DX50_PAD |
489 | #define CB_SELECT BUTTON_PLAY | 518 | #define CB_SELECT BUTTON_PLAY |