From 3aee839269dcd70c9b90e4125037961b840179ec Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Mon, 19 Jun 2023 21:54:07 +0200
Subject: [PATCH 1/2] touch: update per latest changes in upstream API

---
 lib/dbus-display1.xml |  6 +++---
 lib/mks-screen.c      |  2 +-
 lib/mks-touchable.c   | 38 +++++++++++++++++++-------------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/dbus-display1.xml b/lib/dbus-display1.xml
index e8f2394..ed5d633 100644
--- a/lib/dbus-display1.xml
+++ b/lib/dbus-display1.xml
@@ -41,7 +41,7 @@
       Interactions with a console may be done with
       :dbus:iface:`org.qemu.Display1.Keyboard`,
       :dbus:iface:`org.qemu.Display1.Mouse` and
-      :dbus:iface:`org.qemu.Display1.Touch` interfaces when available.
+      :dbus:iface:`org.qemu.Display1.MultiTouch` interfaces when available.
   -->
   <interface name="org.qemu.Display1.Console">
     <!--
@@ -239,7 +239,7 @@
   </interface>
 
   <!--
-      org.qemu.Display1.Touch:
+      org.qemu.Display1.MultiTouch:
 
       This interface in implemented on ``/org/qemu/Display1/Console_$id`` (see
       :dbus:iface:`~org.qemu.Display1.Console` documentation).
@@ -253,7 +253,7 @@
         End         = 2
         Cancel      = 3
   -->
-  <interface name="org.qemu.Display1.Touch">
+  <interface name="org.qemu.Display1.MultiTouch">
     <!--
         SendEvent:
         @kind: The touch event kind
diff --git a/lib/mks-screen.c b/lib/mks-screen.c
index 80ead31..7c0a14e 100644
--- a/lib/mks-screen.c
+++ b/lib/mks-screen.c
@@ -208,7 +208,7 @@ mks_screen_setup (MksDevice     *device,
         self->keyboard = _mks_device_new (MKS_TYPE_KEYBOARD, device->session, object);
       else if (MKS_QEMU_IS_MOUSE (iface))
         self->mouse = _mks_device_new (MKS_TYPE_MOUSE, device->session, object);
-      else if (MKS_QEMU_IS_TOUCH (iface))
+      else if (MKS_QEMU_IS_MULTI_TOUCH (iface))
         self->touchable = _mks_device_new (MKS_TYPE_TOUCHABLE, device->session, object);
     }
 
diff --git a/lib/mks-touchable.c b/lib/mks-touchable.c
index 0fb7539..979b165 100644
--- a/lib/mks-touchable.c
+++ b/lib/mks-touchable.c
@@ -33,8 +33,8 @@
  */
 struct _MksTouchable
 {
-  MksDevice     parent_instance;
-  MksQemuTouch *touch;
+  MksDevice          parent_instance;
+  MksQemuMultiTouch *touch;
 };
 
 struct _MksTouchableClass
@@ -54,11 +54,11 @@ static GParamSpec *properties [N_PROPS];
 
 
 static void
-mks_touchable_set_touch (MksTouchable *self,
-                         MksQemuTouch *touch)
+mks_touchable_set_touch (MksTouchable      *self,
+                         MksQemuMultiTouch *touch)
 {
   g_assert (MKS_IS_TOUCHABLE (self));
-  g_assert (!touch || MKS_QEMU_IS_TOUCH (touch));
+  g_assert (!touch || MKS_QEMU_IS_MULTI_TOUCH (touch));
 
   g_set_object (&self->touch, touch);
 }
