input: Move the xkb fields from weston_seat to weston_keyboard
XKB integration is a keyboard feature and should as such be kept track
of in the keyboard struct.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
diff --git a/src/compositor.h b/src/compositor.h
index 3814b46..6bd637e 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -466,6 +466,13 @@
struct weston_keyboard_grab input_method_grab;
struct wl_resource *input_method_resource;
+
+ struct weston_xkb_info *xkb_info;
+ struct {
+ struct xkb_state *state;
+ enum weston_led leds;
+ } xkb_state;
+ struct xkb_keymap *pending_keymap;
};
struct weston_seat {
@@ -497,13 +504,6 @@
void (*led_update)(struct weston_seat *ws, enum weston_led leds);
- struct weston_xkb_info *xkb_info;
- struct {
- struct xkb_state *state;
- enum weston_led leds;
- } xkb_state;
- struct xkb_keymap *pending_keymap;
-
struct input_method *input_method;
char *seat_name;
};