summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Robertson <aliask@rockbox.org>2008-02-08 08:33:17 +0000
committerWill Robertson <aliask@rockbox.org>2008-02-08 08:33:17 +0000
commitfffa26987abed798b6fda1334724fbce6fa92d44 (patch)
tree12c9d9676de44502c6cd46b09fed83ea87a26b65
parentbc057f91b55e95ba63810bd9c3a7b1734cebdfce (diff)
downloadrockbox-fffa26987abed798b6fda1334724fbce6fa92d44.tar.gz
rockbox-fffa26987abed798b6fda1334724fbce6fa92d44.zip
UI Simulator for Gigabeat S.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16246 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-gigabeat-s.c2
-rwxr-xr-xuisimulator/sdl/UI-gigabeats.bmpbin0 -> 1238454 bytes
-rw-r--r--uisimulator/sdl/button.c39
-rw-r--r--uisimulator/sdl/uisdl.h10
4 files changed, 50 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index 2458976425..dfe2bc852e 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -121,7 +121,7 @@ static const struct button_mapping button_context_list[] = {
121}; /* button_context_list */ 121}; /* button_context_list */
122 122
123static const struct button_mapping button_context_tree[] = { 123static const struct button_mapping button_context_tree[] = {
124 { ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, 124 { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
125 { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, 125 { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE },
126 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 126 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
127 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, 127 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/uisimulator/sdl/UI-gigabeats.bmp b/uisimulator/sdl/UI-gigabeats.bmp
new file mode 100755
index 0000000000..affdbdaf69
--- /dev/null
+++ b/uisimulator/sdl/UI-gigabeats.bmp
Binary files differ
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 3c825eac72..cea65c9fa6 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -185,6 +185,45 @@ void button_event(int key, bool pressed)
185 new_btn = BUTTON_MENU; 185 new_btn = BUTTON_MENU;
186 break; 186 break;
187 187
188#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
189 case SDLK_KP4:
190 case SDLK_LEFT:
191 new_btn = BUTTON_LEFT;
192 break;
193 case SDLK_KP6:
194 case SDLK_RIGHT:
195 new_btn = BUTTON_RIGHT;
196 break;
197 case SDLK_KP8:
198 case SDLK_UP:
199 new_btn = BUTTON_UP;
200 break;
201 case SDLK_KP2:
202 case SDLK_DOWN:
203 new_btn = BUTTON_DOWN;
204 break;
205 case SDLK_F8:
206 case SDLK_ESCAPE:
207 new_btn = BUTTON_POWER;
208 break;
209 case SDLK_KP_PLUS:
210 case SDLK_KP_ENTER:
211 case SDLK_RETURN:
212 new_btn = BUTTON_PLAY;
213 break;
214 case SDLK_KP7:
215 new_btn = BUTTON_BACK;
216 break;
217 case SDLK_KP5:
218 case SDLK_SPACE:
219 new_btn = BUTTON_SELECT;
220 break;
221 case SDLK_KP9:
222 case SDLK_KP_PERIOD:
223 case SDLK_INSERT:
224 new_btn = BUTTON_MENU;
225 break;
226
188#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD 227#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
189 case SDLK_KP4: 228 case SDLK_KP4:
190 case SDLK_LEFT: 229 case SDLK_LEFT:
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index b0a572da75..db11047dd1 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -229,6 +229,16 @@
229#define UI_LCD_WIDTH 240 229#define UI_LCD_WIDTH 240
230#define UI_LCD_HEIGHT 320 230#define UI_LCD_HEIGHT 320
231 231
232#elif defined(GIGABEAT_S)
233#define UI_TITLE "Toshiba Gigabeat"
234#define UI_WIDTH 450 /* width of GUI window */
235#define UI_HEIGHT 688 /* height of GUI window */
236/* high-colour */
237#define UI_LCD_POSX 96 /* x position of lcd */
238#define UI_LCD_POSY 90 /* y position of lcd */
239#define UI_LCD_WIDTH 240
240#define UI_LCD_HEIGHT 320
241
232#elif defined(MROBE_500) 242#elif defined(MROBE_500)
233#define UI_TITLE "Olympus M:Robe 500" 243#define UI_TITLE "Olympus M:Robe 500"
234#define UI_WIDTH 401 /* width of GUI window */ 244#define UI_WIDTH 401 /* width of GUI window */