Patchwork [RFC,8/8] monitor: Fix mouse_button command for absolute coordinates

login
register
mail settings
Submitter Andreas Färber
Date June 16, 2013, 3:40 a.m.
Message ID <1371354005-26873-9-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/251650/
State New
Headers show

Comments

Andreas Färber - June 16, 2013, 3:40 a.m.
When using a virtual mouse device with absolute coordinates (tablet) the
mouse_button command would raise a mouse event at coordinates (0,0,0),
breaking openQA among others.

Use a new kbd_mouse_button_event() to obtain the current position with
the new MouseOps::get_position() callback when in absolute mode.

This allows both switching mice via mouse_set and mixing mouse_move with
interactive GUI/VNC mouse movements.

Addresses LP#752476 / BNC#813642.

Reported-by: Brad Hards <bradh@frogmouth.net>
Reported-by: Ludwig Nussel <lnussel@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 include/ui/console.h |  1 +
 monitor.c            |  2 +-
 ui/input.c           | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

Patch

diff --git a/include/ui/console.h b/include/ui/console.h
index d41dd1d..f912ad6 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -64,6 +64,7 @@  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);
+void kbd_mouse_button_event(int buttons_state);
 
 /* Does the current mouse generate absolute events */
 bool kbd_mouse_is_absolute(void);
diff --git a/monitor.c b/monitor.c
index 6816e82..97ca8a8 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1284,7 +1284,7 @@  static void do_mouse_move(Monitor *mon, const QDict *qdict)
 static void do_mouse_button(Monitor *mon, const QDict *qdict)
 {
     int button_state = qdict_get_int(qdict, "button_state");
-    kbd_mouse_event(0, 0, 0, button_state);
+    kbd_mouse_button_event(button_state);
 }
 
 static void do_ioport_read(Monitor *mon, const QDict *qdict)
diff --git a/ui/input.c b/ui/input.c
index 366f3c0..a02160d 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -491,6 +491,23 @@  void kbd_mouse_move_event(int dx, int dy, int dz)
     kbd_mouse_event(dx, dy, dz, buttons_state);
 }
 
+void kbd_mouse_button_event(int buttons_state)
+{
+    QEMUPutMouseEntry *mouse;
+    int dx = 0, dy = 0;
+
+    if (QTAILQ_EMPTY(&mouse_handlers)) {
+        return;
+    }
+
+    mouse = QTAILQ_FIRST(&mouse_handlers);
+    if (mouse->absolute && mouse->ops->get_position != NULL) {
+        mouse->ops->get_position(mouse->opaque, &dx, &dy);
+    }
+
+    kbd_mouse_event(dx, dy, 0, buttons_state);
+}
+
 bool kbd_mouse_is_absolute(void)
 {
     if (QTAILQ_EMPTY(&mouse_handlers)) {