Samsung YH820/92x keymap bugfixes

This patch fixes some (mostly small) plugin issues with the "big"
YH-keymap patch (a507b). Only one fix affects the main keymaps
(virtual keyboard "DONE" now exits after long key /release/ instead
of long button /press/).

Change-Id: Id34f925ebfa97ae4974cd9405fbe1fee4f597833
This commit is contained in:
Sebastian Leonhardt 2015-12-27 18:14:41 +01:00
parent ad65f8cc71
commit 5e91ec1401
21 changed files with 140 additions and 81 deletions

View file

@ -307,7 +307,7 @@ static const struct button_mapping button_context_keyboard[] = {
#endif #endif
{ ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE }, { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE },
{ ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, { ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD },
{ ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT },
{ ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW },
{ ACTION_KBD_ABORT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_ABORT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
#ifdef SAMSUNG_YH820 #ifdef SAMSUNG_YH820

View file

@ -467,7 +467,13 @@ static int loopit(void)
enum plugin_status plugin_start(const void* parameter) enum plugin_status plugin_start(const void* parameter)
{ {
int w, h; int w, h;
char *off = "[Off] to stop"; char *off =
#if (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) || \
(CONFIG_KEYPAD == SAMSUNG_YH820_PAD)
"[Rew] to stop";
#else
"[Off] to stop";
#endif
(void)(parameter); (void)(parameter);

View file

@ -191,6 +191,7 @@
#define CALENDAR_PREV_DAY BUTTON_LEFT #define CALENDAR_PREV_DAY BUTTON_LEFT
#define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
#define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
#define CALENDAR_EVENT_MENU_NAME "menu"
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define CALENDAR_QUIT BUTTON_BACK #define CALENDAR_QUIT BUTTON_BACK
@ -211,6 +212,7 @@
#define CALENDAR_PREV_DAY BUTTON_BACK #define CALENDAR_PREV_DAY BUTTON_BACK
#define CALENDAR_NEXT_MONTH BUTTON_VOL_UP #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
#define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
#define CALENDAR_EVENT_MENU_NAME "play"
#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
#define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_QUIT BUTTON_POWER
@ -251,6 +253,7 @@
#define CALENDAR_PREV_DAY BUTTON_LEFT #define CALENDAR_PREV_DAY BUTTON_LEFT
#define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
#define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
#define CALENDAR_EVENT_MENU_NAME "menu"
#elif (CONFIG_KEYPAD == ONDAVX777_PAD) #elif (CONFIG_KEYPAD == ONDAVX777_PAD)
#define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_QUIT BUTTON_POWER
@ -287,6 +290,7 @@
#define CALENDAR_PREV_DAY BUTTON_PREV #define CALENDAR_PREV_DAY BUTTON_PREV
#define CALENDAR_NEXT_MONTH BUTTON_PLAY #define CALENDAR_NEXT_MONTH BUTTON_PLAY
#define CALENDAR_PREV_MONTH BUTTON_MENU #define CALENDAR_PREV_MONTH BUTTON_MENU
#define CALENDAR_EVENT_MENU_NAME "FFWD"
#elif CONFIG_KEYPAD == MPIO_HD200_PAD #elif CONFIG_KEYPAD == MPIO_HD200_PAD
#define CALENDAR_QUIT (BUTTON_REC|BUTTON_PLAY) #define CALENDAR_QUIT (BUTTON_REC|BUTTON_PLAY)
@ -297,6 +301,7 @@
#define CALENDAR_PREV_DAY BUTTON_VOL_DOWN #define CALENDAR_PREV_DAY BUTTON_VOL_DOWN
#define CALENDAR_NEXT_MONTH BUTTON_PLAY #define CALENDAR_NEXT_MONTH BUTTON_PLAY
#define CALENDAR_PREV_MONTH BUTTON_REC #define CALENDAR_PREV_MONTH BUTTON_REC
#define CALENDAR_EVENT_MENU_NAME "func"
#elif CONFIG_KEYPAD == MPIO_HD300_PAD #elif CONFIG_KEYPAD == MPIO_HD300_PAD
#define CALENDAR_QUIT (BUTTON_MENU|BUTTON_REPEAT) #define CALENDAR_QUIT (BUTTON_MENU|BUTTON_REPEAT)
@ -307,6 +312,7 @@
#define CALENDAR_PREV_DAY BUTTON_DOWN #define CALENDAR_PREV_DAY BUTTON_DOWN
#define CALENDAR_NEXT_MONTH BUTTON_PLAY #define CALENDAR_NEXT_MONTH BUTTON_PLAY
#define CALENDAR_PREV_MONTH BUTTON_REC #define CALENDAR_PREV_MONTH BUTTON_REC
#define CALENDAR_EVENT_MENU_NAME "enter"
#elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
#define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_QUIT BUTTON_POWER
@ -317,6 +323,7 @@
#define CALENDAR_PREV_DAY BUTTON_LEFT #define CALENDAR_PREV_DAY BUTTON_LEFT
#define CALENDAR_NEXT_MONTH BUTTON_PLAYPAUSE #define CALENDAR_NEXT_MONTH BUTTON_PLAYPAUSE
#define CALENDAR_PREV_MONTH BUTTON_BACK #define CALENDAR_PREV_MONTH BUTTON_BACK
#define CALENDAR_EVENT_MENU_NAME "select"
#elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
#define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_QUIT BUTTON_POWER
@ -347,6 +354,7 @@
#define CALENDAR_PREV_DAY BUTTON_LEFT #define CALENDAR_PREV_DAY BUTTON_LEFT
#define CALENDAR_NEXT_MONTH (BUTTON_RIGHT|BUTTON_POWER) #define CALENDAR_NEXT_MONTH (BUTTON_RIGHT|BUTTON_POWER)
#define CALENDAR_PREV_MONTH (BUTTON_LEFT|BUTTON_POWER) #define CALENDAR_PREV_MONTH (BUTTON_LEFT|BUTTON_POWER)
#define CALENDAR_EVENT_MENU_NAME "select"
#elif CONFIG_KEYPAD == HM801_PAD #elif CONFIG_KEYPAD == HM801_PAD
#define CALENDAR_QUIT BUTTON_POWER #define CALENDAR_QUIT BUTTON_POWER
@ -357,6 +365,7 @@
#define CALENDAR_PREV_DAY BUTTON_LEFT #define CALENDAR_PREV_DAY BUTTON_LEFT
#define CALENDAR_NEXT_MONTH BUTTON_NEXT #define CALENDAR_NEXT_MONTH BUTTON_NEXT
#define CALENDAR_PREV_MONTH BUTTON_PREV #define CALENDAR_PREV_MONTH BUTTON_PREV
#define CALENDAR_EVENT_MENU_NAME "select"
#elif CONFIG_KEYPAD == SONY_NWZ_PAD #elif CONFIG_KEYPAD == SONY_NWZ_PAD
#define CALENDAR_QUIT BUTTON_BACK #define CALENDAR_QUIT BUTTON_BACK
@ -387,6 +396,7 @@
#define CALENDAR_PREV_DAY BUTTON_LEFT #define CALENDAR_PREV_DAY BUTTON_LEFT
#define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT #define CALENDAR_NEXT_MONTH BUTTON_BOTTOMRIGHT
#define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT #define CALENDAR_PREV_MONTH BUTTON_BOTTOMLEFT
#define CALENDAR_EVENT_MENU_NAME "play"
#else #else
#error "No keypad setting." #error "No keypad setting."
@ -417,6 +427,13 @@
#ifndef CALENDAR_PREV_MONTH #ifndef CALENDAR_PREV_MONTH
#define CALENDAR_PREV_MONTH BUTTON_BOTTOMRIGHT #define CALENDAR_PREV_MONTH BUTTON_BOTTOMRIGHT
#endif #endif
#ifndef CALENDAR_EVENT_MENU_NAME
#define CALENDAR_EVENT_MENU_NAME "select"
#endif
#endif
#ifndef CALENDAR_EVENT_MENU_NAME
#define CALENDAR_EVENT_MENU_NAME "right"
#endif #endif
#define MEMO_FILE PLUGIN_APPS_DATA_DIR "/.memo" #define MEMO_FILE PLUGIN_APPS_DATA_DIR "/.memo"
@ -910,7 +927,7 @@ static bool view_events(int selected, struct shown *shown)
int button; int button;
rb->gui_synclist_init(&gui_memos, &get_event_text, shown, false, 1, NULL); rb->gui_synclist_init(&gui_memos, &get_event_text, shown, false, 1, NULL);
rb->gui_synclist_set_title(&gui_memos, "Events (play : menu)", NOICON); rb->gui_synclist_set_title(&gui_memos, "Events (" CALENDAR_EVENT_MENU_NAME " : menu)", NOICON);
rb->gui_synclist_set_nb_items(&gui_memos, memos_in_shown_memory); rb->gui_synclist_set_nb_items(&gui_memos, memos_in_shown_memory);
rb->gui_synclist_select_item(&gui_memos, selected); rb->gui_synclist_select_item(&gui_memos, selected);
rb->gui_synclist_draw(&gui_memos); rb->gui_synclist_draw(&gui_memos);

View file

@ -402,10 +402,9 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_RIGHT BUTTON_RIGHT #define DOOMBUTTON_RIGHT BUTTON_RIGHT
#define DOOMBUTTON_SHOOT BUTTON_PLAY #define DOOMBUTTON_SHOOT BUTTON_PLAY
#define DOOMBUTTON_OPEN BUTTON_REW #define DOOMBUTTON_OPEN BUTTON_REW
#define DOOMBUTTON_ESC BUTTON_REC_SW_ON
#define DOOMBUTTON_ESC2 BUTTON_REC_SW_OFF
#define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_ENTER BUTTON_PLAY
#define DOOMBUTTON_WEAPON BUTTON_FFWD #define DOOMBUTTON_WEAPON BUTTON_FFWD
#define DOOMBUTTON_REC_SWITCH /* record switch toggles run mode; in game menu via hold switch */
#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
#define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_UP BUTTON_UP
@ -618,7 +617,7 @@ static inline void getkey()
hswitch=0; hswitch=0;
} }
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
(CONFIG_KEYPAD == IPOD_1G2G_PAD) (CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
/* Bring up the menu */ /* Bring up the menu */
event.data1=KEY_ESCAPE; event.data1=KEY_ESCAPE;
#else #else
@ -630,10 +629,12 @@ static inline void getkey()
holdbutton=rb->button_hold(); holdbutton=rb->button_hold();
#endif #endif
#ifdef DOOMBUTTON_SCROLLWHEEL #if defined(DOOMBUTTON_SCROLLWHEEL) || defined(DOOMBUTTON_REC_SWITCH)
/* use button_get(false) for clickwheel checks */ /* use button_get(false) for clickwheel checks */
int button; /* move me */ int button; /* move me */
button = rb->button_get(false); button = rb->button_get(false);
#ifdef DOOMBUTTON_SCROLLWHEEL
switch(button){ switch(button){
case DOOMBUTTON_SCROLLWHEEL_CC | BUTTON_REPEAT: case DOOMBUTTON_SCROLLWHEEL_CC | BUTTON_REPEAT:
case DOOMBUTTON_SCROLLWHEEL_CC: case DOOMBUTTON_SCROLLWHEEL_CC:
@ -649,6 +650,16 @@ static inline void getkey()
D_PostEvent(&event); D_PostEvent(&event);
break; break;
} }
#endif
#ifdef DOOMBUTTON_REC_SWITCH
if (button==BUTTON_REC_SW_ON || button==BUTTON_REC_SW_OFF) {
event.type = ev_keydown;
event.data1=KEY_CAPSLOCK; /* Enable run */
D_PostEvent(&event);
event.type = ev_keyup;
D_PostEvent(&event);
}
#endif
#endif #endif
newbuttonstate = rb->button_status(); newbuttonstate = rb->button_status();
#ifdef DOOMBUTTON_SCROLLWHEEL #ifdef DOOMBUTTON_SCROLLWHEEL
@ -696,11 +707,7 @@ static inline void getkey()
D_PostEvent(&event); D_PostEvent(&event);
} }
#ifdef DOOMBUTTON_ESC #ifdef DOOMBUTTON_ESC
if(released & DOOMBUTTON_ESC if(released & DOOMBUTTON_ESC)
#ifdef DOOMBUTTON_ESC2
|| released & DOOMBUTTON_ESC2
#endif
)
{ {
event.data1=KEY_ESCAPE; event.data1=KEY_ESCAPE;
D_PostEvent(&event); D_PostEvent(&event);
@ -762,11 +769,7 @@ static inline void getkey()
D_PostEvent(&event); D_PostEvent(&event);
} }
#ifdef DOOMBUTTON_ESC #ifdef DOOMBUTTON_ESC
if(pressed & DOOMBUTTON_ESC if(pressed & DOOMBUTTON_ESC)
#ifdef DOOMBUTTON_ESC2
|| pressed & DOOMBUTTON_ESC2
#endif
)
{ {
event.data1=KEY_ESCAPE; event.data1=KEY_ESCAPE;
D_PostEvent(&event); D_PostEvent(&event);

View file

@ -318,18 +318,29 @@
#define GBN_BUTTON_PLAY BUTTON_MENU | BUTTON_REL #define GBN_BUTTON_PLAY BUTTON_MENU | BUTTON_REL
#define GBN_BUTTON_NAV_MODE BUTTON_OFF #define GBN_BUTTON_NAV_MODE BUTTON_OFF
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ #elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
(CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define GBN_BUTTON_UP BUTTON_UP #define GBN_BUTTON_UP BUTTON_UP
#define GBN_BUTTON_DOWN BUTTON_DOWN #define GBN_BUTTON_DOWN BUTTON_DOWN
#define GBN_BUTTON_LEFT BUTTON_LEFT #define GBN_BUTTON_LEFT BUTTON_LEFT
#define GBN_BUTTON_RIGHT BUTTON_RIGHT #define GBN_BUTTON_RIGHT BUTTON_RIGHT
#define GBN_BUTTON_RETREAT BUTTON_REW #define GBN_BUTTON_RETREAT BUTTON_FFWD | BUTTON_LEFT
#define GBN_BUTTON_ADVANCE BUTTON_FFWD #define GBN_BUTTON_ADVANCE BUTTON_FFWD | BUTTON_RIGHT
#define GBN_BUTTON_MENU BUTTON_PLAY | BUTTON_LEFT #define GBN_BUTTON_MENU BUTTON_REW
#define GBN_BUTTON_PLAY BUTTON_PLAY #define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_REL
#define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_DOWN #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT
#define GBN_BUTTON_NEXT_VAR BUTTON_PLAY | BUTTON_UP #define GBN_BUTTON_NEXT_VAR BUTTON_FFWD | BUTTON_UP
#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD)
#define GBN_BUTTON_UP BUTTON_UP
#define GBN_BUTTON_DOWN BUTTON_DOWN
#define GBN_BUTTON_LEFT BUTTON_LEFT
#define GBN_BUTTON_RIGHT BUTTON_RIGHT
#define GBN_BUTTON_RETREAT BUTTON_REC | BUTTON_LEFT
#define GBN_BUTTON_ADVANCE BUTTON_REC | BUTTON_RIGHT
#define GBN_BUTTON_MENU BUTTON_REW
#define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_REL
#define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT
#define GBN_BUTTON_NEXT_VAR BUTTON_REC | BUTTON_UP
#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
#define GBN_BUTTON_UP BUTTON_UP #define GBN_BUTTON_UP BUTTON_UP

View file

@ -390,9 +390,6 @@ static int gameProc( void )
if ((status & PACMAN_MENU) == PACMAN_MENU if ((status & PACMAN_MENU) == PACMAN_MENU
#ifdef PACMAN_RC_MENU #ifdef PACMAN_RC_MENU
|| status == PACMAN_RC_MENU || status == PACMAN_RC_MENU
#endif
#ifdef PACMAN_MENU2
|| status == PACMAN_MENU2
#endif #endif
) { ) {
bool menu_res; bool menu_res;

View file

@ -234,22 +234,20 @@
#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
#define PACMAN_UP BUTTON_UP #define PACMAN_UP BUTTON_RIGHT
#define PACMAN_DOWN BUTTON_DOWN #define PACMAN_DOWN BUTTON_LEFT
#define PACMAN_LEFT BUTTON_LEFT #define PACMAN_LEFT BUTTON_UP
#define PACMAN_RIGHT BUTTON_RIGHT #define PACMAN_RIGHT BUTTON_DOWN
#define PACMAN_1UP BUTTON_FFWD #define PACMAN_1UP BUTTON_FFWD
#define PACMAN_2UP BUTTON_REW
#define PACMAN_COIN BUTTON_PLAY #define PACMAN_COIN BUTTON_PLAY
#define PACMAN_MENU BUTTON_REC_SW_ON #define PACMAN_MENU BUTTON_REW
#define PACMAN_MENU2 BUTTON_REC_SW_OFF
#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
#define PACMAN_UP BUTTON_UP #define PACMAN_UP BUTTON_RIGHT
#define PACMAN_DOWN BUTTON_DOWN #define PACMAN_DOWN BUTTON_LEFT
#define PACMAN_LEFT BUTTON_LEFT #define PACMAN_LEFT BUTTON_UP
#define PACMAN_RIGHT BUTTON_RIGHT #define PACMAN_RIGHT BUTTON_DOWN
#define PACMAN_1UP BUTTON_FFWD #define PACMAN_1UP BUTTON_FFWD
#define PACMAN_2UP BUTTON_REW #define PACMAN_2UP BUTTON_REW
#define PACMAN_COIN BUTTON_PLAY #define PACMAN_COIN BUTTON_PLAY

View file

@ -495,7 +495,8 @@
#define SOKOBAN_RIGHT BUTTON_RIGHT #define SOKOBAN_RIGHT BUTTON_RIGHT
#define SOKOBAN_UP BUTTON_UP #define SOKOBAN_UP BUTTON_UP
#define SOKOBAN_DOWN BUTTON_DOWN #define SOKOBAN_DOWN BUTTON_DOWN
#define SOKOBAN_MENU BUTTON_PLAY #define SOKOBAN_MENU_PRE BUTTON_PLAY
#define SOKOBAN_MENU (BUTTON_PLAY | BUTTON_REL)
#define SOKOBAN_UNDO BUTTON_REW #define SOKOBAN_UNDO BUTTON_REW
#define SOKOBAN_REDO BUTTON_FFWD #define SOKOBAN_REDO BUTTON_FFWD
#define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_DOWN) #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_DOWN)
@ -1690,7 +1691,7 @@ static bool sokoban_loop(void)
{ {
bool moved; bool moved;
int i = 0, button = 0; int i = 0, button = 0;
#if defined(SOKOBAN_UNDO_PRE) #if defined(SOKOBAN_UNDO_PRE) || defined(SOKOBAN_MENU_PRE)
int lastbutton = 0; int lastbutton = 0;
#endif #endif
int w, h; int w, h;
@ -1703,10 +1704,15 @@ static bool sokoban_loop(void)
switch(button) switch(button)
{ {
case SOKOBAN_MENU:
#ifdef SOKOBAN_MENU_PRE
if (lastbutton != SOKOBAN_MENU_PRE)
break;
/* fallthrough */
#endif
#ifdef SOKOBAN_RC_MENU #ifdef SOKOBAN_RC_MENU
case SOKOBAN_RC_MENU: case SOKOBAN_RC_MENU:
#endif #endif
case SOKOBAN_MENU:
switch (sokoban_menu()) { switch (sokoban_menu()) {
case 5: /* Quit */ case 5: /* Quit */
case 6: /* Save & quit */ case 6: /* Save & quit */
@ -1794,7 +1800,7 @@ static bool sokoban_loop(void)
return PLUGIN_USB_CONNECTED; return PLUGIN_USB_CONNECTED;
break; break;
} }
#if defined(SOKOBAN_UNDO_PRE) #if defined(SOKOBAN_UNDO_PRE) || defined(SOKOBAN_MENU_PRE)
lastbutton = button; lastbutton = button;
#endif #endif

View file

@ -457,6 +457,9 @@ enum plugin_status plugin_start(const void* parameter)
} }
break; break;
case ACTION_STD_CONTEXT: case ACTION_STD_CONTEXT:
/* These targets have unintuitive STD_MENU keymaps, so we use context keymap instead;
We don't need the "delete line" action, since this can be done via the menu. */
#if !(defined(SAMSUNG_YH920_PAD) || defined(SAMSUNG_YH820_PAD))
if (!line_count) break; if (!line_count) break;
rb->strlcpy(copy_buffer, do_action(ACTION_GET, 0, cur_sel), rb->strlcpy(copy_buffer, do_action(ACTION_GET, 0, cur_sel),
MAX_LINE_LEN); MAX_LINE_LEN);
@ -464,6 +467,7 @@ enum plugin_status plugin_start(const void* parameter)
changed = true; changed = true;
break; break;
case ACTION_STD_MENU: case ACTION_STD_MENU:
#endif
{ {
/* do the item menu */ /* do the item menu */
switch (do_item_menu(cur_sel)) switch (do_item_menu(cur_sel))

View file

@ -198,7 +198,8 @@
#define ZX_LEFT BUTTON_LEFT #define ZX_LEFT BUTTON_LEFT
#define ZX_RIGHT BUTTON_RIGHT #define ZX_RIGHT BUTTON_RIGHT
#define ZX_SELECT BUTTON_PLAY #define ZX_SELECT BUTTON_PLAY
#define ZX_MENU BUTTON_FFWD #define ZX_SELECT2 BUTTON_FFWD
#define ZX_MENU BUTTON_REW
#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD

View file

@ -187,7 +187,11 @@ void spkb_process_events( int evenframe )
spkb_kbstate[ki].state = 0; spkb_kbstate[ki].state = 0;
} }
if ( buttons & ZX_SELECT ){ if ( buttons & ZX_SELECT
#ifdef ZX_SELECT2
|| buttons & ZX_SELECT2
#endif
){
ki = KS_TO_KEY(SK_KP_Insert); ki = KS_TO_KEY(SK_KP_Insert);
spkb_kbstate[ki].state = 1; spkb_kbstate[ki].state = 1;
} }

View file

@ -9,8 +9,8 @@ entire board is shifted down every time a certain number of shots have been
fired. Points are awarded depending on how quickly the level was completed. fired. Points are awarded depending on how quickly the level was completed.
\begin{btnmap} \begin{btnmap}
\opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect} \opt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
\nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp} \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
\opt{HAVEREMOTEKEYMAP}{& \PluginRCUp} \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
& Pause game\\ & Pause game\\
@ -19,8 +19,8 @@ fired. Points are awarded depending on how quickly the level was completed.
\opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight} \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
& Aim the bubble\\ & Aim the bubble\\
\opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp} \opt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginUp}
\nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect} \nopt{ONDIO_PAD,IRIVER_H10_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\PluginSelect}
\opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect} \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
& Fire bubble\\ & Fire bubble\\

View file

@ -53,12 +53,12 @@ Rockdoom options, you will need to quit your current game and restart the plugin
\item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}% \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}%
\opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}% \opt{IPOD_3G_PAD,IPOD_4G_PAD,SAMSUNG_YH92X_PAD}{flipping your \ButtonHold{} switch
a couple of times}%
\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}% ,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}%
\opt{SANSA_FUZE_PAD}{pressing \ButtonHome} \opt{SANSA_FUZE_PAD}{pressing \ButtonHome}
\opt{PBELL_VIBE500_PAD,SAMSUNG_YH820_PAD}{pressing \ButtonRec} \opt{PBELL_VIBE500_PAD,SAMSUNG_YH820_PAD}{pressing \ButtonRec}
\opt{SAMSUNG_YH92X_PAD}{flipping the \ButtonRec{} switch}
\opt{SANSA_FUZEPLUS_PAD}{pressing \ButtonBack} \opt{SANSA_FUZEPLUS_PAD}{pressing \ButtonBack}
\emph{New Game. } Start a new game\\ \emph{New Game. } Start a new game\\
@ -144,13 +144,12 @@ Rockdoom options, you will need to quit your current game and restart the plugin
& Open \\ & Open \\
% %
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
\opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch} \opt{IPOD_3G_PAD,IPOD_4G_PAD,SAMSUNG_YH92X_PAD}{\ButtonHold{} switch}
\opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower} ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower}
\opt{SANSA_FUZE_PAD}{\ButtonHome} \opt{SANSA_FUZE_PAD}{\ButtonHome}
\opt{COWON_D2_PAD}{\TouchTopLeft} \opt{COWON_D2_PAD}{\TouchTopLeft}
\opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SAMSUNG_YH820_PAD}{\ButtonRec} \opt{PBELL_VIBE500_PAD,MPIO_HD300_PAD,SAMSUNG_YH820_PAD}{\ButtonRec}
\opt{SAMSUNG_YH92X_PAD}{\ButtonRec{} switch}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBack} \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& InGame Menu \\ & InGame Menu \\

