From 6d7360a23024771fe0849af98a80b9862bd21270 Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Sat, 7 Mar 2020 15:33:10 +0000 Subject: [PATCH] layout_holder: Rename functions used from C --- eek/eek-gtk-keyboard.c | 8 +++---- eekboard/eekboard-context-service.c | 35 ++++++++++------------------- eekboard/eekboard-context-service.h | 8 +++---- src/server-main.c | 4 ++-- 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c index 7c7c1fe6..656c09a9 100644 --- a/eek/eek-gtk-keyboard.c +++ b/eek/eek-gtk-keyboard.c @@ -126,7 +126,7 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget *self, if (priv->layout->arrangement != new_type) { priv->layout->arrangement = new_type; - eekboard_context_service_use_layout(priv->eekboard_context, priv->layout); + eek_layout_holder_use_layout(priv->eekboard_context, priv->layout); } if (priv->renderer) @@ -158,7 +158,7 @@ static void drag(EekGtkKeyboard *self, if (!priv->keyboard) { return; } - squeek_layout_drag(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout, + squeek_layout_drag(eek_layout_holder_get_keyboard(priv->eekboard_context)->layout, priv->submission, x, y, eek_renderer_get_transformation(priv->renderer), time, priv->eekboard_context, self); @@ -170,7 +170,7 @@ static void release(EekGtkKeyboard *self, guint32 time) if (!priv->keyboard) { return; } - squeek_layout_release(eekboard_context_service_get_keyboard(priv->eekboard_context)->layout, + squeek_layout_release(eek_layout_holder_get_keyboard(priv->eekboard_context)->layout, priv->submission, eek_renderer_get_transformation(priv->renderer), time, priv->eekboard_context, self); @@ -343,7 +343,7 @@ on_notify_keyboard (GObject *object, EekGtkKeyboard *self) { (void)spec; EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self); - priv->keyboard = eekboard_context_service_get_keyboard(LAYOUT_HOLDER(object)); + priv->keyboard = eek_layout_holder_get_keyboard(LAYOUT_HOLDER(object)); if (priv->renderer) { eek_renderer_free(priv->renderer); } diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c index cc284ae9..eb91c380 100644 --- a/eekboard/eekboard-context-service.c +++ b/eekboard/eekboard-context-service.c @@ -62,7 +62,7 @@ eekboard_context_service_set_property (GObject *object, } static void -eekboard_context_service_get_property (GObject *object, +layout_holder_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) @@ -98,7 +98,7 @@ settings_get_layout(GSettings *settings, char **type, char **layout) } void -eekboard_context_service_use_layout(LayoutHolder *context, struct squeek_layout_state *state) { +eek_layout_holder_use_layout(LayoutHolder *context, struct squeek_layout_state *state) { gchar *layout_name = state->overlay_name; if (layout_name == NULL) { @@ -154,12 +154,10 @@ layout_holder_class_init (LayoutHolderClass *klass) GParamSpec *pspec; gobject_class->set_property = eekboard_context_service_set_property; - gobject_class->get_property = eekboard_context_service_get_property; + gobject_class->get_property = layout_holder_get_property; /** - * EekboardContextService:keyboard: - * - * An #EekKeyboard currently active in this context. + * An #LevelKeyboard currently active in this context. */ pspec = g_param_spec_pointer("keyboard", "Keyboard", @@ -170,21 +168,12 @@ layout_holder_class_init (LayoutHolderClass *klass) pspec); } -void -eekboard_context_service_destroy (LayoutHolder *context) -{ - (void)context; -} - /** - * eekboard_context_service_get_keyboard: - * @context: an #EekboardContextService - * * Get keyboard currently active in @context. - * Returns: (transfer none): an #EekKeyboard + * Returns: (transfer none): a LevelKeyboard */ LevelKeyboard * -eekboard_context_service_get_keyboard (LayoutHolder *context) +eek_layout_holder_get_keyboard (LayoutHolder *context) { return context->priv->keyboard; } @@ -195,7 +184,7 @@ void eekboard_context_service_set_hint_purpose(LayoutHolder *context, if (context->layout->hint != hint || context->layout->purpose != purpose) { context->layout->hint = hint; context->layout->purpose = purpose; - eekboard_context_service_use_layout(context, context->layout); + eek_layout_holder_use_layout(context, context->layout); } } @@ -204,7 +193,7 @@ eekboard_context_service_set_overlay(LayoutHolder *context, const char* name) { if (g_strcmp0(context->layout->overlay_name, name)) { g_free(context->layout->overlay_name); context->layout->overlay_name = g_strdup(name); - eekboard_context_service_use_layout(context, context->layout); + eek_layout_holder_use_layout(context, context->layout); } } @@ -213,15 +202,15 @@ eekboard_context_service_get_overlay(LayoutHolder *context) { return context->layout->overlay_name; } -LayoutHolder *eekboard_context_service_new(struct squeek_layout_state *state) +LayoutHolder *eek_layout_holder_new(struct squeek_layout_state *state) { LayoutHolder *context = g_object_new (EEKBOARD_TYPE_LAYOUT_HOLDER, NULL); context->layout = state; - eekboard_context_service_use_layout(context, context->layout); + eek_layout_holder_use_layout(context, context->layout); return context; } -void eekboard_context_service_set_submission(LayoutHolder *context, struct submission *submission) { +void eek_layout_holder_set_submission(LayoutHolder *context, struct submission *submission) { context->priv->submission = submission; if (context->priv->submission) { submission_set_keyboard(context->priv->submission, context->priv->keyboard); @@ -243,7 +232,7 @@ static void settings_update_layout(struct gsettings_tracker *self) { self->layout->layout_name = g_strdup(keyboard_layout); } // This must actually update the UI. - eekboard_context_service_use_layout(self->context, self->layout); + eek_layout_holder_use_layout(self->context, self->layout); } } diff --git a/eekboard/eekboard-context-service.h b/eekboard/eekboard-context-service.h index de51fba8..6763c4ff 100644 --- a/eekboard/eekboard-context-service.h +++ b/eekboard/eekboard-context-service.h @@ -73,9 +73,9 @@ struct gsettings_tracker { void eek_gsettings_tracker_init(struct gsettings_tracker* tracker, LayoutHolder *context, struct squeek_layout_state *layout); -LayoutHolder *eekboard_context_service_new(struct squeek_layout_state *state); -void eekboard_context_service_set_submission(LayoutHolder *context, struct submission *submission); -LevelKeyboard *eekboard_context_service_get_keyboard(LayoutHolder *context); +LayoutHolder *eek_layout_holder_new(struct squeek_layout_state *state); +void eek_layout_holder_set_submission(LayoutHolder *context, struct submission *submission); +LevelKeyboard *eek_layout_holder_get_keyboard(LayoutHolder *context); void eekboard_context_service_set_keymap(LayoutHolder *context, const LevelKeyboard *keyboard); @@ -84,6 +84,6 @@ void eekboard_context_service_set_hint_purpose(LayoutHolder *context, uint32_t hint, uint32_t purpose); void -eekboard_context_service_use_layout(LayoutHolder *context, struct squeek_layout_state *layout); +eek_layout_holder_use_layout(LayoutHolder *context, struct squeek_layout_state *layout); G_END_DECLS #endif /* EEKBOARD_CONTEXT_SERVICE_H */ diff --git a/src/server-main.c b/src/server-main.c index cdbe1eb9..cafa9bed 100644 --- a/src/server-main.c +++ b/src/server-main.c @@ -206,7 +206,7 @@ main (int argc, char **argv) instance.ui_manager = squeek_uiman_new(instance.wayland.outputs); - instance.layout_holder = eekboard_context_service_new(&instance.layout_choice); + instance.layout_holder = eek_layout_holder_new(&instance.layout_choice); eek_gsettings_tracker_init(&instance.gsettings_tracker, instance.layout_holder, &instance.layout_choice); // set up dbus @@ -282,7 +282,7 @@ main (int argc, char **argv) instance.wayland.seat, instance.layout_holder); - eekboard_context_service_set_submission(instance.layout_holder, instance.submission); + eek_layout_holder_set_submission(instance.layout_holder, instance.submission); ServerContextService *ui_context = server_context_service_new( instance.layout_holder,