Re: [PATCH] adb-mouse: convert to use QemuInputHandler

[Philippe Mathieu-Daudé]

Hi Mark,

On 4/9/24 12:40, Mark Cave-Ayland wrote:

Update the ADB mouse implementation to use QemuInputHandler instead of the
legacy qemu_add_mouse_event_handler() function.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
---
  hw/input/adb-mouse.c | 56 ++++++++++++++++++++++++++++++++++++--------
  1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/hw/input/adb-mouse.c b/hw/input/adb-mouse.c
index 144a0ccce7..7aa36caf2f 100644
--- a/hw/input/adb-mouse.c
+++ b/hw/input/adb-mouse.c
@@ -38,6 +38,7 @@ struct MouseState {
      ADBDevice parent_obj;
      /*< private >*/

+ QemuInputHandlerState *hs;

      int buttons_state, last_buttons_state;
      int dx, dy, dz;
  };
@@ -51,17 +52,52 @@ struct ADBMouseClass {
      DeviceRealize parent_realize;
  };

-static void adb_mouse_event(void *opaque,

-                            int dx1, int dy1, int dz1, int buttons_state)
+#define ADB_MOUSE_BUTTON_LEFT   0x01
+#define ADB_MOUSE_BUTTON_RIGHT  0x02
+
+static void adb_mouse_handle_event(DeviceState *dev, QemuConsole *src,
+                                   InputEvent *evt)
  {
-    MouseState *s = opaque;
+    MouseState *s = (MouseState *)dev;
+    InputMoveEvent *move;
+    InputBtnEvent *btn;
+    static const int bmap[INPUT_BUTTON__MAX] = {
+        [INPUT_BUTTON_LEFT]   = ADB_MOUSE_BUTTON_LEFT,
+        [INPUT_BUTTON_RIGHT]  = ADB_MOUSE_BUTTON_RIGHT,
+    };
+
+    switch (evt->type) {
+    case INPUT_EVENT_KIND_REL:
+        move = evt->u.rel.data;
+        if (move->axis == INPUT_AXIS_X) {
+            s->dx += move->value;
+        } else if (move->axis == INPUT_AXIS_Y) {
+            s->dy += move->value;
+        }
+        break;
+
+    case INPUT_EVENT_KIND_BTN:
+        btn = evt->u.btn.data;
+        if (bmap[btn->button]) {
+            if (btn->down) {
+                s->buttons_state |= bmap[btn->button];
+            } else {
+                s->buttons_state &= ~bmap[btn->button];
+            }
+        }
+        break;

- s->dx += dx1;

-    s->dy += dy1;
-    s->dz += dz1;
-    s->buttons_state = buttons_state;
+    default:
+        /* keep gcc happy */
+        break;
+    }
  }

+static const QemuInputHandler adb_mouse_handler = {

+    .name  = "QEMU ADB Mouse",
+    .mask  = INPUT_EVENT_MASK_BTN | INPUT_EVENT_MASK_REL,
+    .event = adb_mouse_handle_event,

Don't we need adb_mouse_handle_sync()?

+};

static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)

  {
@@ -94,10 +130,10 @@ static int adb_mouse_poll(ADBDevice *d, uint8_t *obuf)
      dx &= 0x7f;
      dy &= 0x7f;

- if (!(s->buttons_state & MOUSE_EVENT_LBUTTON)) {

+    if (!(s->buttons_state & ADB_MOUSE_BUTTON_LEFT)) {
          dy |= 0x80;
      }
-    if (!(s->buttons_state & MOUSE_EVENT_RBUTTON)) {
+    if (!(s->buttons_state & ADB_MOUSE_BUTTON_RIGHT)) {
          dx |= 0x80;
      }

@@ -236,7 +272,7 @@ static void adb_mouse_realizefn(DeviceState *dev, Error **errp) amc->parent_realize(dev, errp); - qemu_add_mouse_event_handler(adb_mouse_event, s, 0, "QEMU ADB Mouse");

+    s->hs = qemu_input_handler_register((DeviceState *)s, &adb_mouse_handler);

Simply:

       s->hs = qemu_input_handler_register(dev, &adb_mouse_handler);

  }

static void adb_mouse_initfn(Object *obj)

Waiting for clarification on QemuInputHandler::sync, otherwise LGTM.

Regards,

Phil.