Make event names consistent

5 files changed, 16 insertions, 16 deletions

diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index e3efc895..0d57b08b 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/include/wlr/types/wlr_keyboard.h
@@ -29,7 +29,7 @@ enum wlr_key_state {
 	WLR_KEY_PRESSED,
 };
 
-struct wlr_keyboard_key {
+struct wlr_event_keyboard_key {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	uint32_t keycode;
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index 7f5e2771..e49fd061 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/include/wlr/types/wlr_pointer.h
@@ -19,20 +19,20 @@ struct wlr_pointer {
 	} events;
 };
 
-struct wlr_pointer_motion {
+struct wlr_event_pointer_motion {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	double delta_x, delta_y;
 };
 
-struct wlr_pointer_motion_absolute {
+struct wlr_event_pointer_motion_absolute {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	double x_mm, y_mm;
 	double width_mm, height_mm;
 };
 
-struct wlr_pointer_button {
+struct wlr_event_pointer_button {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	uint32_t button;
@@ -51,7 +51,7 @@ enum wlr_axis_orientation {
 	WLR_AXIS_ORIENTATION_HORIZONTAL,
 };
 
-struct wlr_pointer_axis {
+struct wlr_event_pointer_axis {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	enum wlr_axis_source source;
diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index 7fa7bfd1..fe88ec02 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/include/wlr/types/wlr_tablet_pad.h
@@ -24,7 +24,7 @@ struct wlr_tablet_pad {
 	} events;
 };
 
-struct wlr_tablet_pad_button {
+struct wlr_event_tablet_pad_button {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	uint32_t button;
@@ -36,7 +36,7 @@ enum wlr_tablet_pad_ring_source {
 	WLR_TABLET_PAD_RING_SOURCE_FINGER,
 };
 
-struct wlr_tablet_pad_ring {
+struct wlr_event_tablet_pad_ring {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	enum wlr_tablet_pad_ring_source source;
@@ -49,7 +49,7 @@ enum wlr_tablet_pad_strip_source {
 	WLR_TABLET_PAD_STRIP_SOURCE_FINGER,
 };
 
-struct wlr_tablet_pad_strip {
+struct wlr_event_tablet_pad_strip {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	enum wlr_tablet_pad_strip_source source;
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index 2695914a..6f121463 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -31,7 +31,7 @@ enum wlr_tablet_tool_axes {
 	WLR_TABLET_TOOL_AXIS_WHEEL = 256,
 };
 
-struct wlr_tablet_tool_axis {
+struct wlr_event_tablet_tool_axis {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	uint32_t updated_axes;
@@ -50,7 +50,7 @@ enum wlr_tablet_tool_proximity_state {
 	WLR_TABLET_TOOL_PROXIMITY_IN,
 };
 
-struct wlr_tablet_tool_proximity {
+struct wlr_event_tablet_tool_proximity {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	double x, y;
@@ -63,7 +63,7 @@ enum wlr_tablet_tool_tip_state {
 	WLR_TABLET_TOOL_TIP_DOWN,
 };
 
-struct wlr_tablet_tool_tip {
+struct wlr_event_tablet_tool_tip {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	double x, y;
@@ -71,7 +71,7 @@ struct wlr_tablet_tool_tip {
 	enum wlr_tablet_tool_tip_state state;
 };
 
-struct wlr_tablet_tool_button {
+struct wlr_event_tablet_tool_button {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	uint32_t button;
diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h
index 79c51ea3..e5398814 100644
--- a/include/wlr/types/wlr_touch.h
+++ b/include/wlr/types/wlr_touch.h
@@ -18,7 +18,7 @@ struct wlr_touch {
 	} events;
 };
 
-struct wlr_touch_down {
+struct wlr_event_touch_down {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	int32_t slot;
@@ -26,13 +26,13 @@ struct wlr_touch_down {
 	double width_mm, height_mm;
 };
 
-struct wlr_touch_up {
+struct wlr_event_touch_up {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	int32_t slot;
 };
 
-struct wlr_touch_motion {
+struct wlr_event_touch_motion {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	int32_t slot;
@@ -40,7 +40,7 @@ struct wlr_touch_motion {
 	double width_mm, height_mm;
 };
 
-struct wlr_touch_cancel {
+struct wlr_event_touch_cancel {
 	uint32_t time_sec;
 	uint64_t time_usec;
 	int32_t slot;