s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

layout_holder: Rename functions used from C

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-03-07 15:33:10 +00:00
parent 33039e65cb
commit 6d7360a230
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eek/eek-gtk-keyboard.c
View File

@ -126,7 +126,7 @@ eek_gtk_keyboard_real_size_allocate (GtkWidget *self,
if (priv->layout->arrangement != new_type) { if (priv->layout->arrangement != new_type) {
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) if (priv->renderer)
@ -158,7 +158,7 @@ static void drag(EekGtkKeyboard *self,
if (!priv->keyboard) { if (!priv->keyboard) {
return; 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, priv->submission,
x, y, eek_renderer_get_transformation(priv->renderer), time, x, y, eek_renderer_get_transformation(priv->renderer), time,
priv->eekboard_context, self); priv->eekboard_context, self);
@ -170,7 +170,7 @@ static void release(EekGtkKeyboard *self, guint32 time)
if (!priv->keyboard) { if (!priv->keyboard) {
return; 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, priv->submission,
eek_renderer_get_transformation(priv->renderer), time, eek_renderer_get_transformation(priv->renderer), time,
priv->eekboard_context, self); priv->eekboard_context, self);
@ -343,7 +343,7 @@ on_notify_keyboard (GObject *object,
EekGtkKeyboard *self) { EekGtkKeyboard *self) {
(void)spec; (void)spec;
EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (self); 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) { if (priv->renderer) {
eek_renderer_free(priv->renderer); eek_renderer_free(priv->renderer);
} }

35
eekboard/eekboard-context-service.c
View File

@ -62,7 +62,7 @@ eekboard_context_service_set_property (GObject *object,
} }
static void static void
eekboard_context_service_get_property (GObject *object, layout_holder_get_property (GObject *object,
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
@ -98,7 +98,7 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
} }
void 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; gchar *layout_name = state->overlay_name;
if (layout_name == NULL) { if (layout_name == NULL) {
@ -154,12 +154,10 @@ layout_holder_class_init (LayoutHolderClass *klass)
GParamSpec *pspec; GParamSpec *pspec;
gobject_class->set_property = eekboard_context_service_set_property; 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 #LevelKeyboard currently active in this context.
*
* An #EekKeyboard currently active in this context.
*/ */
pspec = g_param_spec_pointer("keyboard", pspec = g_param_spec_pointer("keyboard",
"Keyboard", "Keyboard",
@ -170,21 +168,12 @@ layout_holder_class_init (LayoutHolderClass *klass)
pspec); pspec);
} }
void
eekboard_context_service_destroy (LayoutHolder *context)
{
(void)context;
}
/** /**
* eekboard_context_service_get_keyboard:
* @context: an #EekboardContextService
*
* Get keyboard currently active in @context. * Get keyboard currently active in @context.
* Returns: (transfer none): an #EekKeyboard * Returns: (transfer none): a LevelKeyboard
*/ */
LevelKeyboard * LevelKeyboard *
eekboard_context_service_get_keyboard (LayoutHolder *context) eek_layout_holder_get_keyboard (LayoutHolder *context)
{ {
return context->priv->keyboard; 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) { if (context->layout->hint != hint || context->layout->purpose != purpose) {
context->layout->hint = hint; context->layout->hint = hint;
context->layout->purpose = purpose; 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)) { if (g_strcmp0(context->layout->overlay_name, name)) {
g_free(context->layout->overlay_name); g_free(context->layout->overlay_name);
context->layout->overlay_name = g_strdup(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; 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); LayoutHolder *context = g_object_new (EEKBOARD_TYPE_LAYOUT_HOLDER, NULL);
context->layout = state; context->layout = state;
eekboard_context_service_use_layout(context, context->layout); eek_layout_holder_use_layout(context, context->layout);
return context; 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; context->priv->submission = submission;
if (context->priv->submission) { if (context->priv->submission) {
submission_set_keyboard(context->priv->submission, context->priv->keyboard); 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); self->layout->layout_name = g_strdup(keyboard_layout);
} }
// This must actually update the UI. // This must actually update the UI.
eekboard_context_service_use_layout(self->context, self->layout); eek_layout_holder_use_layout(self->context, self->layout);
} }
} }

8
eekboard/eekboard-context-service.h
View File

@ -73,9 +73,9 @@ struct gsettings_tracker {
void eek_gsettings_tracker_init(struct gsettings_tracker* tracker, LayoutHolder *context, struct squeek_layout_state *layout); 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); LayoutHolder *eek_layout_holder_new(struct squeek_layout_state *state);
void eekboard_context_service_set_submission(LayoutHolder *context, struct submission *submission); void eek_layout_holder_set_submission(LayoutHolder *context, struct submission *submission);
LevelKeyboard *eekboard_context_service_get_keyboard(LayoutHolder *context); LevelKeyboard *eek_layout_holder_get_keyboard(LayoutHolder *context);
void eekboard_context_service_set_keymap(LayoutHolder *context, void eekboard_context_service_set_keymap(LayoutHolder *context,
const LevelKeyboard *keyboard); const LevelKeyboard *keyboard);
@ -84,6 +84,6 @@ void eekboard_context_service_set_hint_purpose(LayoutHolder *context,
uint32_t hint, uint32_t hint,
uint32_t purpose); uint32_t purpose);
void 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 G_END_DECLS
#endif /* EEKBOARD_CONTEXT_SERVICE_H */ #endif /* EEKBOARD_CONTEXT_SERVICE_H */

4
src/server-main.c
View File

@ -206,7 +206,7 @@ main (int argc, char **argv)
instance.ui_manager = squeek_uiman_new(instance.wayland.outputs); 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); eek_gsettings_tracker_init(&instance.gsettings_tracker, instance.layout_holder, &instance.layout_choice);
// set up dbus // set up dbus
@ -282,7 +282,7 @@ main (int argc, char **argv)
instance.wayland.seat, instance.wayland.seat,
instance.layout_holder); 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( ServerContextService *ui_context = server_context_service_new(
instance.layout_holder, instance.layout_holder,