View file

@ -50,7 +50,8 @@ these markers:
\opt{PBELL_VIBE500_PAD}{\ButtonCancel}% \opt{PBELL_VIBE500_PAD}{\ButtonCancel}%
\opt{MPIO_HD200_PAD}{Long \ButtonFunc}% \opt{MPIO_HD200_PAD}{Long \ButtonFunc}%
\opt{MPIO_HD300_PAD}{\ButtonMenu}% \opt{MPIO_HD300_PAD}{\ButtonMenu}%
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonDown} \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonUp}
\opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonUp}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} button}. \\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} button}. \\
\emph{C } & There is a comment at the current node. It can be viewed/edited using \emph{C } & There is a comment at the current node. It can be viewed/edited using
the \emph{Add/Edit Comment} menu option of the \emph{Context Menu}. \\ the \emph{Add/Edit Comment} menu option of the \emph{Context Menu}. \\
@ -143,7 +144,8 @@ these markers:
\opt{touchscreen}{\TouchBottomLeft} \opt{touchscreen}{\TouchBottomLeft}
\opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonLeft} \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonLeft}
\opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonRew} \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonRew}
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew} \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonLeft}
\opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonLeft}
& &
\opt{HAVEREMOTEKEYMAP}{ \opt{HAVEREMOTEKEYMAP}{
&} &}
@ -161,7 +163,8 @@ these markers:
\opt{touchscreen}{\TouchBottomRight} \opt{touchscreen}{\TouchBottomRight}
\opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonRight} \opt{PBELL_VIBE500_PAD}{\ButtonOK{} + \ButtonRight}
\opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonFF} \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec + \ButtonFF}
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonFF} \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonRight}
\opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonRight}
& &
\opt{HAVEREMOTEKEYMAP}{ \opt{HAVEREMOTEKEYMAP}{
&} &}
@ -180,7 +183,7 @@ these markers:
\opt{RECORDER_PAD}{\ButtonFTwo}% \opt{RECORDER_PAD}{\ButtonFTwo}%
\opt{ONDIO_PAD}{Long \ButtonMenu} \opt{ONDIO_PAD}{Long \ButtonMenu}
\opt{MPIO_HD200_PAD}{Long \ButtonPlay} \opt{MPIO_HD200_PAD}{Long \ButtonPlay}
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonLeft} \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}
\opt{touchscreen}{\TouchTopLeft} \opt{touchscreen}{\TouchTopLeft}
& &
\opt{HAVEREMOTEKEYMAP}{ \opt{HAVEREMOTEKEYMAP}{
@ -202,7 +205,7 @@ these markers:
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft} \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
\opt{MPIO_HD200_PAD}{Long \ButtonFunc} \opt{MPIO_HD200_PAD}{Long \ButtonFunc}
\opt{MPIO_HD300_PAD}{Long \ButtonEnter} \opt{MPIO_HD300_PAD}{Long \ButtonEnter}
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonDown}% \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonPlay}%
& &
\opt{HAVEREMOTEKEYMAP}{ \opt{HAVEREMOTEKEYMAP}{
&} &}
@ -224,7 +227,8 @@ these markers:
\opt{touchscreen}{\TouchTopRight}% \opt{touchscreen}{\TouchTopRight}%
\opt{PBELL_VIBE500_PAD}{\ButtonCancel}% \opt{PBELL_VIBE500_PAD}{\ButtonCancel}%
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}% \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}%
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay+\ButtonUp}% \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} + \ButtonUp}%
\opt{SAMSUNG_YH820_PAD}{\ButtonRec{} + \ButtonUp}%
& &
\opt{HAVEREMOTEKEYMAP}{ \opt{HAVEREMOTEKEYMAP}{
&} &}

