mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: Merge wl_seat into weston_seat

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-05-06 23:19:49 -04:00
parent 4912454ba4
commit e314875d00
23 changed files with 266 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xwayland/selection.c
+6 -6
View File
@@ -195,8 +195,8 @@ weston_wm_get_selection_targets(struct weston_wm *wm)
}
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_send_data(struct weston_wm *wm, xcb_atom_t target, const char *mime_ty
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 @@ weston_wm_handle_xfixes_selection_notify(struct weston_wm *wm,
* 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 @@ weston_wm_handle_selection_event(struct weston_wm *wm,
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 @@ weston_wm_selection_init(struct weston_wm *wm)
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);
}
src/xwayland/window-manager.c
+2 -2
View File
@@ -1015,8 +1015,8 @@ weston_wm_window_handle_moveresize(struct weston_wm_window *window,
struct weston_shell_interface *shell_interface =
&wm->server->compositor->shell_interface;
if (seat->seat.pointer->button_count != 1 ||
seat->seat.pointer->focus != &window->surface->surface)
if (seat->pointer->button_count != 1 ||
seat->pointer->focus != &window->surface->surface)
return;
detail = client_message->data.data32[2];