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.zip
rockbox-fffa26987abed798b6fda1334724fbce6fa92d44.tar.gz
rockbox-fffa26987abed798b6fda1334724fbce6fa92d44.tar.bz2
rockbox-fffa26987abed798b6fda1334724fbce6fa92d44.tar.xz
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 2458976..dfe2bc8 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[] = {
}; /* button_context_list */
static const struct button_mapping button_context_tree[] = {
- { ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REL, BUTTON_BACK },
+ { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
{ ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE },
{ ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ 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 0000000..affdbda
--- /dev/null
+++ b/uisimulator/sdl/UI-gigabeats.bmp
Binary files differ
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 3c825ea..cea65c9 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -185,6 +185,45 @@ void button_event(int key, bool pressed)
new_btn = BUTTON_MENU;
break;
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+ case SDLK_KP4:
+ case SDLK_LEFT:
+ new_btn = BUTTON_LEFT;
+ break;
+ case SDLK_KP6:
+ case SDLK_RIGHT:
+ new_btn = BUTTON_RIGHT;
+ break;
+ case SDLK_KP8:
+ case SDLK_UP:
+ new_btn = BUTTON_UP;
+ break;
+ case SDLK_KP2:
+ case SDLK_DOWN:
+ new_btn = BUTTON_DOWN;
+ break;
+ case SDLK_F8:
+ case SDLK_ESCAPE:
+ new_btn = BUTTON_POWER;
+ break;
+ case SDLK_KP_PLUS:
+ case SDLK_KP_ENTER:
+ case SDLK_RETURN:
+ new_btn = BUTTON_PLAY;
+ break;
+ case SDLK_KP7:
+ new_btn = BUTTON_BACK;
+ break;
+ case SDLK_KP5:
+ case SDLK_SPACE:
+ new_btn = BUTTON_SELECT;
+ break;
+ case SDLK_KP9:
+ case SDLK_KP_PERIOD:
+ case SDLK_INSERT:
+ new_btn = BUTTON_MENU;
+ break;
+
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
case SDLK_KP4:
case SDLK_LEFT:
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index b0a572d..db11047 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -229,6 +229,16 @@
#define UI_LCD_WIDTH 240
#define UI_LCD_HEIGHT 320
+#elif defined(GIGABEAT_S)
+#define UI_TITLE "Toshiba Gigabeat"
+#define UI_WIDTH 450 /* width of GUI window */
+#define UI_HEIGHT 688 /* height of GUI window */
+/* high-colour */
+#define UI_LCD_POSX 96 /* x position of lcd */
+#define UI_LCD_POSY 90 /* y position of lcd */
+#define UI_LCD_WIDTH 240
+#define UI_LCD_HEIGHT 320
+
#elif defined(MROBE_500)
#define UI_TITLE "Olympus M:Robe 500"
#define UI_WIDTH 401 /* width of GUI window */