weston testing experimenttesting

3 files changed, 82 insertions, 11 deletions

diff --git a/src/compositor.c b/src/compositor.c
index 234a6a95..6e69ae0b 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2516,14 +2516,14 @@ int main(int argc, char *argv[])
 	struct wl_event_loop *loop;
 	struct sigaction segv_action;
 	void *shell_module, *backend_module, *xserver_module;
-	int (*shell_init)(struct weston_compositor *ec);
-	int (*xserver_init)(struct weston_compositor *ec);
+	int (*module_init)(struct weston_compositor *ec);
 	struct weston_compositor
 		*(*backend_init)(struct wl_display *display,
 				 int argc, char *argv[]);
 	int i;
 	char *backend = NULL;
 	char *shell = NULL;
+	char *module = NULL;
 	int32_t idle_time = 300;
 	int32_t xserver;
 	char *socket_name = NULL;
@@ -2543,6 +2543,7 @@ int main(int argc, char *argv[])
 		{ WESTON_OPTION_STRING, "socket", 'S', &socket_name },
 		{ WESTON_OPTION_INTEGER, "idle-time", 'i', &idle_time },
 		{ WESTON_OPTION_BOOLEAN, "xserver", 0, &xserver },
+		{ WESTON_OPTION_STRING, "module", 0, &module },
 	};
 
 	argc = parse_options(core_options,
@@ -2589,8 +2590,8 @@ int main(int argc, char *argv[])
 	if (!backend_init)
 		exit(EXIT_FAILURE);
 
-	shell_init = load_module(shell, "shell_init", &shell_module);
-	if (!shell_init)
+	module_init = load_module(shell, "shell_init", &shell_module);
+	if (!module_init)
 		exit(EXIT_FAILURE);
 
 	ec = backend_init(display, argc, argv);
@@ -2607,16 +2608,22 @@ int main(int argc, char *argv[])
 	ec->option_idle_time = idle_time;
 	ec->idle_time = idle_time;
 
-	if (shell_init(ec) < 0)
+	if (module_init(ec) < 0)
 		exit(EXIT_FAILURE);
 
-	xserver_init = NULL;
+	module_init = NULL;
 	if (xserver)
-		xserver_init = load_module("xserver-launcher.so",
-					   "weston_xserver_init",
-					   &xserver_module);
-	if (xserver_init)
-		xserver_init(ec);
+		module_init = load_module("xserver-launcher.so",
+					  "weston_xserver_init",
+					  &xserver_module);
+	if (module_init)
+		module_init(ec);
+
+	module_init = NULL;
+	if (module)
+		module_init = load_module(module, "module_init", NULL);
+	if (module_init)
+		module_init(ec);
 
 	if (wl_display_add_socket(display, socket_name)) {
 		fprintf(stderr, "failed to add socket: %m\n");
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f9c47545..a6376b76 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,6 +13,12 @@ matrix_test_SOURCES =				\
 	$(top_srcdir)/src/matrix.h
 matrix_test_LDADD = -lm -lrt
 
+noinst_LTLIBRARIES =				\
+	test-surface.la
+
+AM_LDFLAGS = -module -avoid-version -rpath $(libdir)
+test_surface_la_SOURCES = test-surface.c
+
 setbacklight_SOURCES =				\
 	setbacklight.c				\
 	$(top_srcdir)/src/libbacklight.c	\
diff --git a/tests/test-surface.c b/tests/test-surface.c
new file mode 100644
index 00000000..6c1a804c
--- /dev/null
+++ b/tests/test-surface.c
@@ -0,0 +1,58 @@
+/*
+ * 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 "../src/compositor.h"
+
+int
+module_init(struct weston_compositor *compositor);
+
+static void
+run_test(void *data)
+{
+	struct weston_compositor *compositor = data;
+	struct weston_surface *surface;
+	int32_t x, y;
+
+	surface = weston_surface_create(compositor);
+	weston_surface_configure(surface, 100, 100, 200, 200);
+	weston_surface_update_transform(surface);
+	weston_surface_to_global(surface, 20, 20, &x, &y);
+
+	fprintf(stderr, "20,20 maps to %d, %d\n", x, y);
+
+	wl_display_terminate(compositor->wl_display);
+}
+
+WL_EXPORT int
+module_init(struct weston_compositor *compositor)
+{
+	struct wl_event_loop *loop;
+
+	loop = wl_display_get_event_loop(compositor->wl_display);
+
+	wl_event_loop_add_idle(loop, run_test, compositor);
+
+	return 0;
+}