input: Merge wl_seat into weston_seat
diff --git a/src/xwayland/selection.c b/src/xwayland/selection.c
index edc7ce6..69665b7 100644
--- a/src/xwayland/selection.c
+++ b/src/xwayland/selection.c
@@ -195,8 +195,8 @@
}
compositor = wm->server->compositor;
- wl_seat_set_selection(&seat->seat, &source->base,
- wl_display_next_serial(compositor->wl_display));
+ weston_seat_set_selection(seat, &source->base,
+ wl_display_next_serial(compositor->wl_display));
free(reply);
}
@@ -441,7 +441,7 @@
weston_wm_read_data_source,
wm);
- source = seat->seat.selection_data_source;
+ source = seat->selection_data_source;
source->send(source, mime_type, p[1]);
}
@@ -563,7 +563,7 @@
* proxy selection. Clear the wayland selection. */
compositor = wm->server->compositor;
serial = wl_display_next_serial(compositor->wl_display);
- wl_seat_set_selection(&seat->seat, NULL, serial);
+ weston_seat_set_selection(seat, NULL, serial);
}
wm->selection_owner = XCB_WINDOW_NONE;
@@ -619,7 +619,7 @@
static void
weston_wm_set_selection(struct wl_listener *listener, void *data)
{
- struct wl_seat *seat = data;
+ struct weston_seat *seat = data;
struct weston_wm *wm =
container_of(listener, struct weston_wm, selection_listener);
struct wl_data_source *source = seat->selection_data_source;
@@ -697,7 +697,7 @@
seat = weston_wm_pick_seat(wm);
wm->selection_listener.notify = weston_wm_set_selection;
- wl_signal_add(&seat->seat.selection_signal, &wm->selection_listener);
+ wl_signal_add(&seat->selection_signal, &wm->selection_listener);
weston_wm_set_selection(&wm->selection_listener, seat);
}