mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to new libxkbcommon API

Browse Source 
We no longer depend on xproto, we use xkbcommon keycodes now. Yay!
This commit is contained in:
Kristian Høgsberg
2012-05-11 11:24:29 -04:00
parent d174521b56
commit bef52d1423
6 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-x11.c
+1 -1
View File
@@ -737,7 +737,7 @@ x11_compositor_get_keymap(struct x11_compositor *c)
length_part = strlen(value_part); \
if (value_part + length_part > (value_all + length_all) && \
length_part > 0 && c->base.xkb_info.names.to == NULL) { \
free(c->base.xkb_info.names.to); \
free((char *) c->base.xkb_info.names.to); \
c->base.xkb_info.names.to = strdup(value_part); \
} \
value_part += length_part + 1;
src/compositor.c
+7 -7
View File
@@ -2614,7 +2614,7 @@ weston_compositor_shutdown(struct weston_compositor *ec)
static int weston_compositor_xkb_init(struct weston_compositor *ec,
struct xkb_rule_names *names)
{
ec->xkb_info.context = xkb_context_new();
ec->xkb_info.context = xkb_context_new(0);
if (ec->xkb_info.context == NULL) {
fprintf(stderr, "failed to create XKB context\n");
return -1;
@@ -2629,7 +2629,7 @@ static int weston_compositor_xkb_init(struct weston_compositor *ec,
ec->xkb_info.names.layout = strdup("us");
ec->xkb_info.keymap = xkb_map_new_from_names(ec->xkb_info.context,
&ec->xkb_info.names);
&ec->xkb_info.names, 0);
if (ec->xkb_info.keymap == NULL) {
fprintf(stderr, "failed to compile XKB keymap\n");
return -1;
@@ -2650,11 +2650,11 @@ static void weston_compositor_xkb_destroy(struct weston_compositor *ec)
xkb_map_unref(ec->xkb_info.keymap);
xkb_context_unref(ec->xkb_info.context);
free(ec->xkb_info.names.rules);
free(ec->xkb_info.names.model);
free(ec->xkb_info.names.layout);
free(ec->xkb_info.names.variant);
free(ec->xkb_info.names.options);
free((char *) ec->xkb_info.names.rules);
free((char *) ec->xkb_info.names.model);
free((char *) ec->xkb_info.names.layout);
free((char *) ec->xkb_info.names.variant);
free((char *) ec->xkb_info.names.options);
}
static int on_term_signal(int signal_number, void *data)