Make event names consistent

5 files changed, 32 insertions, 34 deletions

diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c
index f188b09e..f19d7120 100644
--- a/backend/libinput/keyboard.c
+++ b/backend/libinput/keyboard.c
@@ -45,8 +45,8 @@ void handle_keyboard_key(struct libinput_event *event,
 	}
 	struct libinput_event_keyboard *kbevent =
 		libinput_event_get_keyboard_event(event);
-	struct wlr_keyboard_key *wlr_event =
-		calloc(1, sizeof(struct wlr_keyboard_key));
+	struct wlr_event_keyboard_key *wlr_event =
+		calloc(1, sizeof(struct wlr_event_keyboard_key));
 	wlr_event->time_sec = libinput_event_keyboard_get_time(kbevent);
 	wlr_event->time_usec = libinput_event_keyboard_get_time_usec(kbevent);
 	wlr_event->keycode = libinput_event_keyboard_get_key(kbevent);
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index 436c826a..57c417c8 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -23,8 +23,8 @@ void handle_pointer_motion(struct libinput_event *event,
 	}
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
-	struct wlr_pointer_motion *wlr_event =
-		calloc(1, sizeof(struct wlr_pointer_motion));
+	struct wlr_event_pointer_motion *wlr_event =
+		calloc(1, sizeof(struct wlr_event_pointer_motion));
 	wlr_event->time_sec = libinput_event_pointer_get_time(pevent);
 	wlr_event->time_usec = libinput_event_pointer_get_time_usec(pevent);
 	wlr_event->delta_x = libinput_event_pointer_get_dx(pevent);
@@ -42,8 +42,8 @@ void handle_pointer_motion_abs(struct libinput_event *event,
 	}
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
-	struct wlr_pointer_motion_absolute *wlr_event =
-		calloc(1, sizeof(struct wlr_pointer_motion_absolute));
+	struct wlr_event_pointer_motion_absolute *wlr_event =
+		calloc(1, sizeof(struct wlr_event_pointer_motion_absolute));
 	wlr_event->time_sec = libinput_event_pointer_get_time(pevent);
 	wlr_event->time_usec = libinput_event_pointer_get_time_usec(pevent);
 	wlr_event->x_mm = libinput_event_pointer_get_absolute_x(pevent);
@@ -62,8 +62,8 @@ void handle_pointer_button(struct libinput_event *event,
 	}
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
-	struct wlr_pointer_button *wlr_event =
-		calloc(1, sizeof(struct wlr_pointer_button));
+	struct wlr_event_pointer_button *wlr_event =
+		calloc(1, sizeof(struct wlr_event_pointer_button));
 	wlr_event->time_sec = libinput_event_pointer_get_time(pevent);
 	wlr_event->time_usec = libinput_event_pointer_get_time_usec(pevent);
 	wlr_event->button = libinput_event_pointer_get_button(pevent);
@@ -88,8 +88,8 @@ void handle_pointer_axis(struct libinput_event *event,
 	}
 	struct libinput_event_pointer *pevent =
 		libinput_event_get_pointer_event(event);
