wlr-keyboard: take out modifiers event struct (for now)

3 files changed, 3 insertions, 14 deletions

diff --git a/include/rootston/keyboard.h b/include/rootston/keyboard.h
index 4dd70a65..51977f08 100644
--- a/include/rootston/keyboard.h
+++ b/include/rootston/keyboard.h
@@ -27,7 +27,6 @@ void roots_keyboard_destroy(struct roots_keyboard *keyboard);
 void roots_keyboard_handle_key(struct roots_keyboard *keyboard,
 		struct wlr_event_keyboard_key *event);
 
-void roots_keyboard_handle_modifiers(struct roots_keyboard *r_keyboard,
-		struct wlr_event_keyboard_modifiers *event);
+void roots_keyboard_handle_modifiers(struct roots_keyboard *r_keyboard);
 
 #endif
diff --git a/include/wlr/interfaces/wlr_keyboard.h b/include/wlr/interfaces/wlr_keyboard.h
index 5848416d..570f5721 100644
--- a/include/wlr/interfaces/wlr_keyboard.h
+++ b/include/wlr/interfaces/wlr_keyboard.h
@@ -14,6 +14,7 @@ void wlr_keyboard_destroy(struct wlr_keyboard *keyboard);
 void wlr_keyboard_notify_key(struct wlr_keyboard *keyboard,
 		struct wlr_event_keyboard_key *event);
 void wlr_keyboard_notify_modifiers(struct wlr_keyboard *keyboard,
-		struct wlr_event_keyboard_modifiers *event);
+		uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,
+		uint32_t group);
 
 #endif
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index 4bd5b9b6..e2d50b03 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -66,23 +66,12 @@ enum wlr_key_state {
 };
 
 struct wlr_event_keyboard_key {
-	struct wlr_input_device *device;
-	struct wlr_keyboard *keyboard;
 	uint32_t time_msec;
 	uint32_t keycode;
 	bool update_state;
 	enum wlr_key_state state;
 };
 
-struct wlr_event_keyboard_modifiers {
-	struct wlr_input_device *device;
-	struct wlr_keyboard *keyboard;
-	uint32_t mods_depressed;
-	uint32_t mods_latched;
-	uint32_t mods_locked;
-	uint32_t group;
-};
-
 void wlr_keyboard_set_keymap(struct wlr_keyboard *kb,
 	struct xkb_keymap *keymap);
 void wlr_keyboard_led_update(struct wlr_keyboard *keyboard, uint32_t leds);