diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-21 08:02:23 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-21 08:02:23 +0000 |
commit | a754dd84b82c9aa92e7b94d0154e67500607a6a7 (patch) | |
tree | ea8f4865df30e90bdddebbe61f37aacbf19f0058 /uisimulator | |
parent | 69697aefe84f3e576daad595259a8dd16b00ea99 (diff) | |
download | rockbox-a754dd84b82c9aa92e7b94d0154e67500607a6a7.tar.gz rockbox-a754dd84b82c9aa92e7b94d0154e67500607a6a7.zip |
Added raw button reading functionality
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4907 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/button.c | 13 | ||||
-rw-r--r-- | uisimulator/x11/button-x11.c | 23 |
2 files changed, 21 insertions, 15 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index 4532727200..0af6ff40a6 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -36,13 +36,14 @@ | |||
36 | 36 | ||
37 | struct event_queue button_queue; | 37 | struct event_queue button_queue; |
38 | 38 | ||
39 | static int btn = 0; /* Hopefully keeps track of currently pressed keys... */ | ||
40 | |||
39 | void button_event(int key, bool pressed) | 41 | void button_event(int key, bool pressed) |
40 | { | 42 | { |
41 | bool post = false; | 43 | bool post = false; |
42 | int new_btn = 0; | 44 | int new_btn = 0; |
43 | int diff = 0; | 45 | int diff = 0; |
44 | static int count = 0; | 46 | static int count = 0; |
45 | static int btn = 0; /* Hopefully keeps track of currently pressed keys... */ | ||
46 | static int lastbtn; | 47 | static int lastbtn; |
47 | static int repeat_speed = REPEAT_INTERVAL_START; | 48 | static int repeat_speed = REPEAT_INTERVAL_START; |
48 | static int repeat_count = 0; | 49 | static int repeat_count = 0; |
@@ -180,6 +181,11 @@ void button_event(int key, bool pressed) | |||
180 | lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT); | 181 | lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT); |
181 | } | 182 | } |
182 | 183 | ||
184 | int button_status(void) | ||
185 | { | ||
186 | return btn; | ||
187 | } | ||
188 | |||
183 | void button_init(void) | 189 | void button_init(void) |
184 | { | 190 | { |
185 | } | 191 | } |
@@ -203,3 +209,8 @@ int button_get_w_tmo(int ticks) | |||
203 | queue_wait_w_tmo(&button_queue, &ev, ticks); | 209 | queue_wait_w_tmo(&button_queue, &ev, ticks); |
204 | return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE; | 210 | return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE; |
205 | } | 211 | } |
212 | |||
213 | void button_clear_queue(void) | ||
214 | { | ||
215 | queue_empty(&button_queue); | ||
216 | } | ||
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index 1b2c19232f..6567c2a9bc 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c | |||
@@ -33,20 +33,6 @@ void button_init() | |||
33 | { | 33 | { |
34 | } | 34 | } |
35 | 35 | ||
36 | int button_set_repeat(int newmask) | ||
37 | { | ||
38 | int oldmask = repeat_mask; | ||
39 | repeat_mask = newmask; | ||
40 | return oldmask; | ||
41 | } | ||
42 | |||
43 | int button_set_release(int newmask) | ||
44 | { | ||
45 | int oldmask = release_mask; | ||
46 | release_mask = newmask; | ||
47 | return oldmask; | ||
48 | } | ||
49 | |||
50 | /* | 36 | /* |
51 | * Translate X keys to Recorder keys | 37 | * Translate X keys to Recorder keys |
52 | * | 38 | * |
@@ -214,3 +200,12 @@ int button_get(bool block) | |||
214 | 200 | ||
215 | return bits; | 201 | return bits; |
216 | } | 202 | } |
203 | |||
204 | int button_status(void) | ||
205 | { | ||
206 | return get_raw_button(); | ||
207 | } | ||
208 | |||
209 | void button_clear_queue(void) | ||
210 | { | ||
211 | } | ||