[PATCH] tests: add keyboard test
Kristian Høgsberg
hoegsberg at gmail.com
Thu Oct 4 08:42:47 PDT 2012
On Mon, Oct 01, 2012 at 03:21:16PM -0700, U. Artie Eoff wrote:
> From: "U. Artie Eoff" <ullysses.a.eoff at intel.com>
Thanks Artie, this one and the previous three tests all committed. I
really appreciate the work, it's good to see the test suite become
more useful.
Kristian
> Signed-off-by: U. Artie Eoff <ullysses.a.eoff at intel.com>
> ---
> tests/Makefile.am | 3 +-
> tests/keyboard-test.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/test-client.c | 32 ++++++++++++-
> 3 files changed, 157 insertions(+), 2 deletions(-)
> create mode 100644 tests/keyboard-test.c
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index fcf6674..944879f 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -1,7 +1,7 @@
> TESTS = surface-test.la client-test.la \
> event-test.la text-test.la \
> surface-global-test.la \
> - button-test.la
> + button-test.la keyboard-test.la
>
> TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-test
>
> @@ -24,6 +24,7 @@ client_test_la_SOURCES = client-test.c $(test_runner_src)
> event_test_la_SOURCES = event-test.c $(test_runner_src)
> text_test_la_SOURCES = text-test.c $(test_runner_src)
> button_test_la_SOURCES = button-test.c $(test_runner_src)
> +keyboard_test_la_SOURCES = keyboard-test.c $(test_runner_src)
>
> test_client_SOURCES = test-client.c
> test_client_LDADD = $(SIMPLE_CLIENT_LIBS)
> diff --git a/tests/keyboard-test.c b/tests/keyboard-test.c
> new file mode 100644
> index 0000000..ef450b5
> --- /dev/null
> +++ b/tests/keyboard-test.c
> @@ -0,0 +1,124 @@
> +/*
> + * Copyright © 2012 Intel Corporation
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and
> + * its documentation for any purpose is hereby granted without fee, provided
> + * that the above copyright notice appear in all copies and that both that
> + * copyright notice and this permission notice appear in supporting
> + * documentation, and that the name of the copyright holders not be used in
> + * advertising or publicity pertaining to distribution of the software
> + * without specific, written prior permission. The copyright holders make
> + * no representations about the suitability of this software for any
> + * purpose. It is provided "as is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
> + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
> + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
> + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
> + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
> + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <sys/socket.h>
> +#include <assert.h>
> +#include <unistd.h>
> +#include <string.h>
> +
> +#include "test-runner.h"
> +
> +struct context {
> + struct weston_seat *seat;
> + struct weston_surface *surface;
> + uint32_t expect_key;
> + uint32_t expect_key_state;
> + int expect_focus;
> +};
> +
> +static void
> +handle_keyboard_state(struct test_client *client)
> +{
> + struct context *context = client->data;
> + uint32_t key, key_state;
> + int focus;
> +
> + assert(sscanf(client->buf, "%u %u %d", &key, &key_state, &focus));
> +
> + assert(key == context->expect_key);
> + assert(key_state == context->expect_key_state);
> + assert(focus == context->expect_focus);
> +
> + if (key_state == WL_KEYBOARD_KEY_STATE_PRESSED) {
> + context->expect_key_state = WL_KEYBOARD_KEY_STATE_RELEASED;
> + notify_key(context->seat, 100, context->expect_key,
> + context->expect_key_state,
> + STATE_UPDATE_AUTOMATIC);
> + } else if (focus) {
> + context->expect_focus = 0;
> + notify_keyboard_focus_out(context->seat);
> + } else if (context->expect_key < 10) {
> + context->expect_key++;
> + context->expect_focus = 1;
> + context->expect_key_state = WL_KEYBOARD_KEY_STATE_PRESSED;
> + notify_keyboard_focus_in(context->seat,
> + &context->seat->keyboard.keys,
> + STATE_UPDATE_AUTOMATIC);
> + notify_key(context->seat, 100, context->expect_key,
> + context->expect_key_state,
> + STATE_UPDATE_AUTOMATIC);
> + } else {
> + test_client_send(client, "bye\n");
> + return;
> + }
> +
> + test_client_send(client, "send-keyboard-state\n");
> +}
> +
> +static void
> +handle_surface(struct test_client *client)
> +{
> + uint32_t id;
> + struct context *context = client->data;
> + struct wl_resource *resource;
> + struct wl_list *seat_list;
> +
> + assert(sscanf(client->buf, "surface %u", &id) == 1);
> + fprintf(stderr, "server: got surface id %u\n", id);
> + resource = wl_client_get_object(client->client, id);
> + assert(resource);
> + assert(strcmp(resource->object.interface->name, "wl_surface") == 0);
> +
> + context->surface = (struct weston_surface *) resource;
> + weston_surface_set_color(context->surface, 0.0, 0.0, 0.0, 1.0);
> + weston_surface_configure(context->surface, 100, 100, 100, 100);
> + weston_surface_update_transform(context->surface);
> + weston_surface_damage(context->surface);
> +
> + seat_list = &client->compositor->seat_list;
> + assert(wl_list_length(seat_list) == 1);
> + context->seat = container_of(seat_list->next, struct weston_seat, link);
> +
> + context->seat->keyboard.focus = context->surface;
> + notify_keyboard_focus_out(context->seat);
> +
> + test_client_send(client, "send-keyboard-state\n");
> + client->handle = handle_keyboard_state;
> +}
> +
> +TEST(keyboard_test)
> +{
> + struct context *context;
> + struct test_client *client;
> +
> + client = test_client_launch(compositor, "test-client");
> + client->terminate = 1;
> +
> + test_client_send(client, "create-surface\n");
> + client->handle = handle_surface;
> +
> + context = calloc(1, sizeof *context);
> + assert(context);
> + client->data = context;
> +}
> diff --git a/tests/test-client.c b/tests/test-client.c
> index 78e5123..ef813c7 100644
> --- a/tests/test-client.c
> +++ b/tests/test-client.c
> @@ -46,6 +46,7 @@ struct input {
> uint32_t button_mask;
> struct surface *pointer_focus;
> struct surface *keyboard_focus;
> + uint32_t last_key, last_key_state;
> };
>
> struct output {
> @@ -159,6 +160,11 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
> uint32_t serial, uint32_t time, uint32_t key,
> uint32_t state)
> {
> + struct input *input = data;
> +
> + input->last_key = key;
> + input->last_key_state = state;
> +
> fprintf(stderr, "test-client: got keyboard key %u %u\n", key, state);
> }
>
> @@ -319,6 +325,27 @@ static const struct wl_surface_listener surface_listener = {
> surface_leave
> };
>
> +static void
> +send_keyboard_state(int fd, struct display *display)
> +{
> + char buf[64];
> + int len;
> + int focus = display->input->keyboard_focus != NULL;
> +
> + if (focus) {
> + assert(display->input->keyboard_focus == display->surface);
> + }
> +
> + wl_display_flush(display->display);
> +
> + len = snprintf(buf, sizeof buf, "%u %u %d\n", display->input->last_key,
> + display->input->last_key_state, focus);
> + assert(write(fd, buf, len) == len);
> +
> + wl_display_roundtrip(display->display);
> +}
> +
> +static void
> send_button_state(int fd, struct display *display)
> {
> char buf[64];
> @@ -341,7 +368,8 @@ send_state(int fd, struct display* display)
> wl_fixed_t x = wl_fixed_from_int(-1);
> wl_fixed_t y = wl_fixed_from_int(-1);
>
> - if (display->input->pointer_focus == display->surface) {
> + if (display->input->pointer_focus != NULL) {
> + assert(display->input->pointer_focus == display->surface);
> x = wl_fixed_from_double(display->input->x);
> y = wl_fixed_from_double(display->input->y);
> }
> @@ -423,6 +451,8 @@ int main(int argc, char *argv[])
> send_state(fd, display);
> } else if (strncmp(buf, "send-button-state\n", ret) == 0) {
> send_button_state(fd, display);
> + } else if (strncmp(buf, "send-keyboard-state\n", ret) == 0) {
> + send_keyboard_state(fd, display);
> } else {
> fprintf(stderr, "test-client: unknown command %.*s\n",
> ret, buf);
> --
> 1.7.11.2
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
More information about the wayland-devel
mailing list