summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rwxr-xr-xapps/plugins/bubbles.c4
-rw-r--r--apps/plugins/lib/pluginlib_actions.h63
2 files changed, 64 insertions, 3 deletions
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index efc32f8a85..254539603f 100755
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -2337,7 +2337,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
2337 int buttonres; 2337 int buttonres;
2338 long start; 2338 long start;
2339 const struct button_mapping *plugin_contexts[] 2339 const struct button_mapping *plugin_contexts[]
2340 = {generic_directions,generic_actions}; 2340 = {generic_left_right_fire,generic_actions};
2341 button = pluginlib_getaction(rb,timeout,plugin_contexts,2); 2341 button = pluginlib_getaction(rb,timeout,plugin_contexts,2);
2342 2342
2343#ifdef HAS_BUTTON_HOLD 2343#ifdef HAS_BUTTON_HOLD
@@ -2417,7 +2417,7 @@ static int bubbles(struct game_context* bb) {
2417 bool showscores = false; 2417 bool showscores = false;
2418 long timeout; 2418 long timeout;
2419 const struct button_mapping *plugin_contexts[] 2419 const struct button_mapping *plugin_contexts[]
2420 = {generic_directions,generic_actions}; 2420 = {generic_actions,generic_directions};
2421 2421
2422 bubbles_setcolors(); 2422 bubbles_setcolors();
2423 2423
diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h
index 80c559d492..baf7d82fce 100644
--- a/apps/plugins/lib/pluginlib_actions.h
+++ b/apps/plugins/lib/pluginlib_actions.h
@@ -104,6 +104,67 @@ static const struct button_mapping generic_directions[] =
104 {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE} 104 {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
105}; 105};
106 106
107static const struct button_mapping generic_left_right_fire[] =
108{
109#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \
110 || (CONFIG_KEYPAD == IRIVER_H300_PAD) \
111 || (CONFIG_KEYPAD == IAUDIO_X5_PAD) \
112 || (CONFIG_KEYPAD == GIGABEAT_PAD) \
113 || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)
114 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
115 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
116 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
117 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
118 { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
119 { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE},
120#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
121 { PLA_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE},
122 { PLA_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE},
123 { PLA_LEFT_REPEAT, BUTTON_SCROLL_BACK, BUTTON_NONE},
124 { PLA_RIGHT_REPEAT, BUTTON_SCROLL_FWD, BUTTON_NONE},
125 { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
126 { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE},
127#elif CONFIG_KEYPAD == ONDIO_PAD
128 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
129 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
130 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
131 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
132 { PLA_FIRE, BUTTON_UP, BUTTON_NONE},
133 { PLA_FIRE_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE},
134#elif CONFIG_KEYPAD == PLAYER_PAD
135 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
136 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
137 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
138 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
139 { PLA_FIRE, BUTTON_ON, BUTTON_NONE},
140 { PLA_FIRE_REPEAT, BUTTON_ON|BUTTON_REPEAT, BUTTON_NONE},
141#elif CONFIG_KEYPAD == RECORDER_PAD
142 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
143 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
144 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
145 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
146 { PLA_FIRE, BUTTON_PLAY, BUTTON_NONE},
147 { PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
148#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
149 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
150 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
151 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
152 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
153 { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
154 { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE},
155#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
156 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE},
157 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
158 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
159 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
160 { PLA_FIRE, BUTTON_REW, BUTTON_NONE},
161 { PLA_FIRE_REPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE},
162#else
163 #error pluginlib_actions: Unsupported keypad
164#endif
165 {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
166};
167
107/* these were taken from the bubbles plugin, so may need tweaking */ 168/* these were taken from the bubbles plugin, so may need tweaking */
108static const struct button_mapping generic_actions[] = 169static const struct button_mapping generic_actions[] =
109{ 170{
@@ -117,7 +178,7 @@ static const struct button_mapping generic_actions[] =
117#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) 178#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
118 {PLA_QUIT, BUTTON_MENU|BUTTON_SELECT, BUTTON_NONE}, 179 {PLA_QUIT, BUTTON_MENU|BUTTON_SELECT, BUTTON_NONE},
119 {PLA_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, 180 {PLA_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
120 {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, 181 {PLA_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE},
121 {PLA_FIRE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, 182 {PLA_FIRE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
122 {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, 183 {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
123#elif CONFIG_KEYPAD == IAUDIO_X5_PAD 184#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-24 22:20:59 +0000