[Qemu-devel] [PATCH RFC 6/8] monitor: Eliminate global mouse buttons state for mouse_move

[Andreas Färber]

mouse_button command would save buttons state globally so that
move_move command could reuse it for kbd_mouse_event().

Introduce kbd_mouse_move_event() to allow to use new
MouseOps::get_buttons_state() to obtain buttons state from the
respective mouse.

This means that mouse_set will now affect which buttons state is used on
mouse_move.

Signed-off-by: Andreas Färber <address@hidden>
---
 include/ui/console.h |  1 +
 monitor.c            | 10 ++++------
 ui/input.c           | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/include/ui/console.h b/include/ui/console.h
index 2ac6403..132591a 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -60,6 +60,7 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
 void kbd_put_keycode(int keycode);
 void kbd_put_ledstate(int ledstate);
 void kbd_mouse_event(int dx, int dy, int dz, int buttons_state);
+void kbd_mouse_move_event(int dx, int dy, int dz);
 
 /* Does the current mouse generate absolute events */
 bool kbd_mouse_is_absolute(void);
diff --git a/monitor.c b/monitor.c
index 70ae8f5..6816e82 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1266,8 +1266,6 @@ static void do_sum(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "%05d\n", sum);
 }
 
-static int mouse_button_state;
-
 static void do_mouse_move(Monitor *mon, const QDict *qdict)
 {
     int dx, dy, dz;
@@ -1277,16 +1275,16 @@ static void do_mouse_move(Monitor *mon, const QDict 
*qdict)
     dx = strtol(dx_str, NULL, 0);
     dy = strtol(dy_str, NULL, 0);
     dz = 0;
-    if (dz_str)
+    if (dz_str) {
         dz = strtol(dz_str, NULL, 0);
-    kbd_mouse_event(dx, dy, dz, mouse_button_state);
+    }
+    kbd_mouse_move_event(dx, dy, dz);
 }
 
 static void do_mouse_button(Monitor *mon, const QDict *qdict)
 {
     int button_state = qdict_get_int(qdict, "button_state");
-    mouse_button_state = button_state;
-    kbd_mouse_event(0, 0, 0, mouse_button_state);
+    kbd_mouse_event(0, 0, 0, button_state);
 }
 
 static void do_ioport_read(Monitor *mon, const QDict *qdict)
diff --git a/ui/input.c b/ui/input.c
index 7f1248b..366f3c0 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -477,6 +477,20 @@ void kbd_mouse_event(int dx, int dy, int dz, int 
buttons_state)
     }
 }
 
+void kbd_mouse_move_event(int dx, int dy, int dz)
+{
+    QEMUPutMouseEntry *mouse;
+    int buttons_state;
+
+    if (QTAILQ_EMPTY(&mouse_handlers)) {
+        return;
+    }
+    mouse = QTAILQ_FIRST(&mouse_handlers);
+
+    buttons_state = mouse->ops->get_buttons_state(mouse->opaque);
+    kbd_mouse_event(dx, dy, dz, buttons_state);
+}
+
 bool kbd_mouse_is_absolute(void)
 {
     if (QTAILQ_EMPTY(&mouse_handlers)) {
-- 
1.8.1.4