[Qemu-devel] [PATCH v2 0/4] msmouse: misc fixes.

[Qemu-devel] [PATCH v2 0/4] msmouse: misc fixes.

[Gerd Hoffmann]

  Hi,

A small collection of msmouse fixes.  Not many changes in v2, only
dropped a comment on patch 4 (peters comment) and added paolo's acks
for patches 1+2.

cheers,
  Gerd

Gerd Hoffmann (4):
  msmouse: add MouseState, unregister handler on close
  msmouse: fix buffer handling
  msmouse: switch to new input interface
  msmouse: send short messages if possible.

 backends/msmouse.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 106 insertions(+), 16 deletions(-)

-- 
1.8.3.1

[Qemu-devel] [PATCH 1/4] msmouse: add MouseState, unregister handler on close

[Gerd Hoffmann]

Add struct to track serial mouse state.  Store mouse event handler
there.  Unregister properly on chardev close.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
---
 backends/msmouse.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/backends/msmouse.c b/backends/msmouse.c
index 8dea5a1..731784f 100644
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -29,6 +29,11 @@
 #define MSMOUSE_LO6(n) ((n) & 0x3f)
 #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6)
 
+typedef struct {
+    CharDriverState *chr;
+    QEMUPutMouseEntry *entry;
+} MouseState;
+
 static void msmouse_event(void *opaque,
                           int dx, int dy, int dz, int buttons_state)
 {
@@ -60,7 +65,11 @@ static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int
 
 static void msmouse_chr_close (struct CharDriverState *chr)
 {
-    g_free (chr);
+    MouseState *mouse = chr->opaque;
+
+    qemu_remove_mouse_event_handler(mouse->entry);
+    g_free(mouse);
+    g_free(chr);
 }
 
 static CharDriverState *qemu_chr_open_msmouse(const char *id,
@@ -69,17 +78,20 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id,
                                               Error **errp)
 {
     ChardevCommon *common = backend->u.msmouse.data;
+    MouseState *mouse;
     CharDriverState *chr;
 
     chr = qemu_chr_alloc(common, errp);
-    if (!chr) {
-        return NULL;
-    }
     chr->chr_write = msmouse_chr_write;
     chr->chr_close = msmouse_chr_close;
     chr->explicit_be_open = true;
 
-    qemu_add_mouse_event_handler(msmouse_event, chr, 0, "QEMU Microsoft Mouse");
+    mouse = g_new0(MouseState, 1);
+    mouse->entry = qemu_add_mouse_event_handler(msmouse_event, chr, 0,
+                                                "QEMU Microsoft Mouse");
+
+    mouse->chr = chr;
+    chr->opaque = mouse;
 
     return chr;
 }
-- 
1.8.3.1

[Qemu-devel] [PATCH 2/4] msmouse: fix buffer handling

[Gerd Hoffmann]

The msmouse chardev backend writes data without checking whenever there
is enough space.

That happens to work with linux guests, probably by pure luck because
the linux driver enables the fifo and the serial port emulation accepts
more data than announced via qemu_chr_be_can_write() in that case.

Handle this properly by adding a buffer to MouseState.  Hook up a
CharDriverState->accept_input() handler which feeds the buffer to the
serial port.  msmouse_event() only fills the buffer now, and calls the
accept_input handler too to kick off the transmission.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
---
 backends/msmouse.c | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/backends/msmouse.c b/backends/msmouse.c
index 731784f..9ade31b 100644
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -32,13 +32,35 @@
 typedef struct {
     CharDriverState *chr;
     QEMUPutMouseEntry *entry;
+    uint8_t outbuf[32];
+    int outlen;
 } MouseState;
 
+static void msmouse_chr_accept_input(CharDriverState *chr)
+{
+    MouseState *mouse = chr->opaque;
+    int len;
+
+    len = qemu_chr_be_can_write(chr);
+    if (len > mouse->outlen) {
+        len = mouse->outlen;
+    }
+    if (!len) {
+        return;
+    }
+
+    qemu_chr_be_write(chr, mouse->outbuf, len);
+    mouse->outlen -= len;
+    if (mouse->outlen) {
+        memmove(mouse->outbuf, mouse->outbuf + len, mouse->outlen);
+    }
+}
+
 static void msmouse_event(void *opaque,
                           int dx, int dy, int dz, int buttons_state)
 {
     CharDriverState *chr = (CharDriverState *)opaque;
-
+    MouseState *mouse = chr->opaque;
     unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 };
 
     /* Movement deltas */
@@ -51,10 +73,17 @@ static void msmouse_event(void *opaque,
     bytes[0] |= (buttons_state & 0x02 ? 0x10 : 0x00);
     bytes[3] |= (buttons_state & 0x04 ? 0x20 : 0x00);
 
-    /* We always send the packet of, so that we do not have to keep track
-       of previous state of the middle button. This can potentially confuse
-       some very old drivers for two button mice though. */
-    qemu_chr_be_write(chr, bytes, 4);
+    if (mouse->outlen <= sizeof(mouse->outbuf) - 4) {
+        /* We always send the packet of, so that we do not have to keep track
+           of previous state of the middle button. This can potentially confuse
+           some very old drivers for two button mice though. */
+        memcpy(mouse->outbuf + mouse->outlen, bytes, 4);
+        mouse->outlen += 4;
+    } else {
+        /* queue full -> drop event */
+    }
+
+    msmouse_chr_accept_input(chr);
 }
 
 static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int len)
