diff options
| author | Maarten van Gompel <proycon@anaproy.nl> | 2021-08-23 20:04:35 +0200 |
|---|---|---|
| committer | John Sullivan <jsullivan@csumb.edu> | 2021-10-19 23:12:01 -0700 |
| commit | 5746095e12d53e9572038f0c87c6575d3fc34288 (patch) | |
| tree | 9aa3744a8ff8c02b74e5e057436a842ef8831467 /main.c | |
| parent | 099ab50fdadea974cb10ba6ae9441317565b2967 (diff) | |
| download | suggpicker-5746095e12d53e9572038f0c87c6575d3fc34288.tar.gz | |
implemented support for multiple keymaps
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main.c b/main.c index ef3b217..982f0e0 100644 --- a/main.c +++ b/main.c @@ -17,7 +17,7 @@ /* lazy die macro */ #define die(...) \ fprintf(stderr, __VA_ARGS__); \ - exit(0) + exit(1) /* client state */ static const char *namespace = "wlroots"; @@ -94,7 +94,7 @@ static void layer_surface_configure(void *data, uint32_t serial, uint32_t w, uint32_t h); static void layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface); -static void create_and_upload_keymap(uint32_t comp_unichr, uint32_t comp_shift_unichr); +static void create_and_upload_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_shift_unichr); /* event handlers */ static const struct wl_pointer_listener pointer_listener = { @@ -277,8 +277,8 @@ layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface) { } void -create_and_upload_keymap(uint32_t comp_unichr, uint32_t comp_shift_unichr) { - const char * keymap_str = get_keymap(comp_unichr, comp_shift_unichr); +create_and_upload_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_shift_unichr) { + const char * keymap_str = get_keymap(name, comp_unichr, comp_shift_unichr); size_t keymap_size = strlen(keymap_str) + 1; int keymap_fd = os_create_anonymous_file(keymap_size); if (keymap_fd < 0) { @@ -327,7 +327,7 @@ main(int argc, char **argv) { zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkbd_mgr, seat); /* upload keymap */ - create_and_upload_keymap(0,0); + create_and_upload_keymap(layouts[DefaultLayout].keymap_name, 0,0); /* assign kbd state */ keyboard.surf = &draw_surf; |