@@ -79,8 +79,8 @@ mks_touchable_setup (MksDevice     *device,
     {
       GDBusInterface *iface = iter->data;
 
-      if (MKS_QEMU_IS_TOUCH (iface))
-        mks_touchable_set_touch (self, MKS_QEMU_TOUCH (iface));
+      if (MKS_QEMU_IS_MULTI_TOUCH (iface))
+        mks_touchable_set_touch (self, MKS_QEMU_MULTI_TOUCH (iface));
     }
 
   return self->touch != NULL;
@@ -165,17 +165,17 @@ mks_touchable_send_event_cb (GObject      *object,
                              GAsyncResult *result,
                              gpointer      user_data)
 {
-  MksQemuTouch *touch = (MksQemuTouch *)object;
+  MksQemuMultiTouch *touch = (MksQemuMultiTouch *)object;
   g_autoptr(GTask) task = user_data;
   g_autoptr(GError) error = NULL;
 
   MKS_ENTRY;
 
-  g_assert (MKS_QEMU_IS_TOUCH (touch));
+  g_assert (MKS_QEMU_IS_MULTI_TOUCH (touch));
   g_assert (G_IS_ASYNC_RESULT (result));
   g_assert (G_IS_TASK (task));
 
-  if (!mks_qemu_touch_call_send_event_finish (touch, result, &error))
+  if (!mks_qemu_multi_touch_call_send_event_finish (touch, result, &error))
     g_task_return_error (task, g_steal_pointer (&error));
   else
     g_task_return_boolean (task, TRUE);
@@ -219,11 +219,11 @@ mks_touchable_send_event (MksTouchable       *self,
   if (!check_touch (self, &error))
     g_task_return_error (task, g_steal_pointer (&error));
   else
-    mks_qemu_touch_call_send_event (self->touch, kind,
-                                    num_slot, x, y,
-                                    cancellable,
-                                    mks_touchable_send_event_cb,
-                                    g_steal_pointer (&task));
+    mks_qemu_multi_touch_call_send_event (self->touch, kind,
+                                          num_slot, x, y,
+                                          cancellable,
+                                          mks_touchable_send_event_cb,
+                                          g_steal_pointer (&task));
 
   MKS_EXIT;
 }
@@ -291,9 +291,9 @@ mks_touchable_send_event_sync (MksTouchable      *self,
   if (!check_touch (self, error))
     MKS_RETURN (FALSE);
 
-  ret = mks_qemu_touch_call_send_event_sync (self->touch, kind,
-                                             num_slot, x, y,
-                                             cancellable, error);
+  ret = mks_qemu_multi_touch_call_send_event_sync (self->touch, kind,
+                                                   num_slot, x, y,
+                                                   cancellable, error);
 
   MKS_RETURN (ret);
 }
@@ -310,7 +310,7 @@ mks_touchable_get_max_slots (MksTouchable *self)
   g_return_val_if_fail (MKS_IS_TOUCHABLE (self), 0);
 
   if (self->touch)
-    return mks_qemu_touch_get_max_slots (self->touch);
+    return mks_qemu_multi_touch_get_max_slots (self->touch);
 
   return 0;
 }

From af8d90d1b5a0ee145e880b15d14e440547a8d800 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Mon, 19 Jun 2023 23:57:55 +0200
Subject: [PATCH 2/2] display: Expose a helper for retriving guest position

When running an Android VM with GL support, Android somehow enforces
support for only touch events making it difficult to work with QEMU +
Android for devolpement / demo purposes without a touch screen.

This helper is useful for being able to emulate motion / click
events as touch ones
---
 lib/mks-display-picture-private.h |  6 +++++-
 lib/mks-display-picture.c         |  2 +-
 lib/mks-display.c                 | 29 +++++++++++++++++++++++++++++
 lib/mks-display.h                 |  6 ++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/lib/mks-display-picture-private.h b/lib/mks-display-picture-private.h
index 4db920d..34e8646 100644
--- a/lib/mks-display-picture-private.h
+++ b/lib/mks-display-picture-private.h
@@ -45,5 +45,9 @@ void          mks_display_picture_set_keyboard  (MksDisplayPicture *self,
 MksTouchable *mks_display_picture_get_touchable (MksDisplayPicture *self);
 void          mks_display_picture_set_touchable (MksDisplayPicture *self,
                                                  MksTouchable      *touchable);
-
+gboolean
+   mks_display_picture_event_get_guest_position (MksDisplayPicture *self,
+                                                 GdkEvent          *event,
+                                                 double            *guest_x,
+                                                 double            *guest_y);
 G_END_DECLS
diff --git a/lib/mks-display-picture.c b/lib/mks-display-picture.c
index 7c207d1..14d3a0c 100644
--- a/lib/mks-display-picture.c
+++ b/lib/mks-display-picture.c
@@ -193,7 +193,7 @@ mks_display_picture_mouse_release_cb (GObject      *object,
     g_debug ("Mouse release failed: %s", error->message);
 }
 
-static gboolean
+gboolean
 mks_display_picture_event_get_guest_position (MksDisplayPicture *self,
                                               GdkEvent          *event,
                                               double            *guest_x,
diff --git a/lib/mks-display.c b/lib/mks-display.c
index 8334486..880d06f 100644
--- a/lib/mks-display.c
+++ b/lib/mks-display.c
@@ -569,3 +569,32 @@ mks_display_set_ungrab_trigger (MksDisplay         *self,
 
   MKS_EXIT;
 }
+
+/**
+ * mks_display_get_event_position_in_guest:
+ * @self: a #MksDisplay
+ * @event: A #GdkEvent
+ * @guest_x: (out): Guest's X position
+ * @guest_y: (out): Guest's Y position
+ *
+ * Retrieve the (`guest_x`, `guest_y`) position
+ * where the `event` happened.
+ * 
+ * Could be useful for implementing touch support emulation.
+ * 
+ * Returns: Whether the event has an associated position
+ */
+gboolean
+mks_display_get_event_position_in_guest (MksDisplay *self,
+                                         GdkEvent   *event,
+                                         double     *guest_x,
+                                         double     *guest_y)
+{
+  MksDisplayPrivate *priv = mks_display_get_instance_private (self);
+
+  g_return_val_if_fail (MKS_IS_DISPLAY (self), FALSE);
+  g_return_val_if_fail (GDK_IS_EVENT (event), FALSE);
+
+  return mks_display_picture_event_get_guest_position (priv->picture, event,
+                                                       guest_x, guest_y);
+}
diff --git a/lib/mks-display.h b/lib/mks-display.h
index dee996b..a585577 100644
--- a/lib/mks-display.h
+++ b/lib/mks-display.h
@@ -58,4 +58,10 @@ gboolean            mks_display_get_auto_resize    (MksDisplay         *self);
 MKS_AVAILABLE_IN_ALL
 void                mks_display_set_auto_resize    (MksDisplay         *self,
                                                     gboolean            auto_resize);
+MKS_AVAILABLE_IN_ALL
+gboolean
+          mks_display_get_event_position_in_guest  (MksDisplay         *self,
+                                                    GdkEvent           *event,
+                                                    double             *guest_x,
+                                                    double             *guest_y);
 G_END_DECLS