Index: apps/plugins/sliding_puzzle.c =================================================================== --- apps/plugins/sliding_puzzle.c (révision 31528) +++ apps/plugins/sliding_puzzle.c (copie de travail) @@ -252,8 +252,8 @@ #define PUZZLE_RIGHT BUTTON_RIGHT #define PUZZLE_UP BUTTON_UP #define PUZZLE_DOWN BUTTON_DOWN -#define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE -#define PUZZLE_PICTURE BUTTON_SELECT +#define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE|BUTTON_REPEAT +#define PUZZLE_PICTURE BUTTON_SELECT|BUTTON_REPEAT #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #define PUZZLE_QUIT BUTTON_POWER Index: apps/plugins/flipit.c =================================================================== --- apps/plugins/flipit.c (révision 31528) +++ apps/plugins/flipit.c (copie de travail) @@ -365,7 +365,7 @@ #define FLIPIT_QUIT BUTTON_POWER #define FLIPIT_SHUFFLE BUTTON_PLAYPAUSE #define FLIPIT_SOLVE BUTTON_BACK -#define FLIPIT_STEP_BY_STEP (BUTTON_BACK|BUTTON_PLAYPAUSE) +#define FLIPIT_STEP_BY_STEP BUTTON_BOTTOMLEFT #define FLIPIT_TOGGLE BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD Index: apps/plugins/chessbox/chessbox_pgn.h =================================================================== --- apps/plugins/chessbox/chessbox_pgn.h (révision 31528) +++ apps/plugins/chessbox/chessbox_pgn.h (copie de travail) @@ -402,9 +402,10 @@ #define CB_DOWN BUTTON_DOWN #define CB_LEFT BUTTON_LEFT #define CB_RIGHT BUTTON_RIGHT -#define CB_PLAY BUTTON_PLAYPAUSE -#define CB_LEVEL BUTTON_BACK -#define CB_MENU (BUTTON_PLAYPAUSE | BUTTON_REPEAT) +#define CB_PLAY (BUTTON_PLAYPAUSE | BUTTON_REPEAT) +#define CB_LEVEL BUTTON_BOTTOMRIGHT +#define CB_RESTART (BUTTON_BACK | BUTTON_REPEAT) +#define CB_MENU BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #define CB_SELECT BUTTON_SELECT Index: apps/plugins/snake2.c =================================================================== --- apps/plugins/snake2.c (révision 31528) +++ apps/plugins/snake2.c (copie de travail) @@ -345,7 +345,7 @@ #define SNAKE2_DOWN BUTTON_DOWN #define SNAKE2_QUIT BUTTON_POWER #define SNAKE2_PLAYPAUSE BUTTON_PLAYPAUSE -#define SNAKE2_PLAYPAUSE_TEXT "Play/Pause" +#define SNAKE2_PLAYPAUSE_TEXT "Play-Pause" #else #error No keymap defined! Index: apps/plugins/clix.c =================================================================== --- apps/plugins/clix.c (révision 31528) +++ apps/plugins/clix.c (copie de travail) @@ -190,10 +190,10 @@ #define CLIX_BUTTON_QUIT BUTTON_POWER #define CLIX_BUTTON_UP BUTTON_UP #define CLIX_BUTTON_DOWN BUTTON_DOWN -#define CLIX_BUTTON_SCROLL_FWD BUTTON_BACK -#define CLIX_BUTTON_SCROLL_BACK BUTTON_PLAYPAUSE #define CLIX_BUTTON_LEFT BUTTON_LEFT #define CLIX_BUTTON_RIGHT BUTTON_RIGHT +#define CLIX_BUTTON_SCROLL_FWD BUTTON_BOTTOMRIGHT +#define CLIX_BUTTON_SCROLL_BACK BUTTON_BOTTOMLEFT #define CLIX_BUTTON_CLICK BUTTON_SELECT #else Index: apps/plugins/minesweeper.c =================================================================== --- apps/plugins/minesweeper.c (révision 31528) +++ apps/plugins/minesweeper.c (copie de travail) @@ -295,10 +295,12 @@ # define MINESWP_QUIT BUTTON_POWER # define MINESWP_TOGGLE BUTTON_SELECT # define MINESWP_DISCOVER BUTTON_PLAYPAUSE +# define MINESWP_NEXT BUTTON_BOTTOMRIGHT +# define MINESWP_PREV BUTTON_BOTTOMLEFT # define MINESWP_INFO BUTTON_BACK + #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) - # define MINESWP_SCROLLWHEEL # define MINESWP_LEFT BUTTON_LEFT # define MINESWP_RIGHT BUTTON_RIGHT Index: apps/plugins/lib/pluginlib_actions.c =================================================================== --- apps/plugins/lib/pluginlib_actions.c (révision 31528) +++ apps/plugins/lib/pluginlib_actions.c (copie de travail) @@ -403,7 +403,7 @@ {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) {PLA_CANCEL, BUTTON_BACK, BUTTON_NONE}, - {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, + {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, Index: apps/plugins/spacerocks.c =================================================================== --- apps/plugins/spacerocks.c (révision 31528) +++ apps/plugins/spacerocks.c (copie de travail) @@ -263,7 +263,7 @@ #define AST_PAUSE BUTTON_PLAYPAUSE #define AST_QUIT BUTTON_POWER #define AST_THRUST BUTTON_UP -#define AST_HYPERSPACE BUTTON_DOWN +#define AST_HYPERSPACE BUTTON_BACK #define AST_LEFT BUTTON_LEFT #define AST_RIGHT BUTTON_RIGHT #define AST_FIRE BUTTON_SELECT Index: apps/plugins/blackjack.c =================================================================== --- apps/plugins/blackjack.c (révision 31528) +++ apps/plugins/blackjack.c (copie de travail) @@ -459,8 +459,10 @@ #define BJACK_DOUBLE_NAME "BACK" #define BJACK_SELECT BUTTON_SELECT #define BJACK_QUIT BUTTON_POWER -#define BJACK_STAY BUTTON_PLAYPAUSE -#define BJACK_DOUBLEDOWN BUTTON_BACK +#define BJACK_MAX BUTTON_BOTTOMRIGHT +#define BJACK_MIN BUTTON_BOTTOMLEFT +#define BJACK_STAY BUTTON_BACK +#define BJACK_DOUBLEDOWN BUTTON_PLAYPAUSE #define BJACK_UP BUTTON_UP #define BJACK_DOWN BUTTON_DOWN #define BJACK_RIGHT BUTTON_RIGHT Index: apps/plugins/jewels.c =================================================================== --- apps/plugins/jewels.c (révision 31528) +++ apps/plugins/jewels.c (copie de travail) @@ -311,9 +311,9 @@ #define JEWELS_UP BUTTON_UP #define JEWELS_DOWN BUTTON_DOWN #define JEWELS_SELECT BUTTON_SELECT -#define JEWELS_CANCEL BUTTON_BACK +#define JEWELS_CANCEL BUTTON_POWER #define HK_SELECT "SELECT" -#define HK_CANCEL "BACK" +#define HK_CANCEL "POWER" #else #error No keymap defined! Index: apps/plugins/pacbox/pacbox.h =================================================================== --- apps/plugins/pacbox/pacbox.h (révision 31528) +++ apps/plugins/pacbox/pacbox.h (copie de travail) @@ -250,7 +250,7 @@ #define PACMAN_LEFT BUTTON_LEFT #define PACMAN_RIGHT BUTTON_RIGHT #define PACMAN_1UP BUTTON_SELECT -#define PACMAN_2UP BUTTON_BACK +#define PACMAN_2UP BUTTON_BOTTOMRIGHT #define PACMAN_COIN BUTTON_PLAYPAUSE #define PACMAN_MENU BUTTON_POWER Index: apps/plugins/pong.c =================================================================== --- apps/plugins/pong.c (révision 31528) +++ apps/plugins/pong.c (copie de travail) @@ -238,11 +238,12 @@ #define PONG_RIGHT_DOWN BUTTON_DOWN #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD -#define PONG_QUIT BUTTON_POWER -#define PONG_LEFT_UP BUTTON_LEFT -#define PONG_LEFT_DOWN BUTTON_DOWN -#define PONG_RIGHT_UP BUTTON_UP -#define PONG_RIGHT_DOWN BUTTON_RIGHT +#define PONG_QUIT BUTTON_POWER +#define PONG_LEFT_UP BUTTON_BACK +#define PONG_LEFT_DOWN BUTTON_BOTTOMLEFT +#define PONG_RIGHT_UP BUTTON_PLAYPAUSE +#define PONG_RIGHT_DOWN BUTTON_BOTTOMRIGHT +#define PONG_PAUSE BUTTON_SELECT #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) #define PONG_QUIT BUTTON_BACK Index: apps/plugins/sudoku/sudoku.h =================================================================== --- apps/plugins/sudoku/sudoku.h (révision 31528) +++ apps/plugins/sudoku/sudoku.h (copie de travail) @@ -310,13 +310,16 @@ #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD +#define SUDOKU_BUTTON_QUIT BUTTON_POWER #define SUDOKU_BUTTON_MENU BUTTON_BACK #define SUDOKU_BUTTON_LEFT BUTTON_LEFT #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT -#define SUDOKU_BUTTON_CHANGEDIR BUTTON_SELECT -#define SUDOKU_BUTTON_TOGGLE BUTTON_UP -#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_DOWN +#define SUDOKU_BUTTON_UP BUTTON_UP +#define SUDOKU_BUTTON_DOWN BUTTON_DOWN +#define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT +#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_BOTTOMLEFT #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAYPAUSE +#define SUDOKU_BUTTON_ALTTOGGLE BUTTON_BOTTOMRIGHT #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) #define SUDOKU_BUTTON_QUIT BUTTON_POWER Index: apps/plugins/rockblox.c =================================================================== --- apps/plugins/rockblox.c (révision 31528) +++ apps/plugins/rockblox.c (copie de travail) @@ -360,14 +360,18 @@ #define ROCKBLOX_RESTART BUTTON_REC #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD -#define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_CW BUTTON_SELECT -#define ROCKBLOX_ROTATE_CCW BUTTON_UP -#define ROCKBLOX_DOWN BUTTON_DOWN +#define ROCKBLOX_OFF_PRE BUTTON_POWER +#define ROCKBLOX_OFF BUTTON_POWER|BUTTON_REL +#define ROCKBLOX_ROTATE_CW BUTTON_BOTTOMRIGHT +#define ROCKBLOX_ROTATE_CCW BUTTON_BOTTOMLEFT +#define ROCKBLOX_DOWN BUTTON_SELECT #define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_RIGHT BUTTON_RIGHT -#define ROCKBLOX_DROP BUTTON_PLAYPAUSE -#define ROCKBLOX_RESTART BUTTON_BACK +#define ROCKBLOX_DROP_PRE BUTTON_DOWN +#define ROCKBLOX_DROP BUTTON_DOWN|BUTTON_REL +#define ROCKBLOX_RESTART BUTTON_BACK|BUTTON_REPEAT +#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_UP +#define ROCKBLOX_ROTATE_CW2 BUTTON_VOL_DOWN #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #define ROCKBLOX_OFF BUTTON_POWER Index: apps/plugins/solitaire.c =================================================================== --- apps/plugins/solitaire.c (révision 31528) +++ apps/plugins/solitaire.c (copie de travail) @@ -511,20 +511,18 @@ # define SOL_QUIT BUTTON_POWER # define SOL_UP BUTTON_UP # define SOL_DOWN BUTTON_DOWN -# define SOL_LEFT BUTTON_VOL_UP -# define SOL_RIGHT BUTTON_VOL_DOWN -# define SOL_MOVE (BUTTON_SELECT|BUTTON_REL) -# define SOL_DRAW (BUTTON_PLAYPAUSE|BUTTON_REL) -# define SOL_REM2CUR BUTTON_LEFT -# define SOL_CUR2STACK_PRE (BUTTON_RIGHT | BUTTON_REPEAT) -# define SOL_CUR2STACK BUTTON_RIGHT -# define SOL_REM2STACK (BUTTON_LEFT|BUTTON_REPEAT) -# define SOL_REM2STACK_PRE BUTTON_LEFT -# define HK_MOVE "SHORT SELECT" -# define HK_DRAW "SHORT PLAYPAUSE" -# define HK_REM2CUR "LEFT" -# define HK_CUR2STACK "DOUBLE SELECT" -# define HK_REM2STACK "LEFT" +# define SOL_LEFT BUTTON_LEFT +# define SOL_RIGHT BUTTON_RIGHT +# define SOL_MOVE BUTTON_SELECT +# define SOL_DRAW BUTTON_BACK +# define SOL_REM2CUR BUTTON_BOTTOMLEFT +# define SOL_CUR2STACK BUTTON_PLAYPAUSE|BUTTON_REL +# define SOL_REM2STACK BUTTON_PLAYPAUSE|BUTTON_REPEAT +# define HK_MOVE "SELECT" +# define HK_DRAW "BACK" +# define HK_REM2CUR "BOTTOM-LEFT" +# define HK_CUR2STACK "PLAY-PAUSE" +# define HK_REM2STACK "BOTTOM-RIGHT" #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) # define SOL_QUIT BUTTON_POWER Index: apps/plugins/goban/goban.h =================================================================== --- apps/plugins/goban/goban.h (révision 31528) +++ apps/plugins/goban/goban.h (copie de travail) @@ -359,10 +359,12 @@ #define GBN_BUTTON_DOWN BUTTON_DOWN #define GBN_BUTTON_LEFT BUTTON_LEFT #define GBN_BUTTON_RIGHT BUTTON_RIGHT +#define GBN_BUTTON_MENU BUTTON_POWER +#define GBN_BUTTON_PLAY BUTTON_SELECT #define GBN_BUTTON_RETREAT BUTTON_BACK #define GBN_BUTTON_ADVANCE BUTTON_PLAYPAUSE -#define GBN_BUTTON_PLAY BUTTON_SELECT -#define GBN_BUTTON_MENU BUTTON_POWER +#define GBN_BUTTON_CONTEXT BUTTON_BOTTOMLEFT +#define GBN_BUTTON_NEXT_VAR BUTTON_BOTTOMRIGHT #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) #define GBN_BUTTON_UP BUTTON_UP Index: apps/plugins/star.c =================================================================== --- apps/plugins/star.c (révision 31528) +++ apps/plugins/star.c (copie de travail) @@ -453,7 +453,7 @@ #define STAR_RIGHT BUTTON_RIGHT #define STAR_UP BUTTON_UP #define STAR_DOWN BUTTON_DOWN -#define STAR_TOGGLE_CONTROL BUTTON_SELECT +#define STAR_TOGGLE_CONTROL BUTTON_PLAYPAUSE #define STAR_LEVEL_UP BUTTON_VOL_UP #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN #define STAR_LEVEL_REPEAT (BUTTON_BACK | BUTTON_REPEAT) Index: apps/plugins/doom/i_video.c =================================================================== --- apps/plugins/doom/i_video.c (révision 31528) +++ apps/plugins/doom/i_video.c (copie de travail) @@ -168,6 +168,7 @@ #define DOOMBUTTON_SHOOT BUTTON_PLAY #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_OPEN BUTTON_MENU + #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -178,6 +179,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_REC + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define DOOMBUTTON_UP BUTTON_SCROLL_UP #define DOOMBUTTON_DOWN BUTTON_SCROLL_DOWN @@ -188,6 +190,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_REW #define DOOMBUTTON_WEAPON BUTTON_FF + #elif CONFIG_KEYPAD == SANSA_E200_PAD #define DOOMBUTTON_SCROLLWHEEL #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK @@ -201,6 +204,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW + #elif CONFIG_KEYPAD == SANSA_FUZE_PAD #define DOOMBUTTON_SCROLLWHEEL #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK @@ -214,6 +218,7 @@ #define DOOMBUTTON_ESC BUTTON_HOME #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW + #elif CONFIG_KEYPAD == SANSA_C200_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -224,6 +229,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_UP + #elif CONFIG_KEYPAD == SANSA_CLIP_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -234,6 +240,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_UP + #elif CONFIG_KEYPAD == GIGABEAT_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -245,6 +252,7 @@ #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == GIGABEAT_S_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -256,6 +264,7 @@ #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == MROBE500_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_UP BUTTON_RC_PLAY @@ -266,6 +275,7 @@ #define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP #define DOOMBUTTON_ENTER BUTTON_RC_MODE #define DOOMBUTTON_WEAPON BUTTON_RC_HEART + #elif CONFIG_KEYPAD == IRIVER_H100_PAD || \ CONFIG_KEYPAD == IRIVER_H300_PAD #define DOOMBUTTON_UP BUTTON_UP @@ -277,6 +287,7 @@ #define DOOMBUTTON_ESC BUTTON_OFF #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_ON + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define DOOMBUTTON_ESC BUTTON_RC_REC #define DOOMBUTTON_UP BUTTON_RC_VOL_UP @@ -287,11 +298,13 @@ #define DOOMBUTTON_SHOOT BUTTON_RC_MODE #define DOOMBUTTON_ENTER BUTTON_RC_PLAY #define DOOMBUTTON_WEAPON BUTTON_RC_MENU + #elif CONFIG_KEYPAD == COWON_D2_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_SHOOT BUTTON_PLUS #define DOOMBUTTON_WEAPON BUTTON_MINUS #define DOOMBUTTON_MAP BUTTON_MENU + #elif CONFIG_KEYPAD == MROBE100_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -302,6 +315,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_MENU #define DOOMBUTTON_WEAPON BUTTON_DISPLAY + #elif CONFIG_KEYPAD == IAUDIO67_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_UP BUTTON_STOP @@ -311,6 +325,7 @@ #define DOOMBUTTON_SHOOT BUTTON_VOLUP #define DOOMBUTTON_OPEN BUTTON_VOLDOWN #define DOOMBUTTON_ENTER BUTTON_MENU + #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -322,6 +337,7 @@ #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON BUTTON_MENU #define DOOMBUTTON_MAP BUTTON_CUSTOM + #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -333,6 +349,7 @@ #define DOOMBUTTON_ENTER BUTTON_VIEW #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -344,6 +361,7 @@ #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -355,13 +373,16 @@ #define DOOMBUTTON_ENTER BUTTON_LEFT #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_SHOOT BUTTON_VOL_UP #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX777_PAD #define DOOMBUTTON_ESC BUTTON_POWER + #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -373,6 +394,7 @@ #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_RIGHT) #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_UP) #define DOOMBUTTON_MAP (BUTTON_PLAY|BUTTON_DOWN) + #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD #define DOOMBUTTON_UP BUTTON_OK #define DOOMBUTTON_DOWN BUTTON_CANCEL @@ -383,6 +405,7 @@ #define DOOMBUTTON_ESC BUTTON_REC #define DOOMBUTTON_ENTER BUTTON_POWER #define DOOMBUTTON_WEAPON BUTTON_PLAY + #elif CONFIG_KEYPAD == MPIO_HD200_PAD #define DOOMBUTTON_UP BUTTON_REW #define DOOMBUTTON_DOWN BUTTON_FF @@ -393,6 +416,7 @@ #define DOOMBUTTON_ESC BUTTON_REC #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) + #elif CONFIG_KEYPAD == MPIO_HD300_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -403,16 +427,20 @@ #define DOOMBUTTON_ESC BUTTON_REC #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) + #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN #define DOOMBUTTON_LEFT BUTTON_LEFT #define DOOMBUTTON_RIGHT BUTTON_RIGHT -#define DOOMBUTTON_SHOOT BUTTON_SELECT #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE +#define DOOMBUTTON_QUIT BUTTON_POWER #define DOOMBUTTON_ESC BUTTON_BACK -#define DOOMBUTTON_ENTER (BUTTON_PLAYPAUSE|BUTTON_REPEAT) -#define DOOMBUTTON_WEAPON (BUTTON_SELECT|BUTTON_REPEAT) +#define DOOMBUTTON_ENTER BUTTON_SELECT +#define DOOMBUTTON_SHOOT BUTTON_SELECT +#define DOOMBUTTON_WEAPON BUTTON_BOTTOMLEFT +#define DOOMBUTTON_MAP BUTTON_BOTTOMRIGHT + #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN Index: apps/plugins/sokoban.c =================================================================== --- apps/plugins/sokoban.c (révision 31528) +++ apps/plugins/sokoban.c (copie de travail) @@ -501,15 +501,17 @@ #define SOKOBAN_RIGHT BUTTON_RIGHT #define SOKOBAN_UP BUTTON_UP #define SOKOBAN_DOWN BUTTON_DOWN -#define SOKOBAN_MENU BUTTON_SELECT -#define SOKOBAN_UNDO (BUTTON_BACK|BUTTON_SELECT) -#define SOKOBAN_REDO (BUTTON_PLAYPAUSE|BUTTON_SELECT) +#define SOKOBAN_MENU BUTTON_POWER +#define SOKOBAN_UNDO_PRE BUTTON_BOTTOMLEFT +#define SOKOBAN_UNDO (BUTTON_BOTTOMLEFT|BUTTON_REL) +#define SOKOBAN_REDO_PRE BUTTON_BOTTOMRIGHT +#define SOKOBAN_REDO (BUTTON_BOTTOMRIGHT|BUTTON_REL) +#define SOKOBAN_LEVEL_REPEAT BUTTON_BACK #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN -#define SOKOBAN_LEVEL_REPEAT BUTTON_BACK #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP #define SOKOBAN_PAUSE BUTTON_PLAYPAUSE #define BUTTON_SAVE (BUTTON_SELECT|BUTTON_REPEAT) -#define BUTTON_SAVE_NAME "SELECT LONG" +#define BUTTON_SAVE_NAME "SELECT LONG" #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #define SOKOBAN_LEFT BUTTON_LEFT