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

Use compositor->seat_list instead of a singular seat

Browse Source 
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone
2012-05-30 16:31:53 +01:00
committed by Kristian Høgsberg
parent c9785eacca
commit 4dab5dba3f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+14 -9
View File
@@ -656,20 +656,22 @@ weston_compositor_repick(struct weston_compositor *compositor)
static void static void
weston_surface_unmap(struct weston_surface *surface) weston_surface_unmap(struct weston_surface *surface)
{ {
struct wl_seat *seat = &surface->compositor->seat->seat; struct weston_seat *seat;
weston_surface_damage_below(surface); weston_surface_damage_below(surface);
surface->output = NULL; surface->output = NULL;
wl_list_remove(&surface->link); wl_list_remove(&surface->link);
wl_list_remove(&surface->layer_link); wl_list_remove(&surface->layer_link);
if (seat->keyboard->focus == &surface->surface) wl_list_for_each(seat, &surface->compositor->seat_list, link) {
wl_keyboard_set_focus(seat->keyboard, NULL); if (seat->seat.keyboard->focus == &surface->surface)
if (seat->pointer->focus == &surface->surface) wl_keyboard_set_focus(seat->seat.keyboard, NULL);
wl_pointer_set_focus(seat->pointer, if (seat->seat.pointer->focus == &surface->surface)
NULL, wl_pointer_set_focus(seat->seat.pointer,
wl_fixed_from_int(0), NULL,
wl_fixed_from_int(0)); wl_fixed_from_int(0),
wl_fixed_from_int(0));
}
weston_compositor_schedule_repaint(surface->compositor); weston_compositor_schedule_repaint(surface->compositor);
} }
@@ -2442,7 +2444,10 @@ weston_seat_update_drag_surface(struct wl_seat *seat,
WL_EXPORT void WL_EXPORT void
weston_compositor_update_drag_surfaces(struct weston_compositor *compositor) weston_compositor_update_drag_surfaces(struct weston_compositor *compositor)
{ {
weston_seat_update_drag_surface(&compositor->seat->seat, 0, 0); struct weston_seat *seat;
wl_list_for_each(seat, &compositor->seat_list, link)
weston_seat_update_drag_surface(&seat->seat, 0, 0);
} }
static void static void