diff options
author | Nils Stec <nils.stec@gmail.com> | 2014-06-30 20:24:15 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-06-30 21:20:15 +0200 |
commit | c9816f57bf8782fd2ce6487aa0dc0f739145b631 (patch) | |
tree | af0f7314182fb8ee278ced53b7f79615312f32d2 /apps/plugins | |
parent | 6e575b6c7011827c042cba7b27537c1ceec9ef24 (diff) | |
download | rockbox-c9816f57bf8782fd2ce6487aa0dc0f739145b631.tar.gz rockbox-c9816f57bf8782fd2ce6487aa0dc0f739145b631.zip |
Introduce plugin keymaps for the Sony NWZ Series
Change-Id: I46b8766bd44118bce4931b7ee71815ae5f51cb2e
Reviewed-on: http://gerrit.rockbox.org/879
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'apps/plugins')
47 files changed, 468 insertions, 0 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index b54d40a717..206d4dca0c 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -513,6 +513,20 @@ enum { | |||
513 | #define BJACK_RIGHT BUTTON_RIGHT | 513 | #define BJACK_RIGHT BUTTON_RIGHT |
514 | #define BJACK_LEFT BUTTON_LEFT | 514 | #define BJACK_LEFT BUTTON_LEFT |
515 | 515 | ||
516 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
517 | #define BJACK_SELECT BUTTON_PLAY | ||
518 | #define BJACK_QUIT BUTTON_BACK | ||
519 | #define BJACK_STAY (BUTTON_POWER|BUTTON_PLAY) | ||
520 | #define BJACK_DOUBLEDOWN (BUTTON_POWER|BUTTON_DOWN) | ||
521 | #define BJACK_UP BUTTON_UP | ||
522 | #define BJACK_DOWN BUTTON_DOWN | ||
523 | #define BJACK_RIGHT BUTTON_RIGHT | ||
524 | #define BJACK_LEFT BUTTON_LEFT | ||
525 | #define BJACK_SELECT_NAME "Play" | ||
526 | #define BJACK_STAY_NAME "Option+Play" | ||
527 | #define BJACK_QUIT_NAME "Back" | ||
528 | #define BJACK_DOUBLE_NAME "Option+Down" | ||
529 | |||
516 | #else | 530 | #else |
517 | #error No keymap defined! | 531 | #error No keymap defined! |
518 | #endif | 532 | #endif |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 1574fe7119..6cff61e004 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -295,6 +295,14 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD | |||
295 | #define UP BUTTON_UP | 295 | #define UP BUTTON_UP |
296 | #define DOWN BUTTON_DOWN | 296 | #define DOWN BUTTON_DOWN |
297 | 297 | ||
298 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
299 | #define QUIT BUTTON_BACK | ||
300 | #define LEFT BUTTON_LEFT | ||
301 | #define RIGHT BUTTON_RIGHT | ||
302 | #define SELECT BUTTON_PLAY | ||
303 | #define UP BUTTON_UP | ||
304 | #define DOWN BUTTON_DOWN | ||
305 | |||
298 | #else | 306 | #else |
299 | #error No keymap defined! | 307 | #error No keymap defined! |
300 | #endif | 308 | #endif |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 327ef69b45..5e5e7130a1 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -477,6 +477,16 @@ F3: equal to "=" | |||
477 | #define CALCULATOR_CALC BUTTON_PLAY | 477 | #define CALCULATOR_CALC BUTTON_PLAY |
478 | #define CALCULATOR_CLEAR BUTTON_PREV | 478 | #define CALCULATOR_CLEAR BUTTON_PREV |
479 | 479 | ||
480 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
481 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
482 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
483 | #define CALCULATOR_UP BUTTON_UP | ||
484 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
485 | #define CALCULATOR_QUIT (BUTTON_BACK|BUTTON_REPEAT) | ||
486 | #define CALCULATOR_INPUT BUTTON_PLAY | ||
487 | #define CALCULATOR_CALC BUTTON_POWER | ||
488 | #define CALCULATOR_CLEAR BUTTON_BACK | ||
489 | |||
480 | #else | 490 | #else |
481 | #error No keymap defined! | 491 | #error No keymap defined! |
482 | #endif | 492 | #endif |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 8e43823bb6..d586b4b48c 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -349,6 +349,16 @@ | |||
349 | #define CALENDAR_NEXT_MONTH BUTTON_NEXT | 349 | #define CALENDAR_NEXT_MONTH BUTTON_NEXT |
350 | #define CALENDAR_PREV_MONTH BUTTON_PREV | 350 | #define CALENDAR_PREV_MONTH BUTTON_PREV |
351 | 351 | ||
352 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
353 | #define CALENDAR_QUIT BUTTON_BACK | ||
354 | #define CALENDAR_SELECT BUTTON_PLAY | ||
355 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
356 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
357 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | ||
358 | #define CALENDAR_PREV_WEEK BUTTON_UP | ||
359 | #define CALENDAR_NEXT_MONTH (BUTTON_POWER|BUTTON_DOWN) | ||
360 | #define CALENDAR_PREV_MONTH (BUTTON_POWER|BUTTON_UP) | ||
361 | |||
352 | #else | 362 | #else |
353 | #error "No keypad setting." | 363 | #error "No keypad setting." |
354 | #endif | 364 | #endif |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 3cc136e566..1e8a9ec34f 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -464,6 +464,17 @@ | |||
464 | #define CB_LEVEL BUTTON_PREV | 464 | #define CB_LEVEL BUTTON_PREV |
465 | #define CB_MENU BUTTON_POWER | 465 | #define CB_MENU BUTTON_POWER |
466 | 466 | ||
467 | |||
468 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
469 | #define CB_SELECT BUTTON_PLAY | ||
470 | #define CB_UP BUTTON_UP | ||
471 | #define CB_DOWN BUTTON_DOWN | ||
472 | #define CB_LEFT BUTTON_LEFT | ||
473 | #define CB_RIGHT BUTTON_RIGHT | ||
474 | #define CB_PLAY (BUTTON_REPEAT|BUTTON_PLAY) | ||
475 | #define CB_MENU BUTTON_BACK | ||
476 | #define CB_LEVEL BUTTON_POWER | ||
477 | |||
467 | #else | 478 | #else |
468 | #error No keymap defined! | 479 | #error No keymap defined! |
469 | #endif | 480 | #endif |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index a58dc6bbce..490e588d91 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -367,6 +367,16 @@ | |||
367 | #define CHC_SETTINGS_OK BUTTON_SELECT | 367 | #define CHC_SETTINGS_OK BUTTON_SELECT |
368 | #define CHC_SETTINGS_CANCEL BUTTON_PREV | 368 | #define CHC_SETTINGS_CANCEL BUTTON_PREV |
369 | 369 | ||
370 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
371 | #define CHC_QUIT BUTTON_BACK | ||
372 | #define CHC_STARTSTOP BUTTON_PLAY | ||
373 | #define CHC_RESET BUTTON_LEFT | ||
374 | #define CHC_MENU BUTTON_POWER | ||
375 | #define CHC_SETTINGS_INC BUTTON_UP | ||
376 | #define CHC_SETTINGS_DEC BUTTON_DOWN | ||
377 | #define CHC_SETTINGS_OK BUTTON_RIGHT | ||
378 | #define CHC_SETTINGS_CANCEL BUTTON_BACK | ||
379 | |||
370 | #else | 380 | #else |
371 | #error No keymap defined! | 381 | #error No keymap defined! |
372 | #endif | 382 | #endif |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 63c9b7fa06..873ad37df3 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1231,6 +1231,14 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
1231 | #define CHIP8_KEY6 BUTTON_RIGHT | 1231 | #define CHIP8_KEY6 BUTTON_RIGHT |
1232 | #define CHIP8_KEY8 BUTTON_LEFT | 1232 | #define CHIP8_KEY8 BUTTON_LEFT |
1233 | 1233 | ||
1234 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
1235 | #define CHIP8_OFF BUTTON_BACK | ||
1236 | #define CHIP8_KEY2 BUTTON_UP | ||
1237 | #define CHIP8_KEY4 BUTTON_DOWN | ||
1238 | #define CHIP8_KEY5 BUTTON_PLAY | ||
1239 | #define CHIP8_KEY6 BUTTON_RIGHT | ||
1240 | #define CHIP8_KEY8 BUTTON_LEFT | ||
1241 | |||
1234 | #elif (CONFIG_KEYPAD == HM801_PAD) | 1242 | #elif (CONFIG_KEYPAD == HM801_PAD) |
1235 | #define CHIP8_OFF (BUTTON_POWER|BUTTON_SELECT) | 1243 | #define CHIP8_OFF (BUTTON_POWER|BUTTON_SELECT) |
1236 | #define CHIP8_KEY1 BUTTON_PREV | 1244 | #define CHIP8_KEY1 BUTTON_PREV |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index db836e5393..df578ffcac 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -193,6 +193,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
193 | #define ACTION BUTTON_SELECT | 193 | #define ACTION BUTTON_SELECT |
194 | #define ACTIONTEXT "SELECT" | 194 | #define ACTIONTEXT "SELECT" |
195 | 195 | ||
196 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
197 | #define QUIT BUTTON_BACK | ||
198 | #define ACTION BUTTON_PLAY | ||
199 | #define ACTIONTEXT "PLAY" | ||
200 | |||
196 | #elif !defined(HAVE_TOUCHSCREEN) | 201 | #elif !defined(HAVE_TOUCHSCREEN) |
197 | #error No keymap defined! | 202 | #error No keymap defined! |
198 | #endif | 203 | #endif |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 31951def28..47e27a8635 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -230,6 +230,16 @@ | |||
230 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | 230 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT |
231 | #define CLIX_BUTTON_CLICK BUTTON_SELECT | 231 | #define CLIX_BUTTON_CLICK BUTTON_SELECT |
232 | 232 | ||
233 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
234 | #define CLIX_BUTTON_QUIT BUTTON_BACK | ||
235 | #define CLIX_BUTTON_UP BUTTON_UP | ||
236 | #define CLIX_BUTTON_DOWN BUTTON_DOWN | ||
237 | #define CLIX_BUTTON_SCROLL_FWD (BUTTON_POWER|BUTTON_RIGHT) | ||
238 | #define CLIX_BUTTON_SCROLL_BACK (BUTTON_POWER|BUTTON_LEFT) | ||
239 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | ||
240 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | ||
241 | #define CLIX_BUTTON_CLICK BUTTON_PLAY | ||
242 | |||
233 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR1_PAD) | 243 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR1_PAD) |
234 | #define CLIX_BUTTON_QUIT BUTTON_POWER | 244 | #define CLIX_BUTTON_QUIT BUTTON_POWER |
235 | 245 | ||
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index b75c1f21c8..de548ce308 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -370,6 +370,16 @@ | |||
370 | #define CUBE_PAUSE BUTTON_SELECT | 370 | #define CUBE_PAUSE BUTTON_SELECT |
371 | #define CUBE_HIGHSPEED BUTTON_NEXT | 371 | #define CUBE_HIGHSPEED BUTTON_NEXT |
372 | 372 | ||
373 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
374 | #define CUBE_QUIT BUTTON_BACK | ||
375 | #define CUBE_NEXT BUTTON_RIGHT | ||
376 | #define CUBE_PREV BUTTON_LEFT | ||
377 | #define CUBE_INC BUTTON_UP | ||
378 | #define CUBE_DEC BUTTON_DOWN | ||
379 | #define CUBE_MODE (BUTTON_POWER|BUTTON_UP) | ||
380 | #define CUBE_PAUSE BUTTON_PLAY | ||
381 | #define CUBE_HIGHSPEED (BUTTON_POWER|BUTTON_DOWN) | ||
382 | |||
373 | #else | 383 | #else |
374 | #error No keymap defined! | 384 | #error No keymap defined! |
375 | #endif | 385 | #endif |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 200a663494..90ee93cd17 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -499,6 +499,18 @@ void I_ShutdownGraphics(void) | |||
499 | #define DOOMBUTTON_WEAPON BUTTON_PREV | 499 | #define DOOMBUTTON_WEAPON BUTTON_PREV |
500 | #define DOOMBUTTON_MAP BUTTON_NEXT | 500 | #define DOOMBUTTON_MAP BUTTON_NEXT |
501 | 501 | ||
502 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
503 | #define DOOMBUTTON_UP BUTTON_UP | ||
504 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
505 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
506 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
507 | #define DOOMBUTTON_OPEN BUTTON_BACK | ||
508 | #define DOOMBUTTON_ESC (BUTTON_BACK|BUTTON_REPEAT) | ||
509 | #define DOOMBUTTON_ENTER BUTTON_PLAY | ||
510 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | ||
511 | #define DOOMBUTTON_WEAPON BUTTON_POWER | ||
512 | #define DOOMBUTTON_MAP (BUTTON_POWER|BUTTON_REPEAT) | ||
513 | |||
502 | #else | 514 | #else |
503 | #error Keymap not defined! | 515 | #error Keymap not defined! |
504 | #endif | 516 | #endif |
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 2b7f6a4fbe..28c3cd045c 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c | |||
@@ -302,6 +302,15 @@ GREY_INFO_STRUCT | |||
302 | # define FFT_WINDOW BUTTON_PLAY | 302 | # define FFT_WINDOW BUTTON_PLAY |
303 | # define FFT_QUIT BUTTON_POWER | 303 | # define FFT_QUIT BUTTON_POWER |
304 | 304 | ||
305 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
306 | #define FFT_PREV_GRAPH BUTTON_LEFT | ||
307 | #define FFT_NEXT_GRAPH BUTTON_RIGHT | ||
308 | #define FFT_AMP_SCALE BUTTON_UP | ||
309 | #define FFT_FREQ_SCALE BUTTON_DOWN | ||
310 | #define FFT_QUIT BUTTON_BACK | ||
311 | #define FFT_ORIENTATION BUTTON_POWER | ||
312 | #define FFT_WINDOW BUTTON_PLAY | ||
313 | |||
305 | #elif !defined(HAVE_TOUCHSCREEN) | 314 | #elif !defined(HAVE_TOUCHSCREEN) |
306 | #error No keymap defined! | 315 | #error No keymap defined! |
307 | #endif | 316 | #endif |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 056878e7e4..dd5f809027 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -195,6 +195,17 @@ | |||
195 | #define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_UP) | 195 | #define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_UP) |
196 | #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) | 196 | #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) |
197 | 197 | ||
198 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
199 | #define FLIPIT_LEFT BUTTON_LEFT | ||
200 | #define FLIPIT_RIGHT BUTTON_RIGHT | ||
201 | #define FLIPIT_UP BUTTON_UP | ||
202 | #define FLIPIT_DOWN BUTTON_DOWN | ||
203 | #define FLIPIT_QUIT (BUTTON_BACK|BUTTON_REPEAT) | ||
204 | #define FLIPIT_SHUFFLE BUTTON_BACK | ||
205 | #define FLIPIT_SOLVE (BUTTON_PLAY|BUTTON_REPEAT) | ||
206 | #define FLIPIT_STEP_BY_STEP BUTTON_POWER | ||
207 | #define FLIPIT_TOGGLE BUTTON_PLAY | ||
208 | |||
198 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 209 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
199 | 210 | ||
200 | #define FLIPIT_LEFT BUTTON_LEFT | 211 | #define FLIPIT_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index bb47282298..01a80c5535 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -427,6 +427,19 @@ | |||
427 | #define FRACTAL_PRECISION_DEC BUTTON_PREV | 427 | #define FRACTAL_PRECISION_DEC BUTTON_PREV |
428 | #define FRACTAL_RESET (BUTTON_POWER | BUTTON_PLAY) | 428 | #define FRACTAL_RESET (BUTTON_POWER | BUTTON_PLAY) |
429 | 429 | ||
430 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
431 | #define FRACTAL_QUIT BUTTON_BACK | ||
432 | #define FRACTAL_UP BUTTON_UP | ||
433 | #define FRACTAL_DOWN BUTTON_DOWN | ||
434 | #define FRACTAL_RIGHT BUTTON_RIGHT | ||
435 | #define FRACTAL_LEFT BUTTON_LEFT | ||
436 | #define FRACTAL_ZOOM_IN (BUTTON_POWER|BUTTON_UP) | ||
437 | #define FRACTAL_ZOOM_OUT (BUTTON_POWER|BUTTON_DOWN) | ||
438 | #define FRACTAL_PRECISION_INC (BUTTON_POWER|BUTTON_RIGHT) | ||
439 | #define FRACTAL_PRECISION_DEC (BUTTON_POWER|BUTTON_LEFT) | ||
440 | #define FRACTAL_RESET BUTTON_PLAY | ||
441 | |||
442 | |||
430 | #else | 443 | #else |
431 | #error No keymap defined! | 444 | #error No keymap defined! |
432 | #endif | 445 | #endif |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index d53c6bb5c4..b0f6dbb3d4 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -392,6 +392,14 @@ | |||
392 | #define GBN_BUTTON_PLAY BUTTON_SELECT | 392 | #define GBN_BUTTON_PLAY BUTTON_SELECT |
393 | #define GBN_BUTTON_MENU BUTTON_MENU | 393 | #define GBN_BUTTON_MENU BUTTON_MENU |
394 | 394 | ||
395 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
396 | #define GBN_BUTTON_UP BUTTON_UP | ||
397 | #define GBN_BUTTON_DOWN BUTTON_DOWN | ||
398 | #define GBN_BUTTON_LEFT BUTTON_LEFT | ||
399 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT | ||
400 | #define GBN_BUTTON_PLAY BUTTON_PLAY | ||
401 | #define GBN_BUTTON_MENU BUTTON_BACK | ||
402 | |||
395 | #elif (CONFIG_KEYPAD == HM60X_PAD) | 403 | #elif (CONFIG_KEYPAD == HM60X_PAD) |
396 | #define GBN_BUTTON_UP BUTTON_UP | 404 | #define GBN_BUTTON_UP BUTTON_UP |
397 | #define GBN_BUTTON_DOWN BUTTON_DOWN | 405 | #define GBN_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index 4827ffa038..7695b720d3 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -428,6 +428,18 @@ | |||
428 | #define IMGVIEW_MENU BUTTON_SELECT | 428 | #define IMGVIEW_MENU BUTTON_SELECT |
429 | #define IMGVIEW_QUIT BUTTON_POWER | 429 | #define IMGVIEW_QUIT BUTTON_POWER |
430 | 430 | ||
431 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
432 | #define IMGVIEW_ZOOM_PRE BUTTON_POWER | ||
433 | #define IMGVIEW_ZOOM_IN (BUTTON_POWER|BUTTON_REL) | ||
434 | #define IMGVIEW_ZOOM_OUT (BUTTON_POWER|BUTTON_REPEAT) | ||
435 | #define IMGVIEW_UP BUTTON_UP | ||
436 | #define IMGVIEW_LEFT BUTTON_LEFT | ||
437 | #define IMGVIEW_RIGHT BUTTON_RIGHT | ||
438 | #define IMGVIEW_DOWN BUTTON_DOWN | ||
439 | #define IMGVIEW_NEXT BUTTON_PLAY | ||
440 | #define IMGVIEW_PREVIOUS BUTTON_BACK | ||
441 | #define IMGVIEW_MENU (BUTTON_BACK|BUTTON_REPEAT) | ||
442 | |||
431 | #else | 443 | #else |
432 | #error No keymap defined! | 444 | #error No keymap defined! |
433 | #endif | 445 | #endif |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 158ad2f4d7..81b2df50d7 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -237,6 +237,13 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
237 | #define RIGHT BUTTON_RIGHT | 237 | #define RIGHT BUTTON_RIGHT |
238 | #define FIRE BUTTON_SELECT | 238 | #define FIRE BUTTON_SELECT |
239 | 239 | ||
240 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
241 | |||
242 | #define QUIT BUTTON_BACK | ||
243 | #define LEFT BUTTON_LEFT | ||
244 | #define RIGHT BUTTON_RIGHT | ||
245 | #define FIRE BUTTON_PLAY | ||
246 | |||
240 | #elif (CONFIG_KEYPAD == HM60X_PAD) || \ | 247 | #elif (CONFIG_KEYPAD == HM60X_PAD) || \ |
241 | (CONFIG_KEYPAD == HM801_PAD) | 248 | (CONFIG_KEYPAD == HM801_PAD) |
242 | 249 | ||
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 3270bd1a3d..f3fbb2e80b 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -123,6 +123,17 @@ | |||
123 | #define HK_SELECT "SELECT" | 123 | #define HK_SELECT "SELECT" |
124 | #define HK_CANCEL "POWER" | 124 | #define HK_CANCEL "POWER" |
125 | 125 | ||
126 | |||
127 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
128 | #define JEWELS_UP BUTTON_UP | ||
129 | #define JEWELS_DOWN BUTTON_DOWN | ||
130 | #define JEWELS_LEFT BUTTON_LEFT | ||
131 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
132 | #define JEWELS_SELECT BUTTON_PLAY | ||
133 | #define JEWELS_CANCEL BUTTON_BACK | ||
134 | #define HK_SELECT "PLAY" | ||
135 | #define HK_CANCEL "BACK" | ||
136 | |||
126 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 137 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
127 | (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 138 | (CONFIG_KEYPAD == SANSA_CONNECT_PAD) |
128 | #define JEWELS_SCROLLWHEEL | 139 | #define JEWELS_SCROLLWHEEL |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index af76dcb13a..773cc90196 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -259,6 +259,14 @@ | |||
259 | #define BTN_DOWN BUTTON_DOWN | 259 | #define BTN_DOWN BUTTON_DOWN |
260 | #define BTN_PLAY BUTTON_SELECT | 260 | #define BTN_PLAY BUTTON_SELECT |
261 | 261 | ||
262 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
263 | #define BTN_QUIT BUTTON_BACK | ||
264 | #define BTN_RIGHT BUTTON_RIGHT | ||
265 | #define BTN_LEFT BUTTON_LEFT | ||
266 | #define BTN_UP BUTTON_UP | ||
267 | #define BTN_DOWN BUTTON_DOWN | ||
268 | #define BTN_PLAY BUTTON_PLAY | ||
269 | |||
262 | #else | 270 | #else |
263 | #error No keymap defined! | 271 | #error No keymap defined! |
264 | #endif | 272 | #endif |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index c1e6b4a84d..030151398a 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -357,6 +357,16 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
357 | # define MINESWP_DISCOVER BUTTON_PLAY | 357 | # define MINESWP_DISCOVER BUTTON_PLAY |
358 | # define MINESWP_INFO BUTTON_VOL_DOWN | 358 | # define MINESWP_INFO BUTTON_VOL_DOWN |
359 | 359 | ||
360 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
361 | #define MINESWP_LEFT BUTTON_LEFT | ||
362 | #define MINESWP_RIGHT BUTTON_RIGHT | ||
363 | #define MINESWP_UP BUTTON_UP | ||
364 | #define MINESWP_DOWN BUTTON_DOWN | ||
365 | #define MINESWP_QUIT BUTTON_BACK | ||
366 | #define MINESWP_TOGGLE BUTTON_PLAY | ||
367 | #define MINESWP_DISCOVER (BUTTON_PLAY|BUTTON_REPEAT) | ||
368 | #define MINESWP_INFO BUTTON_POWER | ||
369 | |||
360 | #else | 370 | #else |
361 | #error No keymap defined! | 371 | #error No keymap defined! |
362 | #endif | 372 | #endif |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 642194b983..1326d4484d 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2528,6 +2528,12 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
2528 | #define MP3ENC_DONE BUTTON_DOWN | 2528 | #define MP3ENC_DONE BUTTON_DOWN |
2529 | #define MP3ENC_SELECT BUTTON_SELECT | 2529 | #define MP3ENC_SELECT BUTTON_SELECT |
2530 | 2530 | ||
2531 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
2532 | #define MP3ENC_PREV BUTTON_LEFT | ||
2533 | #define MP3ENC_NEXT BUTTON_RIGHT | ||
2534 | #define MP3ENC_DONE BUTTON_DOWN | ||
2535 | #define MP3ENC_SELECT BUTTON_PLAY | ||
2536 | |||
2531 | #else | 2537 | #else |
2532 | #error No keymap defined! | 2538 | #error No keymap defined! |
2533 | #endif | 2539 | #endif |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 26dd24113c..a5963ef94e 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -273,6 +273,14 @@ struct mpeg_settings settings; | |||
273 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | 273 | #define MPEG_START_TIME_DOWN BUTTON_DOWN |
274 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 274 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
275 | 275 | ||
276 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
277 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | ||
278 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | ||
279 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | ||
280 | #define MPEG_START_TIME_UP BUTTON_UP | ||
281 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | ||
282 | #define MPEG_START_TIME_EXIT BUTTON_BACK | ||
283 | |||
276 | #else | 284 | #else |
277 | #error No keymap defined! | 285 | #error No keymap defined! |
278 | #endif | 286 | #endif |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 97fe7d3f4c..69062d5062 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -399,6 +399,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
399 | #define MPEG_RW BUTTON_PREV | 399 | #define MPEG_RW BUTTON_PREV |
400 | #define MPEG_FF BUTTON_NEXT | 400 | #define MPEG_FF BUTTON_NEXT |
401 | 401 | ||
402 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
403 | #define MPEG_MENU BUTTON_BACK | ||
404 | #define MPEG_PAUSE BUTTON_PLAY | ||
405 | #define MPEG_STOP BUTTON_POWER | ||
406 | #define MPEG_VOLDOWN BUTTON_LEFT | ||
407 | #define MPEG_VOLUP BUTTON_RIGHT | ||
408 | #define MPEG_RW BUTTON_UP | ||
409 | #define MPEG_FF BUTTON_DOWN | ||
410 | |||
402 | #else | 411 | #else |
403 | #error No keymap defined! | 412 | #error No keymap defined! |
404 | #endif | 413 | #endif |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index e23baf01d9..66a2aad7a0 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -464,6 +464,17 @@ | |||
464 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_LEFT | 464 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_LEFT |
465 | /* Need GRAPHMODE */ | 465 | /* Need GRAPHMODE */ |
466 | 466 | ||
467 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
468 | #define OSCILLOSCOPE_QUIT (BUTTON_BACK|BUTTON_REPEAT) | ||
469 | #define OSCILLOSCOPE_DRAWMODE BUTTON_BACK | ||
470 | #define OSCILLOSCOPE_ADVMODE (BUTTON_POWER|BUTTON_REPEAT) | ||
471 | #define OSCILLOSCOPE_ORIENTATION BUTTON_POWER | ||
472 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY | ||
473 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | ||
474 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | ||
475 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | ||
476 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | ||
477 | |||
467 | #else | 478 | #else |
468 | #error No keymap defined! | 479 | #error No keymap defined! |
469 | #endif | 480 | #endif |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 1270e9c064..ebce692118 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -310,6 +310,15 @@ | |||
310 | #define PACMAN_COIN BUTTON_PREV | 310 | #define PACMAN_COIN BUTTON_PREV |
311 | #define PACMAN_MENU BUTTON_POWER | 311 | #define PACMAN_MENU BUTTON_POWER |
312 | 312 | ||
313 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
314 | #define PACMAN_UP BUTTON_UP | ||
315 | #define PACMAN_DOWN BUTTON_DOWN | ||
316 | #define PACMAN_LEFT BUTTON_LEFT | ||
317 | #define PACMAN_RIGHT BUTTON_RIGHT | ||
318 | #define PACMAN_MENU BUTTON_BACK | ||
319 | #define PACMAN_1UP BUTTON_POWER | ||
320 | #define PACMAN_COIN BUTTON_PLAY | ||
321 | |||
313 | #else | 322 | #else |
314 | 323 | ||
315 | #error Keymap not defined! | 324 | #error Keymap not defined! |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 9ad816c6a1..c3a99389f5 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -594,6 +594,23 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
594 | #define LVL_DOWN_TEXT "PREV" | 594 | #define LVL_DOWN_TEXT "PREV" |
595 | #define SELECT_TEXT "SELECT" | 595 | #define SELECT_TEXT "SELECT" |
596 | 596 | ||
597 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
598 | #define PEGBOX_RIGHT BUTTON_RIGHT | ||
599 | #define PEGBOX_LEFT BUTTON_LEFT | ||
600 | #define PEGBOX_UP BUTTON_UP | ||
601 | #define PEGBOX_DOWN BUTTON_DOWN | ||
602 | #define PEGBOX_QUIT BUTTON_POWER | ||
603 | #define PEGBOX_SELECT BUTTON_PLAY | ||
604 | #define PEGBOX_RESTART BUTTON_BACK | ||
605 | |||
606 | #define SAVE_TEXT "BACK+PLAY" | ||
607 | #define QUIT_TEXT "POWER" | ||
608 | #define RESTART_TEXT "BACK+POWER" | ||
609 | #define LVL_UP_TEXT "BACK+RIGHT" | ||
610 | #define LVL_DOWN_TEXT "BACK+LEFT" | ||
611 | #define SELECT_TEXT "PLAY" | ||
612 | |||
613 | |||
597 | #else | 614 | #else |
598 | #error Unsupported keymap! | 615 | #error Unsupported keymap! |
599 | #endif | 616 | #endif |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index ccf07544f2..3299ebbf3e 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -271,6 +271,14 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
271 | #define PONG_RIGHT_UP BUTTON_RIGHT | 271 | #define PONG_RIGHT_UP BUTTON_RIGHT |
272 | #define PONG_RIGHT_DOWN BUTTON_LEFT | 272 | #define PONG_RIGHT_DOWN BUTTON_LEFT |
273 | 273 | ||
274 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
275 | #define PONG_QUIT BUTTON_BACK | ||
276 | #define PONG_PAUSE BUTTON_PLAY | ||
277 | #define PONG_LEFT_UP BUTTON_UP | ||
278 | #define PONG_LEFT_DOWN BUTTON_DOWN | ||
279 | #define PONG_RIGHT_UP BUTTON_RIGHT | ||
280 | #define PONG_RIGHT_DOWN BUTTON_LEFT | ||
281 | |||
274 | #else | 282 | #else |
275 | #error No keymap defined! | 283 | #error No keymap defined! |
276 | #endif | 284 | #endif |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 131a3df32a..ef54945fec 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -296,6 +296,14 @@ | |||
296 | #elif CONFIG_KEYPAD == SAMSUNG_YPR1_PAD | 296 | #elif CONFIG_KEYPAD == SAMSUNG_YPR1_PAD |
297 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | 297 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
298 | 298 | ||
299 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
300 | #define REVERSI_BUTTON_UP BUTTON_UP | ||
301 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | ||
302 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | ||
303 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | ||
304 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_PLAY | ||
305 | #define REVERSI_BUTTON_MENU BUTTON_POWER | ||
306 | |||
299 | #else | 307 | #else |
300 | #error No keymap defined! | 308 | #error No keymap defined! |
301 | #endif | 309 | #endif |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 762f5befc4..a531245a1c 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -429,6 +429,16 @@ | |||
429 | #define ROCKBLOX_DROP BUTTON_SELECT | 429 | #define ROCKBLOX_DROP BUTTON_SELECT |
430 | #define ROCKBLOX_RESTART BUTTON_PLAY | 430 | #define ROCKBLOX_RESTART BUTTON_PLAY |
431 | 431 | ||
432 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
433 | #define ROCKBLOX_OFF (BUTTON_BACK|BUTTON_REPEAT) | ||
434 | #define ROCKBLOX_ROTATE_CCW BUTTON_POWER | ||
435 | #define ROCKBLOX_ROTATE_CW BUTTON_UP | ||
436 | #define ROCKBLOX_DOWN BUTTON_DOWN | ||
437 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
438 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
439 | #define ROCKBLOX_DROP BUTTON_PLAY | ||
440 | #define ROCKBLOX_RESTART BUTTON_BACK | ||
441 | |||
432 | #else | 442 | #else |
433 | #error No keymap defined! | 443 | #error No keymap defined! |
434 | #endif | 444 | #endif |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index ba70d77627..ec6a7d85f8 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -378,6 +378,19 @@ static void setoptions (void) | |||
378 | options.SELECT = BUTTON_SELECT; | 378 | options.SELECT = BUTTON_SELECT; |
379 | options.MENU = BUTTON_POWER; | 379 | options.MENU = BUTTON_POWER; |
380 | 380 | ||
381 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
382 | options.UP = BUTTON_UP; | ||
383 | options.DOWN = BUTTON_DOWN; | ||
384 | options.LEFT = BUTTON_LEFT; | ||
385 | options.RIGHT = BUTTON_RIGHT; | ||
386 | |||
387 | options.START = BUTTON_PLAY; | ||
388 | options.MENU = BUTTON_BACK; | ||
389 | options.SELECT = (BUTTON_POWER|BUTTON_PLAY); | ||
390 | options.A = (BUTTON_POWER|BUTTON_LEFT); | ||
391 | options.B = (BUTTON_POWER|BUTTON_RIGHT); | ||
392 | |||
393 | |||
381 | #else | 394 | #else |
382 | #error No Keymap Defined! | 395 | #error No Keymap Defined! |
383 | #endif | 396 | #endif |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index ce1b911e43..ab384e7644 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -288,6 +288,17 @@ | |||
288 | #define ROCKPAINT_LEFT BUTTON_LEFT | 288 | #define ROCKPAINT_LEFT BUTTON_LEFT |
289 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 289 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
290 | 290 | ||
291 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
292 | #define ROCKPAINT_QUIT (BUTTON_BACK|BUTTON_REPEAT) | ||
293 | #define ROCKPAINT_DRAW BUTTON_PLAY | ||
294 | #define ROCKPAINT_MENU BUTTON_BACK | ||
295 | #define ROCKPAINT_UP BUTTON_UP | ||
296 | #define ROCKPAINT_DOWN BUTTON_DOWN | ||
297 | #define ROCKPAINT_LEFT BUTTON_LEFT | ||
298 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | ||
299 | #define ROCKPAINT_TOOLBAR BUTTON_POWER | ||
300 | #define ROCKPAINT_TOOLBAR2 (BUTTON_POWER|BUTTON_REPEAT) | ||
301 | |||
291 | #else | 302 | #else |
292 | #error "Please define keys for this keypad" | 303 | #error "Please define keys for this keypad" |
293 | #endif | 304 | #endif |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 53c64525ba..ad8eeb70ae 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -292,6 +292,15 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
292 | #define PUZZLE_SHUFFLE BUTTON_SELECT | 292 | #define PUZZLE_SHUFFLE BUTTON_SELECT |
293 | #define PUZZLE_PICTURE BUTTON_PLAY | 293 | #define PUZZLE_PICTURE BUTTON_PLAY |
294 | 294 | ||
295 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
296 | #define PUZZLE_QUIT BUTTON_BACK | ||
297 | #define PUZZLE_LEFT BUTTON_LEFT | ||
298 | #define PUZZLE_RIGHT BUTTON_RIGHT | ||
299 | #define PUZZLE_UP BUTTON_UP | ||
300 | #define PUZZLE_DOWN BUTTON_DOWN | ||
301 | #define PUZZLE_SHUFFLE BUTTON_POWER | ||
302 | #define PUZZLE_PICTURE BUTTON_PLAY | ||
303 | |||
295 | #else | 304 | #else |
296 | #error No keymap defined! | 305 | #error No keymap defined! |
297 | #endif | 306 | #endif |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index e662a3b2e7..eb1fb25b0d 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -253,6 +253,14 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
253 | #define SNAKE_DOWN BUTTON_DOWN | 253 | #define SNAKE_DOWN BUTTON_DOWN |
254 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | 254 | #define SNAKE_PLAYPAUSE BUTTON_SELECT |
255 | 255 | ||
256 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
257 | #define SNAKE_QUIT BUTTON_BACK | ||
258 | #define SNAKE_LEFT BUTTON_LEFT | ||
259 | #define SNAKE_RIGHT BUTTON_RIGHT | ||
260 | #define SNAKE_UP BUTTON_UP | ||
261 | #define SNAKE_DOWN BUTTON_DOWN | ||
262 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | ||
263 | |||
256 | #else | 264 | #else |
257 | #error No keymap defined! | 265 | #error No keymap defined! |
258 | #endif | 266 | #endif |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 54a2bc8709..e2f54f28c7 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -365,6 +365,16 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
365 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT | 365 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT |
366 | #define SNAKE2_PLAYPAUSE_TEXT "Select" | 366 | #define SNAKE2_PLAYPAUSE_TEXT "Select" |
367 | 367 | ||
368 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
369 | #define SNAKE2_LEFT BUTTON_LEFT | ||
370 | #define SNAKE2_RIGHT BUTTON_RIGHT | ||
371 | #define SNAKE2_UP BUTTON_UP | ||
372 | #define SNAKE2_DOWN BUTTON_DOWN | ||
373 | #define SNAKE2_QUIT BUTTON_BACK | ||
374 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY | ||
375 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | ||
376 | |||
377 | |||
368 | #else | 378 | #else |
369 | #error No keymap defined! | 379 | #error No keymap defined! |
370 | #endif | 380 | #endif |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index a3d760d5cd..9a7d6572cc 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -392,6 +392,18 @@ | |||
392 | #define BUTTON_SAVE BUTTON_PLAY | 392 | #define BUTTON_SAVE BUTTON_PLAY |
393 | #define BUTTON_SAVE_NAME "PLAY" | 393 | #define BUTTON_SAVE_NAME "PLAY" |
394 | 394 | ||
395 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
396 | #define SOKOBAN_LEFT BUTTON_LEFT | ||
397 | #define SOKOBAN_RIGHT BUTTON_RIGHT | ||
398 | #define SOKOBAN_UP BUTTON_UP | ||
399 | #define SOKOBAN_DOWN BUTTON_DOWN | ||
400 | #define SOKOBAN_MENU BUTTON_POWER | ||
401 | #define SOKOBAN_UNDO BUTTON_BACK | ||
402 | #define SOKOBAN_REDO BUTTON_NONE | ||
403 | #define SOKOBAN_PAUSE BUTTON_PLAY | ||
404 | #define BUTTON_SAVE BUTTON_PLAY | ||
405 | #define BUTTON_SAVE_NAME "Play" | ||
406 | |||
395 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 407 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
396 | #define SOKOBAN_LEFT BUTTON_LEFT | 408 | #define SOKOBAN_LEFT BUTTON_LEFT |
397 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 409 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 0a1dc36cf5..d97ae082a7 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -617,6 +617,23 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
617 | # define HK_CUR2STACK "POWER + LEFT" | 617 | # define HK_CUR2STACK "POWER + LEFT" |
618 | # define HK_REM2STACK "POWER + RIGHT" | 618 | # define HK_REM2STACK "POWER + RIGHT" |
619 | 619 | ||
620 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
621 | #define SOL_QUIT BUTTON_BACK | ||
622 | #define SOL_UP BUTTON_UP | ||
623 | #define SOL_DOWN BUTTON_DOWN | ||
624 | #define SOL_LEFT BUTTON_LEFT | ||
625 | #define SOL_RIGHT BUTTON_RIGHT | ||
626 | #define SOL_MOVE BUTTON_PLAY | ||
627 | #define SOL_DRAW (BUTTON_POWER|BUTTON_UP) | ||
628 | #define SOL_REM2CUR (BUTTON_POWER|BUTTON_DOWN) | ||
629 | #define SOL_CUR2STACK (BUTTON_POWER|BUTTON_LEFT) | ||
630 | #define SOL_REM2STACK (BUTTON_POWER|BUTTON_RIGHT) | ||
631 | #define HK_MOVE "Play" | ||
632 | #define HK_DRAW "Option+Up" | ||
633 | #define HK_REM2CUR "Option+Down" | ||
634 | #define HK_CUR2STACK "Option+Left" | ||
635 | #define HK_REM2STACK "Option+Right" | ||
636 | |||
620 | #else | 637 | #else |
621 | #error No keymap defined! | 638 | #error No keymap defined! |
622 | #endif | 639 | #endif |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index bc67e4d6d6..5f40589be8 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -315,6 +315,15 @@ | |||
315 | #define AST_RIGHT BUTTON_RIGHT | 315 | #define AST_RIGHT BUTTON_RIGHT |
316 | #define AST_FIRE BUTTON_SELECT | 316 | #define AST_FIRE BUTTON_SELECT |
317 | 317 | ||
318 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
319 | #define AST_PAUSE BUTTON_POWER | ||
320 | #define AST_QUIT BUTTON_BACK | ||
321 | #define AST_THRUST BUTTON_UP | ||
322 | #define AST_HYPERSPACE BUTTON_DOWN | ||
323 | #define AST_LEFT BUTTON_LEFT | ||
324 | #define AST_RIGHT BUTTON_RIGHT | ||
325 | #define AST_FIRE BUTTON_PLAY | ||
326 | |||
318 | #else | 327 | #else |
319 | #error No keymap defined! | 328 | #error No keymap defined! |
320 | #endif | 329 | #endif |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index d74fc45e89..a7ef116d15 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -549,6 +549,22 @@ | |||
549 | #define STAR_LEVEL_DOWN_NAME "PREV" | 549 | #define STAR_LEVEL_DOWN_NAME "PREV" |
550 | #define STAR_LEVEL_REPEAT_NAME "PLAY" | 550 | #define STAR_LEVEL_REPEAT_NAME "PLAY" |
551 | 551 | ||
552 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
553 | #define STAR_QUIT BUTTON_BACK | ||
554 | #define STAR_LEFT BUTTON_LEFT | ||
555 | #define STAR_RIGHT BUTTON_RIGHT | ||
556 | #define STAR_UP BUTTON_UP | ||
557 | #define STAR_DOWN BUTTON_DOWN | ||
558 | #define STAR_TOGGLE_CONTROL BUTTON_PLAY | ||
559 | #define STAR_LEVEL_UP (BUTTON_POWER|BUTTON_UP) | ||
560 | #define STAR_LEVEL_DOWN (BUTTON_POWER|BUTTON_DOWN) | ||
561 | #define STAR_LEVEL_REPEAT (BUTTON_POWER|BUTTON_PLAY) | ||
562 | #define STAR_LEVEL_UP_NAME "Option+Up" | ||
563 | #define STAR_LEVEL_DOWN_NAME "Option+Down" | ||
564 | #define STAR_LEVEL_REPEAT_NAME "Option+Play" | ||
565 | #define STAR_TOGGLE_CONTROL_NAME "Play" | ||
566 | #define STAR_QUIT_NAME "Back" | ||
567 | |||
552 | #else | 568 | #else |
553 | #error No keymap defined! | 569 | #error No keymap defined! |
554 | #endif | 570 | #endif |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index e83fd5d42d..bc0aca8ff5 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -289,6 +289,14 @@ | |||
289 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 289 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
290 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 290 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
291 | 291 | ||
292 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
293 | #define STOPWATCH_QUIT BUTTON_POWER | ||
294 | #define STOPWATCH_START_STOP BUTTON_PLAY | ||
295 | #define STOPWATCH_RESET_TIMER BUTTON_BACK | ||
296 | #define STOPWATCH_LAP_TIMER BUTTON_RIGHT | ||
297 | #define STOPWATCH_SCROLL_UP BUTTON_UP | ||
298 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | ||
299 | |||
292 | #else | 300 | #else |
293 | #error No keymap defined! | 301 | #error No keymap defined! |
294 | #endif | 302 | #endif |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index dc29594223..ba476b4b55 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -380,6 +380,16 @@ | |||
380 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT) | 380 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT) |
381 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT | 381 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT |
382 | 382 | ||
383 | |||
384 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
385 | #define SUDOKU_BUTTON_MENU BUTTON_BACK | ||
386 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
387 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
388 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
389 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
390 | #define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY | ||
391 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_POWER | ||
392 | |||
383 | #else | 393 | #else |
384 | #error No keymap defined! | 394 | #error No keymap defined! |
385 | #endif | 395 | #endif |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 5e1479cd3b..1f62b3cde7 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -198,6 +198,14 @@ char buf[255]; | |||
198 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 198 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
199 | #define SUPERDOM_CANCEL BUTTON_BACK | 199 | #define SUPERDOM_CANCEL BUTTON_BACK |
200 | 200 | ||
201 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
202 | #define SUPERDOM_OK BUTTON_PLAY | ||
203 | #define SUPERDOM_UP BUTTON_UP | ||
204 | #define SUPERDOM_DOWN BUTTON_DOWN | ||
205 | #define SUPERDOM_LEFT BUTTON_LEFT | ||
206 | #define SUPERDOM_RIGHT BUTTON_RIGHT | ||
207 | #define SUPERDOM_CANCEL BUTTON_BACK | ||
208 | |||
201 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 209 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
202 | #define SUPERDOM_OK BUTTON_SELECT | 210 | #define SUPERDOM_OK BUTTON_SELECT |
203 | #define SUPERDOM_UP BUTTON_UP | 211 | #define SUPERDOM_UP BUTTON_UP |
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index b63f8780ea..b1660c0840 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -486,6 +486,16 @@ | |||
486 | #define TV_AUTOSCROLL BUTTON_NEXT | 486 | #define TV_AUTOSCROLL BUTTON_NEXT |
487 | #define TV_BOOKMARK BUTTON_SELECT | 487 | #define TV_BOOKMARK BUTTON_SELECT |
488 | 488 | ||
489 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
490 | #define TV_QUIT (BUTTON_BACK|BUTTON_REPEAT) | ||
491 | #define TV_SCROLL_UP BUTTON_UP | ||
492 | #define TV_SCROLL_DOWN BUTTON_DOWN | ||
493 | #define TV_SCREEN_LEFT BUTTON_LEFT | ||
494 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | ||
495 | #define TV_MENU BUTTON_BACK | ||
496 | #define TV_AUTOSCROLL BUTTON_PLAY | ||
497 | #define TV_BOOKMARK BUTTON_POWER | ||
498 | |||
489 | #else | 499 | #else |
490 | #error No keymap defined! | 500 | #error No keymap defined! |
491 | #endif | 501 | #endif |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 06fc137754..5fd5003085 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -373,6 +373,17 @@ | |||
373 | #define LABEL_MENU "LEFT" | 373 | #define LABEL_MENU "LEFT" |
374 | #define LABEL_VOLUME "UP/DOWN" | 374 | #define LABEL_VOLUME "UP/DOWN" |
375 | 375 | ||
376 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
377 | #define VUMETER_QUIT BUTTON_BACK | ||
378 | #define VUMETER_HELP BUTTON_RIGHT | ||
379 | #define VUMETER_MENU BUTTON_LEFT | ||
380 | #define VUMETER_UP BUTTON_UP | ||
381 | #define VUMETER_DOWN BUTTON_DOWN | ||
382 | #define LABEL_HELP "Right" | ||
383 | #define LABEL_QUIT "Back" | ||
384 | #define LABEL_MENU "Left" | ||
385 | #define LABEL_VOLUME "Up/Down" | ||
386 | |||
376 | #else | 387 | #else |
377 | #error No keymap defined! | 388 | #error No keymap defined! |
378 | #endif | 389 | #endif |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 8f4c7ab5ac..d7cb6fbba2 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -352,6 +352,15 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
352 | #define BTN_QUIT BUTTON_POWER | 352 | #define BTN_QUIT BUTTON_POWER |
353 | #define BTN_STOPRESET BUTTON_PLAY | 353 | #define BTN_STOPRESET BUTTON_PLAY |
354 | 354 | ||
355 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
356 | #define BTN_DIR_UP BUTTON_UP | ||
357 | #define BTN_DIR_DOWN BUTTON_DOWN | ||
358 | #define BTN_DIR_LEFT BUTTON_LEFT | ||
359 | #define BTN_DIR_RIGHT BUTTON_RIGHT | ||
360 | #define BTN_STARTPAUSE BUTTON_PLAY | ||
361 | #define BTN_QUIT BUTTON_BACK | ||
362 | #define BTN_STOPRESET BUTTON_POWER | ||
363 | |||
355 | #else | 364 | #else |
356 | #error No keymap defined! | 365 | #error No keymap defined! |
357 | #endif | 366 | #endif |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 7b2189762e..8c6988e0f9 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -306,6 +306,14 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
306 | #define DOWN BUTTON_DOWN | 306 | #define DOWN BUTTON_DOWN |
307 | #define PAUSE BUTTON_SELECT | 307 | #define PAUSE BUTTON_SELECT |
308 | 308 | ||
309 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | ||
310 | #define QUIT BUTTON_BACK | ||
311 | #define LEFT BUTTON_LEFT | ||
312 | #define RIGHT BUTTON_RIGHT | ||
313 | #define UP BUTTON_UP | ||
314 | #define DOWN BUTTON_DOWN | ||
315 | #define PAUSE BUTTON_PLAY | ||
316 | |||
309 | #else | 317 | #else |
310 | #error No keymap defined! | 318 | #error No keymap defined! |
311 | #endif | 319 | #endif |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 659bcca40a..b14a296d42 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -246,6 +246,14 @@ | |||
246 | #define ZX_LEFT BUTTON_LEFT | 246 | #define ZX_LEFT BUTTON_LEFT |
247 | #define ZX_RIGHT BUTTON_RIGHT | 247 | #define ZX_RIGHT BUTTON_RIGHT |
248 | 248 | ||
249 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
250 | #define ZX_MENU BUTTON_POWER | ||
251 | #define ZX_UP BUTTON_UP | ||
252 | #define ZX_DOWN BUTTON_DOWN | ||
253 | #define ZX_LEFT BUTTON_LEFT | ||
254 | #define ZX_RIGHT BUTTON_RIGHT | ||
255 | #define ZX_SELECT BUTTON_PLAY | ||
256 | |||
249 | #else | 257 | #else |
250 | #error Keymap not defined! | 258 | #error Keymap not defined! |
251 | 259 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 62f593df37..b4b39d57da 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -254,6 +254,14 @@ | |||
254 | #define KBD_UP BUTTON_UP | 254 | #define KBD_UP BUTTON_UP |
255 | #define KBD_DOWN BUTTON_DOWN | 255 | #define KBD_DOWN BUTTON_DOWN |
256 | 256 | ||
257 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | ||
258 | #define KBD_SELECT BUTTON_PLAY | ||
259 | #define KBD_ABORT BUTTON_BACK | ||
260 | #define KBD_LEFT BUTTON_LEFT | ||
261 | #define KBD_RIGHT BUTTON_RIGHT | ||
262 | #define KBD_UP BUTTON_UP | ||
263 | #define KBD_DOWN BUTTON_DOWN | ||
264 | |||
257 | #endif | 265 | #endif |
258 | 266 | ||
259 | #ifdef HAVE_TOUCHSCREEN | 267 | #ifdef HAVE_TOUCHSCREEN |