summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2008-05-15 18:01:14 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2008-05-15 18:01:14 +0000
commit1ea884b53126206ffbc1607454d5d7d255acec7e (patch)
tree50aad7d5622d88470813c2f8ca4ea79855cf52ca /uisimulator
parentc249f5301024da7c8e8f23c32b01fecf72b1d5dc (diff)
downloadrockbox-1ea884b53126206ffbc1607454d5d7d255acec7e.tar.gz
rockbox-1ea884b53126206ffbc1607454d5d7d255acec7e.tar.bz2
rockbox-1ea884b53126206ffbc1607454d5d7d255acec7e.zip
1) Add ZVM60GB and ZV simulator builds (ZVM60GB sim equals to ZVM30GB)
2) Correct typo which'll break build system for ZV currently 3) Split up keymaps for ZV & ZVM git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17525 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/sdl/UI-creativezv.bmpbin0 -> 2034506 bytes
-rw-r--r--uisimulator/sdl/UI-creativezvm60.bmp (renamed from uisimulator/sdl/UI-creativezvm.bmp)bin740790 -> 740790 bytes
-rw-r--r--uisimulator/sdl/button.c47
-rw-r--r--uisimulator/sdl/uisdl.h21
4 files changed, 66 insertions, 2 deletions
diff --git a/uisimulator/sdl/UI-creativezv.bmp b/uisimulator/sdl/UI-creativezv.bmp
new file mode 100644
index 0000000000..4d82b18da7
--- /dev/null
+++ b/uisimulator/sdl/UI-creativezv.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-creativezvm.bmp b/uisimulator/sdl/UI-creativezvm60.bmp
index d244b8d6e7..d244b8d6e7 100644
--- a/uisimulator/sdl/UI-creativezvm.bmp
+++ b/uisimulator/sdl/UI-creativezvm60.bmp
Binary files differ
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 07e53ce951..76a1f2f10c 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -833,6 +833,53 @@ void button_event(int key, bool pressed)
case SDLK_ESCAPE:
new_btn = BUTTON_POWER;
break;
+#elif CONFIG_KEYPAD == CREATIVEZV_PAD
+ case SDLK_KP1:
+ new_btn = BUTTON_PREV;
+ break;
+ case SDLK_KP3:
+ new_btn = BUTTON_NEXT;
+ break;
+ case SDLK_KP7:
+ new_btn = BUTTON_BACK;
+ break;
+ case SDLK_p:
+ new_btn = BUTTON_PLAY;
+ break;
+ case SDLK_KP9:
+ new_btn = BUTTON_MENU;
+ break;
+ 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_KP5:
+ case SDLK_SPACE:
+ new_btn = BUTTON_SELECT;
+ break;
+ case SDLK_KP_MULTIPLY:
+ case SDLK_F8:
+ case SDLK_ESCAPE:
+ new_btn = BUTTON_POWER;
+ break;
+ case SDLK_z:
+ new_btn = BUTTON_VOL_DOWN;
+ break;
+ case SDLK_s:
+ new_btn = BUTTON_VOL_UP;
+ break;
#else
#error No keymap defined!
#endif /* CONFIG_KEYPAD */
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index fa935c7263..abd320ad18 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -374,8 +374,12 @@
#define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */
#define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */
-#elif defined(CREATIVE_ZVM)
-#define UI_TITLE "Creative Zen Vision:M 30GB"
+#elif defined(CREATIVE_ZVM) || defined(CREATIVE_ZVM60GB)
+#ifdef CREATIVE_ZVM
+ #define UI_TITLE "Creative Zen Vision:M 30GB"
+#else
+ #define UI_TITLE "Creative Zen Vision:M 60GB"
+#endif
#define UI_WIDTH 383 /* width of GUI window */
#define UI_HEIGHT 643 /* height of GUI window */
#define UI_LCD_POSX 31 /* x position of lcd */
@@ -387,6 +391,19 @@
#define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */
#define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */
+#elif defined(CREATIVE_ZV)
+#define UI_TITLE "Creative Zen Vision"
+#define UI_WIDTH 1054 /* width of GUI window */
+#define UI_HEIGHT 643 /* height of GUI window */
+#define UI_LCD_POSX 129 /* x position of lcd */
+#define UI_LCD_POSY 85 /* y position of lcd */
+#define UI_LCD_WIDTH 640
+#define UI_LCD_HEIGHT 480
+#define UI_LCD_BGCOLOR 32, 32, 32 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT 192, 192, 192 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_FGCOLOR 0, 0, 0 /* foreground color of LCD (no backlight) */
+#define UI_LCD_FGCOLORLIGHT 0, 0, 0 /* foreground color of LCD (backlight) */
+
#endif
extern SDL_Surface *gui_surface;
extern bool background; /* True if the background image is enabled */