summaryrefslogtreecommitdiff
path: root/uisimulator/sdl
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2007-10-21 23:12:17 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2007-10-21 23:12:17 +0000
commitfdbc01c6e24bf2a758d0d5b38dc2c5c5e46bab07 (patch)
tree1290925de28583bb66e6ddd57981cbf67e1500a4 /uisimulator/sdl
parent2d91cf3ea39e409bc72fd687aa7638cc34191bd9 (diff)
More M:Robe work including a fix to lcd-as-memframe for larger screens thanks to Michael Sevakis. Also fixes simulator builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15254 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/sdl')
-rwxr-xr-xuisimulator/sdl/UI-mrobe500.bmpbin0 -> 1705718 bytes
-rw-r--r--uisimulator/sdl/button.c41
-rw-r--r--uisimulator/sdl/uisdl.h16
3 files changed, 56 insertions, 1 deletions
diff --git a/uisimulator/sdl/UI-mrobe500.bmp b/uisimulator/sdl/UI-mrobe500.bmp
new file mode 100755
index 0000000000..b32250e2de
--- /dev/null
+++ b/uisimulator/sdl/UI-mrobe500.bmp
Binary files differ
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index e50bfea087..62c2c33150 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -589,7 +589,46 @@ void button_event(int key, bool pressed)
case SDLK_KP9:
new_btn = BUTTON_VOL_UP;
break;
-
+
+#elif CONFIG_KEYPAD == MROBE500_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_RC_PLAY;
+ break;
+ case SDLK_KP2:
+ case SDLK_DOWN:
+ new_btn = BUTTON_RC_DOWN;
+ break;
+ case SDLK_KP_PLUS:
+ case SDLK_F8:
+ new_btn = BUTTON_POWER;
+ break;
+ case SDLK_ESCAPE:
+ new_btn = BUTTON_POWER;
+ break;
+ case SDLK_KP_ENTER:
+ case SDLK_RETURN:
+ case SDLK_a:
+ new_btn = BUTTON_RC_VOL_UP;
+ break;
+ case SDLK_KP5:
+ case SDLK_SPACE:
+ new_btn = BUTTON_RC_HEART;
+ break;
+ case SDLK_KP_PERIOD:
+ case SDLK_INSERT:
+ new_btn = BUTTON_RC_MODE;
+ break;
+#else
+#error No keymap defined!
#endif /* CONFIG_KEYPAD */
case SDLK_KP0:
case SDLK_F5:
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index 0f0d29847b..9be517c997 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -229,6 +229,22 @@
#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 */
+#define UI_HEIGHT 655 /* height of GUI window */
+/* high-colour */
+#define UI_LCD_POSX 48 /* x position of lcd */
+#define UI_LCD_POSY 60 /* y position of lcd */
+#define UI_LCD_WIDTH LCD_WIDTH
+#define UI_LCD_HEIGHT LCD_HEIGHT
+#define UI_REMOTE_BGCOLOR 90, 145, 90 /* bkgnd of remote lcd (no bklight) */
+#define UI_REMOTE_BGCOLORLIGHT 130, 180, 250 /* bkgnd of remote lcd (bklight) */
+#define UI_REMOTE_POSX 50 /* x position of remote lcd */
+#define UI_REMOTE_POSY 403 /* y position of remote lcd */
+#define UI_REMOTE_WIDTH 79
+#define UI_REMOTE_HEIGHT 16
+
#elif defined(IRIVER_H10)
#define UI_TITLE "iriver H10 20Gb"
#define UI_WIDTH 392 /* width of GUI window */