@@ -84,6 +113,7 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id,
     chr = qemu_chr_alloc(common, errp);
     chr->chr_write = msmouse_chr_write;
     chr->chr_close = msmouse_chr_close;
+    chr->chr_accept_input = msmouse_chr_accept_input;
     chr->explicit_be_open = true;
 
     mouse = g_new0(MouseState, 1);
-- 
1.8.3.1

[Qemu-devel] [PATCH 3/4] msmouse: switch to new input interface

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 backends/msmouse.c | 68 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/backends/msmouse.c b/backends/msmouse.c
index 9ade31b..b1e1bea 100644
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -25,13 +25,16 @@
 #include "qemu-common.h"
 #include "sysemu/char.h"
 #include "ui/console.h"
+#include "ui/input.h"
 
 #define MSMOUSE_LO6(n) ((n) & 0x3f)
 #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6)
 
 typedef struct {
     CharDriverState *chr;
-    QEMUPutMouseEntry *entry;
+    QemuInputHandlerState *hs;
+    int axis[INPUT_AXIS__MAX];
+    bool btns[INPUT_BUTTON__MAX];
     uint8_t outbuf[32];
     int outlen;
 } MouseState;
@@ -56,12 +59,16 @@ static void msmouse_chr_accept_input(CharDriverState *chr)
     }
 }
 
-static void msmouse_event(void *opaque,
-                          int dx, int dy, int dz, int buttons_state)
+static void msmouse_queue_event(MouseState *mouse)
 {
-    CharDriverState *chr = (CharDriverState *)opaque;
-    MouseState *mouse = chr->opaque;
     unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 };
+    int dx, dy;
+
+    dx = mouse->axis[INPUT_AXIS_X];
+    mouse->axis[INPUT_AXIS_X] = 0;
+
+    dy = mouse->axis[INPUT_AXIS_Y];
+    mouse->axis[INPUT_AXIS_Y] = 0;
 
     /* Movement deltas */
     bytes[0] |= (MSMOUSE_HI2(dy) << 2) | MSMOUSE_HI2(dx);
@@ -69,9 +76,9 @@ static void msmouse_event(void *opaque,
     bytes[2] |= MSMOUSE_LO6(dy);
 
     /* Buttons */
-    bytes[0] |= (buttons_state & 0x01 ? 0x20 : 0x00);
-    bytes[0] |= (buttons_state & 0x02 ? 0x10 : 0x00);
-    bytes[3] |= (buttons_state & 0x04 ? 0x20 : 0x00);
+    bytes[0] |= (mouse->btns[INPUT_BUTTON_LEFT]   ? 0x20 : 0x00);
+    bytes[0] |= (mouse->btns[INPUT_BUTTON_RIGHT]  ? 0x10 : 0x00);
+    bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00);
 
     if (mouse->outlen <= sizeof(mouse->outbuf) - 4) {
         /* We always send the packet of, so that we do not have to keep track
@@ -82,8 +89,38 @@ static void msmouse_event(void *opaque,
     } else {
         /* queue full -> drop event */
     }
+}
 