View file

@ -135,7 +135,7 @@ view a bigger file you may need to stop playback.}
} }
& Show menu / Abort \\ & Show menu / Abort \\
\opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD% \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD%
,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{ ,SAMSUNG_YH820_PAD}{
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
\opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower} \opt{GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
\opt{GIGABEAT_S_PAD}{\ButtonBack} \opt{GIGABEAT_S_PAD}{\ButtonBack}

View file

@ -30,34 +30,38 @@ found at \url{http://www.mame.net}.
% 20GB H10 and 5/6GB H10 have different direction key mappings to match the % 20GB H10 and 5/6GB H10 have different direction key mappings to match the
% orientation of the playing field on their different displays - don't use *_PAD ! % orientation of the playing field on their different displays - don't use *_PAD !
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,% \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonRight} IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD,SAMSUNG_YH92X_PAD,%
SAMSUNG_YH820_PAD}{\ButtonRight}
\opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD% \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD%
,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp} ,SANSA_FUZEPLUS_PAD}{\ButtonUp}
\opt{iriverh10_5gb}{\ButtonScrollUp} \opt{iriverh10_5gb}{\ButtonScrollUp}
\opt{COWON_D2_PAD}{\TouchTopMiddle} \opt{COWON_D2_PAD}{\TouchTopMiddle}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Move Up\\ & Move Up\\
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,% \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonLeft} IPOD_3G_PAD,iriverh10,MROBE100_PAD,SANSA_FUZE_PAD,SAMSUNG_YH92X_PAD,%
SAMSUNG_YH820_PAD}{\ButtonLeft}
\opt{iriverh10_5gb}{\ButtonScrollDown} \opt{iriverh10_5gb}{\ButtonScrollDown}
\opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD% \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD,%
,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown} SANSA_FUZEPLUS_PAD}{\ButtonDown}
\opt{COWON_D2_PAD}{\TouchBottomMiddle} \opt{COWON_D2_PAD}{\TouchBottomMiddle}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Move Down\\ & Move Down\\
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonUp} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD%
,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonUp}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
\opt{iriverh10}{\ButtonScrollUp} \opt{iriverh10}{\ButtonScrollUp}
\opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD% \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD%
,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonLeft} ,SANSA_FUZEPLUS_PAD}{\ButtonLeft}
\opt{COWON_D2_PAD}{\TouchMidLeft} \opt{COWON_D2_PAD}{\TouchMidLeft}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Move Left\\ & Move Left\\
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonDown} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,MROBE100_PAD,SANSA_FUZE_PAD%
,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonDown}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
\opt{iriverh10}{\ButtonScrollDown} \opt{iriverh10}{\ButtonScrollDown}
\opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD% \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,PBELL_VIBE500_PAD%
,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRight} ,SANSA_FUZEPLUS_PAD}{\ButtonRight}
\opt{COWON_D2_PAD}{\TouchMidRight} \opt{COWON_D2_PAD}{\TouchMidRight}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Move Right\\ & Move Right\\
@ -88,7 +92,8 @@ found at \url{http://www.mame.net}.
\opt{MROBE100_PAD}{\ButtonMenu} \opt{MROBE100_PAD}{\ButtonMenu}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight} \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
\opt{COWON_D2_PAD}{\TouchBottomRight} \opt{COWON_D2_PAD}{\TouchBottomRight}
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew} \opt{SAMSUNG_YH92X_PAD}{n/a}
\opt{SAMSUNG_YH820_PAD}{\ButtonRew}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& 2-Player Start\\ & 2-Player Start\\
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
@ -97,7 +102,7 @@ found at \url{http://www.mame.net}.
\opt{SANSA_E200_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower} \opt{SANSA_E200_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
\opt{SANSA_FUZE_PAD}{\ButtonHome} \opt{SANSA_FUZE_PAD}{\ButtonHome}
\opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonMenu} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
\opt{SAMSUNG_YH92X_PAD}{\ButtonRec{} switch} \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
\opt{SAMSUNG_YH820_PAD}{\ButtonRec} \opt{SAMSUNG_YH820_PAD}{\ButtonRec}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Menu\\ & Menu\\

View file

@ -106,7 +106,7 @@ aware:
\nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD}{\ActionStdMenu} \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD}{\ActionStdMenu}
\nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdMenu} \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdMenu}
\opt{SANSA_FUZEPLUS_PAD}{long \ButtonSelect} \opt{SANSA_FUZEPLUS_PAD}{long \ButtonSelect}
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew} \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{or \ButtonRew}
& &
\opt{HAVEREMOTEKEYMAP}{ \opt{HAVEREMOTEKEYMAP}{
\opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdMenu} \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdMenu}

