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

Track libxkbcommon API changes

Browse Source
This commit is contained in:
Kristian Høgsberg
2010-07-02 15:12:02 -04:00
parent 67a21bdf56
commit 3e6e7e6acb
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+8 -10
View File
@@ -64,7 +64,7 @@ struct display {
struct wl_list window_list; struct wl_list window_list;
char *device_name; char *device_name;
cairo_surface_t *active_frame, *inactive_frame, *shadow; cairo_surface_t *active_frame, *inactive_frame, *shadow;
XkbcDescPtr xkb; struct xkb_desc *xkb;
}; };
struct window { struct window {
@@ -802,17 +802,15 @@ display_render_frame(struct display *d)
static void static void
init_xkb(struct display *d) init_xkb(struct display *d)
{ {
XkbRMLVOSet rmlvo; struct xkb_rule_names names;
char rules[] = "evdev", model[] = "pc105", layout[] = "us";
rmlvo.rules = rules; names.rules = "evdev";
rmlvo.model = model; names.model = "pc105";
rmlvo.layout = layout; names.layout = "us";
rmlvo.variant = ""; names.variant = "";
rmlvo.options = ""; names.options = "";
XkbcInitAtoms(NULL, NULL); d->xkb = xkb_compile_keymap_from_rules(&names);
d->xkb = XkbcCompileKeymapFromRules(&rmlvo);
if (!d->xkb) { if (!d->xkb) {
fprintf(stderr, "Failed to compile keymap\n"); fprintf(stderr, "Failed to compile keymap\n");
exit(1); exit(1);