[PATCH] event-test: fix compilation

Philipp Brüschweiler blei42 at gmail.com
Tue Aug 14 05:46:38 PDT 2012


Also fixes a compiler warning in test-client. The test is still failing,
but that's for another patch.

https://bugs.freedesktop.org/show_bug.cgi?id=53462
---
 tests/event-test.c  | 7 +++++--
 tests/test-client.c | 7 ++++---
 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)

diff --git a/tests/event-test.c b/tests/event-test.c
index 68926e5..ba048d6 100644
--- a/tests/event-test.c
+++ b/tests/event-test.c
@@ -37,7 +37,8 @@ handle_surface(struct test_client *client)
 	struct wl_resource *resource;
 	struct weston_surface *surface;
 	struct weston_layer *layer = client->data;
-	struct wl_seat *seat;
+	struct wl_list *seat_list;
+	struct weston_seat *seat;
 
 	assert(sscanf(client->buf, "surface %u", &id) == 1);
 	fprintf(stderr, "got surface id %u\n", id);
@@ -53,7 +54,9 @@ handle_surface(struct test_client *client)
 	wl_list_insert(&layer->surface_list, &surface->layer_link);
 	weston_surface_damage(surface);
 
-	seat = &client->compositor->seat->seat;
+	seat_list = &client->compositor->seat_list;
+	assert(wl_list_length(seat_list) == 1);
+	seat = container_of(seat_list->next, struct weston_seat, link);
 	client->compositor->focus = 1; /* Make it work even if pointer is
 					* outside X window. */
 	notify_motion(seat, 100,
diff --git a/tests/test-client.c b/tests/test-client.c
index 6d7b4dc..ba084d8 100644
--- a/tests/test-client.c
+++ b/tests/test-client.c
@@ -60,8 +60,8 @@ struct surface {
 
 static void
 pointer_handle_enter(void *data, struct wl_pointer *pointer,
-			   uint32_t serial, struct wl_surface *surface,
-			   wl_fixed_t x, wl_fixed_t y)
+		     uint32_t serial, struct wl_surface *surface,
+		     wl_fixed_t x, wl_fixed_t y)
 {
 	struct input *input = data;
 
@@ -207,7 +207,8 @@ output_handle_geometry(void *data,
 		       int physical_height,
 		       int subpixel,
 		       const char *make,
-		       const char *model)
+		       const char *model,
+		       int32_t transform)
 {
 	struct output *output = data;
 
-- 
1.7.11.4



More information about the wayland-devel mailing list