-    msmouse_chr_accept_input(chr);
+static void msmouse_input_event(DeviceState *dev, QemuConsole *src,
+                                InputEvent *evt)
+{
+    MouseState *mouse = (MouseState *)dev;
+    InputMoveEvent *move;
+    InputBtnEvent *btn;
+
+    switch (evt->type) {
+    case INPUT_EVENT_KIND_REL:
+        move = evt->u.rel.data;
+        mouse->axis[move->axis] += move->value;
+        break;
+
+    case INPUT_EVENT_KIND_BTN:
+        btn = evt->u.btn.data;
+        mouse->btns[btn->button] = btn->down;
+        break;
+
+    default:
+        /* keep gcc happy */
+        break;
+    }
+}
+
+static void msmouse_input_sync(DeviceState *dev)
+{
+    MouseState *mouse = (MouseState *)dev;
+
+    msmouse_queue_event(mouse);
+    msmouse_chr_accept_input(mouse->chr);
 }
 
 static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int len)
@@ -96,11 +133,18 @@ static void msmouse_chr_close (struct CharDriverState *chr)
 {
     MouseState *mouse = chr->opaque;
 
-    qemu_remove_mouse_event_handler(mouse->entry);
+    qemu_input_handler_unregister(mouse->hs);
     g_free(mouse);
     g_free(chr);
 }
 
+static QemuInputHandler msmouse_handler = {
+    .name  = "QEMU Microsoft Mouse",
+    .mask  = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
+    .event = msmouse_input_event,
+    .sync  = msmouse_input_sync,
+};
+
 static CharDriverState *qemu_chr_open_msmouse(const char *id,
                                               ChardevBackend *backend,
                                               ChardevReturn *ret,
@@ -117,8 +161,8 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id,
     chr->explicit_be_open = true;
 
     mouse = g_new0(MouseState, 1);
-    mouse->entry = qemu_add_mouse_event_handler(msmouse_event, chr, 0,
-                                                "QEMU Microsoft Mouse");
+    mouse->hs = qemu_input_handler_register((DeviceState *)mouse,
+                                            &msmouse_handler);
 
     mouse->chr = chr;
     chr->opaque = mouse;
-- 
1.8.3.1

[Qemu-devel] [PATCH 4/4] msmouse: send short messages if possible.

[Gerd Hoffmann]

Keep track of button changes.  Send the extended 4-byte messages for
three button mice only in case we have something to report for the
middle button.  Use the short 3-byte messages (original protocol for
two-button microsoft mouse) otherwise.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 backends/msmouse.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/backends/msmouse.c b/backends/msmouse.c
index b1e1bea..aeb9055 100644
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -35,6 +35,7 @@ typedef struct {
     QemuInputHandlerState *hs;
     int axis[INPUT_AXIS__MAX];
     bool btns[INPUT_BUTTON__MAX];
+    bool btnc[INPUT_BUTTON__MAX];
     uint8_t outbuf[32];
     int outlen;
 } MouseState;
@@ -62,7 +63,7 @@ static void msmouse_chr_accept_input(CharDriverState *chr)
 static void msmouse_queue_event(MouseState *mouse)
 {
     unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 };
-    int dx, dy;
+    int dx, dy, count = 3;
 
     dx = mouse->axis[INPUT_AXIS_X];
     mouse->axis[INPUT_AXIS_X] = 0;
@@ -78,14 +79,16 @@ static void msmouse_queue_event(MouseState *mouse)
     /* Buttons */
     bytes[0] |= (mouse->btns[INPUT_BUTTON_LEFT]   ? 0x20 : 0x00);
     bytes[0] |= (mouse->btns[INPUT_BUTTON_RIGHT]  ? 0x10 : 0x00);
-    bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00);
+    if (mouse->btns[INPUT_BUTTON_MIDDLE] ||
+        mouse->btnc[INPUT_BUTTON_MIDDLE]) {
+        bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00);
+        mouse->btnc[INPUT_BUTTON_MIDDLE] = false;
+        count = 4;
+    }
 
-    if (mouse->outlen <= sizeof(mouse->outbuf) - 4) {
-        /* We always send the packet of, so that we do not have to keep track
-           of previous state of the middle button. This can potentially confuse
-           some very old drivers for two button mice though. */
-        memcpy(mouse->outbuf + mouse->outlen, bytes, 4);
-        mouse->outlen += 4;
+    if (mouse->outlen <= sizeof(mouse->outbuf) - count) {
+        memcpy(mouse->outbuf + mouse->outlen, bytes, count);
+        mouse->outlen += count;
     } else {
         /* queue full -> drop event */
     }
@@ -107,6 +110,7 @@ static void msmouse_input_event(DeviceState *dev, QemuConsole *src,
     case INPUT_EVENT_KIND_BTN:
         btn = evt->u.btn.data;
         mouse->btns[btn->button] = btn->down;
+        mouse->btnc[btn->button] = true;
         break;
 
     default:
-- 
1.8.3.1