From fffa26987abed798b6fda1334724fbce6fa92d44 Mon Sep 17 00:00:00 2001 From: Will Robertson Date: Fri, 8 Feb 2008 08:33:17 +0000 Subject: UI Simulator for Gigabeat S. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16246 a1c6a512-1295-4272-9138-f99709370657 --- apps/keymaps/keymap-gigabeat-s.c | 2 +- uisimulator/sdl/UI-gigabeats.bmp | Bin 0 -> 1238454 bytes uisimulator/sdl/button.c | 39 +++++++++++++++++++++++++++++++++++++++ uisimulator/sdl/uisdl.h | 10 ++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100755 uisimulator/sdl/UI-gigabeats.bmp 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[] = { }; /* 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 0000000000..affdbdaf69 Binary files /dev/null and b/uisimulator/sdl/UI-gigabeats.bmp 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) 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 b0a572da75..db11047dd1 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 */ -- cgit v1.2.3