diff -u -r rockbox/apps/plugins/battery_bench.c changed_rockbox/apps/plugins/battery_bench.c --- rockbox/apps/plugins/battery_bench.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/battery_bench.c 2009-03-31 13:18:28.000000000 +0200 @@ -98,14 +98,19 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define BATTERY_ON BUTTON_SELECT #define BATTERY_OFF BUTTON_POWER #define BATTERY_ON_TXT "SELECT - start" #define BATTERY_OFF_TXT "POWER" +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define BATTERY_ON BUTTON_SELECT +#define BATTERY_OFF BUTTON_HOME +#define BATTERY_ON_TXT "SELECT - start" +#define BATTERY_OFF_TXT "HOME" + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define BATTERY_ON BUTTON_PLAY diff -u -r rockbox/apps/plugins/beatbox/beatbox.c changed_rockbox/apps/plugins/beatbox/beatbox.c --- rockbox/apps/plugins/beatbox/beatbox.c 2009-03-31 09:16:24.000000000 +0200 +++ changed_rockbox/apps/plugins/beatbox/beatbox.c 2009-03-31 13:45:09.000000000 +0200 @@ -64,11 +64,18 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) +(CONFIG_KEYPAD == SANSA_M200_PAD) #define BTN_QUIT BUTTON_POWER #define BTN_RIGHT BUTTON_RIGHT #define BTN_UP BUTTON_UP #define BTN_DOWN BUTTON_DOWN +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ +(CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define BTN_QUIT BUTTON_HOME +#define BTN_RIGHT BUTTON_RIGHT +#define BTN_UP BUTTON_UP +#define BTN_DOWN BUTTON_DOWN #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define BTN_QUIT BUTTON_POWER @@ -85,7 +92,6 @@ #endif - #define FRACTSIZE 10 #ifndef SIMULATOR diff -u -r rockbox/apps/plugins/blackjack.c changed_rockbox/apps/plugins/blackjack.c --- rockbox/apps/plugins/blackjack.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/blackjack.c 2009-03-31 14:07:55.000000000 +0200 @@ -177,7 +177,7 @@ #elif CONFIG_KEYPAD == SANSA_FUZE_PAD #define BJACK_START BUTTON_SELECT -#define BJACK_QUIT BUTTON_POWER +#define BJACK_QUIT BUTTON_HOME #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) #define BJACK_MIN (BUTTON_SELECT|BUTTON_DOWN) #define BJACK_HIT (BUTTON_SELECT|BUTTON_REL) @@ -190,7 +190,6 @@ #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT - #elif CONFIG_KEYPAD == SANSA_C200_PAD #define BJACK_START BUTTON_SELECT #define BJACK_QUIT BUTTON_POWER @@ -208,13 +207,13 @@ #elif CONFIG_KEYPAD == SANSA_CLIP_PAD #define BJACK_START BUTTON_SELECT -#define BJACK_QUIT BUTTON_POWER +#define BJACK_QUIT BUTTON_HOME #define BJACK_MAX BUTTON_VOL_UP #define BJACK_MIN BUTTON_VOL_DOWN #define BJACK_HIT BUTTON_SELECT #define BJACK_STAY BUTTON_RIGHT #define BJACK_DOUBLEDOWN BUTTON_LEFT -#define BJACK_SCORES BUTTON_HOME +#define BJACK_SCORES (BUTTON_SELECT | BUTTON_UP) #define BJACK_RESUME BUTTON_DOWN #define BJACK_UP BUTTON_UP #define BJACK_DOWN BUTTON_DOWN diff -u -r rockbox/apps/plugins/bounce.c changed_rockbox/apps/plugins/bounce.c --- rockbox/apps/plugins/bounce.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/bounce.c 2009-03-31 13:13:59.000000000 +0200 @@ -21,6 +21,7 @@ #include "plugin.h" #include "time.h" #include "lib/fixedpoint.h" +#include "lib/pluginlib_actions.h" PLUGIN_HEADER @@ -30,163 +31,13 @@ #define XSPEED 3 #define YADD -4 -/* variable button definitions */ -#if CONFIG_KEYPAD == RECORDER_PAD -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) -#define BOUNCE_MODE (BUTTON_ON | BUTTON_REL) - -#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) -#define BOUNCE_MODE (BUTTON_ON | BUTTON_REL) - -#elif CONFIG_KEYPAD == ONDIO_PAD -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) -#define BOUNCE_MODE (BUTTON_MENU | BUTTON_REL) - -#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ - (CONFIG_KEYPAD == IRIVER_H300_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) -#define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) - -#define BOUNCE_RC_QUIT (BUTTON_RC_STOP | BUTTON_REL) - -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IPOD_3G_PAD) || \ - (CONFIG_KEYPAD == IPOD_1G2G_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_SCROLL_BACK -#define BOUNCE_DOWN BUTTON_SCROLL_FWD -#define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) -#define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) - -#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_PLAY - -#elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_A - -#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_SCROLL_BACK -#define BOUNCE_DOWN BUTTON_SCROLL_FWD -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_SELECT - -#elif CONFIG_KEYPAD == SANSA_C200_PAD || \ - CONFIG_KEYPAD == SANSA_CLIP_PAD || \ - CONFIG_KEYPAD == SANSA_M200_PAD -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_SELECT - -#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_SCROLL_UP -#define BOUNCE_DOWN BUTTON_SCROLL_DOWN -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_PLAY - -#elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_BACK -#define BOUNCE_MODE BUTTON_MENU - -#elif (CONFIG_KEYPAD == MROBE100_PAD) -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_DISPLAY - -#elif CONFIG_KEYPAD == IAUDIO_M3_PAD -#define BOUNCE_LEFT BUTTON_RC_REW -#define BOUNCE_RIGHT BUTTON_RC_FF -#define BOUNCE_UP BUTTON_RC_VOL_UP -#define BOUNCE_DOWN BUTTON_RC_VOL_DOWN -#define BOUNCE_QUIT BUTTON_RC_REC -#define BOUNCE_MODE BUTTON_RC_MODE - -#elif (CONFIG_KEYPAD == COWOND2_PAD) -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_MENU - -#elif CONFIG_KEYPAD == CREATIVEZVM_PAD -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_BACK -#define BOUNCE_MODE BUTTON_MENU - -#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD -#define BOUNCE_LEFT BUTTON_LEFT -#define BOUNCE_RIGHT BUTTON_RIGHT -#define BOUNCE_UP BUTTON_UP -#define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_POWER -#define BOUNCE_MODE BUTTON_MENU - -#else -#error No keymap defined! -#endif - -#ifdef HAVE_TOUCHSCREEN -#ifndef BOUNCE_LEFT -#define BOUNCE_LEFT BUTTON_MIDLEFT -#endif -#ifndef BOUNCE_RIGHT -#define BOUNCE_RIGHT BUTTON_MIDRIGHT -#endif -#ifndef BOUNCE_UP -#define BOUNCE_UP BUTTON_TOPMIDDLE -#endif -#ifndef BOUNCE_DOWN -#define BOUNCE_DOWN BUTTON_BOTTOMMIDDLE -#endif -#ifndef BOUNCE_QUIT -#define BOUNCE_QUIT BUTTON_TOPLEFT -#endif -#ifndef BOUNCE_MODE -#define BOUNCE_MODE BUTTON_CENTER -#endif -#endif +#define MAZE_NEW PLA_START +#define BOUNCE_QUIT PLA_QUIT +#define BOUNCE_RIGHT PLA_RIGHT +#define BOUNCE_LEFT PLA_LEFT +#define BOUNCE_UP PLA_UP +#define BOUNCE_DOWN PLA_DOWN +#define BOUNCE_MODE PLA_FIRE #define LETTER_WIDTH 11 #define LETTER_HEIGHT 16 diff -u -r rockbox/apps/plugins/brickmania.c changed_rockbox/apps/plugins/brickmania.c --- rockbox/apps/plugins/brickmania.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/brickmania.c 2009-03-31 13:01:59.000000000 +0200 @@ -27,19 +27,16 @@ #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) - #define QUIT BUTTON_OFF #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define SELECT BUTTON_SELECT #define UP BUTTON_UP #define DOWN BUTTON_DOWN - #define RC_QUIT BUTTON_RC_STOP #elif CONFIG_KEYPAD == ONDIO_PAD - #define QUIT BUTTON_OFF #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -47,9 +44,7 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN - #elif CONFIG_KEYPAD == RECORDER_PAD - #define QUIT BUTTON_OFF #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -57,9 +52,7 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN - #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD - #define QUIT BUTTON_OFF #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -67,24 +60,19 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN - #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) - #define QUIT BUTTON_MENU #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define SELECT BUTTON_SELECT #define UP BUTTON_SCROLL_BACK #define DOWN BUTTON_SCROLL_FWD - #define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD) #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) - #elif (CONFIG_KEYPAD == GIGABEAT_PAD) - #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -92,9 +80,7 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN - #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD - #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -102,25 +88,28 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN - -#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) - +#elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define SELECT BUTTON_SELECT #define UP BUTTON_SCROLL_BACK #define DOWN BUTTON_SCROLL_FWD - #define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD) #define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define QUIT BUTTON_HOME +#define LEFT BUTTON_LEFT +#define RIGHT BUTTON_RIGHT +#define SELECT BUTTON_SELECT +#define UP BUTTON_SCROLL_BACK +#define DOWN BUTTON_SCROLL_FWD +#define SCROLL_FWD(x) ((x) & BUTTON_SCROLL_FWD) +#define SCROLL_BACK(x) ((x) & BUTTON_SCROLL_BACK) -#elif CONFIG_KEYPAD == SANSA_C200_PAD || \ -CONFIG_KEYPAD == SANSA_CLIP_PAD || \ -CONFIG_KEYPAD == SANSA_M200_PAD - +#elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ +(CONFIG_KEYPAD == SANSA_M200_PAD) #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -130,9 +119,17 @@ #define UP BUTTON_UP #define DOWN BUTTON_DOWN +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD +#define QUIT BUTTON_HOME +#define LEFT BUTTON_LEFT +#define RIGHT BUTTON_RIGHT +#define ALTLEFT BUTTON_VOL_DOWN +#define ALTRIGHT BUTTON_VOL_UP +#define SELECT BUTTON_SELECT +#define UP BUTTON_UP +#define DOWN BUTTON_DOWN #elif CONFIG_KEYPAD == IRIVER_H10_PAD - #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -141,7 +138,6 @@ #define DOWN BUTTON_SCROLL_DOWN #elif CONFIG_KEYPAD == GIGABEAT_S_PAD - #define QUIT BUTTON_BACK #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -150,7 +146,6 @@ #define DOWN BUTTON_DOWN #elif (CONFIG_KEYPAD == MROBE100_PAD) - #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -159,21 +154,18 @@ #define DOWN BUTTON_DOWN #elif CONFIG_KEYPAD == IAUDIO_M3_PAD - #define QUIT BUTTON_RC_REC #define LEFT BUTTON_RC_REW #define RIGHT BUTTON_RC_FF #define SELECT BUTTON_RC_PLAY #define UP BUTTON_RC_VOL_UP #define DOWN BUTTON_RC_VOL_DOWN - #define RC_QUIT BUTTON_REC #elif CONFIG_KEYPAD == COWOND2_PAD #define QUIT BUTTON_POWER #elif CONFIG_KEYPAD == CREATIVEZVM_PAD - #define QUIT BUTTON_BACK #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT @@ -182,7 +174,6 @@ #define DOWN BUTTON_DOWN #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD - #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT diff -u -r rockbox/apps/plugins/calculator.c changed_rockbox/apps/plugins/calculator.c --- rockbox/apps/plugins/calculator.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/calculator.c 2009-03-31 12:57:56.000000000 +0200 @@ -192,41 +192,45 @@ #define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_A -#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ - (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK +#define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD +#define CALCULATOR_QUIT BUTTON_HOME +#define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT +#define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) +#define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) +#define CALCULATOR_CLEAR (BUTTON_SELECT|BUTTON_UP) + +#elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN -#if defined(HAVE_SCROLLWHEEL) -/* c200 does not have a scroll wheel */ #define CALCULATOR_UP_W_SHIFT BUTTON_SCROLL_BACK #define CALCULATOR_DOWN_W_SHIFT BUTTON_SCROLL_FWD -#endif #define CALCULATOR_QUIT BUTTON_POWER #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) -#if (CONFIG_KEYPAD == SANSA_E200_PAD) #define CALCULATOR_CLEAR BUTTON_REC -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define CALCULATOR_CLEAR BUTTON_HOME -#endif - #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) #define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN -#define CALCULATOR_QUIT BUTTON_POWER +#define CALCULATOR_QUIT BUTTON_HOME #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT #define CALCULATOR_INPUT (BUTTON_SELECT|BUTTON_REL) #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) -#define CALCULATOR_CLEAR BUTTON_HOME +#define CALCULATOR_CLEAR (BUTTON_SELECT|BUTTON_UP) -#elif (CONFIG_KEYPAD == SANSA_M200_PAD) +#elif (CONFIG_KEYPAD == SANSA_M200_PAD) || \ +(CONFIG_KEYPAD == SANSA_C200_PAD) #define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP diff -u -r rockbox/apps/plugins/calendar.c changed_rockbox/apps/plugins/calendar.c --- rockbox/apps/plugins/calendar.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/calendar.c 2009-03-31 12:53:12.000000000 +0200 @@ -90,8 +90,7 @@ #define CALENDAR_NEXT_MONTH BUTTON_VOL_DOWN #define CALENDAR_PREV_MONTH BUTTON_VOL_UP -#elif CONFIG_KEYPAD == SANSA_E200_PAD || \ - CONFIG_KEYPAD == SANSA_FUZE_PAD +#elif CONFIG_KEYPAD == SANSA_E200_PAD #define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_SELECT BUTTON_SELECT #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD @@ -101,8 +100,17 @@ #define CALENDAR_NEXT_MONTH BUTTON_DOWN #define CALENDAR_PREV_MONTH BUTTON_UP +#elif CONFIG_KEYPAD == SANSA_FUZE_PAD +#define CALENDAR_QUIT BUTTON_HOME +#define CALENDAR_SELECT BUTTON_SELECT +#define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD +#define CALENDAR_PREV_WEEK BUTTON_SCROLL_BACK +#define CALENDAR_NEXT_DAY BUTTON_RIGHT +#define CALENDAR_PREV_DAY BUTTON_LEFT +#define CALENDAR_NEXT_MONTH BUTTON_DOWN +#define CALENDAR_PREV_MONTH BUTTON_UP + #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ -CONFIG_KEYPAD == SANSA_CLIP_PAD || \ CONFIG_KEYPAD == SANSA_M200_PAD #define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_SELECT BUTTON_SELECT @@ -113,6 +121,16 @@ #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD +#define CALENDAR_QUIT BUTTON_HOME +#define CALENDAR_SELECT BUTTON_SELECT +#define CALENDAR_NEXT_WEEK BUTTON_DOWN +#define CALENDAR_PREV_WEEK BUTTON_UP +#define CALENDAR_NEXT_DAY BUTTON_RIGHT +#define CALENDAR_PREV_DAY BUTTON_LEFT +#define CALENDAR_NEXT_MONTH BUTTON_VOL_UP +#define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_SELECT BUTTON_PLAY diff -u -r rockbox/apps/plugins/chessclock.c changed_rockbox/apps/plugins/chessclock.c --- rockbox/apps/plugins/chessclock.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/chessclock.c 2009-03-31 12:50:03.000000000 +0200 @@ -123,9 +123,7 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define CHC_QUIT BUTTON_POWER #define CHC_STARTSTOP BUTTON_SELECT #define CHC_RESET BUTTON_DOWN @@ -135,6 +133,17 @@ #define CHC_SETTINGS_OK BUTTON_SELECT #define CHC_SETTINGS_CANCEL BUTTON_POWER +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define CHC_QUIT BUTTON_HOME +#define CHC_STARTSTOP BUTTON_SELECT +#define CHC_RESET BUTTON_DOWN +#define CHC_MENU BUTTON_UP +#define CHC_SETTINGS_INC BUTTON_RIGHT +#define CHC_SETTINGS_DEC BUTTON_LEFT +#define CHC_SETTINGS_OK BUTTON_SELECT +#define CHC_SETTINGS_CANCEL BUTTON_POWER + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define CHC_QUIT BUTTON_POWER #define CHC_STARTSTOP BUTTON_PLAY diff -u -r rockbox/apps/plugins/chopper.c changed_rockbox/apps/plugins/chopper.c --- rockbox/apps/plugins/chopper.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/chopper.c 2009-03-31 12:48:59.000000000 +0200 @@ -69,13 +69,17 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define QUIT BUTTON_POWER #define ACTION BUTTON_SELECT #define ACTIONTEXT "SELECT" +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define QUIT BUTTON_HOME +#define ACTION BUTTON_SELECT +#define ACTIONTEXT "SELECT" + #elif CONFIG_KEYPAD == GIGABEAT_PAD #define QUIT BUTTON_MENU #define ACTION BUTTON_SELECT diff -u -r rockbox/apps/plugins/cube.c changed_rockbox/apps/plugins/cube.c --- rockbox/apps/plugins/cube.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/cube.c 2009-03-31 12:47:58.000000000 +0200 @@ -130,8 +130,7 @@ #define CUBE_PAUSE BUTTON_SELECT #define CUBE_HIGHSPEED BUTTON_A -#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define CUBE_QUIT BUTTON_POWER #define CUBE_NEXT BUTTON_RIGHT #define CUBE_PREV BUTTON_LEFT @@ -141,6 +140,16 @@ #define CUBE_PAUSE BUTTON_UP #define CUBE_HIGHSPEED BUTTON_SELECT +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define CUBE_QUIT BUTTON_HOME +#define CUBE_NEXT BUTTON_RIGHT +#define CUBE_PREV BUTTON_LEFT +#define CUBE_INC BUTTON_SCROLL_FWD +#define CUBE_DEC BUTTON_SCROLL_BACK +#define CUBE_MODE BUTTON_DOWN +#define CUBE_PAUSE BUTTON_UP +#define CUBE_HIGHSPEED BUTTON_SELECT + #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_M200_PAD) @@ -153,6 +162,15 @@ #define CUBE_PAUSE BUTTON_UP #define CUBE_HIGHSPEED BUTTON_SELECT +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ +#define CUBE_QUIT BUTTON_HOME +#define CUBE_NEXT BUTTON_RIGHT +#define CUBE_PREV BUTTON_LEFT +#define CUBE_INC BUTTON_VOL_UP +#define CUBE_DEC BUTTON_VOL_DOWN +#define CUBE_MODE BUTTON_DOWN +#define CUBE_PAUSE BUTTON_UP +#define CUBE_HIGHSPEED BUTTON_SELECT #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #define CUBE_QUIT BUTTON_POWER diff -u -r rockbox/apps/plugins/dict.c changed_rockbox/apps/plugins/dict.c --- rockbox/apps/plugins/dict.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/dict.c 2009-03-31 13:23:20.000000000 +0200 @@ -117,12 +117,11 @@ #define LP_QUIT BUTTON_POWER #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_M200_PAD) #define LP_QUIT BUTTON_POWER -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -/* TODO: #define LP_QUIT BUTTOM_HOME */ -#define LP_QUIT BUTTON_POWER +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ + (CONFIG_KEYPAD == SANSA_CLIP_PAD) +#define LP_QUIT BUTTON_HOME #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define LP_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == MROBE500_PAD diff -u -r rockbox/apps/plugins/fireworks.c changed_rockbox/apps/plugins/fireworks.c --- rockbox/apps/plugins/fireworks.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/fireworks.c 2009-03-31 12:45:01.000000000 +0200 @@ -73,8 +73,9 @@ #define BTN_MENU BUTTON_POWER #define BTN_FIRE BUTTON_SELECT -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define BTN_MENU BUTTON_DOWN +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ + (CONFIG_KEYPAD == SANSA_CLIP_PAD) +#define BTN_MENU BUTTON_HOME #define BTN_FIRE BUTTON_SELECT #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) diff -u -r rockbox/apps/plugins/flipit.c changed_rockbox/apps/plugins/flipit.c --- rockbox/apps/plugins/flipit.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/flipit.c 2009-03-31 12:43:52.000000000 +0200 @@ -152,7 +152,7 @@ #define FLIPIT_DOWN BUTTON_DOWN #define FLIPIT_NEXT BUTTON_SCROLL_FWD #define FLIPIT_PREV BUTTON_SCROLL_BACK -#define FLIPIT_QUIT (BUTTON_SELECT | BUTTON_UP) +#define FLIPIT_QUIT BUTTON_HOME #define FLIPIT_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) #define FLIPIT_SOLVE (BUTTON_SELECT | BUTTON_DOWN) #define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_RIGHT) @@ -177,11 +177,12 @@ #define FLIPIT_RIGHT BUTTON_RIGHT #define FLIPIT_UP BUTTON_UP #define FLIPIT_DOWN BUTTON_DOWN -#define FLIPIT_QUIT BUTTON_POWER -#define FLIPIT_SHUFFLE (BUTTON_HOME | BUTTON_LEFT) -#define FLIPIT_SOLVE (BUTTON_HOME | BUTTON_RIGHT) -#define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_SELECT) -#define FLIPIT_TOGGLE BUTTON_SELECT +#define FLIPIT_QUIT BUTTON_HOME +#define FLIPIT_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) +#define FLIPIT_SOLVE (BUTTON_SELECT | BUTTON_DOWN) +#define FLIPIT_STEP_BY_STEP (BUTTON_SELECT | BUTTON_RIGHT) +#define FLIPIT_TOGGLE_PRE BUTTON_SELECT +#define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) #elif CONFIG_KEYPAD == SANSA_M200_PAD diff -u -r rockbox/apps/plugins/goban/goban.h changed_rockbox/apps/plugins/goban/goban.h --- rockbox/apps/plugins/goban/goban.h 2009-03-31 09:16:20.000000000 +0200 +++ changed_rockbox/apps/plugins/goban/goban.h 2009-03-31 13:52:05.000000000 +0200 @@ -97,10 +97,10 @@ #define GBN_BUTTON_RIGHT BUTTON_RIGHT #define GBN_BUTTON_RETREAT BUTTON_SCROLL_BACK #define GBN_BUTTON_ADVANCE BUTTON_SCROLL_FWD -#define GBN_BUTTON_MENU BUTTON_POWER +#define GBN_BUTTON_MENU BUTTON_HOME #define GBN_BUTTON_PLAY BUTTON_SELECT | BUTTON_REL #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT -#define GBN_BUTTON_NEXT_VAR BUTTON_HOME +/* No next var */ #elif (CONFIG_KEYPAD == SANSA_C200_PAD) #define GBN_BUTTON_UP BUTTON_UP @@ -121,10 +121,10 @@ #define GBN_BUTTON_RIGHT BUTTON_RIGHT #define GBN_BUTTON_RETREAT BUTTON_VOL_DOWN #define GBN_BUTTON_ADVANCE BUTTON_VOL_UP -#define GBN_BUTTON_MENU BUTTON_POWER +#define GBN_BUTTON_MENU BUTTON_HOME #define GBN_BUTTON_PLAY BUTTON_SELECT | BUTTON_REL #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT -#define GBN_BUTTON_NEXT_VAR BUTTON_HOME +/* No next var */ #elif (CONFIG_KEYPAD == SANSA_M200_PAD) #define GBN_BUTTON_UP BUTTON_UP diff -u -r rockbox/apps/plugins/invadrox.c changed_rockbox/apps/plugins/invadrox.c --- rockbox/apps/plugins/invadrox.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/invadrox.c 2009-03-31 12:38:49.000000000 +0200 @@ -93,14 +93,20 @@ #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT -#elif CONFIG_KEYPAD == SANSA_E200_PAD || \ - CONFIG_KEYPAD == SANSA_FUZE_PAD +#elif CONFIG_KEYPAD == SANSA_E200_PAD #define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT +#elif CONFIG_KEYPAD == SANSA_FUZE_PAD + +#define QUIT BUTTON_HOME +#define LEFT BUTTON_LEFT +#define RIGHT BUTTON_RIGHT +#define FIRE BUTTON_SELECT + #elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD /* TODO: Figure out which buttons to use for Tatung Elio TPJ-1022 */ diff -u -r rockbox/apps/plugins/jewels.c changed_rockbox/apps/plugins/jewels.c --- rockbox/apps/plugins/jewels.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/jewels.c 2009-03-31 12:37:28.000000000 +0200 @@ -98,8 +98,7 @@ #define JEWELS_SELECT BUTTON_SELECT #define JEWELS_CANCEL BUTTON_POWER -#elif CONFIG_KEYPAD == SANSA_E200_PAD || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#elif CONFIG_KEYPAD == SANSA_E200_PAD #define JEWELS_SCROLLWHEEL #define JEWELS_UP BUTTON_UP #define JEWELS_DOWN BUTTON_DOWN @@ -110,6 +109,17 @@ #define JEWELS_SELECT BUTTON_SELECT #define JEWELS_CANCEL BUTTON_POWER +#elif CONFIG_KEYPAD == SANSA_FUZE_PAD +#define JEWELS_SCROLLWHEEL +#define JEWELS_UP BUTTON_UP +#define JEWELS_DOWN BUTTON_DOWN +#define JEWELS_LEFT BUTTON_LEFT +#define JEWELS_RIGHT BUTTON_RIGHT +#define JEWELS_PREV BUTTON_SCROLL_BACK +#define JEWELS_NEXT BUTTON_SCROLL_FWD +#define JEWELS_SELECT BUTTON_SELECT +#define JEWELS_CANCEL BUTTON_HOME + #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ CONFIG_KEYPAD == SANSA_CLIP_PAD || \ CONFIG_KEYPAD == SANSA_M200_PAD @@ -120,6 +130,14 @@ #define JEWELS_SELECT BUTTON_SELECT #define JEWELS_CANCEL BUTTON_POWER +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD +#define JEWELS_UP BUTTON_UP +#define JEWELS_DOWN BUTTON_DOWN +#define JEWELS_LEFT BUTTON_LEFT +#define JEWELS_RIGHT BUTTON_RIGHT +#define JEWELS_SELECT BUTTON_SELECT +#define JEWELS_CANCEL BUTTON_HOME + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define JEWELS_UP BUTTON_SCROLL_UP #define JEWELS_DOWN BUTTON_SCROLL_DOWN diff -u -r rockbox/apps/plugins/jpeg/jpeg.h changed_rockbox/apps/plugins/jpeg/jpeg.h --- rockbox/apps/plugins/jpeg/jpeg.h 2009-03-31 09:16:13.000000000 +0200 +++ changed_rockbox/apps/plugins/jpeg/jpeg.h 2009-03-31 13:37:24.000000000 +0200 @@ -141,7 +141,7 @@ #define JPEG_DOWN BUTTON_DOWN #define JPEG_LEFT BUTTON_LEFT #define JPEG_RIGHT BUTTON_RIGHT -#define JPEG_MENU BUTTON_POWER +#define JPEG_MENU BUTTON_HOME #define JPEG_NEXT BUTTON_SCROLL_FWD #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_FWD|BUTTON_REPEAT) #define JPEG_PREVIOUS BUTTON_SCROLL_BACK @@ -170,8 +170,7 @@ #define JPEG_DOWN BUTTON_DOWN #define JPEG_LEFT BUTTON_LEFT #define JPEG_RIGHT BUTTON_RIGHT -#define JPEG_MENU BUTTON_POWER -#define JPEG_SLIDE_SHOW BUTTON_HOME +#define JPEG_MENU BUTTON_HOME #define JPEG_NEXT BUTTON_VOL_UP #define JPEG_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT) #define JPEG_PREVIOUS BUTTON_VOL_DOWN diff -u -r rockbox/apps/plugins/lamp.c changed_rockbox/apps/plugins/lamp.c --- rockbox/apps/plugins/lamp.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/lamp.c 2009-03-31 12:35:07.000000000 +0200 @@ -58,7 +58,8 @@ # define LAMP_NEXT BUTTON_SCROLL_FWD # define LAMP_PREV BUTTON_SCROLL_BACK -#elif (CONFIG_KEYPAD == SANSA_C200_PAD) +#elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ +(CONFIG_KEYPAD == SANSA_CLIP_PAD) # define LAMP_LEFT BUTTON_LEFT # define LAMP_RIGHT BUTTON_RIGHT diff -u -r rockbox/apps/plugins/lib/pluginlib_actions.c changed_rockbox/apps/plugins/lib/pluginlib_actions.c --- rockbox/apps/plugins/lib/pluginlib_actions.c 2009-03-31 09:16:23.000000000 +0200 +++ changed_rockbox/apps/plugins/lib/pluginlib_actions.c 2009-03-31 10:28:47.000000000 +0200 @@ -372,13 +372,18 @@ {PLA_FIRE_REPEAT, BUTTON_ON|BUTTON_REPEAT, BUTTON_NONE}, #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ CONFIG_KEYPAD == SANSA_C200_PAD || \ - CONFIG_KEYPAD == SANSA_CLIP_PAD || \ - CONFIG_KEYPAD == SANSA_M200_PAD || \ - CONFIG_KEYPAD == SANSA_FUZE_PAD + CONFIG_KEYPAD == SANSA_M200_PAD {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, {PLA_START, BUTTON_UP, BUTTON_NONE}, {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, + {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD || \ + CONFIG_KEYPAD == SANSA_FUZE_PAD + {PLA_QUIT, BUTTON_HOME, BUTTON_NONE}, + {PLA_START, BUTTON_UP, BUTTON_NONE}, + {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, + {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, #elif CONFIG_KEYPAD == IRIVER_H10_PAD {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, diff -u -r rockbox/apps/plugins/logo.c changed_rockbox/apps/plugins/logo.c --- rockbox/apps/plugins/logo.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/logo.c 2009-03-31 12:33:19.000000000 +0200 @@ -97,15 +97,21 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define LP_QUIT BUTTON_POWER #define LP_DEC_X BUTTON_LEFT #define LP_INC_X BUTTON_RIGHT #define LP_DEC_Y BUTTON_DOWN #define LP_INC_Y BUTTON_UP +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define LP_QUIT BUTTON_HOME +#define LP_DEC_X BUTTON_LEFT +#define LP_INC_X BUTTON_RIGHT +#define LP_DEC_Y BUTTON_DOWN +#define LP_INC_Y BUTTON_UP + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define LP_QUIT BUTTON_POWER #define LP_DEC_X BUTTON_LEFT diff -u -r rockbox/apps/plugins/mandelbrot.c changed_rockbox/apps/plugins/mandelbrot.c --- rockbox/apps/plugins/mandelbrot.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/mandelbrot.c 2009-03-31 12:32:26.000000000 +0200 @@ -139,7 +139,7 @@ #define MANDELBROT_RESET BUTTON_REC #elif CONFIG_KEYPAD == SANSA_FUZE_PAD -#define MANDELBROT_QUIT BUTTON_POWER +#define MANDELBROT_QUIT BUTTON_HOME #define MANDELBROT_UP BUTTON_UP #define MANDELBROT_DOWN BUTTON_DOWN #define MANDELBROT_LEFT BUTTON_LEFT @@ -163,7 +163,7 @@ #define MANDELBROT_RESET BUTTON_REC #elif CONFIG_KEYPAD == SANSA_CLIP_PAD -#define MANDELBROT_QUIT BUTTON_POWER +#define MANDELBROT_QUIT BUTTON_HOME #define MANDELBROT_UP BUTTON_UP #define MANDELBROT_DOWN BUTTON_DOWN #define MANDELBROT_LEFT BUTTON_LEFT @@ -172,7 +172,7 @@ #define MANDELBROT_ZOOM_OUT BUTTON_VOL_DOWN #define MANDELBROT_MAXITER_INC (BUTTON_SELECT | BUTTON_RIGHT) #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) -#define MANDELBROT_RESET BUTTON_HOME +#define MANDELBROT_RESET (BUTTON_SELECT | BUTTON_REPEAT) #elif CONFIG_KEYPAD == SANSA_M200_PAD #define MANDELBROT_QUIT BUTTON_POWER diff -u -r rockbox/apps/plugins/matrix.c changed_rockbox/apps/plugins/matrix.c --- rockbox/apps/plugins/matrix.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/matrix.c 2009-03-31 12:31:21.000000000 +0200 @@ -89,11 +89,17 @@ #define MATRIX_PAUSE BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_FUZE_PAD -#define MATRIX_EXIT BUTTON_DOWN +#define MATRIX_EXIT BUTTON_HOME #define MATRIX_SLEEP_MORE BUTTON_SCROLL_BACK|BUTTON_REPEAT #define MATRIX_SLEEP_LESS BUTTON_SCROLL_FWD|BUTTON_REPEAT #define MATRIX_PAUSE BUTTON_SELECT +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD +#define MATRIX_EXIT BUTTON_HOME +#define MATRIX_SLEEP_MORE BUTTON_UP +#define MATRIX_SLEEP_LESS BUTTON_DOWN +#define MATRIX_PAUSE BUTTON_SELECT + #elif CONFIG_KEYPAD == SANSA_C200_PAD #define MATRIX_EXIT BUTTON_POWER #define MATRIX_SLEEP_MORE BUTTON_UP diff -u -r rockbox/apps/plugins/minesweeper.c changed_rockbox/apps/plugins/minesweeper.c --- rockbox/apps/plugins/minesweeper.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/minesweeper.c 2009-03-31 10:39:58.000000000 +0200 @@ -141,13 +141,14 @@ # define MINESWP_RIGHT BUTTON_RIGHT # define MINESWP_UP BUTTON_UP # define MINESWP_DOWN BUTTON_DOWN -# define MINESWP_QUIT BUTTON_POWER +# define MINESWP_QUIT BUTTON_HOME +# define MINESWP_NEXT BUTTON_SCROLL_FWD +# define MINESWP_PREV BUTTON_SCROLL_BACK # define MINESWP_TOGGLE BUTTON_SCROLL_FWD # define MINESWP_DISCOVER BUTTON_SELECT -# define MINESWP_INFO BUTTON_SCROLL_BACK +# define MINESWP_INFO (BUTTON_SELECT | BUTTON_UP) #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_M200_PAD) # define MINESWP_LEFT BUTTON_LEFT # define MINESWP_RIGHT BUTTON_RIGHT @@ -161,6 +162,19 @@ # define MINESWP_DISCOVER2 BUTTON_VOL_UP # define MINESWP_INFO (BUTTON_SELECT | BUTTON_UP) +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) +# define MINESWP_LEFT BUTTON_LEFT +# define MINESWP_RIGHT BUTTON_RIGHT +# define MINESWP_UP BUTTON_UP +# define MINESWP_DOWN BUTTON_DOWN +# define MINESWP_QUIT BUTTON_HOME +# define MINESWP_TOGGLE_PRE BUTTON_SELECT +# define MINESWP_TOGGLE (BUTTON_SELECT | BUTTON_REL) +# define MINESWP_TOGGLE2 BUTTON_VOL_DOWN +# define MINESWP_DISCOVER (BUTTON_SELECT | BUTTON_REPEAT) +# define MINESWP_DISCOVER2 BUTTON_VOL_UP +# define MINESWP_INFO (BUTTON_SELECT | BUTTON_UP) + #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) # define MINESWP_LEFT BUTTON_LEFT # define MINESWP_RIGHT BUTTON_RIGHT diff -u -r rockbox/apps/plugins/mosaique.c changed_rockbox/apps/plugins/mosaique.c --- rockbox/apps/plugins/mosaique.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/mosaique.c 2009-03-31 10:35:27.000000000 +0200 @@ -95,13 +95,17 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define MOSAIQUE_QUIT BUTTON_POWER #define MOSAIQUE_SPEED BUTTON_DOWN #define MOSAIQUE_RESTART BUTTON_SELECT +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define MOSAIQUE_QUIT BUTTON_HOME +#define MOSAIQUE_SPEED BUTTON_DOWN +#define MOSAIQUE_RESTART BUTTON_SELECT + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define MOSAIQUE_QUIT BUTTON_POWER #define MOSAIQUE_SPEED BUTTON_FF diff -u -r rockbox/apps/plugins/oscilloscope.c changed_rockbox/apps/plugins/oscilloscope.c --- rockbox/apps/plugins/oscilloscope.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/oscilloscope.c 2009-03-31 10:34:18.000000000 +0200 @@ -112,7 +112,7 @@ #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_BACK #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define OSCILLOSCOPE_QUIT BUTTON_DOWN +#define OSCILLOSCOPE_QUIT BUTTON_HOME #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) #define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT | BUTTON_LEFT) @@ -134,11 +134,11 @@ #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) -#define OSCILLOSCOPE_QUIT BUTTON_POWER -#define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT -#define OSCILLOSCOPE_ADVMODE BUTTON_DOWN -#define OSCILLOSCOPE_ORIENTATION BUTTON_UP -#define OSCILLOSCOPE_PAUSE BUTTON_HOME +#define OSCILLOSCOPE_QUIT BUTTON_HOME +#define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) +#define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT | BUTTON_RIGHT) +#define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT | BUTTON_LEFT) +#define OSCILLOSCOPE_PAUSE BUTTON_UP #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT #define OSCILLOSCOPE_VOL_UP BUTTON_VOL_UP diff -u -r rockbox/apps/plugins/pacbox/pacbox.h changed_rockbox/apps/plugins/pacbox/pacbox.h --- rockbox/apps/plugins/pacbox/pacbox.h 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/pacbox/pacbox.h 2009-03-31 13:35:21.000000000 +0200 @@ -121,7 +121,7 @@ #define PACMAN_1UP BUTTON_SELECT #define PACMAN_COIN_PRE BUTTON_SELECT #define PACMAN_COIN (BUTTON_SELECT | BUTTON_DOWN) -#define PACMAN_MENU BUTTON_POWER +#define PACMAN_MENU BUTTON_HOME #elif CONFIG_KEYPAD == IRIVER_H10_PAD diff -u -r rockbox/apps/plugins/pegbox.c changed_rockbox/apps/plugins/pegbox.c --- rockbox/apps/plugins/pegbox.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/pegbox.c 2009-03-31 10:32:28.000000000 +0200 @@ -194,9 +194,7 @@ #elif CONFIG_KEYPAD == SANSA_FUZE_PAD #define PEGBOX_SAVE BUTTON_SELECT|BUTTON_REL -#define PEGBOX_QUIT BUTTON_POWER -/* FIXME: -#define PEGBOX_RESTART BUTTON_HOME */ +#define PEGBOX_QUIT BUTTON_HOME #define PEGBOX_RESTART BUTTON_SELECT|BUTTON_LEFT #define PEGBOX_LVL_UP BUTTON_SCROLL_BACK #define PEGBOX_LVL_DOWN BUTTON_SCROLL_FWD @@ -206,7 +204,7 @@ #define PEGBOX_LEFT BUTTON_LEFT #define SAVE_TEXT "SELECT" -#define QUIT_TEXT "POWER" +#define QUIT_TEXT "HOME" #define RESTART_TEXT "SELECT & LEFT" #define LVL_UP_TEXT "SCROLL BACK" #define LVL_DOWN_TEXT "SCROLL FWD" @@ -274,15 +272,15 @@ #define PEGBOX_LEFT BUTTON_LEFT #define SAVE_TEXT "SELECT" -#define QUIT_TEXT "POWER" +#define QUIT_TEXT "HOME" #define RESTART_TEXT "REC" #define LVL_UP_TEXT "VOL+" #define LVL_DOWN_TEXT "VOL-" #elif CONFIG_KEYPAD == SANSA_CLIP_PAD #define PEGBOX_SAVE BUTTON_SELECT -#define PEGBOX_QUIT BUTTON_POWER -#define PEGBOX_RESTART BUTTON_HOME +#define PEGBOX_QUIT BUTTON_HOME +#define PEGBOX_RESTART BUTTON_SELECT|BUTTON_LEFT #define PEGBOX_LVL_UP BUTTON_VOL_UP #define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN #define PEGBOX_UP BUTTON_UP @@ -292,7 +290,7 @@ #define SAVE_TEXT "SELECT" #define QUIT_TEXT "POWER" -#define RESTART_TEXT "HOME" +#define RESTART_TEXT "SELECT & LEFT" #define LVL_UP_TEXT "VOL+" #define LVL_DOWN_TEXT "VOL-" diff -u -r rockbox/apps/plugins/plasma.c changed_rockbox/apps/plugins/plasma.c --- rockbox/apps/plugins/plasma.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/plasma.c 2009-03-31 10:23:44.000000000 +0200 @@ -68,13 +68,17 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define PLASMA_QUIT BUTTON_POWER #define PLASMA_INCREASE_FREQUENCY BUTTON_UP #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define PLASMA_QUIT BUTTON_HOME +#define PLASMA_INCREASE_FREQUENCY BUTTON_UP +#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN + #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) #define PLASMA_QUIT BUTTON_POWER #define PLASMA_INCREASE_FREQUENCY BUTTON_UP diff -u -r rockbox/apps/plugins/pong.c changed_rockbox/apps/plugins/pong.c --- rockbox/apps/plugins/pong.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/pong.c 2009-03-31 10:22:28.000000000 +0200 @@ -103,9 +103,7 @@ #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define PONG_QUIT BUTTON_POWER #define PONG_PAUSE BUTTON_SELECT #define PONG_LEFT_UP BUTTON_LEFT @@ -113,6 +111,15 @@ #define PONG_RIGHT_UP BUTTON_UP #define PONG_RIGHT_DOWN BUTTON_RIGHT +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define PONG_QUIT BUTTON_HOME +#define PONG_PAUSE BUTTON_SELECT +#define PONG_LEFT_UP BUTTON_LEFT +#define PONG_LEFT_DOWN BUTTON_DOWN +#define PONG_RIGHT_UP BUTTON_UP +#define PONG_RIGHT_DOWN BUTTON_RIGHT + #elif (CONFIG_KEYPAD == SANSA_C200_PAD) #define PONG_QUIT BUTTON_POWER #define PONG_PAUSE BUTTON_SELECT diff -u -r rockbox/apps/plugins/reversi/reversi-gui.h changed_rockbox/apps/plugins/reversi/reversi-gui.h --- rockbox/apps/plugins/reversi/reversi-gui.h 2009-03-31 09:16:24.000000000 +0200 +++ changed_rockbox/apps/plugins/reversi/reversi-gui.h 2009-03-31 13:34:46.000000000 +0200 @@ -108,9 +108,7 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ -(CONFIG_KEYPAD == SANSA_M200_PAD) || \ -(CONFIG_KEYPAD == SANSA_FUZE_PAD) +(CONFIG_KEYPAD == SANSA_M200_PAD) #define REVERSI_BUTTON_QUIT BUTTON_POWER #define REVERSI_BUTTON_UP BUTTON_UP #define REVERSI_BUTTON_DOWN BUTTON_DOWN @@ -119,6 +117,16 @@ #define REVERSI_BUTTON_MAKE_MOVE (BUTTON_SELECT|BUTTON_REL) #define REVERSI_BUTTON_MENU (BUTTON_SELECT|BUTTON_REPEAT) +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ +(CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define REVERSI_BUTTON_QUIT BUTTON_HOME +#define REVERSI_BUTTON_UP BUTTON_UP +#define REVERSI_BUTTON_DOWN BUTTON_DOWN +#define REVERSI_BUTTON_LEFT BUTTON_LEFT +#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT +#define REVERSI_BUTTON_MAKE_MOVE (BUTTON_SELECT|BUTTON_REL) +#define REVERSI_BUTTON_MENU (BUTTON_SELECT|BUTTON_REPEAT) + #elif CONFIG_KEYPAD == MROBE500_PAD #define REVERSI_QUIT BUTTON_POWER #define REVERSI_BUTTON_UP BUTTON_RC_PLAY diff -u -r rockbox/apps/plugins/robotfindskitten.c changed_rockbox/apps/plugins/robotfindskitten.c --- rockbox/apps/plugins/robotfindskitten.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/robotfindskitten.c 2009-03-31 10:20:37.000000000 +0200 @@ -483,9 +483,10 @@ # define RFK_RUP (BUTTON_MENU | BUTTON_REPEAT) # define RFK_RDOWN (BUTTON_PLAY | BUTTON_REPEAT) -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ +(CONFIG_KEYPAD == SANSA_CLIP_PAD) # undef __PLUGINLIB_ACTIONS_H__ -# define RFK_QUIT (BUTTON_SELECT | BUTTON_REPEAT) +# define RFK_QUIT BUTTON_HOME # define RFK_RIGHT BUTTON_RIGHT # define RFK_LEFT BUTTON_LEFT # define RFK_UP BUTTON_UP diff -u -r rockbox/apps/plugins/rockblox1d.c changed_rockbox/apps/plugins/rockblox1d.c --- rockbox/apps/plugins/rockblox1d.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/rockblox1d.c 2009-03-31 10:16:27.000000000 +0200 @@ -60,12 +60,15 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ CONFIG_KEYPAD == SANSA_C200_PAD || \ - CONFIG_KEYPAD == SANSA_CLIP_PAD || \ - CONFIG_KEYPAD == SANSA_M200_PAD || \ - CONFIG_KEYPAD == SANSA_FUZE_PAD + CONFIG_KEYPAD == SANSA_M200_PAD #define ONEDROCKBLOX_DOWN BUTTON_SELECT #define ONEDROCKBLOX_QUIT BUTTON_POWER +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD || \ + CONFIG_KEYPAD == SANSA_FUZE_PAD +#define ONEDROCKBLOX_DOWN BUTTON_SELECT +#define ONEDROCKBLOX_QUIT BUTTON_HOME + #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #define ONEDROCKBLOX_DOWN BUTTON_PLAY #define ONEDROCKBLOX_QUIT BUTTON_POWER diff -u -r rockbox/apps/plugins/rockblox.c changed_rockbox/apps/plugins/rockblox.c --- rockbox/apps/plugins/rockblox.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/rockblox.c 2009-03-31 10:17:51.000000000 +0200 @@ -124,7 +124,7 @@ #elif CONFIG_KEYPAD == SANSA_FUZE_PAD -#define ROCKBLOX_OFF BUTTON_POWER +#define ROCKBLOX_OFF BUTTON_HOME #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK #define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD @@ -132,7 +132,7 @@ #define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_DROP BUTTON_SELECT -#define ROCKBLOX_RESTART BUTTON_HOME +#define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_UP) #elif CONFIG_KEYPAD == SANSA_C200_PAD @@ -149,7 +149,7 @@ #elif CONFIG_KEYPAD == SANSA_CLIP_PAD -#define ROCKBLOX_OFF BUTTON_POWER +#define ROCKBLOX_OFF BUTTON_HOME #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP #define ROCKBLOX_ROTATE_RIGHT2 BUTTON_VOL_DOWN #define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP @@ -157,7 +157,7 @@ #define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_DROP BUTTON_SELECT -#define ROCKBLOX_RESTART BUTTON_HOME +#define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_UP) #elif CONFIG_KEYPAD == SANSA_M200_PAD diff -u -r rockbox/apps/plugins/rockboy/rockboy.c changed_rockbox/apps/plugins/rockboy/rockboy.c --- rockbox/apps/plugins/rockboy/rockboy.c 2009-03-31 09:16:24.000000000 +0200 +++ changed_rockbox/apps/plugins/rockboy/rockboy.c 2009-03-31 13:33:35.000000000 +0200 @@ -158,10 +158,10 @@ options.DOWN=BUTTON_DOWN; options.A=BUTTON_SELECT; - options.B=BUTTON_HOME; + options.B=BUTTON_LEFT; options.START=BUTTON_SCROLL_BACK; options.SELECT=BUTTON_SCROLL_FWD; - options.MENU=BUTTON_POWER; + options.MENU=BUTTON_HOME; #elif CONFIG_KEYPAD == SANSA_C200_PAD options.UP=BUTTON_UP; diff -u -r rockbox/apps/plugins/rockpaint.c changed_rockbox/apps/plugins/rockpaint.c --- rockbox/apps/plugins/rockpaint.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/rockpaint.c 2009-03-31 10:14:55.000000000 +0200 @@ -95,13 +95,11 @@ #define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_RIGHT BUTTON_RIGHT -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define ROCKPAINT_QUIT BUTTON_POWER +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ +(CONFIG_KEYPAD == SANSA_CLIP_PAD) +#define ROCKPAINT_QUIT BUTTON_HOME #define ROCKPAINT_DRAW BUTTON_SELECT #define ROCKPAINT_MENU ( BUTTON_SELECT | BUTTON_DOWN ) -/* FIXME: -#define ROCKPAINT_TOOLBAR BUTTON_HOME -#define ROCKPAINT_TOOLBAR2 ( BUTTON_HOME | BUTTON_LEFT ) */ #define ROCKPAINT_TOOLBAR ( BUTTON_SELECT | BUTTON_LEFT ) #define ROCKPAINT_TOOLBAR2 ( BUTTON_SELECT | BUTTON_RIGHT ) #define ROCKPAINT_UP BUTTON_UP diff -u -r rockbox/apps/plugins/sliding_puzzle.c changed_rockbox/apps/plugins/sliding_puzzle.c --- rockbox/apps/plugins/sliding_puzzle.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/sliding_puzzle.c 2009-03-31 10:13:06.000000000 +0200 @@ -103,26 +103,16 @@ #define PUZZLE_SHUFFLE BUTTON_REC #define PUZZLE_PICTURE BUTTON_SELECT -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define PUZZLE_QUIT BUTTON_POWER +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ +(CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define PUZZLE_QUIT BUTTON_HOME #define PUZZLE_LEFT BUTTON_LEFT #define PUZZLE_RIGHT BUTTON_RIGHT #define PUZZLE_UP BUTTON_UP #define PUZZLE_DOWN BUTTON_DOWN -/* FIXME: -#define PUZZLE_SHUFFLE BUTTON_HOME */ #define PUZZLE_SHUFFLE BUTTON_SELECT|BUTTON_DOWN #define PUZZLE_PICTURE BUTTON_SELECT -#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) -#define PUZZLE_QUIT BUTTON_POWER -#define PUZZLE_LEFT BUTTON_LEFT -#define PUZZLE_RIGHT BUTTON_RIGHT -#define PUZZLE_UP BUTTON_UP -#define PUZZLE_DOWN BUTTON_DOWN -#define PUZZLE_SHUFFLE BUTTON_HOME -#define PUZZLE_PICTURE BUTTON_SELECT - #elif (CONFIG_KEYPAD == SANSA_M200_PAD) #define PUZZLE_QUIT BUTTON_POWER #define PUZZLE_LEFT BUTTON_LEFT diff -u -r rockbox/apps/plugins/snake2.c changed_rockbox/apps/plugins/snake2.c --- rockbox/apps/plugins/snake2.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/snake2.c 2009-03-31 10:10:59.000000000 +0200 @@ -234,8 +234,7 @@ #define SNAKE2_PLAYPAUSE BUTTON_SELECT #define SNAKE2_PLAYPAUSE_TEXT "Select" -#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ -(CONFIG_KEYPAD == SANSA_M200_PAD) +#elif (CONFIG_KEYPAD == SANSA_M200_PAD) #define SNAKE2_LEFT BUTTON_LEFT #define SNAKE2_RIGHT BUTTON_RIGHT #define SNAKE2_UP BUTTON_UP @@ -249,12 +248,26 @@ #define SNAKE2_PLAYPAUSE BUTTON_SELECT #define SNAKE2_PLAYPAUSE_TEXT "Select" +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) +#define SNAKE2_LEFT BUTTON_LEFT +#define SNAKE2_RIGHT BUTTON_RIGHT +#define SNAKE2_UP BUTTON_UP +#define SNAKE2_DOWN BUTTON_DOWN +#define SNAKE2_QUIT BUTTON_HOME +#define SNAKE2_LEVEL_UP BUTTON_UP +#define SNAKE2_LEVEL_DOWN BUTTON_DOWN +#define SNAKE2_MAZE_NEXT BUTTON_RIGHT +#define SNAKE2_MAZE_LAST BUTTON_LEFT +#define SNAKE2_SELECT_TYPE BUTTON_VOL_UP +#define SNAKE2_PLAYPAUSE BUTTON_SELECT +#define SNAKE2_PLAYPAUSE_TEXT "Select" + #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) #define SNAKE2_LEFT BUTTON_LEFT #define SNAKE2_RIGHT BUTTON_RIGHT #define SNAKE2_UP BUTTON_UP #define SNAKE2_DOWN BUTTON_DOWN -#define SNAKE2_QUIT BUTTON_POWER +#define SNAKE2_QUIT BUTTON_HOME #define SNAKE2_LEVEL_UP BUTTON_UP #define SNAKE2_LEVEL_DOWN BUTTON_DOWN #define SNAKE2_MAZE_NEXT BUTTON_RIGHT diff -u -r rockbox/apps/plugins/snake.c changed_rockbox/apps/plugins/snake.c --- rockbox/apps/plugins/snake.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/snake.c 2009-03-31 10:11:53.000000000 +0200 @@ -101,9 +101,7 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define SNAKE_QUIT BUTTON_POWER #define SNAKE_LEFT BUTTON_LEFT #define SNAKE_RIGHT BUTTON_RIGHT @@ -111,6 +109,15 @@ #define SNAKE_DOWN BUTTON_DOWN #define SNAKE_PLAYPAUSE BUTTON_SELECT +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define SNAKE_QUIT BUTTON_HOME +#define SNAKE_LEFT BUTTON_LEFT +#define SNAKE_RIGHT BUTTON_RIGHT +#define SNAKE_UP BUTTON_UP +#define SNAKE_DOWN BUTTON_DOWN +#define SNAKE_PLAYPAUSE BUTTON_SELECT + #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #define SNAKE_QUIT BUTTON_POWER #define SNAKE_LEFT BUTTON_LEFT diff -u -r rockbox/apps/plugins/snow.c changed_rockbox/apps/plugins/snow.c --- rockbox/apps/plugins/snow.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/snow.c 2009-03-31 10:08:54.000000000 +0200 @@ -50,11 +50,11 @@ #define SNOW_QUIT BUTTON_POWER #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_M200_PAD) #define SNOW_QUIT BUTTON_POWER -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define SNOW_QUIT BUTTON_DOWN +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ +(CONFIG_KEYPAD == SANSA_CLIP_PAD) +#define SNOW_QUIT BUTTON_HOME #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define SNOW_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == MROBE500_PAD diff -u -r rockbox/apps/plugins/sokoban.c changed_rockbox/apps/plugins/sokoban.c --- rockbox/apps/plugins/sokoban.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/sokoban.c 2009-03-31 13:24:15.000000000 +0200 @@ -220,12 +220,13 @@ #define BUTTON_SAVE BUTTON_SELECT #define BUTTON_SAVE_NAME "SELECT" -#elif CONFIG_KEYPAD == SANSA_FUZE_PAD +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ +(CONFIG_KEYPAD == SANSA_CLIP_PAD) #define SOKOBAN_LEFT BUTTON_LEFT #define SOKOBAN_RIGHT BUTTON_RIGHT #define SOKOBAN_UP BUTTON_UP #define SOKOBAN_DOWN BUTTON_DOWN -#define SOKOBAN_MENU BUTTON_POWER +#define SOKOBAN_MENU BUTTON_HOME #define SOKOBAN_UNDO_PRE BUTTON_SELECT #define SOKOBAN_UNDO (BUTTON_SELECT | BUTTON_REL) #define SOKOBAN_REDO (BUTTON_SELECT | BUTTON_LEFT) @@ -252,22 +253,6 @@ #define BUTTON_SAVE BUTTON_SELECT #define BUTTON_SAVE_NAME "SELECT" -#elif CONFIG_KEYPAD == SANSA_CLIP_PAD -#define SOKOBAN_LEFT BUTTON_LEFT -#define SOKOBAN_RIGHT BUTTON_RIGHT -#define SOKOBAN_UP BUTTON_UP -#define SOKOBAN_DOWN BUTTON_DOWN -#define SOKOBAN_MENU BUTTON_POWER -#define SOKOBAN_UNDO_PRE BUTTON_SELECT -#define SOKOBAN_UNDO (BUTTON_SELECT | BUTTON_REL) -#define SOKOBAN_REDO BUTTON_HOME -#define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN -#define SOKOBAN_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_RIGHT) -#define SOKOBAN_LEVEL_UP BUTTON_VOL_UP -#define SOKOBAN_PAUSE BUTTON_SELECT -#define BUTTON_SAVE BUTTON_SELECT -#define BUTTON_SAVE_NAME "SELECT" - #elif CONFIG_KEYPAD == SANSA_M200_PAD #define SOKOBAN_LEFT BUTTON_LEFT #define SOKOBAN_RIGHT BUTTON_RIGHT diff -u -r rockbox/apps/plugins/star.c changed_rockbox/apps/plugins/star.c --- rockbox/apps/plugins/star.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/star.c 2009-03-31 09:56:55.000000000 +0200 @@ -162,11 +162,23 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ -(CONFIG_KEYPAD == SANSA_M200_PAD) || \ +(CONFIG_KEYPAD == SANSA_M200_PAD) + +#define STAR_QUIT BUTTON_POWER +#define STAR_LEFT BUTTON_LEFT +#define STAR_RIGHT BUTTON_RIGHT +#define STAR_UP BUTTON_UP +#define STAR_DOWN BUTTON_DOWN +#define STAR_TOGGLE_CONTROL BUTTON_SELECT +#define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) +#define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) +#define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) +#define STAR_MENU_RUN BUTTON_SELECT + +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define STAR_QUIT BUTTON_POWER +#define STAR_QUIT BUTTON_HOME #define STAR_LEFT BUTTON_LEFT #define STAR_RIGHT BUTTON_RIGHT #define STAR_UP BUTTON_UP diff -u -r rockbox/apps/plugins/starfield.c changed_rockbox/apps/plugins/starfield.c --- rockbox/apps/plugins/starfield.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/starfield.c 2009-03-31 09:56:12.000000000 +0200 @@ -63,9 +63,7 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ - (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ - (CONFIG_KEYPAD == SANSA_M200_PAD) || \ - (CONFIG_KEYPAD == SANSA_FUZE_PAD) + (CONFIG_KEYPAD == SANSA_M200_PAD) #define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_UP #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN @@ -73,6 +71,15 @@ #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ + (CONFIG_KEYPAD == SANSA_FUZE_PAD) +#define STARFIELD_QUIT BUTTON_HOME +#define STARFIELD_INCREASE_ZMOVE BUTTON_UP +#define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN +#define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT +#define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT +#define STARFIELD_TOGGLE_COLOR BUTTON_SELECT + #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) #define STARFIELD_QUIT BUTTON_BACK #define STARFIELD_INCREASE_ZMOVE BUTTON_UP diff -u -r rockbox/apps/plugins/stats.c changed_rockbox/apps/plugins/stats.c --- rockbox/apps/plugins/stats.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/stats.c 2009-03-31 09:53:13.000000000 +0200 @@ -56,14 +56,12 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_M200_PAD) #define STATS_STOP BUTTON_POWER -#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) -/* FIXME: -#define STATS_STOP BUTTON_HOME */ -#define STATS_STOP BUTTON_DOWN +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ +(CONFIG_KEYPAD == SANSA_CLIP_PAD) +#define STATS_STOP BUTTON_HOME #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define STATS_STOP BUTTON_POWER diff -u -r rockbox/apps/plugins/stopwatch.c changed_rockbox/apps/plugins/stopwatch.c --- rockbox/apps/plugins/stopwatch.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/stopwatch.c 2009-03-31 09:50:58.000000000 +0200 @@ -113,7 +113,6 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_M200_PAD) #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_RIGHT @@ -122,6 +121,14 @@ #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) +#define STOPWATCH_QUIT BUTTON_HOME +#define STOPWATCH_START_STOP BUTTON_RIGHT +#define STOPWATCH_RESET_TIMER BUTTON_LEFT +#define STOPWATCH_LAP_TIMER BUTTON_SELECT +#define STOPWATCH_SCROLL_UP BUTTON_UP +#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN + #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) #define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_RIGHT diff -u -r rockbox/apps/plugins/superdom.c changed_rockbox/apps/plugins/superdom.c --- rockbox/apps/plugins/superdom.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/superdom.c 2009-03-31 09:49:45.000000000 +0200 @@ -113,6 +113,14 @@ #define SUPERDOM_RIGHT BUTTON_RIGHT #define SUPERDOM_CANCEL BUTTON_POWER +#elif CONFIG_KEYPAD == SANSA_E200_PAD +#define SUPERDOM_OK BUTTON_SELECT +#define SUPERDOM_UP BUTTON_SCROLL_BACK +#define SUPERDOM_DOWN BUTTON_SCROLL_FWD +#define SUPERDOM_LEFT BUTTON_LEFT +#define SUPERDOM_RIGHT BUTTON_RIGHT +#define SUPERDOM_CANCEL BUTTON_POWER + #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ CONFIG_KEYPAD == SANSA_FUZE_PAD #define SUPERDOM_OK BUTTON_SELECT @@ -120,7 +128,15 @@ #define SUPERDOM_DOWN BUTTON_SCROLL_FWD #define SUPERDOM_LEFT BUTTON_LEFT #define SUPERDOM_RIGHT BUTTON_RIGHT -#define SUPERDOM_CANCEL BUTTON_POWER +#define SUPERDOM_CANCEL BUTTON_HOME + +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD +#define SUPERDOM_OK BUTTON_SELECT +#define SUPERDOM_UP BUTTON_UP +#define SUPERDOM_DOWN BUTTON_DOWN +#define SUPERDOM_LEFT BUTTON_LEFT +#define SUPERDOM_RIGHT BUTTON_RIGHT +#define SUPERDOM_CANCEL BUTTON_HOME #elif CONFIG_KEYPAD == GIGABEAT_S_PAD #define SUPERDOM_OK BUTTON_SELECT diff -u -r rockbox/apps/plugins/viewer.c changed_rockbox/apps/plugins/viewer.c --- rockbox/apps/plugins/viewer.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/viewer.c 2009-03-31 09:44:58.000000000 +0200 @@ -187,7 +187,7 @@ /* Sansa Fuze keys */ #elif CONFIG_KEYPAD == SANSA_FUZE_PAD -#define VIEWER_QUIT BUTTON_POWER +#define VIEWER_QUIT BUTTON_HOME #define VIEWER_PAGE_UP BUTTON_UP #define VIEWER_PAGE_DOWN BUTTON_DOWN #define VIEWER_SCREEN_LEFT BUTTON_LEFT @@ -211,13 +211,13 @@ /* Sansa Clip keys */ #elif CONFIG_KEYPAD == SANSA_CLIP_PAD -#define VIEWER_QUIT BUTTON_POWER +#define VIEWER_QUIT BUTTON_HOME #define VIEWER_PAGE_UP BUTTON_VOL_UP #define VIEWER_PAGE_DOWN BUTTON_VOL_DOWN #define VIEWER_SCREEN_LEFT BUTTON_LEFT #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT -#define VIEWER_MENU BUTTON_SELECT -#define VIEWER_AUTOSCROLL BUTTON_HOME +#define VIEWER_MENU BUTTON_SELECT|BUTTON_REPEAT +#define VIEWER_AUTOSCROLL BUTTON_SELECT|BUTTON_DOWN #define VIEWER_LINE_UP BUTTON_UP #define VIEWER_LINE_DOWN BUTTON_DOWN diff -u -r rockbox/apps/plugins/wormlet.c changed_rockbox/apps/plugins/wormlet.c --- rockbox/apps/plugins/wormlet.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/wormlet.c 2009-03-31 09:39:34.000000000 +0200 @@ -173,9 +173,9 @@ #define BTN_DIR_DOWN BUTTON_DOWN #define BTN_DIR_LEFT BUTTON_LEFT #define BTN_DIR_RIGHT BUTTON_RIGHT -#define BTN_STARTPAUSE BUTTON_SELECT -#define BTN_QUIT BUTTON_POWER -#define BTN_STOPRESET BUTTON_HOME +#define BTN_STARTPAUSE (BUTTON_SELECT | BUTTON_UP) +#define BTN_QUIT BUTTON_HOME +#define BTN_STOPRESET (BUTTON_SELECT | BUTTON_DOWN) #define PLAYERS_TEXT "Up/Down" #define WORMS_TEXT "Left/Right" diff -u -r rockbox/apps/plugins/xobox.c changed_rockbox/apps/plugins/xobox.c --- rockbox/apps/plugins/xobox.c 2009-03-31 09:16:25.000000000 +0200 +++ changed_rockbox/apps/plugins/xobox.c 2009-03-31 09:47:58.000000000 +0200 @@ -87,16 +87,15 @@ #define DOWN BUTTON_DOWN #define PAUSE BUTTON_REC - #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_FUZE_PAD) -#define QUIT BUTTON_POWER +#define QUIT BUTTON_HOME #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define UP BUTTON_UP #define DOWN BUTTON_DOWN -#define PAUSE BUTTON_HOME +#define PAUSE BUTTON_SELECT #elif (CONFIG_KEYPAD == SANSA_M200_PAD) diff -u -r rockbox/apps/plugins/zxbox/zxbox_keyb.c changed_rockbox/apps/plugins/zxbox/zxbox_keyb.c --- rockbox/apps/plugins/zxbox/zxbox_keyb.c 2009-03-31 09:16:14.000000000 +0200 +++ changed_rockbox/apps/plugins/zxbox/zxbox_keyb.c 2009-03-31 13:29:46.000000000 +0200 @@ -112,13 +112,9 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) || \ -(CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ (CONFIG_KEYPAD == SANSA_M200_PAD) || \ -(CONFIG_KEYPAD == SANSA_FUZE_PAD) || \ (CONFIG_KEYPAD == MROBE100_PAD) -/* TODO: Check keyboard mappings */ - #define KBD_SELECT BUTTON_SELECT #define KBD_ABORT BUTTON_POWER #define KBD_LEFT BUTTON_LEFT @@ -126,6 +122,16 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN +#elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ +(CONFIG_KEYPAD == SANSA_FUZE_PAD) + +#define KBD_SELECT BUTTON_SELECT +#define KBD_ABORT BUTTON_HOME +#define KBD_LEFT BUTTON_LEFT +#define KBD_RIGHT BUTTON_RIGHT +#define KBD_UP BUTTON_UP +#define KBD_DOWN BUTTON_DOWN + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define KBD_SELECT BUTTON_RC_PLAY