View file

@ -149,8 +149,8 @@ if you select Exit, so any unsaved changes will be lost.}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft{} or \ButtonBottomRight} \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft{} or \ButtonBottomRight}
\opt{touchscreen}{\TouchBottomLeft} \opt{touchscreen}{\TouchBottomLeft}
\opt{PBELL_VIBE500_PAD}{\ButtonOK} \opt{PBELL_VIBE500_PAD}{\ButtonOK}
\opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} or \ButtonRec}% \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} or \ButtonLeft+\ButtonFF}%
\opt{SAMSUNG_YH820_PAD}{\ButtonFF{} or \ButtonLeft+\ButtonFF}% \opt{SAMSUNG_YH820_PAD}{\ButtonFF{} or \ButtonRec}%
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Displays the toolbar.\\ & Displays the toolbar.\\

View file

@ -27,12 +27,15 @@ the \setting{Virtual Keyboard} (see \reference{sec:virtual_keyboard}).
\opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel} \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel}
& Exit / Abort Editing\\ & Exit / Abort Editing\\
\ActionStdMenu \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdContext}
\nopt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ActionStdMenu}
\opt{HAVEREMOTEKEYMAP}{& \ActionRCStdMenu} \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdMenu}
& Show Item Menu\\ & Show Item Menu\\
\ActionStdContext \nopt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{
\opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext} \ActionStdContext
& Delete Line\\ \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}
& Delete Line\\
}
\end{btnmap} \end{btnmap}

