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

layout: Split out choice to a struct on its own

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-02-24 13:21:08 +00:00
parent 46cbaf8e87
commit 61e1ab5c5a
8 changed files with 153 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server-main.c
View File

@ -28,6 +28,7 @@
#include "eek/eek.h"
#include "eekboard/eekboard-context-service.h"
#include "dbus.h"
#include "layout.h"
#include "outputs.h"
#include "submission.h"
#include "server-context-service.h"
@ -38,11 +39,12 @@
/// Global application state
struct squeekboard {
struct squeek_wayland wayland;
DBusHandler *dbus_handler;
EekboardContextService *settings_context;
ServerContextService *ui_context;
struct submission *submission;
struct squeek_wayland wayland; // Just hooks.
DBusHandler *dbus_handler; // Controls visibility of the OSK.
EekboardContextService *settings_context; // Gsettings hooks.
ServerContextService *ui_context; // mess, includes the entire UI
struct submission *submission; // Wayland text input handling.
struct squeek_layout_state layout_choice; // Currently wanted layout.
};
@ -199,7 +201,7 @@ main (int argc, char **argv)
g_warning("Wayland input method interface not available");
}
instance.settings_context = eekboard_context_service_new();
instance.settings_context = eekboard_context_service_new(&instance.layout_choice);
// set up dbus
@ -276,7 +278,8 @@ main (int argc, char **argv)
ServerContextService *ui_context = server_context_service_new(
instance.settings_context,
instance.submission);
instance.submission,
&instance.layout_choice);
if (!ui_context) {
g_error("Could not initialize GUI");
exit(1);