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 | |
parent | a8758c953d50fb020b245d5739c41de113638b49 (diff) | |
download | rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.tar.gz rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.zip |
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')
47 files changed, 473 insertions, 160 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 4022696a1f..2c8fecddea 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -396,13 +396,13 @@ enum { | |||
396 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 396 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
397 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 397 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
398 | #define BJACK_SELECT_NAME "PLAY" | 398 | #define BJACK_SELECT_NAME "PLAY" |
399 | #define BJACK_STAY_NAME "RECORD" | 399 | #define BJACK_STAY_NAME "FFWD" |
400 | #define BJACK_QUIT_NAME "REW" | 400 | #define BJACK_QUIT_NAME "LONG REW" |
401 | #define BJACK_DOUBLE_NAME "FFWD" | 401 | #define BJACK_DOUBLE_NAME "REW" |
402 | #define BJACK_SELECT BUTTON_PLAY | 402 | #define BJACK_SELECT BUTTON_PLAY |
403 | #define BJACK_QUIT BUTTON_REW | 403 | #define BJACK_QUIT (BUTTON_REW|BUTTON_REPEAT) |
404 | #define BJACK_STAY BUTTON_REC | 404 | #define BJACK_STAY BUTTON_FFWD |
405 | #define BJACK_DOUBLEDOWN BUTTON_FFWD | 405 | #define BJACK_DOUBLEDOWN (BUTTON_REW|BUTTON_REL) |
406 | #define BJACK_UP BUTTON_UP | 406 | #define BJACK_UP BUTTON_UP |
407 | #define BJACK_DOWN BUTTON_DOWN | 407 | #define BJACK_DOWN BUTTON_DOWN |
408 | #define BJACK_RIGHT BUTTON_RIGHT | 408 | #define BJACK_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 0c9223d398..05c8c9c185 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -245,7 +245,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD | |||
245 | 245 | ||
246 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 246 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
247 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 247 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
248 | #define QUIT BUTTON_FFWD | 248 | #define QUIT BUTTON_REW |
249 | #define SELECT BUTTON_PLAY | 249 | #define SELECT BUTTON_PLAY |
250 | #define LEFT BUTTON_LEFT | 250 | #define LEFT BUTTON_LEFT |
251 | #define RIGHT BUTTON_RIGHT | 251 | #define RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index c378ecbb81..f516cef1c3 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -380,17 +380,28 @@ F3: equal to "=" | |||
380 | #elif CONFIG_KEYPAD == MROBE500_PAD | 380 | #elif CONFIG_KEYPAD == MROBE500_PAD |
381 | #define CALCULATOR_QUIT BUTTON_POWER | 381 | #define CALCULATOR_QUIT BUTTON_POWER |
382 | 382 | ||
383 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 383 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
384 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
385 | 384 | ||
386 | #define CALCULATOR_LEFT BUTTON_LEFT | 385 | #define CALCULATOR_LEFT BUTTON_LEFT |
387 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 386 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
388 | #define CALCULATOR_UP BUTTON_UP | 387 | #define CALCULATOR_UP BUTTON_UP |
389 | #define CALCULATOR_DOWN BUTTON_DOWN | 388 | #define CALCULATOR_DOWN BUTTON_DOWN |
390 | #define CALCULATOR_QUIT BUTTON_REC | 389 | #define CALCULATOR_QUIT (BUTTON_REW|BUTTON_REPEAT) |
390 | #define CALCULATOR_INPUT BUTTON_PLAY | ||
391 | #define CALCULATOR_CALC BUTTON_FFWD | ||
392 | #define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL) | ||
393 | #define CALCULATOR_OPERATORS BUTTON_REC | ||
394 | |||
395 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
396 | |||
397 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
398 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
399 | #define CALCULATOR_UP BUTTON_UP | ||
400 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
401 | #define CALCULATOR_QUIT (BUTTON_REW|BUTTON_REPEAT) | ||
391 | #define CALCULATOR_INPUT BUTTON_PLAY | 402 | #define CALCULATOR_INPUT BUTTON_PLAY |
392 | #define CALCULATOR_CALC BUTTON_FFWD | 403 | #define CALCULATOR_CALC BUTTON_FFWD |
393 | #define CALCULATOR_CLEAR BUTTON_REW | 404 | #define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL) |
394 | 405 | ||
395 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 406 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
396 | 407 | ||
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 91613fcf88..d2744ea9f6 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -258,16 +258,25 @@ | |||
258 | #elif CONFIG_KEYPAD == MROBE500_PAD | 258 | #elif CONFIG_KEYPAD == MROBE500_PAD |
259 | #define CALENDAR_QUIT BUTTON_POWER | 259 | #define CALENDAR_QUIT BUTTON_POWER |
260 | 260 | ||
261 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 261 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
262 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 262 | #define CALENDAR_QUIT BUTTON_REW |
263 | #define CALENDAR_QUIT BUTTON_REC | ||
264 | #define CALENDAR_SELECT BUTTON_PLAY | 263 | #define CALENDAR_SELECT BUTTON_PLAY |
265 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | 264 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN |
266 | #define CALENDAR_PREV_WEEK BUTTON_UP | 265 | #define CALENDAR_PREV_WEEK BUTTON_UP |
267 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | 266 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT |
268 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 267 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
269 | #define CALENDAR_NEXT_MONTH BUTTON_FFWD | 268 | #define CALENDAR_NEXT_MONTH (BUTTON_FFWD|BUTTON_DOWN) |
270 | #define CALENDAR_PREV_MONTH BUTTON_REW | 269 | #define CALENDAR_PREV_MONTH (BUTTON_FFWD|BUTTON_UP) |
270 | |||
271 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
272 | #define CALENDAR_QUIT BUTTON_REW | ||
273 | #define CALENDAR_SELECT BUTTON_PLAY | ||
274 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | ||
275 | #define CALENDAR_PREV_WEEK BUTTON_UP | ||
276 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
277 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
278 | #define CALENDAR_NEXT_MONTH (BUTTON_REC|BUTTON_DOWN) | ||
279 | #define CALENDAR_PREV_MONTH (BUTTON_REC|BUTTON_UP) | ||
271 | 280 | ||
272 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 281 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
273 | #define CALENDAR_QUIT BUTTON_REC | 282 | #define CALENDAR_QUIT BUTTON_REC |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 906cc5d4c8..be69f672e4 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -680,6 +680,10 @@ static struct cb_command cb_getcommand (void) { | |||
680 | #ifdef CB_PLAY_PRE | 680 | #ifdef CB_PLAY_PRE |
681 | if (lastbutton != CB_PLAY_PRE) | 681 | if (lastbutton != CB_PLAY_PRE) |
682 | break; | 682 | break; |
683 | /* fallthrough */ | ||
684 | #endif | ||
685 | #ifdef CB_PLAY_ALT | ||
686 | case CB_PLAY_ALT: | ||
683 | #endif | 687 | #endif |
684 | result.type = COMMAND_PLAY; | 688 | result.type = COMMAND_PLAY; |
685 | return result; | 689 | return result; |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 159bdf13a7..e38d7f417f 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -357,16 +357,30 @@ | |||
357 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 357 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
358 | #define CB_MENU BUTTON_POWER | 358 | #define CB_MENU BUTTON_POWER |
359 | 359 | ||
360 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 360 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
361 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 361 | #define CB_SELECT BUTTON_PLAY |
362 | #define CB_SELECT BUTTON_FFWD | ||
363 | #define CB_UP BUTTON_UP | 362 | #define CB_UP BUTTON_UP |
364 | #define CB_DOWN BUTTON_DOWN | 363 | #define CB_DOWN BUTTON_DOWN |
365 | #define CB_LEFT BUTTON_LEFT | 364 | #define CB_LEFT BUTTON_LEFT |
366 | #define CB_RIGHT BUTTON_RIGHT | 365 | #define CB_RIGHT BUTTON_RIGHT |
367 | #define CB_PLAY BUTTON_PLAY | 366 | #define CB_PLAY BUTTON_REC |
368 | #define CB_LEVEL (BUTTON_REW|BUTTON_RIGHT) | 367 | #define CB_LEVEL BUTTON_FFWD |
369 | #define CB_MENU (BUTTON_REW|BUTTON_LEFT) | 368 | #define CB_MENU BUTTON_REW |
369 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
370 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
371 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
372 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
373 | |||
374 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
375 | #define CB_SELECT BUTTON_PLAY | ||
376 | #define CB_UP BUTTON_UP | ||
377 | #define CB_DOWN BUTTON_DOWN | ||
378 | #define CB_LEFT BUTTON_LEFT | ||
379 | #define CB_RIGHT BUTTON_RIGHT | ||
380 | #define CB_PLAY BUTTON_REC_SW_ON | ||
381 | #define CB_PLAY_ALT BUTTON_REC_SW_OFF | ||
382 | #define CB_LEVEL BUTTON_FFWD | ||
383 | #define CB_MENU BUTTON_REW | ||
370 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | 384 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) |
371 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | 385 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) |
372 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 386 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 01895d20f8..7c25f9eada 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -278,14 +278,16 @@ | |||
278 | 278 | ||
279 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 279 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
280 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 280 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
281 | #define CHC_QUIT BUTTON_REC | 281 | #define CHC_QUIT BUTTON_REW |
282 | #define CHC_STARTSTOP BUTTON_PLAY | 282 | #define CHC_STARTSTOP BUTTON_PLAY |
283 | #define CHC_RESET BUTTON_FFWD | 283 | #define CHC_RESET BUTTON_FFWD |
284 | #define CHC_MENU BUTTON_LEFT | 284 | #define CHC_MENU BUTTON_LEFT |
285 | #define CHC_SETTINGS_INC BUTTON_UP | 285 | #define CHC_SETTINGS_INC BUTTON_UP |
286 | #define CHC_SETTINGS_DEC BUTTON_DOWN | 286 | #define CHC_SETTINGS_DEC BUTTON_DOWN |
287 | #define CHC_SETTINGS_OK BUTTON_PLAY | 287 | #define CHC_SETTINGS_OK BUTTON_PLAY |
288 | #define CHC_SETTINGS_OK2 BUTTON_RIGHT | ||
288 | #define CHC_SETTINGS_CANCEL BUTTON_REW | 289 | #define CHC_SETTINGS_CANCEL BUTTON_REW |
290 | #define CHC_SETTINGS_CANCEL2 BUTTON_LEFT | ||
289 | 291 | ||
290 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 292 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
291 | #define CHC_QUIT BUTTON_REC | 293 | #define CHC_QUIT BUTTON_REC |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 09b0062382..d9c165f00d 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1145,7 +1145,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
1145 | 1145 | ||
1146 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 1146 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
1147 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 1147 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
1148 | #define CHIP8_OFF BUTTON_REC | 1148 | #define CHIP8_OFF BUTTON_REW |
1149 | #define CHIP8_KEY0 BUTTON_FFWD | ||
1149 | #define CHIP8_KEY2 BUTTON_UP | 1150 | #define CHIP8_KEY2 BUTTON_UP |
1150 | #define CHIP8_KEY4 BUTTON_LEFT | 1151 | #define CHIP8_KEY4 BUTTON_LEFT |
1151 | #define CHIP8_KEY5 BUTTON_PLAY | 1152 | #define CHIP8_KEY5 BUTTON_PLAY |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 94fe750a28..7189feda04 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -164,7 +164,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
164 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 164 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
165 | #define QUIT BUTTON_LEFT | 165 | #define QUIT BUTTON_LEFT |
166 | #define ACTION BUTTON_RIGHT | 166 | #define ACTION BUTTON_RIGHT |
167 | #define ACTIONTEXT "RIGHT" | 167 | #define ACTION2 BUTTON_UP |
168 | #define ACTIONTEXT "RIGHT or UP" | ||
168 | 169 | ||
169 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 170 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
170 | #define QUIT BUTTON_REC | 171 | #define QUIT BUTTON_REC |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index ffbb01abb8..d0e3f0caef 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -183,7 +183,7 @@ | |||
183 | 183 | ||
184 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 184 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
185 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 185 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
186 | #define CLIX_BUTTON_QUIT BUTTON_REC | 186 | #define CLIX_BUTTON_QUIT BUTTON_REW |
187 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | 187 | #define CLIX_BUTTON_LEFT BUTTON_LEFT |
188 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | 188 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT |
189 | #define CLIX_BUTTON_CLICK BUTTON_PLAY | 189 | #define CLIX_BUTTON_CLICK BUTTON_PLAY |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 09993204cd..2b0febfe68 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -281,14 +281,16 @@ | |||
281 | 281 | ||
282 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 282 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
283 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 283 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
284 | #define CUBE_QUIT BUTTON_REC | 284 | #define CUBE_QUIT BUTTON_REW |
285 | #define CUBE_NEXT BUTTON_RIGHT | 285 | #define CUBE_NEXT BUTTON_RIGHT |
286 | #define CUBE_PREV BUTTON_LEFT | 286 | #define CUBE_PREV BUTTON_LEFT |
287 | #define CUBE_INC BUTTON_UP | 287 | #define CUBE_INC BUTTON_UP |
288 | #define CUBE_DEC BUTTON_DOWN | 288 | #define CUBE_DEC BUTTON_DOWN |
289 | #define CUBE_MODE BUTTON_REW | 289 | #define CUBE_MODE (BUTTON_FFWD|BUTTON_REL) |
290 | #define CUBE_MODE_PRE BUTTON_FFWD | ||
290 | #define CUBE_PAUSE BUTTON_PLAY | 291 | #define CUBE_PAUSE BUTTON_PLAY |
291 | #define CUBE_HIGHSPEED BUTTON_FFWD | 292 | #define CUBE_HIGHSPEED (BUTTON_FFWD|BUTTON_REPEAT) |
293 | #define CUBE_HIGHSPEED_PRE BUTTON_FFWD | ||
292 | 294 | ||
293 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 295 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
294 | #define CUBE_QUIT BUTTON_REC | 296 | #define CUBE_QUIT BUTTON_REC |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 7ec768f1d3..c97dce9821 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -395,8 +395,19 @@ void I_ShutdownGraphics(void) | |||
395 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 395 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
396 | #define DOOMBUTTON_ESC BUTTON_POWER | 396 | #define DOOMBUTTON_ESC BUTTON_POWER |
397 | 397 | ||
398 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 398 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
399 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 399 | #define DOOMBUTTON_UP BUTTON_UP |
400 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
401 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
402 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
403 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | ||
404 | #define DOOMBUTTON_OPEN BUTTON_REW | ||
405 | #define DOOMBUTTON_ESC BUTTON_REC_SW_ON | ||
406 | #define DOOMBUTTON_ESC2 BUTTON_REC_SW_OFF | ||
407 | #define DOOMBUTTON_ENTER BUTTON_PLAY | ||
408 | #define DOOMBUTTON_WEAPON BUTTON_FFWD | ||
409 | |||
410 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
400 | #define DOOMBUTTON_UP BUTTON_UP | 411 | #define DOOMBUTTON_UP BUTTON_UP |
401 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 412 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
402 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 413 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
@@ -404,7 +415,7 @@ void I_ShutdownGraphics(void) | |||
404 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | 415 | #define DOOMBUTTON_SHOOT BUTTON_PLAY |
405 | #define DOOMBUTTON_OPEN BUTTON_REW | 416 | #define DOOMBUTTON_OPEN BUTTON_REW |
406 | #define DOOMBUTTON_ESC BUTTON_REC | 417 | #define DOOMBUTTON_ESC BUTTON_REC |
407 | #define DOOMBUTTON_ENTER BUTTON_FFWD | 418 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
408 | #define DOOMBUTTON_WEAPON BUTTON_FFWD | 419 | #define DOOMBUTTON_WEAPON BUTTON_FFWD |
409 | 420 | ||
410 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 421 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
@@ -685,7 +696,11 @@ static inline void getkey() | |||
685 | D_PostEvent(&event); | 696 | D_PostEvent(&event); |
686 | } | 697 | } |
687 | #ifdef DOOMBUTTON_ESC | 698 | #ifdef DOOMBUTTON_ESC |
688 | if(released & DOOMBUTTON_ESC) | 699 | if(released & DOOMBUTTON_ESC |
700 | #ifdef DOOMBUTTON_ESC2 | ||
701 | || released & DOOMBUTTON_ESC2 | ||
702 | #endif | ||
703 | ) | ||
689 | { | 704 | { |
690 | event.data1=KEY_ESCAPE; | 705 | event.data1=KEY_ESCAPE; |
691 | D_PostEvent(&event); | 706 | D_PostEvent(&event); |
@@ -747,7 +762,11 @@ static inline void getkey() | |||
747 | D_PostEvent(&event); | 762 | D_PostEvent(&event); |
748 | } | 763 | } |
749 | #ifdef DOOMBUTTON_ESC | 764 | #ifdef DOOMBUTTON_ESC |
750 | if(pressed & DOOMBUTTON_ESC) | 765 | if(pressed & DOOMBUTTON_ESC |
766 | #ifdef DOOMBUTTON_ESC2 | ||
767 | || pressed & DOOMBUTTON_ESC2 | ||
768 | #endif | ||
769 | ) | ||
751 | { | 770 | { |
752 | event.data1=KEY_ESCAPE; | 771 | event.data1=KEY_ESCAPE; |
753 | D_PostEvent(&event); | 772 | D_PostEvent(&event); |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 834dea3bf3..773bc080fb 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -351,11 +351,11 @@ | |||
351 | #define FLIPIT_RIGHT BUTTON_RIGHT | 351 | #define FLIPIT_RIGHT BUTTON_RIGHT |
352 | #define FLIPIT_UP BUTTON_UP | 352 | #define FLIPIT_UP BUTTON_UP |
353 | #define FLIPIT_DOWN BUTTON_DOWN | 353 | #define FLIPIT_DOWN BUTTON_DOWN |
354 | #define FLIPIT_QUIT BUTTON_REC | 354 | #define FLIPIT_QUIT (BUTTON_REW|BUTTON_REPEAT) |
355 | #define FLIPIT_SHUFFLE BUTTON_PLAY | 355 | #define FLIPIT_SHUFFLE (BUTTON_REW|BUTTON_REL) |
356 | #define FLIPIT_SOLVE BUTTON_FFWD | 356 | #define FLIPIT_SOLVE (BUTTON_FFWD|BUTTON_REPEAT) |
357 | #define FLIPIT_STEP_BY_STEP (BUTTON_FFWD|BUTTON_UP) | 357 | #define FLIPIT_STEP_BY_STEP (BUTTON_FFWD|BUTTON_REL) |
358 | #define FLIPIT_TOGGLE BUTTON_REW | 358 | #define FLIPIT_TOGGLE BUTTON_PLAY |
359 | 359 | ||
360 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 360 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
361 | 361 | ||
@@ -941,6 +941,13 @@ enum plugin_status plugin_start(const void* parameter) | |||
941 | rb->lcd_putsxy(2, 28, "[VOL+] shuffle"); | 941 | rb->lcd_putsxy(2, 28, "[VOL+] shuffle"); |
942 | rb->lcd_putsxy(2, 38, "[PREV] solution"); | 942 | rb->lcd_putsxy(2, 38, "[PREV] solution"); |
943 | rb->lcd_putsxy(2, 48, "[NEXT] step by step"); | 943 | rb->lcd_putsxy(2, 48, "[NEXT] step by step"); |
944 | #elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) || \ | ||
945 | (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) | ||
946 | rb->lcd_putsxy(2, 8, "Long [REW] to stop"); | ||
947 | rb->lcd_putsxy(2, 18, "[PLAY] toggle"); | ||
948 | rb->lcd_putsxy(2, 28, "[REW] shuffle"); | ||
949 | rb->lcd_putsxy(2, 38, "Long [FFWD] solution"); | ||
950 | rb->lcd_putsxy(2, 48, "[FFWD] step by step"); | ||
944 | #endif | 951 | #endif |
945 | 952 | ||
946 | #ifdef HAVE_TOUCHSCREEN | 953 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 7e13657595..51296b07f0 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -318,15 +318,28 @@ | |||
318 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 318 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
319 | #define FRACTAL_QUIT BUTTON_POWER | 319 | #define FRACTAL_QUIT BUTTON_POWER |
320 | 320 | ||
321 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 321 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
322 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 322 | #define FRACTAL_QUIT (BUTTON_REW | BUTTON_REPEAT) |
323 | #define FRACTAL_QUIT BUTTON_REC | 323 | #define FRACTAL_UP BUTTON_UP |
324 | #define FRACTAL_DOWN BUTTON_DOWN | ||
325 | #define FRACTAL_LEFT BUTTON_LEFT | ||
326 | #define FRACTAL_RIGHT BUTTON_RIGHT | ||
327 | #define FRACTAL_ZOOM_IN BUTTON_FFWD | ||
328 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_REW | ||
329 | #define FRACTAL_ZOOM_OUT (BUTTON_REW | BUTTON_REL) | ||
330 | #define FRACTAL_PRECISION_INC (BUTTON_REC | BUTTON_UP) | ||
331 | #define FRACTAL_PRECISION_DEC (BUTTON_REC | BUTTON_DOWN) | ||
332 | #define FRACTAL_RESET BUTTON_PLAY | ||
333 | |||
334 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
335 | #define FRACTAL_QUIT (BUTTON_REW | BUTTON_REPEAT) | ||
324 | #define FRACTAL_UP BUTTON_UP | 336 | #define FRACTAL_UP BUTTON_UP |
325 | #define FRACTAL_DOWN BUTTON_DOWN | 337 | #define FRACTAL_DOWN BUTTON_DOWN |
326 | #define FRACTAL_LEFT BUTTON_LEFT | 338 | #define FRACTAL_LEFT BUTTON_LEFT |
327 | #define FRACTAL_RIGHT BUTTON_RIGHT | 339 | #define FRACTAL_RIGHT BUTTON_RIGHT |
328 | #define FRACTAL_ZOOM_IN BUTTON_FFWD | 340 | #define FRACTAL_ZOOM_IN BUTTON_FFWD |
329 | #define FRACTAL_ZOOM_OUT BUTTON_REW | 341 | #define FRACTAL_ZOOM_OUT_PRE BUTTON_REW |
342 | #define FRACTAL_ZOOM_OUT (BUTTON_REW | BUTTON_REL) | ||
330 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_UP) | 343 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_UP) |
331 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_DOWN) | 344 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_DOWN) |
332 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_RIGHT) | 345 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_RIGHT) |
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index 39507a1fcf..05d2770863 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c | |||
@@ -553,7 +553,8 @@ static int scroll_bmp(struct image_info *info) | |||
553 | static long ss_timeout = 0; | 553 | static long ss_timeout = 0; |
554 | 554 | ||
555 | int button; | 555 | int button; |
556 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | 556 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) \ |
557 | || defined(IMGVIEW_SLIDE_SHOW_PRE) | ||
557 | int lastbutton = BUTTON_NONE; | 558 | int lastbutton = BUTTON_NONE; |
558 | #endif | 559 | #endif |
559 | 560 | ||
@@ -642,6 +643,13 @@ static int scroll_bmp(struct image_info *info) | |||
642 | 643 | ||
643 | #ifdef IMGVIEW_SLIDE_SHOW | 644 | #ifdef IMGVIEW_SLIDE_SHOW |
644 | case IMGVIEW_SLIDE_SHOW: | 645 | case IMGVIEW_SLIDE_SHOW: |
646 | #ifdef IMGVIEW_SLIDE_SHOW_PRE | ||
647 | if (lastbutton != IMGVIEW_SLIDE_SHOW_PRE) | ||
648 | break; | ||
649 | #endif | ||
650 | #ifdef IMGVIEW_SLIDE_SHOW2 | ||
651 | case IMGVIEW_SLIDE_SHOW2: | ||
652 | #endif | ||
645 | iv_api.slideshow_enabled = !iv_api.slideshow_enabled; | 653 | iv_api.slideshow_enabled = !iv_api.slideshow_enabled; |
646 | break; | 654 | break; |
647 | #endif | 655 | #endif |
@@ -714,7 +722,7 @@ static int scroll_bmp(struct image_info *info) | |||
714 | break; | 722 | break; |
715 | 723 | ||
716 | } /* switch */ | 724 | } /* switch */ |
717 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | 725 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) || defined(IMGVIEW_SLIDE_SHOW_PRE) |
718 | if (button != BUTTON_NONE) | 726 | if (button != BUTTON_NONE) |
719 | lastbutton = button; | 727 | lastbutton = button; |
720 | #endif | 728 | #endif |
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index c5fb9730c1..5c16ad28d8 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -314,8 +314,7 @@ | |||
314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 314 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 315 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
316 | 316 | ||
317 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 317 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
318 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
319 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) | 318 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) |
320 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) | 319 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) |
321 | #define IMGVIEW_UP BUTTON_UP | 320 | #define IMGVIEW_UP BUTTON_UP |
@@ -324,9 +323,29 @@ | |||
324 | #define IMGVIEW_RIGHT BUTTON_RIGHT | 323 | #define IMGVIEW_RIGHT BUTTON_RIGHT |
325 | #define IMGVIEW_NEXT BUTTON_FFWD | 324 | #define IMGVIEW_NEXT BUTTON_FFWD |
326 | #define IMGVIEW_PREVIOUS BUTTON_REW | 325 | #define IMGVIEW_PREVIOUS BUTTON_REW |
326 | #define IMGVIEW_NEXT_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) | ||
327 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_REW|BUTTON_REPEAT) | ||
327 | #define IMGVIEW_MENU_PRE BUTTON_PLAY | 328 | #define IMGVIEW_MENU_PRE BUTTON_PLAY |
328 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) | 329 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) |
329 | #define IMGVIEW_QUIT BUTTON_REC | 330 | #define IMGVIEW_SLIDE_SHOW BUTTON_REC_SW_ON |
331 | #define IMGVIEW_SLIDE_SHOW2 BUTTON_REC_SW_OFF | ||
332 | |||
333 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
334 | #define IMGVIEW_ZOOM_IN (BUTTON_REC|BUTTON_UP) | ||
335 | #define IMGVIEW_ZOOM_OUT (BUTTON_REC|BUTTON_DOWN) | ||
336 | #define IMGVIEW_UP BUTTON_UP | ||
337 | #define IMGVIEW_DOWN BUTTON_DOWN | ||
338 | #define IMGVIEW_LEFT BUTTON_LEFT | ||
339 | #define IMGVIEW_RIGHT BUTTON_RIGHT | ||
340 | #define IMGVIEW_NEXT BUTTON_FFWD | ||
341 | #define IMGVIEW_PREVIOUS BUTTON_REW | ||
342 | #define IMGVIEW_NEXT_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) | ||
343 | #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_REW|BUTTON_REPEAT) | ||
344 | #define IMGVIEW_MENU_PRE BUTTON_PLAY | ||
345 | #define IMGVIEW_MENU (BUTTON_PLAY|BUTTON_REL) | ||
346 | #define IMGVIEW_SLIDE_SHOW (BUTTON_PLAY|BUTTON_REPEAT) | ||
347 | #define IMGVIEW_SLIDE_SHOW_PRE BUTTON_PLAY | ||
348 | #define IMGVIEW_QUIT (BUTTON_REC|BUTTON_PLAY) | ||
330 | 349 | ||
331 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 350 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
332 | #define IMGVIEW_ZOOM_IN (BUTTON_REC | BUTTON_UP) | 351 | #define IMGVIEW_ZOOM_IN (BUTTON_REC | BUTTON_UP) |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index c1da3a6338..d03b4ad8ea 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -211,10 +211,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
211 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 211 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
212 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 212 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
213 | 213 | ||
214 | #define QUIT BUTTON_REC | 214 | #define QUIT BUTTON_REW |
215 | #define LEFT BUTTON_LEFT | 215 | #define LEFT BUTTON_LEFT |
216 | #define RIGHT BUTTON_RIGHT | 216 | #define RIGHT BUTTON_RIGHT |
217 | #define FIRE BUTTON_PLAY | 217 | #define FIRE BUTTON_PLAY |
218 | #define FIRE2 BUTTON_UP | ||
218 | 219 | ||
219 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 220 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
220 | 221 | ||
@@ -304,7 +305,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
304 | #define ACTION_QUIT (QUIT | RC_QUIT) | 305 | #define ACTION_QUIT (QUIT | RC_QUIT) |
305 | #define ACTION_LEFT LEFT | 306 | #define ACTION_LEFT LEFT |
306 | #define ACTION_RIGHT RIGHT | 307 | #define ACTION_RIGHT RIGHT |
308 | #ifndef FIRE2 | ||
307 | #define ACTION_FIRE FIRE | 309 | #define ACTION_FIRE FIRE |
310 | #else | ||
311 | #define ACTION_FIRE (FIRE | FIRE2) | ||
312 | #endif | ||
308 | 313 | ||
309 | #endif | 314 | #endif |
310 | 315 | ||
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 3113f64667..bd910ac632 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -385,10 +385,10 @@ const struct button_mapping pla_main_ctx[] = | |||
385 | {PLA_SELECT, BUTTON_VOL_UP, BUTTON_NONE}, | 385 | {PLA_SELECT, BUTTON_VOL_UP, BUTTON_NONE}, |
386 | {PLA_SELECT_REL, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP}, | 386 | {PLA_SELECT_REL, BUTTON_VOL_UP|BUTTON_REL, BUTTON_VOL_UP}, |
387 | {PLA_SELECT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 387 | {PLA_SELECT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
388 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ | 388 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ |
389 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 389 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
390 | {PLA_CANCEL, BUTTON_REW, BUTTON_NONE}, | 390 | {PLA_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_REW}, |
391 | {PLA_EXIT, BUTTON_FFWD, BUTTON_NONE}, | 391 | {PLA_EXIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE}, |
392 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 392 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
393 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 393 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
394 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 394 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index e8014b7f9d..02217390cd 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c | |||
@@ -78,8 +78,7 @@ enum metronome_errors | |||
78 | #define PART_MAX 10 /* maximum count of programmed parts */ | 78 | #define PART_MAX 10 /* maximum count of programmed parts */ |
79 | 79 | ||
80 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 80 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
81 | || (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \ | 81 | || (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) |
82 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
83 | #define MET_SYNC | 82 | #define MET_SYNC |
84 | #endif | 83 | #endif |
85 | 84 | ||
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 5d3c5f63e8..b8516da048 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -195,7 +195,7 @@ | |||
195 | 195 | ||
196 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 196 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
197 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 197 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
198 | #define BTN_QUIT BUTTON_REC | 198 | #define BTN_QUIT (BUTTON_PLAY|BUTTON_REPEAT) |
199 | #define BTN_RIGHT BUTTON_RIGHT | 199 | #define BTN_RIGHT BUTTON_RIGHT |
200 | #define BTN_LEFT BUTTON_LEFT | 200 | #define BTN_LEFT BUTTON_LEFT |
201 | #define BTN_UP BUTTON_UP | 201 | #define BTN_UP BUTTON_UP |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 982bb8b67c..6250cb180b 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -247,16 +247,27 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \ | |||
247 | CONFIG_KEYPAD == MROBE500_PAD | 247 | CONFIG_KEYPAD == MROBE500_PAD |
248 | # define MINESWP_QUIT BUTTON_POWER | 248 | # define MINESWP_QUIT BUTTON_POWER |
249 | 249 | ||
250 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 250 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) |
251 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
252 | # define MINESWP_LEFT BUTTON_LEFT | 251 | # define MINESWP_LEFT BUTTON_LEFT |
253 | # define MINESWP_RIGHT BUTTON_RIGHT | 252 | # define MINESWP_RIGHT BUTTON_RIGHT |
254 | # define MINESWP_UP BUTTON_UP | 253 | # define MINESWP_UP BUTTON_UP |
255 | # define MINESWP_DOWN BUTTON_DOWN | 254 | # define MINESWP_DOWN BUTTON_DOWN |
256 | # define MINESWP_QUIT BUTTON_REC | 255 | # define MINESWP_QUIT (BUTTON_REW|BUTTON_REPEAT) |
257 | # define MINESWP_TOGGLE BUTTON_PLAY | 256 | # define MINESWP_TOGGLE BUTTON_PLAY |
258 | # define MINESWP_DISCOVER BUTTON_REW | 257 | # define MINESWP_DISCOVER BUTTON_FFWD |
259 | # define MINESWP_INFO BUTTON_FFWD | 258 | # define MINESWP_INFO BUTTON_REC |
259 | |||
260 | #elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
261 | # define MINESWP_LEFT BUTTON_LEFT | ||
262 | # define MINESWP_RIGHT BUTTON_RIGHT | ||
263 | # define MINESWP_UP BUTTON_UP | ||
264 | # define MINESWP_DOWN BUTTON_DOWN | ||
265 | # define MINESWP_QUIT (BUTTON_REW|BUTTON_REPEAT) | ||
266 | # define MINESWP_TOGGLE (BUTTON_PLAY|BUTTON_REL) | ||
267 | # define MINESWP_TOGGLE_PRE BUTTON_PLAY | ||
268 | # define MINESWP_DISCOVER BUTTON_FFWD | ||
269 | # define MINESWP_INFO (BUTTON_PLAY|BUTTON_REPEAT) | ||
270 | # define MINESWP_INFO_PRE BUTTON_PLAY | ||
260 | 271 | ||
261 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | 272 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) |
262 | # define MINESWP_LEFT BUTTON_PREV | 273 | # define MINESWP_LEFT BUTTON_PREV |
@@ -788,7 +799,7 @@ static enum minesweeper_status minesweeper( void ) | |||
788 | { | 799 | { |
789 | int i, j; | 800 | int i, j; |
790 | int button; | 801 | int button; |
791 | #if defined(HAVE_TOUCHSCREEN) || defined(MINESWP_TOGGLE_PRE) | 802 | #if defined(HAVE_TOUCHSCREEN) || defined(MINESWP_TOGGLE_PRE) || defined(MINESWP_INFO_PRE) |
792 | int lastbutton = BUTTON_NONE; | 803 | int lastbutton = BUTTON_NONE; |
793 | #endif | 804 | #endif |
794 | 805 | ||
@@ -977,6 +988,10 @@ static enum minesweeper_status minesweeper( void ) | |||
977 | /* show how many mines you think you have found and how many | 988 | /* show how many mines you think you have found and how many |
978 | * there really are on the game */ | 989 | * there really are on the game */ |
979 | case MINESWP_INFO: | 990 | case MINESWP_INFO: |
991 | #ifdef MINESWP_INFO_PRE | ||
992 | if( lastbutton != MINESWP_INFO_PRE ) | ||
993 | break; | ||
994 | #endif | ||
980 | if( no_mines ) | 995 | if( no_mines ) |
981 | break; | 996 | break; |
982 | int flags_used = count_flags(); | 997 | int flags_used = count_flags(); |
@@ -996,7 +1011,7 @@ static enum minesweeper_status minesweeper( void ) | |||
996 | return MINESWEEPER_USB; | 1011 | return MINESWEEPER_USB; |
997 | break; | 1012 | break; |
998 | } | 1013 | } |
999 | #if defined(HAVE_TOUCHSCREEN) || defined(MINESWP_TOGGLE_PRE) | 1014 | #if defined(HAVE_TOUCHSCREEN) || defined(MINESWP_TOGGLE_PRE) || defined(MINESWP_INFO_PRE) |
1000 | if( button != BUTTON_NONE ) | 1015 | if( button != BUTTON_NONE ) |
1001 | lastbutton = button; | 1016 | lastbutton = button; |
1002 | #endif | 1017 | #endif |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 1a9636e8d8..1f49d4ec48 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -211,9 +211,7 @@ struct mpeg_settings settings; | |||
211 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | 211 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT |
212 | #define MPEG_START_TIME_UP BUTTON_UP | 212 | #define MPEG_START_TIME_UP BUTTON_UP |
213 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | 213 | #define MPEG_START_TIME_DOWN BUTTON_DOWN |
214 | #define MPEG_START_TIME_LEFT2 BUTTON_REW | 214 | #define MPEG_START_TIME_EXIT BUTTON_REW |
215 | #define MPEG_START_TIME_RIGHT2 BUTTON_FFWD | ||
216 | #define MPEG_START_TIME_EXIT BUTTON_REC | ||
217 | 215 | ||
218 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 216 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
219 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 217 | #define MPEG_START_TIME_SELECT BUTTON_PLAY |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 66da5d52f7..712e6489a1 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -319,13 +319,14 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
319 | 319 | ||
320 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 320 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
321 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 321 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
322 | #define MPEG_MENU BUTTON_LEFT | 322 | #define MPEG_MENU BUTTON_REW |
323 | #define MPEG_STOP BUTTON_RIGHT | 323 | #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) |
324 | #define MPEG_PAUSE BUTTON_PLAY | 324 | #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) |
325 | #define MPEG_VOLDOWN BUTTON_DOWN | 325 | #define MPEG_VOLDOWN BUTTON_DOWN |
326 | #define MPEG_VOLUP BUTTON_UP | 326 | #define MPEG_VOLUP BUTTON_UP |
327 | #define MPEG_RW BUTTON_REW | 327 | #define MPEG_RW BUTTON_LEFT |
328 | #define MPEG_FF BUTTON_FFWD | 328 | #define MPEG_FF BUTTON_RIGHT |
329 | #define MPEG_SHOW_OSD BUTTON_FFWD | ||
329 | 330 | ||
330 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 331 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
331 | #define MPEG_MENU BUTTON_MENU | 332 | #define MPEG_MENU BUTTON_MENU |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index a0b976f466..344a40f9bf 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -349,18 +349,31 @@ | |||
349 | #elif CONFIG_KEYPAD == MROBE500_PAD | 349 | #elif CONFIG_KEYPAD == MROBE500_PAD |
350 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 350 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
351 | 351 | ||
352 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 352 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
353 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 353 | #define OSCILLOSCOPE_QUIT BUTTON_REW |
354 | #define OSCILLOSCOPE_QUIT BUTTON_REC | 354 | #define OSCILLOSCOPE_DRAWMODE BUTTON_FFWD |
355 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY|BUTTON_LEFT) | ||
356 | #define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT) | 355 | #define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT) |
357 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY|BUTTON_UP) | 356 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY|BUTTON_UP) |
358 | #define OSCILLOSCOPE_PAUSE (BUTTON_PLAY|BUTTON_DOWN) | 357 | #define OSCILLOSCOPE_GRAPHMODE (BUTTON_PLAY|BUTTON_LEFT) |
358 | #define OSCILLOSCOPE_PAUSE_PRE BUTTON_PLAY | ||
359 | #define OSCILLOSCOPE_PAUSE (BUTTON_PLAY|BUTTON_REL) | ||
360 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | ||
361 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | ||
362 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | ||
363 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | ||
364 | #define NEED_LASTBUTTON | ||
365 | |||
366 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
367 | #define OSCILLOSCOPE_QUIT BUTTON_REW | ||
368 | #define OSCILLOSCOPE_DRAWMODE BUTTON_FFWD | ||
369 | #define OSCILLOSCOPE_ADVMODE (BUTTON_REC|BUTTON_RIGHT) | ||
370 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_REC|BUTTON_UP) | ||
371 | #define OSCILLOSCOPE_GRAPHMODE (BUTTON_REC|BUTTON_LEFT) | ||
372 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY | ||
359 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | 373 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT |
360 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | 374 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT |
361 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | 375 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP |
362 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | 376 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN |
363 | /* Need GRAPHMODE */ | ||
364 | 377 | ||
365 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 378 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
366 | #define OSCILLOSCOPE_QUIT BUTTON_REC | 379 | #define OSCILLOSCOPE_QUIT BUTTON_REC |
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c index efba47b576..cc5b5ef76d 100644 --- a/apps/plugins/pacbox/pacbox.c +++ b/apps/plugins/pacbox/pacbox.c | |||
@@ -391,6 +391,9 @@ static int gameProc( void ) | |||
391 | #ifdef PACMAN_RC_MENU | 391 | #ifdef PACMAN_RC_MENU |
392 | || status == PACMAN_RC_MENU | 392 | || status == PACMAN_RC_MENU |
393 | #endif | 393 | #endif |
394 | #ifdef PACMAN_MENU2 | ||
395 | || status == PACMAN_MENU2 | ||
396 | #endif | ||
394 | ) { | 397 | ) { |
395 | bool menu_res; | 398 | bool menu_res; |
396 | 399 | ||
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 34de08f86b..5fcb51eb79 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -232,8 +232,19 @@ | |||
232 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 232 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
233 | #define PACMAN_MENU BUTTON_POWER | 233 | #define PACMAN_MENU BUTTON_POWER |
234 | 234 | ||
235 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 235 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
236 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 236 | |
237 | #define PACMAN_UP BUTTON_UP | ||
238 | #define PACMAN_DOWN BUTTON_DOWN | ||
239 | #define PACMAN_LEFT BUTTON_LEFT | ||
240 | #define PACMAN_RIGHT BUTTON_RIGHT | ||
241 | #define PACMAN_1UP BUTTON_FFWD | ||
242 | #define PACMAN_2UP BUTTON_REW | ||
243 | #define PACMAN_COIN BUTTON_PLAY | ||
244 | #define PACMAN_MENU BUTTON_REC_SW_ON | ||
245 | #define PACMAN_MENU2 BUTTON_REC_SW_OFF | ||
246 | |||
247 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
237 | 248 | ||
238 | #define PACMAN_UP BUTTON_UP | 249 | #define PACMAN_UP BUTTON_UP |
239 | #define PACMAN_DOWN BUTTON_DOWN | 250 | #define PACMAN_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 25f374b37f..5820d54fcd 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -414,23 +414,39 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
414 | 414 | ||
415 | #define QUIT_TEXT "POWER" | 415 | #define QUIT_TEXT "POWER" |
416 | 416 | ||
417 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \ | 417 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
418 | CONFIG_KEYPAD == SAMSUNG_YH920_PAD | 418 | #define PEGBOX_QUIT BUTTON_REW |
419 | #define PEGBOX_QUIT BUTTON_REC | 419 | #define PEGBOX_RESTART BUTTON_FFWD |
420 | #define PEGBOX_RESTART BUTTON_REW | 420 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_UP) |
421 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_FFWD) | 421 | #define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_DOWN) |
422 | #define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_REW) | ||
423 | #define PEGBOX_UP BUTTON_UP | 422 | #define PEGBOX_UP BUTTON_UP |
424 | #define PEGBOX_DOWN BUTTON_DOWN | 423 | #define PEGBOX_DOWN BUTTON_DOWN |
425 | #define PEGBOX_RIGHT BUTTON_RIGHT | 424 | #define PEGBOX_RIGHT BUTTON_RIGHT |
426 | #define PEGBOX_LEFT BUTTON_LEFT | 425 | #define PEGBOX_LEFT BUTTON_LEFT |
427 | #define PEGBOX_SELECT BUTTON_PLAY | 426 | #define PEGBOX_SELECT BUTTON_PLAY |
428 | 427 | ||
429 | #define QUIT_TEXT "REC" | 428 | #define QUIT_TEXT "REW" |
430 | #define RESTART_TEXT "REW" | 429 | #define RESTART_TEXT "FFWD" |
431 | #define LVL_UP_TEXT "PLAY+FFWD" | 430 | #define LVL_UP_TEXT "PLAY+UP" |
432 | #define LVL_DOWN_TEXT "PLAY+REW" | 431 | #define LVL_DOWN_TEXT "PLAY+DOWN" |
433 | #define SELECT_TEXT "PLAY" | 432 | #define SELECT_TEXT "PLAY" |
433 | |||
434 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
435 | #define PEGBOX_QUIT BUTTON_REW | ||
436 | #define PEGBOX_RESTART BUTTON_FFWD | ||
437 | #define PEGBOX_LVL_UP (BUTTON_REC|BUTTON_UP) | ||
438 | #define PEGBOX_LVL_DOWN (BUTTON_REC|BUTTON_DOWN) | ||
439 | #define PEGBOX_UP BUTTON_UP | ||
440 | #define PEGBOX_DOWN BUTTON_DOWN | ||
441 | #define PEGBOX_RIGHT BUTTON_RIGHT | ||
442 | #define PEGBOX_LEFT BUTTON_LEFT | ||
443 | #define PEGBOX_SELECT BUTTON_PLAY | ||
444 | |||
445 | #define QUIT_TEXT "REW" | ||
446 | #define RESTART_TEXT "FFWD" | ||
447 | #define LVL_UP_TEXT "REC+UP" | ||
448 | #define LVL_DOWN_TEXT "REC+DOWN" | ||
449 | #define SELECT_TEXT "PLAY" | ||
434 | 450 | ||
435 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 451 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
436 | #define PEGBOX_QUIT BUTTON_REC | 452 | #define PEGBOX_QUIT BUTTON_REC |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 53fede1c2c..414c191e6f 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -61,7 +61,6 @@ | |||
61 | #define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2) | 61 | #define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2) |
62 | 62 | ||
63 | #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \ | 63 | #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \ |
64 | CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD || \ | ||
65 | CONFIG_KEYPAD == MPIO_HD300_PAD | 64 | CONFIG_KEYPAD == MPIO_HD300_PAD |
66 | #define USE_CORE_PREVNEXT | 65 | #define USE_CORE_PREVNEXT |
67 | #endif | 66 | #endif |
@@ -154,9 +153,15 @@ const struct button_mapping pf_context_buttons[] = | |||
154 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ | 153 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || CONFIG_KEYPAD == IRIVER_H300_PAD || \ |
155 | CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD | 154 | CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD |
156 | {PF_QUIT, BUTTON_OFF, BUTTON_NONE}, | 155 | {PF_QUIT, BUTTON_OFF, BUTTON_NONE}, |
157 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD || CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \ | 156 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
158 | CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
159 | {PF_QUIT, BUTTON_REC, BUTTON_NONE}, | 157 | {PF_QUIT, BUTTON_REC, BUTTON_NONE}, |
158 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
159 | {PF_QUIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW}, | ||
160 | {PF_MENU, BUTTON_REW|BUTTON_REL, BUTTON_REW}, | ||
161 | {PF_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | ||
162 | {PF_CONTEXT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_FFWD}, | ||
163 | {PF_TRACKLIST, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD}, | ||
164 | {PF_WPS, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY}, | ||
160 | #endif | 165 | #endif |
161 | #if CONFIG_KEYPAD == IAUDIO_M3_PAD | 166 | #if CONFIG_KEYPAD == IAUDIO_M3_PAD |
162 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD|CONTEXT_REMOTE) | 167 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD|CONTEXT_REMOTE) |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index e72584f12f..c344952073 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -215,15 +215,22 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \ | |||
215 | CONFIG_KEYPAD == MROBE500_PAD | 215 | CONFIG_KEYPAD == MROBE500_PAD |
216 | #define PONG_QUIT BUTTON_POWER | 216 | #define PONG_QUIT BUTTON_POWER |
217 | 217 | ||
218 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 218 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
219 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 219 | #define PONG_QUIT (BUTTON_PLAY|BUTTON_REPEAT) |
220 | #define PONG_QUIT BUTTON_REC | 220 | #define PONG_PAUSE (BUTTON_PLAY|BUTTON_REL) |
221 | #define PONG_PAUSE BUTTON_PLAY | ||
222 | #define PONG_LEFT_UP BUTTON_UP | 221 | #define PONG_LEFT_UP BUTTON_UP |
223 | #define PONG_LEFT_DOWN BUTTON_DOWN | 222 | #define PONG_LEFT_DOWN BUTTON_DOWN |
224 | #define PONG_RIGHT_UP BUTTON_FFWD | 223 | #define PONG_RIGHT_UP BUTTON_FFWD |
225 | #define PONG_RIGHT_DOWN BUTTON_REW | 224 | #define PONG_RIGHT_DOWN BUTTON_REW |
226 | 225 | ||
226 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
227 | #define PONG_QUIT BUTTON_REW | ||
228 | #define PONG_PAUSE BUTTON_PLAY | ||
229 | #define PONG_LEFT_UP BUTTON_UP | ||
230 | #define PONG_LEFT_DOWN BUTTON_DOWN | ||
231 | #define PONG_RIGHT_UP BUTTON_REC | ||
232 | #define PONG_RIGHT_DOWN BUTTON_FFWD | ||
233 | |||
227 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 234 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
228 | #define PONG_QUIT BUTTON_REC | 235 | #define PONG_QUIT BUTTON_REC |
229 | #define PONG_PAUSE BUTTON_OK | 236 | #define PONG_PAUSE BUTTON_OK |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 3932b688ef..001dc7b14e 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -232,13 +232,13 @@ | |||
232 | 232 | ||
233 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 233 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
234 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 234 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
235 | #define REVERSI_BUTTON_QUIT BUTTON_REC | 235 | #define REVERSI_BUTTON_QUIT BUTTON_REW |
236 | #define REVERSI_BUTTON_UP BUTTON_UP | 236 | #define REVERSI_BUTTON_UP BUTTON_UP |
237 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | 237 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN |
238 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | 238 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT |
239 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | 239 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT |
240 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_FFWD | 240 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_PLAY |
241 | #define REVERSI_BUTTON_MENU BUTTON_PLAY | 241 | #define REVERSI_BUTTON_MENU BUTTON_FFWD |
242 | 242 | ||
243 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 243 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
244 | #define REVERSI_BUTTON_QUIT BUTTON_REC | 244 | #define REVERSI_BUTTON_QUIT BUTTON_REC |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 268a386474..d88eabea87 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -328,17 +328,26 @@ | |||
328 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 328 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
329 | #define ROCKBLOX_OFF BUTTON_POWER | 329 | #define ROCKBLOX_OFF BUTTON_POWER |
330 | 330 | ||
331 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 331 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
332 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
333 | 332 | ||
334 | #define ROCKBLOX_OFF BUTTON_REC | 333 | #define ROCKBLOX_OFF BUTTON_FFWD |
335 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP | 334 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP |
336 | #define ROCKBLOX_ROTATE_CW BUTTON_DOWN | 335 | #define ROCKBLOX_ROTATE_CW BUTTON_DOWN |
337 | #define ROCKBLOX_DOWN BUTTON_REW | 336 | #define ROCKBLOX_DOWN BUTTON_REW |
338 | #define ROCKBLOX_LEFT BUTTON_LEFT | 337 | #define ROCKBLOX_LEFT BUTTON_LEFT |
339 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 338 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
340 | #define ROCKBLOX_DROP BUTTON_PLAY | 339 | #define ROCKBLOX_DROP BUTTON_PLAY |
341 | #define ROCKBLOX_RESTART BUTTON_FFWD | 340 | |
341 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
342 | |||
343 | #define ROCKBLOX_OFF BUTTON_REW | ||
344 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP | ||
345 | #define ROCKBLOX_ROTATE_CW BUTTON_DOWN | ||
346 | #define ROCKBLOX_DOWN BUTTON_FFWD | ||
347 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
348 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
349 | #define ROCKBLOX_DROP BUTTON_PLAY | ||
350 | #define ROCKBLOX_RESTART BUTTON_REC | ||
342 | 351 | ||
343 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 352 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
344 | 353 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 784b551fdf..f4ca70cc68 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -285,8 +285,17 @@ static void setoptions (void) | |||
285 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 285 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
286 | options.MENU = BUTTON_POWER; | 286 | options.MENU = BUTTON_POWER; |
287 | 287 | ||
288 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 288 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
289 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 289 | options.UP = BUTTON_UP; |
290 | options.DOWN = BUTTON_DOWN; | ||
291 | |||
292 | options.A = BUTTON_PLAY; | ||
293 | options.B = BUTTON_FFWD; | ||
294 | options.START = BUTTON_REW; | ||
295 | options.SELECT = BUTTON_NONE; | ||
296 | options.MENU = BUTTON_REC_SW_ON; | ||
297 | |||
298 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
290 | options.UP = BUTTON_UP; | 299 | options.UP = BUTTON_UP; |
291 | options.DOWN = BUTTON_DOWN; | 300 | options.DOWN = BUTTON_DOWN; |
292 | 301 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index f3647c6024..725382c165 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -199,13 +199,23 @@ | |||
199 | #elif CONFIG_KEYPAD == MROBE500_PAD | 199 | #elif CONFIG_KEYPAD == MROBE500_PAD |
200 | #define ROCKPAINT_QUIT BUTTON_POWER | 200 | #define ROCKPAINT_QUIT BUTTON_POWER |
201 | 201 | ||
202 | #elif ( CONFIG_KEYPAD == SAMSUNG_YH820_PAD ) || \ | 202 | #elif ( CONFIG_KEYPAD == SAMSUNG_YH920_PAD ) |
203 | ( CONFIG_KEYPAD == SAMSUNG_YH920_PAD ) | 203 | #define ROCKPAINT_QUIT ( BUTTON_REW | BUTTON_REPEAT ) |
204 | #define ROCKPAINT_QUIT BUTTON_REC | ||
205 | #define ROCKPAINT_DRAW BUTTON_PLAY | 204 | #define ROCKPAINT_DRAW BUTTON_PLAY |
206 | #define ROCKPAINT_MENU BUTTON_FFWD | 205 | #define ROCKPAINT_MENU ( BUTTON_REW | BUTTON_REL ) |
207 | #define ROCKPAINT_TOOLBAR BUTTON_REW | 206 | #define ROCKPAINT_TOOLBAR BUTTON_FFWD |
208 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_REW | BUTTON_LEFT ) | 207 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_FFWD | BUTTON_LEFT ) |
208 | #define ROCKPAINT_UP BUTTON_UP | ||
209 | #define ROCKPAINT_DOWN BUTTON_DOWN | ||
210 | #define ROCKPAINT_LEFT BUTTON_LEFT | ||
211 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | ||
212 | |||
213 | #elif ( CONFIG_KEYPAD == SAMSUNG_YH820_PAD ) | ||
214 | #define ROCKPAINT_QUIT ( BUTTON_REW | BUTTON_REPEAT ) | ||
215 | #define ROCKPAINT_DRAW BUTTON_PLAY | ||
216 | #define ROCKPAINT_MENU ( BUTTON_REW | BUTTON_REL ) | ||
217 | #define ROCKPAINT_TOOLBAR BUTTON_FFWD | ||
218 | #define ROCKPAINT_TOOLBAR2 BUTTON_REC | ||
209 | #define ROCKPAINT_UP BUTTON_UP | 219 | #define ROCKPAINT_UP BUTTON_UP |
210 | #define ROCKPAINT_DOWN BUTTON_DOWN | 220 | #define ROCKPAINT_DOWN BUTTON_DOWN |
211 | #define ROCKPAINT_LEFT BUTTON_LEFT | 221 | #define ROCKPAINT_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index d4dd01f948..82017bc7b9 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -221,12 +221,12 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
221 | 221 | ||
222 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 222 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
223 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 223 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
224 | #define PUZZLE_QUIT BUTTON_REC | 224 | #define PUZZLE_QUIT BUTTON_REW |
225 | #define PUZZLE_LEFT BUTTON_LEFT | 225 | #define PUZZLE_LEFT BUTTON_LEFT |
226 | #define PUZZLE_RIGHT BUTTON_RIGHT | 226 | #define PUZZLE_RIGHT BUTTON_RIGHT |
227 | #define PUZZLE_UP BUTTON_UP | 227 | #define PUZZLE_UP BUTTON_UP |
228 | #define PUZZLE_DOWN BUTTON_DOWN | 228 | #define PUZZLE_DOWN BUTTON_DOWN |
229 | #define PUZZLE_SHUFFLE BUTTON_REW | 229 | #define PUZZLE_SHUFFLE BUTTON_FFWD |
230 | #define PUZZLE_PICTURE BUTTON_PLAY | 230 | #define PUZZLE_PICTURE BUTTON_PLAY |
231 | 231 | ||
232 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | 232 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index a22ecf4c70..4f02e99e8b 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -192,7 +192,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
192 | 192 | ||
193 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 193 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
194 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 194 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
195 | #define SNAKE_QUIT BUTTON_REC | 195 | #define SNAKE_QUIT BUTTON_REW |
196 | #define SNAKE_LEFT BUTTON_LEFT | 196 | #define SNAKE_LEFT BUTTON_LEFT |
197 | #define SNAKE_RIGHT BUTTON_RIGHT | 197 | #define SNAKE_RIGHT BUTTON_RIGHT |
198 | #define SNAKE_UP BUTTON_UP | 198 | #define SNAKE_UP BUTTON_UP |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 3f24b00dcc..4f026021f2 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -328,7 +328,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
328 | #define SNAKE2_RIGHT BUTTON_RIGHT | 328 | #define SNAKE2_RIGHT BUTTON_RIGHT |
329 | #define SNAKE2_UP BUTTON_UP | 329 | #define SNAKE2_UP BUTTON_UP |
330 | #define SNAKE2_DOWN BUTTON_DOWN | 330 | #define SNAKE2_DOWN BUTTON_DOWN |
331 | #define SNAKE2_QUIT BUTTON_REC | 331 | #define SNAKE2_QUIT BUTTON_REW |
332 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY | 332 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY |
333 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 333 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
334 | 334 | ||
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 70bc57e218..76eb6288cd 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -474,19 +474,34 @@ | |||
474 | #define SOKOBAN_MENU BUTTON_POWER | 474 | #define SOKOBAN_MENU BUTTON_POWER |
475 | #define SOKOBAN_MENU_NAME "[POWER]" | 475 | #define SOKOBAN_MENU_NAME "[POWER]" |
476 | 476 | ||
477 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 477 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
478 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
479 | #define SOKOBAN_LEFT BUTTON_LEFT | 478 | #define SOKOBAN_LEFT BUTTON_LEFT |
480 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 479 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
481 | #define SOKOBAN_UP BUTTON_UP | 480 | #define SOKOBAN_UP BUTTON_UP |
482 | #define SOKOBAN_DOWN BUTTON_DOWN | 481 | #define SOKOBAN_DOWN BUTTON_DOWN |
483 | #define SOKOBAN_MENU BUTTON_REC | 482 | #define SOKOBAN_MENU BUTTON_PLAY |
483 | #define SOKOBAN_UNDO BUTTON_REW | ||
484 | #define SOKOBAN_REDO BUTTON_FFWD | ||
485 | #define SOKOBAN_LEVEL_DOWN (BUTTON_REC | BUTTON_DOWN) | ||
486 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_REC | BUTTON_RIGHT) | ||
487 | #define SOKOBAN_LEVEL_UP (BUTTON_REC | BUTTON_UP) | ||
488 | #define SOKOBAN_QUIT_REPLAY BUTTON_REW | ||
489 | #define SOKOBAN_PAUSE BUTTON_PLAY | ||
490 | #define BUTTON_SAVE BUTTON_PLAY | ||
491 | #define BUTTON_SAVE_NAME "PLAY" | ||
492 | |||
493 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
494 | #define SOKOBAN_LEFT BUTTON_LEFT | ||
495 | #define SOKOBAN_RIGHT BUTTON_RIGHT | ||
496 | #define SOKOBAN_UP BUTTON_UP | ||
497 | #define SOKOBAN_DOWN BUTTON_DOWN | ||
498 | #define SOKOBAN_MENU BUTTON_PLAY | ||
484 | #define SOKOBAN_UNDO BUTTON_REW | 499 | #define SOKOBAN_UNDO BUTTON_REW |
485 | #define SOKOBAN_UNDO_PRE (BUTTON_REW | BUTTON_LEFT) | ||
486 | #define SOKOBAN_REDO BUTTON_FFWD | 500 | #define SOKOBAN_REDO BUTTON_FFWD |
487 | #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_DOWN) | 501 | #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_DOWN) |
488 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_RIGHT) | 502 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_RIGHT) |
489 | #define SOKOBAN_LEVEL_UP (BUTTON_PLAY | BUTTON_UP) | 503 | #define SOKOBAN_LEVEL_UP (BUTTON_PLAY | BUTTON_UP) |
504 | #define SOKOBAN_QUIT_REPLAY BUTTON_REW | ||
490 | #define SOKOBAN_PAUSE BUTTON_PLAY | 505 | #define SOKOBAN_PAUSE BUTTON_PLAY |
491 | #define BUTTON_SAVE BUTTON_PLAY | 506 | #define BUTTON_SAVE BUTTON_PLAY |
492 | #define BUTTON_SAVE_NAME "PLAY" | 507 | #define BUTTON_SAVE_NAME "PLAY" |
@@ -662,6 +677,10 @@ | |||
662 | #endif | 677 | #endif |
663 | #endif | 678 | #endif |
664 | 679 | ||
680 | #ifndef SOKOBAN_QUIT_REPLAY | ||
681 | #define SOKOBAN_QUIT_REPLAY SOKOBAN_MENU | ||
682 | #endif | ||
683 | |||
665 | #define SOKOBAN_FONT FONT_SYSFIXED | 684 | #define SOKOBAN_FONT FONT_SYSFIXED |
666 | 685 | ||
667 | 686 | ||
@@ -1413,7 +1432,7 @@ static bool load(char *filename, bool silent) | |||
1413 | 1432 | ||
1414 | while ((button = rb->button_get(false)) || paused) { | 1433 | while ((button = rb->button_get(false)) || paused) { |
1415 | switch (button) { | 1434 | switch (button) { |
1416 | case SOKOBAN_MENU: | 1435 | case SOKOBAN_QUIT_REPLAY: |
1417 | /* Pretend the level is complete so we'll quit */ | 1436 | /* Pretend the level is complete so we'll quit */ |
1418 | current_info.level.boxes_to_go = 0; | 1437 | current_info.level.boxes_to_go = 0; |
1419 | return true; | 1438 | return true; |
@@ -1602,6 +1621,20 @@ static int sokoban_menu(void) | |||
1602 | rb->lcd_putsxy(3, 36, "[VOL-] Previous Level"); | 1621 | rb->lcd_putsxy(3, 36, "[VOL-] Previous Level"); |
1603 | rb->lcd_putsxy(3, 46, "[NEXT+PREV] Restart Level"); | 1622 | rb->lcd_putsxy(3, 46, "[NEXT+PREV] Restart Level"); |
1604 | rb->lcd_putsxy(3, 56, "[VOL+] Next Level"); | 1623 | rb->lcd_putsxy(3, 56, "[VOL+] Next Level"); |
1624 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
1625 | rb->lcd_putsxy(3, 6, "[PLAY] Menu"); | ||
1626 | rb->lcd_putsxy(3, 16, "[REW] Undo"); | ||
1627 | rb->lcd_putsxy(3, 26, "[FFWD] Redo"); | ||
1628 | rb->lcd_putsxy(3, 36, "[PLAY+DOWN] Previous Level"); | ||
1629 | rb->lcd_putsxy(3, 46, "[PLAY+RIGHT] Restart Level"); | ||
1630 | rb->lcd_putsxy(3, 56, "[PLAY+UP] Next Level"); | ||
1631 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
1632 | rb->lcd_putsxy(3, 6, "[PLAY] Menu"); | ||
1633 | rb->lcd_putsxy(3, 16, "[REW] Undo"); | ||
1634 | rb->lcd_putsxy(3, 26, "[FFWD] Redo"); | ||
1635 | rb->lcd_putsxy(3, 36, "[REC+DOWN] Prev. Lvl"); | ||
1636 | rb->lcd_putsxy(3, 46, "[REC+RIGHT] Rest. Lvl"); | ||
1637 | rb->lcd_putsxy(3, 56, "[REC+UP] Next Level"); | ||
1605 | #endif | 1638 | #endif |
1606 | 1639 | ||
1607 | #ifdef HAVE_TOUCHSCREEN | 1640 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index d71847120b..c06e767a37 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -452,23 +452,40 @@ | |||
452 | CONFIG_KEYPAD == MROBE500_PAD | 452 | CONFIG_KEYPAD == MROBE500_PAD |
453 | # define SOL_QUIT BUTTON_POWER | 453 | # define SOL_QUIT BUTTON_POWER |
454 | 454 | ||
455 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 455 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
456 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 456 | # define SOL_QUIT BUTTON_REW |
457 | # define SOL_QUIT BUTTON_REC | ||
458 | # define SOL_UP BUTTON_UP | 457 | # define SOL_UP BUTTON_UP |
459 | # define SOL_DOWN BUTTON_DOWN | 458 | # define SOL_DOWN BUTTON_DOWN |
460 | # define SOL_LEFT BUTTON_LEFT | 459 | # define SOL_LEFT BUTTON_LEFT |
461 | # define SOL_RIGHT BUTTON_RIGHT | 460 | # define SOL_RIGHT BUTTON_RIGHT |
462 | # define SOL_MOVE BUTTON_PLAY | 461 | # define SOL_MOVE BUTTON_PLAY |
463 | # define SOL_DRAW BUTTON_FFWD | 462 | # define SOL_DRAW BUTTON_FFWD |
464 | # define SOL_REM2CUR (BUTTON_FFWD | BUTTON_LEFT) | 463 | # define SOL_REM2CUR (BUTTON_REC | BUTTON_DOWN) |
465 | # define SOL_CUR2STACK BUTTON_REW | 464 | # define SOL_CUR2STACK (BUTTON_REC | BUTTON_UP) |
466 | # define SOL_REM2STACK (BUTTON_REW | BUTTON_LEFT) | 465 | # define SOL_REM2STACK (BUTTON_REC | BUTTON_RIGHT) |
467 | # define HK_MOVE "PLAY" | 466 | # define HK_MOVE "PLAY" |
468 | # define HK_DRAW "REW.." | 467 | # define HK_DRAW "FFWD" |
469 | # define HK_REM2CUR "FFWD" | 468 | # define HK_REM2CUR "REC+DOWN" |
470 | # define HK_CUR2STACK "REW" | 469 | # define HK_CUR2STACK "REC+UP" |
471 | # define HK_REM2STACK "FFWD.." | 470 | # define HK_REM2STACK "REC+RIGHT" |
471 | |||
472 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
473 | # define SOL_QUIT BUTTON_REW | ||
474 | # define SOL_UP BUTTON_UP | ||
475 | # define SOL_DOWN BUTTON_DOWN | ||
476 | # define SOL_LEFT BUTTON_LEFT | ||
477 | # define SOL_RIGHT BUTTON_RIGHT | ||
478 | # define SOL_MOVE_PRE BUTTON_PLAY | ||
479 | # define SOL_MOVE (BUTTON_PLAY | BUTTON_REL) | ||
480 | # define SOL_DRAW BUTTON_FFWD | ||
481 | # define SOL_REM2CUR (BUTTON_PLAY | BUTTON_DOWN) | ||
482 | # define SOL_CUR2STACK (BUTTON_PLAY | BUTTON_UP) | ||
483 | # define SOL_REM2STACK (BUTTON_PLAY | BUTTON_RIGHT) | ||
484 | # define HK_MOVE "PLAY" | ||
485 | # define HK_DRAW "FFWD" | ||
486 | # define HK_REM2CUR "PLAY+DOWN" | ||
487 | # define HK_CUR2STACK "PLAY+UP" | ||
488 | # define HK_REM2STACK "PLAY+RIGHT" | ||
472 | 489 | ||
473 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 490 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
474 | # define SOL_QUIT BUTTON_REC | 491 | # define SOL_QUIT BUTTON_REC |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index a7e9912cf4..001cb1918d 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -231,8 +231,9 @@ | |||
231 | 231 | ||
232 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 232 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
233 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 233 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
234 | |||
234 | #define AST_PAUSE BUTTON_FFWD | 235 | #define AST_PAUSE BUTTON_FFWD |
235 | #define AST_QUIT BUTTON_REC | 236 | #define AST_QUIT BUTTON_REW |
236 | #define AST_THRUST BUTTON_UP | 237 | #define AST_THRUST BUTTON_UP |
237 | #define AST_HYPERSPACE BUTTON_DOWN | 238 | #define AST_HYPERSPACE BUTTON_DOWN |
238 | #define AST_LEFT BUTTON_LEFT | 239 | #define AST_LEFT BUTTON_LEFT |
@@ -240,6 +241,7 @@ | |||
240 | #define AST_FIRE BUTTON_PLAY | 241 | #define AST_FIRE BUTTON_PLAY |
241 | 242 | ||
242 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | 243 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) |
244 | |||
243 | #define AST_PAUSE BUTTON_PLAY | 245 | #define AST_PAUSE BUTTON_PLAY |
244 | #define AST_QUIT BUTTON_REC | 246 | #define AST_QUIT BUTTON_REC |
245 | #define AST_THRUST BUTTON_UP | 247 | #define AST_THRUST BUTTON_UP |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 3cb27790c6..9d27432dff 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -391,23 +391,41 @@ | |||
391 | #define STAR_QUIT BUTTON_POWER | 391 | #define STAR_QUIT BUTTON_POWER |
392 | #define STAR_QUIT_NAME "POWER" | 392 | #define STAR_QUIT_NAME "POWER" |
393 | 393 | ||
394 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 394 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
395 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
396 | 395 | ||
397 | #define STAR_QUIT BUTTON_REC | 396 | #define STAR_QUIT (BUTTON_REW|BUTTON_REPEAT) |
398 | #define STAR_LEFT BUTTON_LEFT | 397 | #define STAR_LEFT BUTTON_LEFT |
399 | #define STAR_RIGHT BUTTON_RIGHT | 398 | #define STAR_RIGHT BUTTON_RIGHT |
400 | #define STAR_UP BUTTON_UP | 399 | #define STAR_UP BUTTON_UP |
401 | #define STAR_DOWN BUTTON_DOWN | 400 | #define STAR_DOWN BUTTON_DOWN |
402 | #define STAR_LEVEL_UP BUTTON_FFWD | 401 | #define STAR_LEVEL_UP (BUTTON_REC|BUTTON_UP) |
403 | #define STAR_LEVEL_DOWN BUTTON_REW | 402 | #define STAR_LEVEL_DOWN (BUTTON_REC|BUTTON_DOWN) |
404 | #define STAR_TOGGLE_CONTROL BUTTON_PLAY | 403 | #define STAR_TOGGLE_CONTROL BUTTON_PLAY |
405 | #define STAR_LEVEL_REPEAT (BUTTON_REW|BUTTON_FFWD) | 404 | #define STAR_LEVEL_REPEAT_PRE BUTTON_FFWD |
405 | #define STAR_LEVEL_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) | ||
406 | #define STAR_TOGGLE_CONTROL_NAME "PLAY" | 406 | #define STAR_TOGGLE_CONTROL_NAME "PLAY" |
407 | #define STAR_QUIT_NAME "REC" | 407 | #define STAR_QUIT_NAME "LONG REW" |
408 | #define STAR_LEVEL_UP_NAME "FF" | 408 | #define STAR_LEVEL_UP_NAME "REC+UP" |
409 | #define STAR_LEVEL_DOWN_NAME "REW" | 409 | #define STAR_LEVEL_DOWN_NAME "REC+DOWN" |
410 | #define STAR_LEVEL_REPEAT_NAME "REW+FF" | 410 | #define STAR_LEVEL_REPEAT_NAME "LONG FFWD" |
411 | |||
412 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
413 | |||
414 | #define STAR_QUIT (BUTTON_REW|BUTTON_REPEAT) | ||
415 | #define STAR_LEFT BUTTON_LEFT | ||
416 | #define STAR_RIGHT BUTTON_RIGHT | ||
417 | #define STAR_UP BUTTON_UP | ||
418 | #define STAR_DOWN BUTTON_DOWN | ||
419 | #define STAR_LEVEL_UP (BUTTON_FFWD|BUTTON_UP) | ||
420 | #define STAR_LEVEL_DOWN (BUTTON_FFWD|BUTTON_DOWN) | ||
421 | #define STAR_TOGGLE_CONTROL (BUTTON_PLAY|BUTTON_REL) | ||
422 | #define STAR_LEVEL_REPEAT_PRE (BUTTON_FFWD|BUTTON_REPEAT) | ||
423 | #define STAR_LEVEL_REPEAT (BUTTON_FFWD|BUTTON_REL) | ||
424 | #define STAR_TOGGLE_CONTROL_NAME "PLAY" | ||
425 | #define STAR_QUIT_NAME "LONG REW" | ||
426 | #define STAR_LEVEL_UP_NAME "FFWD+UP" | ||
427 | #define STAR_LEVEL_DOWN_NAME "FFWD+DOWN" | ||
428 | #define STAR_LEVEL_REPEAT_NAME "LONG FFWD" | ||
411 | 429 | ||
412 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 430 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
413 | 431 | ||
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 83f5893150..4ad6dc0c01 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -225,7 +225,7 @@ | |||
225 | 225 | ||
226 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 226 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
227 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 227 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
228 | #define STOPWATCH_QUIT BUTTON_REC | 228 | #define STOPWATCH_QUIT BUTTON_REW |
229 | #define STOPWATCH_START_STOP BUTTON_PLAY | 229 | #define STOPWATCH_START_STOP BUTTON_PLAY |
230 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | 230 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT |
231 | #define STOPWATCH_LAP_TIMER BUTTON_RIGHT | 231 | #define STOPWATCH_LAP_TIMER BUTTON_RIGHT |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 2caa75fbbe..634a874a87 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -282,16 +282,25 @@ | |||
282 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) | 282 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) |
283 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 283 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
284 | 284 | ||
285 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 285 | #elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
286 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 286 | #define SUDOKU_BUTTON_UP BUTTON_UP |
287 | #define SUDOKU_BUTTON_QUIT BUTTON_REC | 287 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
288 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
289 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
290 | #define SUDOKU_BUTTON_TOGGLE BUTTON_FFWD | ||
291 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_REW | ||
292 | #define SUDOKU_BUTTON_MENU (BUTTON_PLAY|BUTTON_REPEAT) | ||
293 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_PLAY|BUTTON_REL) | ||
294 | |||
295 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) | ||
288 | #define SUDOKU_BUTTON_UP BUTTON_UP | 296 | #define SUDOKU_BUTTON_UP BUTTON_UP |
289 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 297 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
290 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 298 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
291 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 299 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
292 | #define SUDOKU_BUTTON_TOGGLE BUTTON_FFWD | 300 | #define SUDOKU_BUTTON_TOGGLE BUTTON_FFWD |
293 | #define SUDOKU_BUTTON_MENU BUTTON_PLAY | 301 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_REW |
294 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REW | 302 | #define SUDOKU_BUTTON_MENU BUTTON_REC |
303 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | ||
295 | 304 | ||
296 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 305 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
297 | #define SUDOKU_BUTTON_QUIT BUTTON_REC | 306 | #define SUDOKU_BUTTON_QUIT BUTTON_REC |
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) | |||
98 | if (lastbutton != TV_AUTOSCROLL_PRE) | 98 | if (lastbutton != TV_AUTOSCROLL_PRE) |
99 | break; | 99 | break; |
100 | #endif | 100 | #endif |
101 | #ifdef TV_AUTOSCROLL2 | ||
102 | /* fallthrough */ | ||
103 | case TV_AUTOSCROLL2: | ||
104 | #endif | ||
101 | autoscroll = !autoscroll; | 105 | autoscroll = !autoscroll; |
102 | break; | 106 | break; |
103 | 107 | ||
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 @@ | |||
380 | #define TV_QUIT BUTTON_POWER | 380 | #define TV_QUIT BUTTON_POWER |
381 | #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER) | 381 | #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER) |
382 | 382 | ||
383 | /* SAMSUNG YH-820 / YH-920 / YH-925 keys */ | 383 | /* SAMSUNG YH-920 / YH-925 keys */ |
384 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 384 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
385 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 385 | #define TV_QUIT (BUTTON_REW|BUTTON_REPEAT) |
386 | #define TV_QUIT BUTTON_REC | ||
387 | #define TV_SCROLL_UP BUTTON_UP | 386 | #define TV_SCROLL_UP BUTTON_UP |
388 | #define TV_SCROLL_DOWN BUTTON_DOWN | 387 | #define TV_SCROLL_DOWN BUTTON_DOWN |
389 | #define TV_SCREEN_LEFT BUTTON_LEFT | 388 | #define TV_SCREEN_LEFT BUTTON_LEFT |
390 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | 389 | #define TV_SCREEN_RIGHT BUTTON_RIGHT |
391 | #define TV_MENU BUTTON_PLAY | 390 | #define TV_MENU BUTTON_REW |
392 | #define TV_AUTOSCROLL BUTTON_REW | 391 | #define TV_AUTOSCROLL BUTTON_REC_SW_ON |
393 | #define TV_BOOKMARK BUTTON_FFWD | 392 | #define TV_AUTOSCROLL2 BUTTON_REC_SW_OFF |
393 | #define TV_BOOKMARK BUTTON_PLAY | ||
394 | #define TV_LINE_UP (BUTTON_FFWD|BUTTON_UP) | ||
395 | #define TV_LINE_DOWN (BUTTON_FFWD|BUTTON_DOWN) | ||
396 | #define TV_COLUMN_LEFT (BUTTON_FFWD|BUTTON_LEFT) | ||
397 | #define TV_COLUMN_RIGHT (BUTTON_FFWD|BUTTON_RIGHT) | ||
398 | |||
399 | /* SAMSUNG YH-820 keys */ | ||
400 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
401 | #define TV_QUIT (BUTTON_REW|BUTTON_REPEAT) | ||
402 | #define TV_SCROLL_UP BUTTON_UP | ||
403 | #define TV_SCROLL_DOWN BUTTON_DOWN | ||
404 | #define TV_SCREEN_LEFT BUTTON_LEFT | ||
405 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | ||
406 | #define TV_MENU BUTTON_REW | ||
407 | #define TV_AUTOSCROLL BUTTON_FFWD | ||
408 | #define TV_BOOKMARK BUTTON_PLAY | ||
409 | #define TV_LINE_UP (BUTTON_REC|BUTTON_UP) | ||
410 | #define TV_LINE_DOWN (BUTTON_REC|BUTTON_DOWN) | ||
411 | #define TV_COLUMN_LEFT (BUTTON_REC|BUTTON_LEFT) | ||
412 | #define TV_COLUMN_RIGHT (BUTTON_REC|BUTTON_RIGHT) | ||
394 | 413 | ||
395 | /* Packard Bell Vibe 500 keys */ | 414 | /* Packard Bell Vibe 500 keys */ |
396 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 415 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 8a9c35b1ff..93e89bbc19 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -285,13 +285,13 @@ | |||
285 | 285 | ||
286 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 286 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
287 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 287 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) |
288 | #define VUMETER_QUIT BUTTON_REC | 288 | #define VUMETER_QUIT BUTTON_REW |
289 | #define VUMETER_HELP BUTTON_PLAY | 289 | #define VUMETER_HELP BUTTON_PLAY |
290 | #define VUMETER_MENU BUTTON_REW | 290 | #define VUMETER_MENU BUTTON_LEFT |
291 | #define VUMETER_UP BUTTON_UP | 291 | #define VUMETER_UP BUTTON_UP |
292 | #define VUMETER_DOWN BUTTON_DOWN | 292 | #define VUMETER_DOWN BUTTON_DOWN |
293 | #define LABEL_HELP "PLAY" | 293 | #define LABEL_HELP "PLAY" |
294 | #define LABEL_QUIT "REC" | 294 | #define LABEL_QUIT "REW" |
295 | #define LABEL_MENU "LEFT" | 295 | #define LABEL_MENU "LEFT" |
296 | #define LABEL_VOLUME "UP/DOWN" | 296 | #define LABEL_VOLUME "UP/DOWN" |
297 | 297 | ||
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 6d5cf4b0df..c2125ac6d6 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -279,8 +279,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
279 | #define BTN_DIR_LEFT BUTTON_LEFT | 279 | #define BTN_DIR_LEFT BUTTON_LEFT |
280 | #define BTN_DIR_RIGHT BUTTON_RIGHT | 280 | #define BTN_DIR_RIGHT BUTTON_RIGHT |
281 | #define BTN_STARTPAUSE BUTTON_PLAY | 281 | #define BTN_STARTPAUSE BUTTON_PLAY |
282 | #define BTN_QUIT BUTTON_REC | 282 | #define BTN_QUIT BUTTON_REW |
283 | #define BTN_STOPRESET BUTTON_REW | 283 | #define BTN_STOPRESET BUTTON_FFWD |
284 | 284 | ||
285 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 285 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
286 | 286 | ||
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 68c32726c0..4e98c62a68 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -235,7 +235,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
235 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \ | 235 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \ |
236 | CONFIG_KEYPAD == SAMSUNG_YH920_PAD | 236 | CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
237 | 237 | ||
238 | #define QUIT BUTTON_REC | 238 | #define QUIT BUTTON_REW |
239 | #define LEFT BUTTON_LEFT | 239 | #define LEFT BUTTON_LEFT |
240 | #define RIGHT BUTTON_RIGHT | 240 | #define RIGHT BUTTON_RIGHT |
241 | #define UP BUTTON_UP | 241 | #define UP BUTTON_UP |