View file

@ -46,7 +46,7 @@ Additionally, ``extra'' data files that modify the in-game strings and font can
& Move Left and Right\\ & Move Left and Right\\
% %
\opt{SANSA_FUZE_PAD}{\ButtonHome} \opt{SANSA_FUZE_PAD}{\ButtonHome}
\opt{SAMSUNG_YH920_PAD}{\ButtonFFWD} \opt{SAMSUNG_YH92X_PAD}{\ButtonFF}
\opt{IRIVER_H300_PAD,SANSA_E200_PAD,SAMSUNG_YH820_PAD,IAUDIO_X5M5_PAD}{\ButtonRec} \opt{IRIVER_H300_PAD,SANSA_E200_PAD,SAMSUNG_YH820_PAD,IAUDIO_X5M5_PAD}{\ButtonRec}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,CREATIVE_ZEN_PAD,SANSA_CLIP_PAD}{\ButtonSelect} \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,CREATIVE_ZEN_PAD,SANSA_CLIP_PAD}{\ButtonSelect}
\opt{SONY_NWZ_PAD,CREATIVEZVM_PAD}{\ButtonPlay} \opt{SONY_NWZ_PAD,CREATIVEZVM_PAD}{\ButtonPlay}
@ -68,7 +68,7 @@ Additionally, ``extra'' data files that modify the in-game strings and font can
,SANSA_FUZEPLUS_PAD}{\ButtonVolDown} ,SANSA_FUZEPLUS_PAD}{\ButtonVolDown}
\opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonMenu}
\opt{SANSA_FUZE_PAD}{\ButtonSelect} \opt{SANSA_FUZE_PAD}{\ButtonSelect}
\opt{SAMSUNG_YH920_PAD}{\ButtonRew} \opt{SAMSUNG_YH92X_PAD}{\ButtonRew}
\opt{SAMSUNG_YH820_PAD,IAUDIO_X5M5_PAD}{\ButtonPlay} \opt{SAMSUNG_YH820_PAD,IAUDIO_X5M5_PAD}{\ButtonPlay}
\opt{SANSA_E200_PAD,SANSA_CLIP_PAD}{\ButtonPower} \opt{SANSA_E200_PAD,SANSA_CLIP_PAD}{\ButtonPower}
\opt{CREATIVE_ZEN_PAD,SONY_NWZ_PAD}{\ButtonBack} \opt{CREATIVE_ZEN_PAD,SONY_NWZ_PAD}{\ButtonBack}

View file

@ -33,7 +33,8 @@ including an additional but fixed menu button, are assigned as follows:
\opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD% \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,IAUDIO_X5_PAD%
,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,MROBE100_PAD ,SANSA_C200_PAD,SANSA_CLIP_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,MROBE100_PAD
,SANSA_FUZEPLUS_PAD}{\ButtonSelect} ,SANSA_FUZEPLUS_PAD}{\ButtonSelect}
\opt{RECORDER_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay} \opt{RECORDER_PAD}{\ButtonPlay}
\opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay{} or \ButtonFF}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
\opt{ONDIO_PAD}{\ButtonMenu} \opt{ONDIO_PAD}{\ButtonMenu}
\opt{IRIVER_H10_PAD}{\ButtonRew} \opt{IRIVER_H10_PAD}{\ButtonRew}