test_input: always print keysym

[platform/upstream/kmscon.git] / tests / test_output.c

diff --git a/tests/test_output.c b/tests/test_output.c
index 061f6dc..d3da2b7 100644 (file)
--- a/tests/test_output.c
+++ b/tests/test_output.c
@@ -28,14 +28,13 @@
  * Test KMS/DRI output subsystem
  * This is an example how to use the output subsystem. Invoked without
  * arguments it prints a list of all connected outputs and their modes.
- * If you pass numbers as arguments, it will enable these outputs and show an
- * image on the given monitors for 5 seconds.
+ * If you pass any argument it will enable all outputs for 5seconds.
  *
  * This lists all outputs:
  * $ ./test_output
  *
- * This would show a test screen on output 0 and 4:
- * $ ./test_output 0 4
+ * This would show a test screen:
+ * $ ./test_output something
  * The test screen is a colored quad with 4 different colors in each corner.
  */
 
@@ -53,6 +52,9 @@
 #include "uterm.h"
 #include "test_include.h"
 
+/* eloop object */
+static struct ev_eloop *eloop;
+
 /* a colored quad */
 float d_vert[] = { -1, -1, 1, -1, -1, 1, 1, -1, 1, 1, -1, 1 };
 float d_col[] = { 1, 1, 0, 1,
@@ -62,10 +64,10 @@ float d_col[] = { 1, 1, 0, 1,
                0, 0, 1, 1,
                0, 1, 1, 1 };
 
-static int set_outputs(struct uterm_video *video, int num, char **list)
+static int set_outputs(struct uterm_video *video)
 {
        struct uterm_display *iter;
-       int i, j, val, ret;
+       int j, ret;
        struct gl_shader *shader;
        struct uterm_screen *screen;
 
@@ -78,28 +80,16 @@ static int set_outputs(struct uterm_video *video, int num, char **list)
        j = 0;
        iter = uterm_video_get_displays(video);
        for ( ; iter; iter = uterm_display_next(iter)) {
-               for (i = 0; i < num; ++i) {
-                       val = atoi(list[i]);
-                       if (val == j)
-                               break;
-               }
+               log_notice("Activating display %d %p...", j, iter);
+               ret = uterm_display_activate(iter, NULL);
+               if (ret)
+                       log_err("Cannot activate display %d: %d", j, ret);
+               else
+                       log_notice("Successfully activated display %d", j);
 
-               if (i == num) {
-                       log_notice("Ignoring display %d", j);
-               } else {
-                       log_notice("Activating display %d %p...", j, iter);
-                       ret = uterm_display_activate(iter, NULL);
-                       if (ret)
-                               log_err("Cannot activate display %d: %d", j,
-                                                                       ret);
-                       else
-                               log_notice("Successfully activated display %d",
-                                               j);
-
-                       ret = uterm_display_set_dpms(iter, UTERM_DPMS_ON);
-                       if (ret)
-                               log_err("Cannot set DPMS to ON: %d", ret);
-               }
+               ret = uterm_display_set_dpms(iter, UTERM_DPMS_ON);
+               if (ret)
+                       log_err("Cannot set DPMS to ON: %d", ret);
 
                ++j;
        }
@@ -144,7 +134,7 @@ static int set_outputs(struct uterm_video *video, int num, char **list)
        }
 
        log_notice("Waiting 5 seconds...");
-       sleep(5);
+       ev_eloop_run(eloop, 5000);
        log_notice("Exiting...");
 
        gl_shader_unref(shader);
@@ -186,17 +176,20 @@ int main(int argc, char **argv)
 {
        struct uterm_video *video;
        int ret;
-       struct ev_eloop *eloop;
 
        ret = test_prepare(argc, argv, &eloop);
        if (ret)
                goto err_fail;
 
        log_notice("Creating video object...");
-       ret = uterm_video_new(&video, UTERM_VIDEO_DRM, eloop);
+       ret = uterm_video_new(&video, eloop, UTERM_VIDEO_DRM, "/dev/dri/card0");
        if (ret)
                goto err_exit;
 
+       ret = uterm_video_use(video);
+       if (ret)
+               goto err_unref;
+
        log_notice("Wakeing up video object...");
        ret = uterm_video_wake_up(video);
        if (ret < 0)
@@ -209,7 +202,7 @@ int main(int argc, char **argv)
                        goto err_unref;
                }
        } else {
-               ret = set_outputs(video, argc - 1, &argv[1]);
+               ret = set_outputs(video);
                if (ret) {
                        log_err("Cannot set outputs: %d", ret);
                        goto err_unref;