Track libxkbcommon API changes

clients/window.c

@@ -64,7 +64,7 @@ struct display {
 	struct wl_list window_list;
 	char *device_name;
 	cairo_surface_t *active_frame, *inactive_frame, *shadow;
-	XkbcDescPtr xkb;
+	struct xkb_desc *xkb;
 };
 
 struct window {
@@ -802,17 +802,15 @@ display_render_frame(struct display *d)
 static void
 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) {
 		fprintf(stderr, "Failed to compile keymap\n");
 		exit(1);