From 76b74b07690c1487d8f9c303a2899f08e87a8135 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 9 Feb 2023 03:00:36 -0800 Subject: [PATCH] lib: add press and release MksKeyboard API This currently wraps the internal layers. The real magic will happen in a GtkWidget with event controllers to proxy things here. --- lib/mks-keyboard.c | 156 +++++++++++++++++++++++++++++++++++++++++++++ lib/mks-keyboard.h | 36 ++++++++++- 2 files changed, 189 insertions(+), 3 deletions(-) diff --git a/lib/mks-keyboard.c b/lib/mks-keyboard.c index 9b3f0a7..f2a3f8e 100644 --- a/lib/mks-keyboard.c +++ b/lib/mks-keyboard.c @@ -166,3 +166,159 @@ mks_keyboard_get_modifiers (MksKeyboard *self) return self->modifiers; } + +static gboolean +check_keyboard (MksKeyboard *self, + GError **error) +{ + if (self->keyboard == NULL) + { + g_set_error_literal (error, + G_IO_ERROR, + G_IO_ERROR_NOT_CONNECTED, + "Not connected"); + return FALSE; + } + + return TRUE; +} + +static void +mks_keyboard_press_cb (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + MksQemuKeyboard *keyboard = (MksQemuKeyboard *)object; + g_autoptr(GTask) task = user_data; + g_autoptr(GError) error = NULL; + + g_assert (MKS_QEMU_IS_KEYBOARD (keyboard)); + g_assert (G_IS_ASYNC_RESULT (result)); + g_assert (G_IS_TASK (task)); + + if (!mks_qemu_keyboard_call_press_finish (keyboard, result, &error)) + g_task_return_error (task, g_steal_pointer (&error)); + else + g_task_return_boolean (task, TRUE); +} + +/** + * mks_keyboard_press: + * @self: an #MksKeyboard + * @keycode: the hardware keycode + * @cancellable: (nullable): a #GCancellable + * @callback: a #GAsyncReadyCallback to execute upon completion + * @user_data: closure data for @callback + * + * Asynchronously presses @keycode. + */ +void +mks_keyboard_press (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_autoptr(GTask) task = NULL; + g_autoptr(GError) error = NULL; + + g_return_if_fail (MKS_IS_KEYBOARD (self)); + g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); + + task = g_task_new (self, cancellable, callback, user_data); + g_task_set_source_tag (task, mks_keyboard_press); + + if (!check_keyboard (self, &error)) + g_task_return_error (task, g_steal_pointer (&error)); + else + mks_qemu_keyboard_call_press (self->keyboard, + keycode, + cancellable, + mks_keyboard_press_cb, + g_steal_pointer (&task)); +} + +gboolean +mks_keyboard_press_sync (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GError **error) +{ + g_return_val_if_fail (MKS_IS_KEYBOARD (self), FALSE); + g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), FALSE); + + if (!check_keyboard (self, error)) + return FALSE; + + return mks_qemu_keyboard_call_press_sync (self->keyboard, keycode, cancellable, error); +} + +static void +mks_keyboard_release_cb (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + MksQemuKeyboard *keyboard = (MksQemuKeyboard *)object; + g_autoptr(GTask) task = user_data; + g_autoptr(GError) error = NULL; + + g_assert (MKS_QEMU_IS_KEYBOARD (keyboard)); + g_assert (G_IS_ASYNC_RESULT (result)); + g_assert (G_IS_TASK (task)); + + if (!mks_qemu_keyboard_call_release_finish (keyboard, result, &error)) + g_task_return_error (task, g_steal_pointer (&error)); + else + g_task_return_boolean (task, TRUE); +} + +/** + * mks_keyboard_release: + * @self: an #MksKeyboard + * @keycode: the hardware keycode + * @cancellable: (nullable): a #GCancellable + * @callback: a #GAsyncReadyCallback to execute upon completion + * @user_data: closure data for @callback + * + * Asynchronously releases @keycode. + */ +void +mks_keyboard_release (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_autoptr(GTask) task = NULL; + g_autoptr(GError) error = NULL; + + g_return_if_fail (MKS_IS_KEYBOARD (self)); + g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable)); + + task = g_task_new (self, cancellable, callback, user_data); + g_task_set_source_tag (task, mks_keyboard_release); + + if (!check_keyboard (self, &error)) + g_task_return_error (task, g_steal_pointer (&error)); + else + mks_qemu_keyboard_call_release (self->keyboard, + keycode, + cancellable, + mks_keyboard_release_cb, + g_steal_pointer (&task)); +} + +gboolean +mks_keyboard_release_sync (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GError **error) +{ + g_return_val_if_fail (MKS_IS_KEYBOARD (self), FALSE); + g_return_val_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable), FALSE); + + if (!check_keyboard (self, error)) + return FALSE; + + return mks_qemu_keyboard_call_release_sync (self->keyboard, keycode, cancellable, error); +} diff --git a/lib/mks-keyboard.h b/lib/mks-keyboard.h index 899b414..2047ef4 100644 --- a/lib/mks-keyboard.h +++ b/lib/mks-keyboard.h @@ -25,7 +25,7 @@ # error "Only can be included directly." #endif -#include +#include #include "mks-types.h" #include "mks-version-macros.h" @@ -51,8 +51,38 @@ typedef enum _MksKeyboardModifier } MksKeyboardModifier; MKS_AVAILABLE_IN_ALL -GType mks_keyboard_get_type (void) G_GNUC_CONST; +GType mks_keyboard_get_type (void) G_GNUC_CONST; MKS_AVAILABLE_IN_ALL -MksKeyboardModifier mks_keyboard_get_modifiers (MksKeyboard *self); +MksKeyboardModifier mks_keyboard_get_modifiers (MksKeyboard *self); +MKS_AVAILABLE_IN_ALL +void mks_keyboard_press (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +MKS_AVAILABLE_IN_ALL +gboolean mks_keyboard_press_finish (MksKeyboard *self, + GAsyncResult *result, + GError **error); +MKS_AVAILABLE_IN_ALL +gboolean mks_keyboard_press_sync (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GError **error); +MKS_AVAILABLE_IN_ALL +void mks_keyboard_release (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +MKS_AVAILABLE_IN_ALL +gboolean mks_keyboard_release_finish (MksKeyboard *self, + GAsyncResult *result, + GError **error); +MKS_AVAILABLE_IN_ALL +gboolean mks_keyboard_release_sync (MksKeyboard *self, + guint keycode, + GCancellable *cancellable, + GError **error); G_END_DECLS