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 @@
 
 struct event_queue button_queue;
 
+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;
-    static int btn = 0;     /* Hopefully keeps track of currently pressed keys... */
     static int lastbtn;
     static int repeat_speed = REPEAT_INTERVAL_START;
     static int repeat_count = 0;
@@ -180,6 +181,11 @@ void button_event(int key, bool pressed)
     lastbtn = btn & ~(BUTTON_REL | BUTTON_REPEAT);
 }
 
+int button_status(void)
+{
+    return btn;
+}
+   
 void button_init(void)
 {
 }
@@ -203,3 +209,8 @@ int button_get_w_tmo(int ticks)
     queue_wait_w_tmo(&button_queue, &ev, ticks);
     return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE;
 } 
+
+void button_clear_queue(void)
+{
+    queue_empty(&button_queue);
+}
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()
 {
 }
 
-int button_set_repeat(int newmask)
-{
-    int oldmask = repeat_mask;
-    repeat_mask = newmask;
-    return oldmask;
-}
-
-int button_set_release(int newmask)
-{
-    int oldmask = release_mask;
-    release_mask = newmask;
-    return oldmask;
-}
-
 /*
  * Translate X keys to Recorder keys
  *
@@ -214,3 +200,12 @@ int button_get(bool block)
 
     return bits;
 }
+
+int button_status(void)
+{
+    return get_raw_button();
+}
+
+void button_clear_queue(void)
+{
+}