-	struct wlr_pointer_axis *wlr_event =
-		calloc(1, sizeof(struct wlr_pointer_axis));
+	struct wlr_event_pointer_axis *wlr_event =
+		calloc(1, sizeof(struct wlr_event_pointer_axis));
 	wlr_event->time_sec = libinput_event_pointer_get_time(pevent);
 	wlr_event->time_usec = libinput_event_pointer_get_time_usec(pevent);
 	switch (libinput_event_pointer_get_axis_source(pevent)) {
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index fdb4775e..5517fa63 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -23,8 +23,8 @@ void handle_tablet_pad_button(struct libinput_event *event,
 	}
 	struct libinput_event_tablet_pad *pevent =
 		libinput_event_get_tablet_pad_event(event);
-	struct wlr_tablet_pad_button *wlr_event =
-		calloc(1, sizeof(struct wlr_tablet_pad_button));
+	struct wlr_event_tablet_pad_button *wlr_event =
+		calloc(1, sizeof(struct wlr_event_tablet_pad_button));
 	wlr_event->time_sec = libinput_event_tablet_pad_get_time(pevent);
 	wlr_event->time_usec = libinput_event_tablet_pad_get_time_usec(pevent);
 	wlr_event->button = libinput_event_tablet_pad_get_button_number(pevent);
@@ -49,8 +49,8 @@ void handle_tablet_pad_ring(struct libinput_event *event,
 	}
 	struct libinput_event_tablet_pad *pevent =
 		libinput_event_get_tablet_pad_event(event);
-	struct wlr_tablet_pad_ring *wlr_event =
-		calloc(1, sizeof(struct wlr_tablet_pad_ring));
+	struct wlr_event_tablet_pad_ring *wlr_event =
+		calloc(1, sizeof(struct wlr_event_tablet_pad_ring));
 	wlr_event->time_sec = libinput_event_tablet_pad_get_time(pevent);
 	wlr_event->time_usec = libinput_event_tablet_pad_get_time_usec(pevent);
 	wlr_event->ring = libinput_event_tablet_pad_get_ring_number(pevent);
@@ -76,8 +76,8 @@ void handle_tablet_pad_strip(struct libinput_event *event,
 	}
 	struct libinput_event_tablet_pad *pevent =
 		libinput_event_get_tablet_pad_event(event);
-	struct wlr_tablet_pad_strip *wlr_event =
-		calloc(1, sizeof(struct wlr_tablet_pad_strip));
+	struct wlr_event_tablet_pad_strip *wlr_event =
+		calloc(1, sizeof(struct wlr_event_tablet_pad_strip));
 	wlr_event->time_sec = libinput_event_tablet_pad_get_time(pevent);
 	wlr_event->time_usec = libinput_event_tablet_pad_get_time_usec(pevent);
 	wlr_event->strip = libinput_event_tablet_pad_get_strip_number(pevent);
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index e9e2951f..95bdd3fd 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -23,8 +23,8 @@ void handle_tablet_tool_axis(struct libinput_event *event,
 	}
 	struct libinput_event_tablet_tool *tevent =
 		libinput_event_get_tablet_tool_event(event);
-	struct wlr_tablet_tool_axis *wlr_event =
-		calloc(1, sizeof(struct wlr_tablet_tool_axis));
+	struct wlr_event_tablet_tool_axis *wlr_event =
+		calloc(1, sizeof(struct wlr_event_tablet_tool_axis));
 	wlr_event->time_sec = libinput_event_tablet_tool_get_time(tevent);
 	wlr_event->time_usec = libinput_event_tablet_tool_get_time_usec(tevent);
 	libinput_device_get_size(device, &wlr_event->width_mm, &wlr_event->height_mm);
@@ -77,8 +77,8 @@ void handle_tablet_tool_proximity(struct libinput_event *event,
 	}
 	struct libinput_event_tablet_tool *tevent =
 		libinput_event_get_tablet_tool_event(event);
-	struct wlr_tablet_tool_proximity *wlr_event =
-		calloc(1, sizeof(struct wlr_tablet_tool_proximity));
+	struct wlr_event_tablet_tool_proximity *wlr_event =
+		calloc(1, sizeof(struct wlr_event_tablet_tool_proximity));
 	wlr_event->time_sec = libinput_event_tablet_tool_get_time(tevent);
 	wlr_event->time_usec = libinput_event_tablet_tool_get_time_usec(tevent);
 	switch (libinput_event_tablet_tool_get_proximity_state(tevent)) {
@@ -104,8 +104,8 @@ void handle_tablet_tool_tip(struct libinput_event *event,
 	handle_tablet_tool_axis(event, device);
 	struct libinput_event_tablet_tool *tevent =
 		libinput_event_get_tablet_tool_event(event);
-	struct wlr_tablet_tool_tip *wlr_event =
-		calloc(1, sizeof(struct wlr_tablet_tool_tip));
+	struct wlr_event_tablet_tool_tip *wlr_event =
+		calloc(1, sizeof(struct wlr_event_tablet_tool_tip));
 	wlr_event->time_sec = libinput_event_tablet_tool_get_time(tevent);
 	wlr_event->time_usec = libinput_event_tablet_tool_get_time_usec(tevent);
 	switch (libinput_event_tablet_tool_get_tip_state(tevent)) {
@@ -127,13 +127,11 @@ void handle_tablet_tool_button(struct libinput_event *event,
 		wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
 		return;
 	}
-	// Tip events contain axis information. We update this information
-	// before we send the proximity event
 	handle_tablet_tool_axis(event, device);
 	struct libinput_event_tablet_tool *tevent =
 		libinput_event_get_tablet_tool_event(event);
-	struct wlr_tablet_tool_button *wlr_event =
-		calloc(1, sizeof(struct wlr_tablet_tool_button));
+	struct wlr_event_tablet_tool_button *wlr_event =
+		calloc(1, sizeof(struct wlr_event_tablet_tool_button));
 	wlr_event->time_sec = libinput_event_tablet_tool_get_time(tevent);
 	wlr_event->time_usec = libinput_event_tablet_tool_get_time_usec(tevent);
 	wlr_event->button = libinput_event_tablet_tool_get_button(tevent);
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index b19597a3..c002b6a0 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -23,8 +23,8 @@ void handle_touch_down(struct libinput_event *event,
 	}
 	struct libinput_event_touch *tevent =
 		libinput_event_get_touch_event(event);
-	struct wlr_touch_down *wlr_event =
-		calloc(1, sizeof(struct wlr_touch_down));
+	struct wlr_event_touch_down *wlr_event =
+		calloc(1, sizeof(struct wlr_event_touch_down));
 	wlr_event->time_sec = libinput_event_touch_get_time(tevent);
 	wlr_event->time_usec = libinput_event_touch_get_time_usec(tevent);
 	wlr_event->slot = libinput_event_touch_get_slot(tevent);
@@ -44,8 +44,8 @@ void handle_touch_up(struct libinput_event *event,
 	}
 	struct libinput_event_touch *tevent =
 		libinput_event_get_touch_event(event);
-	struct wlr_touch_up *wlr_event =
-		calloc(1, sizeof(struct wlr_touch_up));
+	struct wlr_event_touch_up *wlr_event =
+		calloc(1, sizeof(struct wlr_event_touch_up));
 	wlr_event->time_sec = libinput_event_touch_get_time(tevent);
 	wlr_event->time_usec = libinput_event_touch_get_time_usec(tevent);
 	wlr_event->slot = libinput_event_touch_get_slot(tevent);
@@ -62,8 +62,8 @@ void handle_touch_motion(struct libinput_event *event,
 	}
 	struct libinput_event_touch *tevent =
 		libinput_event_get_touch_event(event);
-	struct wlr_touch_motion *wlr_event =
-		calloc(1, sizeof(struct wlr_touch_motion));
+	struct wlr_event_touch_motion *wlr_event =
+		calloc(1, sizeof(struct wlr_event_touch_motion));
 	wlr_event->time_sec = libinput_event_touch_get_time(tevent);
 	wlr_event->time_usec = libinput_event_touch_get_time_usec(tevent);
 	wlr_event->slot = libinput_event_touch_get_slot(tevent);
@@ -83,8 +83,8 @@ void handle_touch_cancel(struct libinput_event *event,
 	}
 	struct libinput_event_touch *tevent =
 		libinput_event_get_touch_event(event);
-	struct wlr_touch_cancel *wlr_event =
-		calloc(1, sizeof(struct wlr_touch_cancel));
+	struct wlr_event_touch_cancel *wlr_event =
+		calloc(1, sizeof(struct wlr_event_touch_cancel));
 	wlr_event->time_sec = libinput_event_touch_get_time(tevent);
 	wlr_event->time_usec = libinput_event_touch_get_time_usec(tevent);
 	wlr_event->slot = libinput_event_touch_get_slot(tevent);