aboutsummaryrefslogtreecommitdiff
path: root/src/x11_window.c
diff options
context:
space:
mode:
authorHarry Jeffery <harry@exec64.co.uk>2019-08-25 00:36:44 +0100
committerHarry Jeffery <harry@exec64.co.uk>2019-08-25 00:36:44 +0100
commit40a738b43b38c187233ae3b0905a785ce824b03f (patch)
treef779bc677b9161987f797344458d4485e71a947d /src/x11_window.c
parenta9b4be7e4a75a8e3d7041cedc99cb808d1da5e1d (diff)
downloadimv-40a738b43b38c187233ae3b0905a785ce824b03f.tar.gz
Remove unused imv_window_get_keymap function
Diffstat (limited to 'src/x11_window.c')
-rw-r--r--src/x11_window.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/x11_window.c b/src/x11_window.c
index 734a1c4..d4b187f 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -39,7 +39,6 @@ struct imv_window {
struct imv_keyboard *keyboard;
int pipe_fds[2];
- char *keymap;
};
static void set_nonblocking(int fd)
@@ -80,7 +79,9 @@ static void setup_keymap(struct imv_window *window)
struct xkb_keymap *keymap =
xkb_x11_keymap_new_from_device(context, conn, device, 0);
if (keymap) {
- window->keymap = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_USE_ORIGINAL_FORMAT);
+ char *keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_USE_ORIGINAL_FORMAT);
+ imv_keyboard_set_keymap(window->keyboard, keymap_str);
+ free(keymap_str);
} else {
imv_log(IMV_ERROR, "x11_window: Failed to load keymap. xkb_x11_keymap_new_from_device returned NULL.");
}
@@ -148,7 +149,6 @@ struct imv_window *imv_window_create(int w, int h, const char *title)
assert(window->keyboard);
setup_keymap(window);
- imv_keyboard_set_keymap(window->keyboard, window->keymap);
return window;
}
@@ -160,7 +160,6 @@ void imv_window_free(struct imv_window *window)
close(window->pipe_fds[1]);
glXDestroyContext(window->x_display, window->x_glc);
XCloseDisplay(window->x_display);
- free(window->keymap);
free(window);
}
@@ -424,8 +423,3 @@ void imv_window_pump_events(struct imv_window *window, imv_event_handler handler
}
}
}
-
-const char *imv_window_get_keymap(struct imv_window *window)
-{
- return window->keymap;
-}