diff options
Diffstat (limited to 'uisimulator')
| -rw-r--r-- | uisimulator/sdl/button.c | 16 | ||||
| -rw-r--r-- | uisimulator/win32/button.c | 16 | ||||
| -rw-r--r-- | uisimulator/x11/button-x11.c | 13 |
3 files changed, 37 insertions, 8 deletions
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 671cf12d5c..72224315a2 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c @@ -39,7 +39,6 @@ static int btn = 0; /* Hopefully keeps track of currently pressed keys... */ void button_event(int key, bool pressed) { - bool post = false; int new_btn = 0; int diff = 0; static int count = 0; @@ -47,6 +46,7 @@ void button_event(int key, bool pressed) static int repeat_speed = REPEAT_INTERVAL_START; static int repeat_count = 0; static bool repeat = false; + static bool post = false; switch (key) { @@ -175,7 +175,8 @@ void button_event(int key, bool pressed) { if ( repeat ) { - count--; + if (!post) + count--; if (count == 0) { post = true; @@ -203,9 +204,18 @@ void button_event(int key, bool pressed) if ( post ) { if(repeat) - queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); + { + if (queue_empty(&button_queue)) + { + queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); + post = false; + } + } else + { queue_post(&button_queue, btn, NULL); + post = false; + } #ifdef HAVE_REMOTE_LCD if(btn & BUTTON_REMOTE) diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index 7996af583d..8f21fe4396 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c @@ -40,7 +40,6 @@ static int btn = 0; /* Hopefully keeps track of currently pressed keys... */ void button_event(int key, bool pressed) { - bool post = false; int new_btn = 0; int diff = 0; static int count = 0; @@ -48,6 +47,7 @@ void button_event(int key, bool pressed) static int repeat_speed = REPEAT_INTERVAL_START; static int repeat_count = 0; static bool repeat = false; + static bool post = false; switch (key) { @@ -176,7 +176,8 @@ void button_event(int key, bool pressed) { if ( repeat ) { - count--; + if (!post) + count--; if (count == 0) { post = true; @@ -204,9 +205,18 @@ void button_event(int key, bool pressed) if ( post ) { if(repeat) - queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); + { + if (queue_empty(&button_queue)) + { + queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); + post = false; + } + } else + { queue_post(&button_queue, btn, NULL); + post = false; + } #ifdef HAVE_REMOTE_LCD if(btn & BUTTON_REMOTE) diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index 08b09cf8cb..673f71ea7b 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c @@ -55,13 +55,13 @@ static void button_tick(void) static int repeat_speed = REPEAT_INTERVAL_START; static int repeat_count = 0; static bool repeat = false; + static bool post = false; int diff; int btn; /* only poll every X ticks */ if ( ++tick >= POLL_FREQUENCY ) { - bool post = false; button_read(); btn = button_state; @@ -115,9 +115,18 @@ static void button_tick(void) if ( post ) { if (repeat) - queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); + { + if (queue_empty(&button_queue)) + { + queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); + post = false; + } + } else + { queue_post(&button_queue, btn, NULL); + post = false; + } #ifdef HAVE_REMOTE_LCD if(btn & BUTTON_REMOTE) remote_backlight_on(); |