Revert "merge sway master"

This reverts commit 7460d9f565092836f81b917a040caff57142d91a.

9 files changed, 92 insertions, 146 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 0b2f03a2..6fddee90 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -386,29 +386,28 @@ static void pointer_motion(struct sway_cursor *cursor, uint32_t time_msec,
 static void handle_pointer_motion_relative(
 		struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, motion);
-	struct wlr_pointer_motion_event *e = data;
-	cursor_handle_activity_from_device(cursor, &e->pointer->base);
+	struct wlr_event_pointer_motion *e = data;
+	cursor_handle_activity_from_device(cursor, e->device);
 
-	pointer_motion(cursor, e->time_msec, &e->pointer->base, e->delta_x,
-		e->delta_y, e->unaccel_dx, e->unaccel_dy);
+	pointer_motion(cursor, e->time_msec, e->device, e->delta_x, e->delta_y,
+			e->unaccel_dx, e->unaccel_dy);
 }
 
 static void handle_pointer_motion_absolute(
 		struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor =
 		wl_container_of(listener, cursor, motion_absolute);
-	struct wlr_pointer_motion_absolute_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_motion_absolute *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 
 	double lx, ly;
-	wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->pointer->base,
+	wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device,
 			event->x, event->y, &lx, &ly);
 
 	double dx = lx - cursor->cursor->x;
 	double dy = ly - cursor->cursor->y;
 
-	pointer_motion(cursor, event->time_msec, &event->pointer->base, dx, dy,
-		dx, dy);
+	pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
 }
 
 void dispatch_cursor_button(struct sway_cursor *cursor,
@@ -423,7 +422,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
 
 static void handle_pointer_button(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
-	struct wlr_pointer_button_event *event = data;
+	struct wlr_event_pointer_button *event = data;
 
 	if (event->state == WLR_BUTTON_PRESSED) {
 		cursor->pressed_button_count++;
@@ -435,20 +434,20 @@ static void handle_pointer_button(struct wl_listener *listener, void *data) {
 		}
 	}
 
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
-	dispatch_cursor_button(cursor, &event->pointer->base,
+	cursor_handle_activity_from_device(cursor, event->device);
+	dispatch_cursor_button(cursor, event->device,
 			event->time_msec, event->button, event->state);
 }
 
 void dispatch_cursor_axis(struct sway_cursor *cursor,
-		struct wlr_pointer_axis_event *event) {
+		struct wlr_event_pointer_axis *event) {
 	seatop_pointer_axis(cursor->seat, event);
 }
 
 static void handle_pointer_axis(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, axis);
-	struct wlr_pointer_axis_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_axis *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	dispatch_cursor_axis(cursor, event);
 }
 
@@ -459,8 +458,8 @@ static void handle_pointer_frame(struct wl_listener *listener, void *data) {
 
 static void handle_touch_down(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down);
-	struct wlr_touch_down_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->touch->base);
+	struct wlr_event_touch_down *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	cursor_hide(cursor);
 
 	struct sway_seat *seat = cursor->seat;
@@ -468,7 +467,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
 	struct wlr_surface *surface = NULL;
 
 	double lx, ly;
-	wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->touch->base,
+	wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device,
 			event->x, event->y, &lx, &ly);
 	double sx, sy;
 	struct sway_node *focused_node = node_at_coords(seat, lx, ly, &surface, &sx, &sy);
@@ -496,25 +495,24 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
 		double dx, dy;
 		dx = lx - cursor->cursor->x;
 		dy = ly - cursor->cursor->y;
