tests: introduce create_client()
Introduce a new helper create_client(), which creates and initializes the client struct, but does not create a wl_surface. This will be useful for ivi-shell tests. v2: Rebased, and restored the dependency to weston-test.so, since seat handling requires it. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
This commit is contained in:
@@ -736,10 +736,9 @@ client_set_input(struct client *cl)
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct client *
|
struct client *
|
||||||
client_create(int x, int y, int width, int height)
|
create_client(void)
|
||||||
{
|
{
|
||||||
struct client *client;
|
struct client *client;
|
||||||
struct surface *surface;
|
|
||||||
|
|
||||||
wl_log_set_handler_client(log_handler);
|
wl_log_set_handler_client(log_handler);
|
||||||
|
|
||||||
@@ -752,7 +751,8 @@ client_create(int x, int y, int width, int height)
|
|||||||
|
|
||||||
/* setup registry so we can bind to interfaces */
|
/* setup registry so we can bind to interfaces */
|
||||||
client->wl_registry = wl_display_get_registry(client->wl_display);
|
client->wl_registry = wl_display_get_registry(client->wl_display);
|
||||||
wl_registry_add_listener(client->wl_registry, ®istry_listener, client);
|
wl_registry_add_listener(client->wl_registry, ®istry_listener,
|
||||||
|
client);
|
||||||
|
|
||||||
/* this roundtrip makes sure we have all globals and we bound to them */
|
/* this roundtrip makes sure we have all globals and we bound to them */
|
||||||
client_roundtrip(client);
|
client_roundtrip(client);
|
||||||
@@ -778,6 +778,17 @@ client_create(int x, int y, int width, int height)
|
|||||||
/* must have seat set */
|
/* must have seat set */
|
||||||
assert(client->input);
|
assert(client->input);
|
||||||
|
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct client *
|
||||||
|
client_create(int x, int y, int width, int height)
|
||||||
|
{
|
||||||
|
struct client *client;
|
||||||
|
struct surface *surface;
|
||||||
|
|
||||||
|
client = create_client();
|
||||||
|
|
||||||
/* initialize the client surface */
|
/* initialize the client surface */
|
||||||
surface = xzalloc(sizeof *surface);
|
surface = xzalloc(sizeof *surface);
|
||||||
surface->wl_surface =
|
surface->wl_surface =
|
||||||
|
|||||||
@@ -143,6 +143,9 @@ xzalloc(size_t size)
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct client *
|
||||||
|
create_client(void);
|
||||||
|
|
||||||
struct client *
|
struct client *
|
||||||
client_create(int x, int y, int width, int height);
|
client_create(int x, int y, int width, int height);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user