diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-01-17 00:29:08 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-01-17 00:29:08 +0000 |
commit | c9aacb61f45e62793052bb66e58c86623dbfc771 (patch) | |
tree | 0caf81dabf82b745900ffadc259486f82f314171 /uisimulator | |
parent | 9f700acd0b9e2628e62910fe463c08365febe8f7 (diff) | |
download | rockbox-c9aacb61f45e62793052bb66e58c86623dbfc771.tar.gz rockbox-c9aacb61f45e62793052bb66e58c86623dbfc771.zip |
Win32 simulator: Button handling adapted to iRiver and reworked a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5569 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/button.c | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index a304c366c4..d49086a725 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -103,14 +103,20 @@ void button_event(int key, bool pressed) | |||
103 | case VK_F3: | 103 | case VK_F3: |
104 | new_btn = BUTTON_F3; | 104 | new_btn = BUTTON_F3; |
105 | break; | 105 | break; |
106 | #elif defined(BUTTON_REC) | ||
107 | case VK_DIVIDE: | ||
108 | new_btn = BUTTON_REC; | ||
109 | break; | ||
106 | #endif | 110 | #endif |
107 | 111 | ||
108 | #ifdef BUTTON_PLAY | ||
109 | case VK_NUMPAD5: | 112 | case VK_NUMPAD5: |
110 | case VK_SPACE: | 113 | case VK_SPACE: |
114 | #ifdef BUTTON_PLAY | ||
111 | new_btn = BUTTON_PLAY; | 115 | new_btn = BUTTON_PLAY; |
112 | break; | 116 | #elif defined(BUTTON_SELECT) |
117 | new_btn = BUTTON_SELECT; | ||
113 | #endif | 118 | #endif |
119 | break; | ||
114 | 120 | ||
115 | #ifdef HAVE_LCD_BITMAP | 121 | #ifdef HAVE_LCD_BITMAP |
116 | case VK_NUMPAD0: | 122 | case VK_NUMPAD0: |
@@ -123,15 +129,13 @@ void button_event(int key, bool pressed) | |||
123 | break; | 129 | break; |
124 | #endif | 130 | #endif |
125 | 131 | ||
132 | case VK_DECIMAL: | ||
126 | #ifdef BUTTON_MENU | 133 | #ifdef BUTTON_MENU |
127 | #if CONFIG_KEYPAD == PLAYER_PAD | ||
128 | case VK_RETURN: | ||
129 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
130 | case VK_INSERT: | ||
131 | #endif | ||
132 | new_btn = BUTTON_MENU; | 134 | new_btn = BUTTON_MENU; |
133 | break; | 135 | #elif defined(BUTTON_MODE) |
136 | new_btn = BUTTON_MODE; | ||
134 | #endif | 137 | #endif |
138 | break; | ||
135 | } | 139 | } |
136 | 140 | ||
137 | if (pressed) | 141 | if (pressed) |
@@ -208,15 +212,6 @@ void button_event(int key, bool pressed) | |||
208 | lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT); | 212 | lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT); |
209 | } | 213 | } |
210 | 214 | ||
211 | int button_status(void) | ||
212 | { | ||
213 | return btn; | ||
214 | } | ||
215 | |||
216 | void button_init(void) | ||
217 | { | ||
218 | } | ||
219 | |||
220 | /* Again copied from real button.c... */ | 215 | /* Again copied from real button.c... */ |
221 | 216 | ||
222 | int button_get(bool block) | 217 | int button_get(bool block) |
@@ -237,7 +232,17 @@ int button_get_w_tmo(int ticks) | |||
237 | return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE; | 232 | return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE; |
238 | } | 233 | } |
239 | 234 | ||
235 | void button_init(void) | ||
236 | { | ||
237 | } | ||
238 | |||
239 | int button_status(void) | ||
240 | { | ||
241 | return btn; | ||
242 | } | ||
243 | |||
240 | void button_clear_queue(void) | 244 | void button_clear_queue(void) |
241 | { | 245 | { |
242 | queue_empty(&button_queue); | 246 | queue_empty(&button_queue); |
243 | } | 247 | } |
248 | |||