aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-10-27 15:21:19 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-10-27 15:21:19 +0000
commit061bbd704961b17419fd69344af6268487abb926 (patch)
treedbcd298ccffd325fb97e3deaee5d151df55f4bf8 /main.c
parentwayland: move clipboard/primary structs into the wayland struct (diff)
kbd: break out XKB kbd struct to a separate file
Diffstat (limited to 'main.c')
-rw-r--r--main.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/main.c b/main.c
index 0bdfe69a..7c8de292 100644
--- a/main.c
+++ b/main.c
@@ -21,7 +21,6 @@
#include <wayland-client.h>
#include <wayland-cursor.h>
#include <xdg-shell.h>
-#include <xkbcommon/xkbcommon-compose.h>
#include <xdg-output-unstable-v1.h>
#include <xdg-decoration-unstable-v1.h>
@@ -1151,17 +1150,7 @@ out:
shm_fini();
- if (term.kbd.xkb_compose_state != NULL)
- xkb_compose_state_unref(term.kbd.xkb_compose_state);
- if (term.kbd.xkb_compose_table != NULL)
- xkb_compose_table_unref(term.kbd.xkb_compose_table);
- if (term.kbd.xkb_keymap != NULL)
- xkb_keymap_unref(term.kbd.xkb_keymap);
- if (term.kbd.xkb_state != NULL)
- xkb_state_unref(term.kbd.xkb_state);
- if (term.kbd.xkb != NULL)
- xkb_context_unref(term.kbd.xkb);
-
+ kbd_destroy(&term.kbd);
wayl_win_destroy(&term.window);
wayl_destroy(&term.wl);