summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2009-10-31 16:27:09 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2009-10-31 16:27:09 +0000
commit223eba732e99d869fa0f65f98153642bd8d058a6 (patch)
treef431c1ed91282f1fb8b9a8d4c61fee9b5e988904 /uisimulator
parent8aba665bdd28b0c2238511e17e9a1a5ea8043abf (diff)
downloadrockbox-223eba732e99d869fa0f65f98153642bd8d058a6.tar.gz
rockbox-223eba732e99d869fa0f65f98153642bd8d058a6.tar.bz2
rockbox-223eba732e99d869fa0f65f98153642bd8d058a6.zip
Simulator: Fix scrollwheel targets without HAVE_WHEEL_ACCELERATION defined
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23438 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/sdl/button.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 3a6b9ce09f..da672f3c92 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -1243,10 +1243,16 @@ void button_event(int key, bool pressed)
* implementation (look at button-e200.c for example if you are trying to
* figure out why using button_get_data needed a hack before).
*/
-#if defined(BUTTON_SCROLL_FWD) && defined(BUTTON_SCROLL_BACK)
+#if defined(HAVE_WHEEL_ACCELERATION)
if((new_btn == BUTTON_SCROLL_FWD || new_btn == BUTTON_SCROLL_BACK) &&
pressed)
{
+ /* Clear these buttons from the data - adding them to the queue is
+ * handled in the scrollwheel drivers for the targets. They do not
+ * store the scroll forward/back buttons in their button data for
+ * the button_read call.
+ */
+ btn &= ~(BUTTON_SCROLL_FWD | BUTTON_SCROLL_BACK);
queue_post(&button_queue, new_btn, 1<<24);
}
#endif