commit e314875d00739b9c55a065b96f8040f627edb8e3
author Kristian Høgsberg <krh@bitplanet.net> Mon May 06 23:19:49 2013 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Tue May 07 09:07:43 2013 -0400
tree 2f11f67afaea905900ca2effcffc313e277775f4
parent 4912454ba48b36153011e25eaa840db2a18c7fb7

input: Merge wl_seat into weston_seat

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 7abb671..4dba3a3 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -122,7 +122,7 @@
 	/* If a pointer falls outside the outputs new geometry, move it to its
 	 * lower-right corner */
 	wl_list_for_each(seat, &output->compositor->seat_list, link) {
-		struct weston_pointer *pointer = seat->seat.pointer;
+		struct weston_pointer *pointer = seat->pointer;
 		int32_t x, y;
 
 		if (!pointer)
@@ -946,12 +946,12 @@
 	wl_list_remove(&surface->layer_link);
 
 	wl_list_for_each(seat, &surface->compositor->seat_list, link) {
-		if (seat->seat.keyboard &&
-		    seat->seat.keyboard->focus == &surface->surface)
-			weston_keyboard_set_focus(seat->seat.keyboard, NULL);
-		if (seat->seat.pointer &&
-		    seat->seat.pointer->focus == &surface->surface)
-			weston_pointer_set_focus(seat->seat.pointer,
+		if (seat->keyboard &&
+		    seat->keyboard->focus == &surface->surface)
+			weston_keyboard_set_focus(seat->keyboard, NULL);
+		if (seat->pointer &&
+		    seat->pointer->focus == &surface->surface)
+			weston_pointer_set_focus(seat->pointer,
 						 NULL,
 						 wl_fixed_from_int(0),
 						 wl_fixed_from_int(0));