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

event-test: fix compilation

Browse Source 
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
This commit is contained in:
Philipp Brüschweiler
2012-08-14 14:46:38 +02:00
committed by Kristian Høgsberg
parent b8a8aff357
commit 468262be3e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/event-test.c
+5 -2
View File
@@ -37,7 +37,8 @@ handle_surface(struct test_client *client)
struct wl_resource *resource; struct wl_resource *resource;
struct weston_surface *surface; struct weston_surface *surface;
struct weston_layer *layer = client->data; 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); assert(sscanf(client->buf, "surface %u", &id) == 1);
fprintf(stderr, "got surface id %u\n", id); 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); wl_list_insert(&layer->surface_list, &surface->layer_link);
weston_surface_damage(surface); 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 client->compositor->focus = 1; /* Make it work even if pointer is
* outside X window. */ * outside X window. */
notify_motion(seat, 100, notify_motion(seat, 100,
tests/test-client.c
+4 -3
View File
@@ -60,8 +60,8 @@ struct surface {
static void static void
pointer_handle_enter(void *data, struct wl_pointer *pointer, pointer_handle_enter(void *data, struct wl_pointer *pointer,
uint32_t serial, struct wl_surface *surface, uint32_t serial, struct wl_surface *surface,
wl_fixed_t x, wl_fixed_t y) wl_fixed_t x, wl_fixed_t y)
{ {
struct input *input = data; struct input *input = data;
@@ -207,7 +207,8 @@ output_handle_geometry(void *data,
int physical_height, int physical_height,
int subpixel, int subpixel,
const char *make, const char *make,
const char *model) const char *model,
int32_t transform)
{ {
struct output *output = data; struct output *output = data;