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

Rename LevelKeyboard to Layout

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2022-11-28 13:07:37 +00:00
parent e9cc20106b
commit 9c9f371f91
8 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ typedef struct _EekGtkKeyboardPrivate
struct squeek_state_manager *state_manager; // shared reference
struct submission *submission; // unowned reference
LevelKeyboard *keyboard; // unowned reference; it's kept in server-context
Layout *keyboard; // unowned reference; it's kept in server-context
GdkEventSequence *sequence; // unowned reference
LfbEvent *event;

8
eek/eek-keyboard.c
View File

@ -86,15 +86,15 @@ struct keymap squeek_key_map_from_str(const char *keymap_str) {
return km;
}
void level_keyboard_free(LevelKeyboard *self) {
void layout_free(Layout *self) {
squeek_layout_free(self->layout);
g_free(self);
}
LevelKeyboard*
level_keyboard_new (char *style_name, struct squeek_layout *layout)
Layout*
layout_new (char *style_name, struct squeek_layout *layout)
{
LevelKeyboard *keyboard = g_new0(LevelKeyboard, 1);
Layout *keyboard = g_new0(Layout, 1);
if (!keyboard) {
g_error("Failed to create a keyboard");
}

11
eek/eek-keyboard.h
View File

@ -39,17 +39,14 @@ struct keymap {
};
/// Keyboard info holder
struct _LevelKeyboard {
struct _Layout {
char style_name[20]; // The name of the css class on layout
struct squeek_layout *layout; // owned
};
typedef struct _LevelKeyboard LevelKeyboard;
gchar *eek_keyboard_get_keymap(LevelKeyboard *keyboard);
LevelKeyboard*
level_keyboard_new (char *style_name, struct squeek_layout *layout);
void level_keyboard_free(LevelKeyboard *self);
Layout*
layout_new (char *style_name, struct squeek_layout *layout);
void layout_free(Layout *self);
G_END_DECLS
#endif /* EEK_KEYBOARD_H */

4
eek/eek-renderer.c
View File

@ -206,7 +206,7 @@ eek_renderer_render_keyboard (EekRenderer *self,
struct render_geometry geometry,
struct submission *submission,
cairo_t *cr,
LevelKeyboard *keyboard)
Layout *keyboard)
{
g_return_if_fail (geometry.allocation_width > 0.0);
g_return_if_fail (geometry.allocation_height > 0.0);
@ -316,7 +316,7 @@ renderer_init (EekRenderer *self)
}
EekRenderer *
eek_renderer_new (LevelKeyboard *keyboard,
eek_renderer_new (Layout *keyboard,
PangoContext *pcontext)
{
EekRenderer *renderer = calloc(1, sizeof(EekRenderer));

4
eek/eek-renderer.h
View File

@ -58,7 +58,7 @@ struct render_geometry {
};
GType eek_renderer_get_type (void) G_GNUC_CONST;
EekRenderer *eek_renderer_new (LevelKeyboard *keyboard,
EekRenderer *eek_renderer_new (Layout *keyboard,
PangoContext *pcontext);
void eek_renderer_set_scale_factor (EekRenderer *renderer,
gint scale);
@ -68,7 +68,7 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar *icon_name,
gint scale);
void eek_renderer_render_keyboard (EekRenderer *renderer, struct render_geometry geometry, struct submission *submission,
cairo_t *cr, LevelKeyboard *keyboard);
cairo_t *cr, Layout *keyboard);
void
eek_renderer_free (EekRenderer *self);

2
eek/eek-types.h
View File

@ -39,7 +39,7 @@ typedef struct _EekBounds EekBounds;
typedef struct _EekboardContextService EekboardContextService;
typedef struct _ServerContextService ServerContextService;
typedef struct _LevelKeyboard LevelKeyboard;
typedef struct _Layout Layout;
/**
* EekPoint:

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

@ -57,7 +57,7 @@ struct _EekboardContextService {
GObject parent;
struct squeek_state_manager *state_manager; // shared reference
LevelKeyboard *keyboard; // currently used keyboard
Layout *keyboard; // currently used keyboard
GSettings *settings; // Owned reference
/// Needed for keymap changes after keyboard updates.
@ -127,9 +127,9 @@ settings_get_layout(GSettings *settings, char **type, char **layout)
}
void eekboard_context_service_set_layout(EekboardContextService *context, char *style_name, struct squeek_layout *layout, uint32_t timestamp) {
LevelKeyboard *keyboard = level_keyboard_new(style_name, layout);
Layout *keyboard = layout_new(style_name, layout);
// set as current
LevelKeyboard *previous_keyboard = context->keyboard;
Layout *previous_keyboard = context->keyboard;
context->keyboard = keyboard;
// Update the keymap if necessary.
// TODO: Update submission on change event
@ -142,7 +142,7 @@ void eekboard_context_service_set_layout(EekboardContextService *context, char *
// replacing the keyboard above will cause the previous keyboard to get destroyed from the UI side (eek_gtk_keyboard_dispose)
if (previous_keyboard) {
level_keyboard_free(previous_keyboard);
layout_free(previous_keyboard);
}
}
@ -264,7 +264,7 @@ eekboard_context_service_destroy (EekboardContextService *context)
* Get keyboard currently active in @context.
* Returns: (transfer none): an #EekKeyboard
*/
LevelKeyboard *
Layout *
eekboard_context_service_get_keyboard (EekboardContextService *context)
{
return context->keyboard;

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

@ -41,10 +41,10 @@ G_DECLARE_FINAL_TYPE(EekboardContextService, eekboard_context_service, EEKBOARD,
EekboardContextService *eekboard_context_service_new(struct squeek_state_manager *state_manager);
void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
void eekboard_context_service_destroy (EekboardContextService *context);
LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
Layout *eekboard_context_service_get_keyboard(EekboardContextService *context);
void eekboard_context_service_set_keymap(EekboardContextService *context,
const LevelKeyboard *keyboard);
const Layout *keyboard);
G_END_DECLS
#endif /* EEKBOARD_CONTEXT_SERVICE_H */