motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui/dbus: Expose a touch device interface

Browse source 
So that clients making use of the DBus backend could
send touch events through the new org.qemu.Display1.Touch
interface

Signed-off-by: Bilal Elmoussaoui <belmouss@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20230619095337.9899-3-belmouss@redhat.com>
This commit is contained in:
Bilal Elmoussaoui 2023-06-19 11:53:37 +02:00 • committed by Marc-André Lureau
parent b659678598
commit de9f844ce2
3 changed files with 102 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

59
ui/dbus-console.c
View file

@ -32,6 +32,8 @@
#include "dbus.h"
static struct touch_slot touch_slots[INPUT_EVENT_SLOTS_MAX];
struct _DBusDisplayConsole {
GDBusObjectSkeleton parent_instance;
DisplayChangeListener dcl;
@ -44,6 +46,7 @@ struct _DBusDisplayConsole {
QKbdState *kbd;
QemuDBusDisplay1Mouse *iface_mouse;
QemuDBusDisplay1MultiTouch *iface_touch;
gboolean last_set;
guint last_x;
guint last_y;
@ -345,6 +348,46 @@ dbus_mouse_rel_motion(DBusDisplayConsole *ddc,
return DBUS_METHOD_INVOCATION_HANDLED;
}
static gboolean
dbus_touch_send_event(DBusDisplayConsole *ddc,
GDBusMethodInvocation *invocation,
guint kind, uint64_t num_slot,
double x, double y)
{
Error *error = NULL;
int width, height;
trace_dbus_touch_send_event(kind, num_slot, x, y);
if (kind != INPUT_MULTI_TOUCH_TYPE_BEGIN &&
kind != INPUT_MULTI_TOUCH_TYPE_UPDATE &&
kind != INPUT_MULTI_TOUCH_TYPE_CANCEL &&
kind != INPUT_MULTI_TOUCH_TYPE_END)
{
g_dbus_method_invocation_return_error(
invocation, DBUS_DISPLAY_ERROR,
DBUS_DISPLAY_ERROR_INVALID,
"Invalid touch event kind");
return DBUS_METHOD_INVOCATION_HANDLED;
}
width = qemu_console_get_width(ddc->dcl.con, 0);
height = qemu_console_get_height(ddc->dcl.con, 0);
console_handle_touch_event(ddc->dcl.con, touch_slots,
num_slot, width, height,
x, y, kind, &error);
if (error != NULL) {
g_dbus_method_invocation_return_error(
invocation, DBUS_DISPLAY_ERROR,
DBUS_DISPLAY_ERROR_INVALID,
error_get_pretty(error), NULL);
error_free(error);
} else {
qemu_dbus_display1_multi_touch_complete_send_event(ddc->iface_touch,
invocation);
}
return DBUS_METHOD_INVOCATION_HANDLED;
}
static gboolean
dbus_mouse_set_pos(DBusDisplayConsole *ddc,
GDBusMethodInvocation *invocation,
@ -440,7 +483,7 @@ dbus_display_console_new(DBusDisplay *display, QemuConsole *con)
g_autofree char *label = NULL;
char device_addr[256] = "";
DBusDisplayConsole *ddc;
int idx;
int idx, i;
assert(display);
assert(con);
@ -495,6 +538,20 @@ dbus_display_console_new(DBusDisplay *display, QemuConsole *con)
g_dbus_object_skeleton_add_interface(G_DBUS_OBJECT_SKELETON(ddc),
G_DBUS_INTERFACE_SKELETON(ddc->iface_mouse));
ddc->iface_touch = qemu_dbus_display1_multi_touch_skeleton_new();
g_object_connect(ddc->iface_touch,
"swapped-signal::handle-send-event", dbus_touch_send_event, ddc,
NULL);
qemu_dbus_display1_multi_touch_set_max_slots(ddc->iface_touch,
INPUT_EVENT_SLOTS_MAX);
g_dbus_object_skeleton_add_interface(G_DBUS_OBJECT_SKELETON(ddc),
G_DBUS_INTERFACE_SKELETON(ddc->iface_touch));
for (i = 0; i < INPUT_EVENT_SLOTS_MAX; i++) {
struct touch_slot *slot = &touch_slots[i];
slot->tracking_id = -1;
}
register_displaychangelistener(&ddc->dcl);
ddc->mouse_mode_notifier.notify = dbus_mouse_mode_change;
qemu_add_mouse_mode_change_notifier(&ddc->mouse_mode_notifier);