tests: Convert keyboard-test to new test extension

This adds a weston-test-runner for the weston test extension and
some weston test client helper methods.

Converted keyboard-test to use the new test interface, runner,
and helper methods.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=56822

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>

1 files changed, 109 insertions, 0 deletions

diff --git a/tests/weston-test-client-helper.h b/tests/weston-test-client-helper.h
new file mode 100644
index 00000000..582572d5
--- /dev/null
+++ b/tests/weston-test-client-helper.h
@@ -0,0 +1,109 @@
+/*
+ * 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.
+ */
+
+#ifndef _WESTON_TEST_CLIENT_HELPER_H_
+#define _WESTON_TEST_CLIENT_HELPER_H_
+
+#include <assert.h>
+#include "weston-test-runner.h"
+#include "wayland-test-client-protocol.h"
+
+struct client {
+	struct wl_display *wl_display;
+	struct wl_registry *wl_registry;
+	struct wl_compositor *wl_compositor;
+	struct wl_shm *wl_shm;
+	struct test *test;
+	struct input *input;
+	struct output *output;
+	struct surface *surface;
+	int has_argb;
+};
+
+struct test {
+	struct wl_test *wl_test;
+	int pointer_x;
+	int pointer_y;
+};
+
+struct input {
+	struct wl_seat *wl_seat;
+	struct pointer *pointer;
+	struct keyboard *keyboard;
+};
+
+struct pointer {
+	struct wl_pointer *wl_pointer;
+	struct surface *focus;
+	int x;
+	int y;
+	uint32_t button;
+	uint32_t state;
+};
+
+struct keyboard {
+	struct wl_keyboard *wl_keyboard;
+	struct surface *focus;
+	uint32_t key;
+	uint32_t state;
+	uint32_t mods_depressed;
+	uint32_t mods_latched;
+	uint32_t mods_locked;
+	uint32_t group;
+};
+
+struct output {
+	struct wl_output *wl_output;
+	int x;
+	int y;
+	int width;
+	int height;
+};
+
+struct surface {
+	struct wl_surface *wl_surface;
+	struct wl_buffer *wl_buffer;
+	struct output *output;
+	int x;
+	int y;
+	int width;
+	int height;
+	void *data;
+};
+
+struct client *
+client_create(int x, int y, int width, int height);
+
+int
+surface_contains(struct surface *surface, int x, int y);
+
+void
+yield(struct client *client);
+
+void
+move_pointer(struct client *client, int x, int y);
+
+void
+move_client(struct client *client, int x, int y);
+
+
+#endif