-		pointer_motion(cursor, event->time_msec, &event->touch->base, dx, dy,
-			dx, dy);
-		dispatch_cursor_button(cursor, &event->touch->base, event->time_msec,
+		pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
+		dispatch_cursor_button(cursor, event->device, event->time_msec,
 				BTN_LEFT, WLR_BUTTON_PRESSED);
 	}
 }
 
 static void handle_touch_up(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
-	struct wlr_touch_up_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->touch->base);
+	struct wlr_event_touch_up *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 
 	struct wlr_seat *wlr_seat = cursor->seat->wlr_seat;
 
 	if (cursor->simulating_pointer_from_touch) {
 		if (cursor->pointer_touch_id == cursor->seat->touch_id) {
 			cursor->pointer_touch_up = true;
-			dispatch_cursor_button(cursor, &event->touch->base,
-				event->time_msec, BTN_LEFT, WLR_BUTTON_RELEASED);
+			dispatch_cursor_button(cursor, event->device, event->time_msec,
+					BTN_LEFT, WLR_BUTTON_RELEASED);
 		}
 	} else {
 		wlr_seat_touch_notify_up(wlr_seat, event->time_msec, event->touch_id);
@@ -524,15 +522,15 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
 static void handle_touch_motion(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor =
 		wl_container_of(listener, cursor, touch_motion);
-	struct wlr_touch_motion_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->touch->base);
+	struct wlr_event_touch_motion *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 
 	struct sway_seat *seat = cursor->seat;
 	struct wlr_seat *wlr_seat = seat->wlr_seat;
 	struct wlr_surface *surface = NULL;
 
 	double lx, ly;
-	wlr_cursor_absolute_to_layout_coords(cursor->cursor, &event->touch->base,
+	wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device,
 			event->x, event->y, &lx, &ly);
 	double sx, sy;
 	node_at_coords(cursor->seat, lx, ly, &surface, &sx, &sy);
@@ -554,8 +552,7 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
 			double dx, dy;
 			dx = lx - cursor->cursor->x;
 			dy = ly - cursor->cursor->y;
-			pointer_motion(cursor, event->time_msec, &event->touch->base,
-				dx, dy, dx, dy);
+			pointer_motion(cursor, event->time_msec, event->device, dx, dy, dx, dy);
 		}
 	} else if (surface) {
 		wlr_seat_touch_notify_motion(wlr_seat, event->time_msec,
@@ -594,15 +591,14 @@ static void apply_mapping_from_region(struct wlr_input_device *device,
 	double x1 = region->x1, x2 = region->x2;
 	double y1 = region->y1, y2 = region->y2;
 
-	if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
-		struct wlr_tablet *tablet = device->tablet;
-		if (tablet->width_mm == 0 || tablet->height_mm == 0) {
+	if (region->mm) {
+		if (device->width_mm == 0 || device->height_mm == 0) {
 			return;
 		}
-		x1 /= tablet->width_mm;
-		x2 /= tablet->width_mm;
-		y1 /= tablet->height_mm;
-		y2 /= tablet->height_mm;
+		x1 /= device->width_mm;
+		x2 /= device->width_mm;
+		y1 /= device->height_mm;
+		y2 /= device->height_mm;
 	}
 
 	*x = apply_mapping_from_coord(x1, x2, *x);
@@ -664,8 +660,8 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
 
 static void handle_tool_axis(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis);
-	struct wlr_tablet_tool_axis_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->tablet->base);
+	struct wlr_event_tablet_tool_axis *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 
 	struct sway_tablet_tool *sway_tool = event->tool->data;
 	if (!sway_tool) {
@@ -720,8 +716,8 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
 
 static void handle_tool_tip(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip);
-	struct wlr_tablet_tool_tip_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->tablet->base);
+	struct wlr_event_tablet_tool_tip *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 
 	struct sway_tablet_tool *sway_tool = event->tool->data;
 	struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2;
@@ -736,7 +732,7 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
 	if (cursor->simulating_pointer_from_tool_tip &&
 			event->state == WLR_TABLET_TOOL_TIP_UP) {
 		cursor->simulating_pointer_from_tool_tip = false;
-		dispatch_cursor_button(cursor, &event->tablet->base, event->time_msec,
+		dispatch_cursor_button(cursor, event->device, event->time_msec,
 			BTN_LEFT, WLR_BUTTON_RELEASED);
 		wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
 	} else if (!surface || !wlr_surface_accepts_tablet_v2(tablet_v2, surface)) {
@@ -748,8 +744,8 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
 				WLR_TABLET_TOOL_TIP_UP);
 		} else {
 			cursor->simulating_pointer_from_tool_tip = true;
-			dispatch_cursor_button(cursor, &event->tablet->base,
-				event->time_msec, BTN_LEFT, WLR_BUTTON_PRESSED);
+			dispatch_cursor_button(cursor, event->device, event->time_msec,
+				BTN_LEFT, WLR_BUTTON_PRESSED);
 			wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
 		}
 	} else {
@@ -771,13 +767,12 @@ static struct sway_tablet *get_tablet_for_device(struct sway_cursor *cursor,
 static void handle_tool_proximity(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor =
 		wl_container_of(listener, cursor, tool_proximity);
-	struct wlr_tablet_tool_proximity_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->tablet->base);
+	struct wlr_event_tablet_tool_proximity *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 
 	struct wlr_tablet_tool *tool = event->tool;
 	if (!tool->data) {
-		struct sway_tablet *tablet = get_tablet_for_device(cursor,
-			&event->tablet->base);
+		struct sway_tablet *tablet = get_tablet_for_device(cursor, event->device);
 		if (!tablet) {
 			sway_log(SWAY_ERROR, "no tablet for tablet tool");
 			return;
@@ -802,8 +797,8 @@ static void handle_tool_proximity(struct wl_listener *listener, void *data) {
 
 static void handle_tool_button(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button);
-	struct wlr_tablet_tool_button_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->tablet->base);
+	struct wlr_event_tablet_tool_button *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 
 	struct sway_tablet_tool *sway_tool = event->tool->data;
 	if (!sway_tool) {
@@ -824,14 +819,14 @@ static void handle_tool_button(struct wl_listener *listener, void *data) {
 		switch (event->state) {
 		case WLR_BUTTON_PRESSED:
 			if (cursor->tool_buttons == 0) {
-				dispatch_cursor_button(cursor, &event->tablet->base,
+				dispatch_cursor_button(cursor, event->device,
 						event->time_msec, BTN_RIGHT, event->state);
 			}
 			cursor->tool_buttons++;
 			break;
 		case WLR_BUTTON_RELEASED:
 			if (cursor->tool_buttons == 1) {
-				dispatch_cursor_button(cursor, &event->tablet->base,
+				dispatch_cursor_button(cursor, event->device,
 						event->time_msec, BTN_RIGHT, event->state);
 			}
 			cursor->tool_buttons--;
@@ -931,8 +926,8 @@ static void handle_request_pointer_set_cursor(struct wl_listener *listener,
 static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(
 			listener, cursor, pinch_begin);
-	struct wlr_pointer_pinch_begin_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_pinch_begin *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	wlr_pointer_gestures_v1_send_pinch_begin(
 			cursor->pointer_gestures, cursor->seat->wlr_seat,
 			event->time_msec, event->fingers);
@@ -941,8 +936,8 @@ static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data)
 static void handle_pointer_pinch_update(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(
 			listener, cursor, pinch_update);
-	struct wlr_pointer_pinch_update_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_pinch_update *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	wlr_pointer_gestures_v1_send_pinch_update(
 			cursor->pointer_gestures, cursor->seat->wlr_seat,
 			event->time_msec, event->dx, event->dy,
@@ -952,8 +947,8 @@ static void handle_pointer_pinch_update(struct wl_listener *listener, void *data
 static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(
 			listener, cursor, pinch_end);
-	struct wlr_pointer_pinch_end_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_pinch_end *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	wlr_pointer_gestures_v1_send_pinch_end(
 			cursor->pointer_gestures, cursor->seat->wlr_seat,
 			event->time_msec, event->cancelled);
@@ -962,8 +957,8 @@ static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) {
 static void handle_pointer_swipe_begin(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(
 			listener, cursor, swipe_begin);
-	struct wlr_pointer_swipe_begin_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_swipe_begin *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	wlr_pointer_gestures_v1_send_swipe_begin(
 			cursor->pointer_gestures, cursor->seat->wlr_seat,
 			event->time_msec, event->fingers);
@@ -972,8 +967,8 @@ static void handle_pointer_swipe_begin(struct wl_listener *listener, void *data)
 static void handle_pointer_swipe_update(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(
 			listener, cursor, swipe_update);
-	struct wlr_pointer_swipe_update_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_swipe_update *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	wlr_pointer_gestures_v1_send_swipe_update(
 			cursor->pointer_gestures, cursor->seat->wlr_seat,
 			event->time_msec, event->dx, event->dy);
@@ -982,33 +977,13 @@ static void handle_pointer_swipe_update(struct wl_listener *listener, void *data
 static void handle_pointer_swipe_end(struct wl_listener *listener, void *data) {
 	struct sway_cursor *cursor = wl_container_of(
 			listener, cursor, swipe_end);
-	struct wlr_pointer_swipe_end_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
+	struct wlr_event_pointer_swipe_end *event = data;
+	cursor_handle_activity_from_device(cursor, event->device);
 	wlr_pointer_gestures_v1_send_swipe_end(
 			cursor->pointer_gestures, cursor->seat->wlr_seat,
 			event->time_msec, event->cancelled);
 }
 
-static void handle_pointer_hold_begin(struct wl_listener *listener, void *data) {
-	struct sway_cursor *cursor = wl_container_of(
-			listener, cursor, hold_begin);
-	struct wlr_pointer_hold_begin_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
-	wlr_pointer_gestures_v1_send_hold_begin(
-			cursor->pointer_gestures, cursor->seat->wlr_seat,
-			event->time_msec, event->fingers);
-}
-
-static void handle_pointer_hold_end(struct wl_listener *listener, void *data) {
-	struct sway_cursor *cursor = wl_container_of(
-			listener, cursor, hold_end);
-	struct wlr_pointer_hold_end_event *event = data;
-	cursor_handle_activity_from_device(cursor, &event->pointer->base);
-	wlr_pointer_gestures_v1_send_hold_end(
-			cursor->pointer_gestures, cursor->seat->wlr_seat,
-			event->time_msec, event->cancelled);
-}
-
 static void handle_image_surface_destroy(struct wl_listener *listener,
 		void *data) {
 	struct sway_cursor *cursor =
@@ -1086,8 +1061,6 @@ void sway_cursor_destroy(struct sway_cursor *cursor) {
 	wl_list_remove(&cursor->swipe_begin.link);
 	wl_list_remove(&cursor->swipe_update.link);
 	wl_list_remove(&cursor->swipe_end.link);
-	wl_list_remove(&cursor->hold_begin.link);
-	wl_list_remove(&cursor->hold_end.link);
 	wl_list_remove(&cursor->motion.link);
 	wl_list_remove(&cursor->motion_absolute.link);
 	wl_list_remove(&cursor->button.link);
@@ -1144,10 +1117,6 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
 	wl_signal_add(&wlr_cursor->events.swipe_update, &cursor->swipe_update);
 	cursor->swipe_end.notify = handle_pointer_swipe_end;
 	wl_signal_add(&wlr_cursor->events.swipe_end, &cursor->swipe_end);
-	cursor->hold_begin.notify = handle_pointer_hold_begin;
-	wl_signal_add(&wlr_cursor->events.hold_begin, &cursor->hold_begin);
-	cursor->hold_end.notify = handle_pointer_hold_end;
-	wl_signal_add(&wlr_cursor->events.hold_end, &cursor->hold_end);
 
 	// input events
 	wl_signal_add(&wlr_cursor->events.motion, &cursor->motion);
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 8538d97c..f04a8ce0 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -377,7 +377,7 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) {
 	struct sway_input_manager *input_manager =
 		wl_container_of(listener, input_manager, virtual_keyboard_new);
 	struct wlr_virtual_keyboard_v1 *keyboard = data;
-	struct wlr_input_device *device = &keyboard->keyboard.base;
+	struct wlr_input_device *device = &keyboard->input_device;
 
 	// TODO: Amend protocol to allow NULL seat
 	struct sway_seat *seat = keyboard->seat ?
@@ -410,7 +410,7 @@ void handle_virtual_pointer(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, input_manager, virtual_pointer_new);
 	struct wlr_virtual_pointer_v1_new_pointer_event *event = data;
 	struct wlr_virtual_pointer_v1 *pointer = event->new_pointer;
-	struct wlr_input_device *device = &pointer->pointer.base;
+	struct wlr_input_device *device = &pointer->input_device;
 
 	struct sway_seat *seat = event->suggested_seat ?
 		input_manager_sway_seat_from_wlr_seat(event->suggested_seat) :
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index 1aa30655..f258ac7d 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -401,7 +401,7 @@ static struct wlr_input_method_keyboard_grab_v2 *keyboard_get_im_grab(
 }
 
 static void handle_key_event(struct sway_keyboard *keyboard,
-		struct wlr_keyboard_key_event *event) {
+		struct wlr_event_keyboard_key *event) {
 	struct sway_seat *seat = keyboard->seat_device->sway_seat;
 	struct wlr_seat *wlr_seat = seat->wlr_seat;
 	struct wlr_input_device *wlr_device =
@@ -517,7 +517,7 @@ static void handle_key_event(struct sway_keyboard *keyboard,
 			&keyboard->state_pressed_sent, event->keycode,
 			event->state, keyinfo.keycode, 0);
 		if (pressed_sent) {
-			wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard);
+			wlr_seat_set_keyboard(wlr_seat, wlr_device);
 			wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
 				event->keycode, event->state);
 			handled = true;
@@ -542,7 +542,7 @@ static void handle_key_event(struct sway_keyboard *keyboard,
 		update_shortcut_state(
 			&keyboard->state_pressed_sent, event->keycode, event->state,
 			keyinfo.keycode, 0);
-		wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard);
+		wlr_seat_set_keyboard(wlr_seat, wlr_device);
 		wlr_seat_keyboard_notify_key(wlr_seat, event->time_msec,
 				event->keycode, event->state);
 	}
@@ -670,7 +670,7 @@ static void handle_modifier_event(struct sway_keyboard *keyboard) {
 					&wlr_device->keyboard->modifiers);
 		} else {
 			struct wlr_seat *wlr_seat = keyboard->seat_device->sway_seat->wlr_seat;
-			wlr_seat_set_keyboard(wlr_seat, wlr_device->keyboard);
+			wlr_seat_set_keyboard(wlr_seat, wlr_device);
 			wlr_seat_keyboard_notify_modifiers(wlr_seat,
 					&wlr_device->keyboard->modifiers);
 		}
@@ -950,7 +950,7 @@ static void sway_keyboard_group_add(struct sway_keyboard *keyboard) {
 		goto cleanup;
 	}
 	sway_group->seat_device->input_device->wlr_device =
-		&sway_group->wlr_group->keyboard.base;
+		sway_group->wlr_group->input_device;
 
 	if (!sway_keyboard_create(seat, sway_group->seat_device)) {
 		sway_log(SWAY_ERROR, "Failed to allocate sway_keyboard for group");
@@ -1086,7 +1086,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
 	}
 
 	struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;
-	wlr_seat_set_keyboard(seat, wlr_device->keyboard);
+	wlr_seat_set_keyboard(seat, wlr_device);
 
 	wl_list_remove(&keyboard->keyboard_key.link);
 	wl_signal_add(&wlr_device->keyboard->events.key, &keyboard->keyboard_key);
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 85179dc7..ce933b66 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -11,7 +11,6 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_tablet_v2.h>
-#include <wlr/types/wlr_touch.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "config.h"
 #include "list.h"
@@ -43,7 +42,6 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
 	sway_keyboard_destroy(seat_device->keyboard);
 	sway_tablet_destroy(seat_device->tablet);
 	sway_tablet_pad_destroy(seat_device->tablet_pad);
-	sway_switch_destroy(seat_device->switch_device);
 	wlr_cursor_detach_input_device(seat_device->sway_seat->cursor->cursor,
 		seat_device->input_device->wlr_device);
 	wl_list_remove(&seat_device->link);
@@ -247,7 +245,7 @@ static void handle_seat_node_destroy(struct wl_listener *listener, void *data) {
 		seat_node_destroy(seat_node);
 		// If an unmanaged or layer surface is focused when an output gets
 		// disabled and an empty workspace on the output was focused by the
-		// seat, the seat needs to refocus its focus inactive to update the
+		// seat, the seat needs to refocus it's focus inactive to update the
 		// value of seat->workspace.
 		if (seat->workspace == node->sway_workspace) {
 			struct sway_node *node = seat_get_focus_inactive(seat, &root->node);
@@ -380,8 +378,8 @@ void drag_icon_update_position(struct sway_drag_icon *icon) {
 	case WLR_DRAG_GRAB_KEYBOARD:
 		return;
 	case WLR_DRAG_GRAB_KEYBOARD_POINTER:
-		icon->x = cursor->x + wlr_icon->surface->sx;
-		icon->y = cursor->y + wlr_icon->surface->sy;
+		icon->x = cursor->x;
+		icon->y = cursor->y;
 		break;
 	case WLR_DRAG_GRAB_KEYBOARD_TOUCH:;
 		struct wlr_touch_point *point =
@@ -389,8 +387,8 @@ void drag_icon_update_position(struct sway_drag_icon *icon) {
 		if (point == NULL) {
 			return;
 		}
-		icon->x = seat->touch_x + wlr_icon->surface->sx;
-		icon->y = seat->touch_y + wlr_icon->surface->sy;
+		icon->x = seat->touch_x;
+		icon->y = seat->touch_y;
 	}
 
 	drag_icon_damage_whole(icon);
@@ -726,25 +724,14 @@ static void seat_apply_input_config(struct sway_seat *seat,
 		ic == NULL ? MAPPED_TO_DEFAULT : ic->mapped_to;
 
 	switch (mapped_to) {
-	case MAPPED_TO_DEFAULT:;
+	case MAPPED_TO_DEFAULT:
 		/*
 		 * If the wlroots backend provides an output name, use that.
 		 *
-		 * Otherwise, try to map built-in touch and pointer devices to the
+		 * Otherwise, try to map built-in touch and tablet tool devices to the
 		 * built-in output.
 		 */
-		struct wlr_input_device *dev = sway_device->input_device->wlr_device;
-		switch (dev->type) {
-		case WLR_INPUT_DEVICE_POINTER:
-			mapped_to_output = dev->pointer->output_name;
-			break;
-		case WLR_INPUT_DEVICE_TOUCH:
-			mapped_to_output = dev->touch->output_name;
-			break;
-		default:
-			mapped_to_output = NULL;
-			break;
-		}
+		mapped_to_output = sway_device->input_device->wlr_device->output_name;
 		if (mapped_to_output == NULL && is_touch_or_tablet_tool(sway_device) &&
 				sway_libinput_device_is_builtin(sway_device->input_device)) {
 			mapped_to_output = get_builtin_output_name();
@@ -813,7 +800,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
 	}
 	sway_keyboard_configure(seat_device->keyboard);
 	wlr_seat_set_keyboard(seat->wlr_seat,
-			seat_device->input_device->wlr_device->keyboard);
+			seat_device->input_device->wlr_device);
 	struct sway_node *focus = seat_get_focus(seat);
 	if (focus && node_is_view(focus)) {
 		// force notify reenter to pick up the new configuration
@@ -1574,7 +1561,7 @@ void seatop_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
 }
 
 void seatop_pointer_axis(struct sway_seat *seat,
-		struct wlr_pointer_axis_event *event) {
+		struct wlr_event_pointer_axis *event) {
 	if (seat->seatop_impl->pointer_axis) {
 		seat->seatop_impl->pointer_axis(seat, event);
 	}
diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
index 15d1ca8b..4320a3b4 100644
--- a/sway/input/seatop_default.c
+++ b/sway/input/seatop_default.c
@@ -474,7 +474,7 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec,
 			seat_set_focus(seat, node);
 		}
 
-		// If moving a container by its title bar, use a threshold for the drag
+		// If moving a container by it's title bar, use a threshold for the drag
 		if (!mod_pressed && config->tiling_drag_threshold > 0) {
 			seatop_begin_move_tiling_threshold(seat, cont);
 		} else {
@@ -645,7 +645,7 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
  * Functions used by handle_pointer_axis  /
  *--------------------------------------*/
 
-static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
+static uint32_t wl_axis_to_button(struct wlr_event_pointer_axis *event) {
 	switch (event->orientation) {
 	case WLR_AXIS_ORIENTATION_VERTICAL:
 		return event->delta < 0 ? SWAY_SCROLL_UP : SWAY_SCROLL_DOWN;
@@ -658,9 +658,9 @@ static uint32_t wl_axis_to_button(struct wlr_pointer_axis_event *event) {
 }
 
 static void handle_pointer_axis(struct sway_seat *seat,
-		struct wlr_pointer_axis_event *event) {
+		struct wlr_event_pointer_axis *event) {
 	struct sway_input_device *input_device =
-		event->pointer ? event->pointer->base.data : NULL;
+		event->device ? event->device->data : NULL;
 	struct input_config *ic =
 		input_device ? input_device_get_config(input_device) : NULL;
 	struct sway_cursor *cursor = seat->cursor;
diff --git a/sway/input/seatop_down.c b/sway/input/seatop_down.c
index b40773d0..ecc34fea 100644
--- a/sway/input/seatop_down.c
+++ b/sway/input/seatop_down.c
@@ -18,9 +18,9 @@ struct seatop_down_event {
 };
 
 static void handle_pointer_axis(struct sway_seat *seat,
-		struct wlr_pointer_axis_event *event) {
+		struct wlr_event_pointer_axis *event) {
 	struct sway_input_device *input_device =
-		event->pointer ? event->pointer->base.data : NULL;
+		event->device ? event->device->data : NULL;
 	struct input_config *ic =
 		input_device ? input_device_get_config(input_device) : NULL;
 	float scroll_factor =
diff --git a/sway/input/switch.c b/sway/input/switch.c
index af5a2385..9ea87a1a 100644
--- a/sway/input/switch.c
+++ b/sway/input/switch.c
@@ -19,19 +19,6 @@ struct sway_switch *sway_switch_create(struct sway_seat *seat,
 	return switch_device;
 }
 
-static bool sway_switch_trigger_test(enum sway_switch_trigger trigger,
-		enum wlr_switch_state state) {
-	switch (trigger) {
-	case SWAY_SWITCH_TRIGGER_ON:
-		return state == WLR_SWITCH_STATE_ON;
-	case SWAY_SWITCH_TRIGGER_OFF:
-		return state == WLR_SWITCH_STATE_OFF;
-	case SWAY_SWITCH_TRIGGER_TOGGLE:
-		return true;
-	}
-	abort(); // unreachable
-}
-
 static void execute_binding(struct sway_switch *sway_switch) {
 	struct sway_seat* seat = sway_switch->seat_device->sway_seat;
 	bool input_inhibited = seat->exclusive_client != NULL;
@@ -43,10 +30,11 @@ static void execute_binding(struct sway_switch *sway_switch) {
 		if (binding->type != sway_switch->type) {
 			continue;
 		}
-		if (!sway_switch_trigger_test(binding->trigger, sway_switch->state)) {
+		if (binding->state != WLR_SWITCH_STATE_TOGGLE &&
+				binding->state != sway_switch->state) {
 			continue;
 		}
-		if (config->reloading && (binding->trigger == SWAY_SWITCH_TRIGGER_TOGGLE
+		if (config->reloading && (binding->state == WLR_SWITCH_STATE_TOGGLE
 				|| (binding->flags & BINDING_RELOAD) == 0)) {
 			continue;
 		}
@@ -77,7 +65,7 @@ static void execute_binding(struct sway_switch *sway_switch) {
 static void handle_switch_toggle(struct wl_listener *listener, void *data) {
 	struct sway_switch *sway_switch =
 			wl_container_of(listener, sway_switch, switch_toggle);
-	struct wlr_switch_toggle_event *event = data;
+	struct wlr_event_switch_toggle *event = data;
 	struct sway_seat *seat = sway_switch->seat_device->sway_seat;
 	seat_idle_notify_activity(seat, IDLE_SOURCE_SWITCH);
 
diff --git a/sway/input/tablet.c b/sway/input/tablet.c
index db2f93ec..26e86e36 100644
--- a/sway/input/tablet.c
+++ b/sway/input/tablet.c
@@ -196,7 +196,7 @@ static void handle_tablet_pad_attach(struct wl_listener *listener,
 
 static void handle_tablet_pad_ring(struct wl_listener *listener, void *data) {
 	struct sway_tablet_pad *pad = wl_container_of(listener, pad, ring);
-	struct wlr_tablet_pad_ring_event *event = data;
+	struct wlr_event_tablet_pad_ring *event = data;
 
 	if (!pad->current_surface) {
 		return;
@@ -210,7 +210,7 @@ static void handle_tablet_pad_ring(struct wl_listener *listener, void *data) {
 
 static void handle_tablet_pad_strip(struct wl_listener *listener, void *data) {
 	struct sway_tablet_pad *pad = wl_container_of(listener, pad, strip);
-	struct wlr_tablet_pad_strip_event *event = data;
+	struct wlr_event_tablet_pad_strip *event = data;
 
 	if (!pad->current_surface) {
 		return;
@@ -224,7 +224,7 @@ static void handle_tablet_pad_strip(struct wl_listener *listener, void *data) {
 
 static void handle_tablet_pad_button(struct wl_listener *listener, void *data) {
 	struct sway_tablet_pad *pad = wl_container_of(listener, pad, button);
-	struct wlr_tablet_pad_button_event *event = data;
+	struct wlr_event_tablet_pad_button *event = data;
 
 	if (!pad->current_surface) {
 		return;
diff --git a/sway/input/text_input.c b/sway/input/text_input.c
index 58911c2d..b8c19c17 100644
--- a/sway/input/text_input.c
+++ b/sway/input/text_input.c
@@ -77,6 +77,8 @@ static void handle_im_grab_keyboard(struct wl_listener *listener, void *data) {
 	struct wlr_keyboard *active_keyboard = wlr_seat_get_keyboard(relay->seat->wlr_seat);
 	wlr_input_method_keyboard_grab_v2_set_keyboard(keyboard_grab,
 		active_keyboard);
+	wlr_input_method_keyboard_grab_v2_send_modifiers(keyboard_grab,
+		&active_keyboard->modifiers);
 
 	wl_signal_add(&keyboard_grab->events.destroy,
 		&relay->input_method_keyboard_grab_destroy);