From 1c71300782107df30b9693096f07f6e4bd7a0f15 Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Sun, 22 Aug 2021 12:38:10 +0200 Subject: Allow more flexible layouts rather than fixed grid and first layout overhaul --- main.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 45ec8fc..a76c872 100644 --- a/main.c +++ b/main.c @@ -258,7 +258,7 @@ handle_global_remove(void *data, struct wl_registry *registry, uint32_t name) {} void layer_surface_configure(void *data, struct zwlr_layer_surface_v1 *surface, uint32_t serial, uint32_t w, uint32_t h) { - kbd_resize(&keyboard, w + KBD_PIXEL_OVERSCAN_WIDTH, h); + kbd_resize(&keyboard, w + KBD_PIXEL_OVERSCAN_WIDTH, h, layouts, NumLayouts); zwlr_layer_surface_v1_ack_configure(surface, serial); } @@ -315,13 +315,6 @@ main(int argc, char **argv) { zwp_virtual_keyboard_v1_keymap( keyboard.vkbd, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keymap_fd, keymap_size); - /* init layouts */ - for (i = 0; i < NumLayouts; i++) { - if (layouts[i].keys) { - kbd_init_layout(&layouts[i]); - } - } - /* assign kbd state */ keyboard.surf = &draw_surf; -- cgit 1.4.1