1 files changed, 6 insertions, 10 deletions

diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c
index d1310d71e2..c838677778 100644
--- a/uisimulator/x11/button-x11.c
+++ b/uisimulator/x11/button-x11.c
@@ -63,19 +63,14 @@ int button_set_release(int newmask)
  */
 
 /* from uibasic.c */
-extern int screenhack_handle_events (void);
+extern int screenhack_handle_events(bool *release);
 
 static int get_raw_button (void)
 {
     int k;
-    static int next = 0;
-    if ( next ) {
-        k = next;
-        next = 0;
-        return k;
-    }
+    bool release=false; /* is this a release event */
 
-    switch(screenhack_handle_events())
+    switch(screenhack_handle_events(&release))
     {
         case XK_KP_Left:
         case XK_Left:
@@ -153,8 +148,9 @@ static int get_raw_button (void)
             break;
     }
 
-    if ( k )
-        next = k | BUTTON_REL;
+    if ( release )
+        /* return a release event */
+        k |= BUTTON_REL;
 
     return k;
 }