button-test: Use wl_display_roundtrip instead of yield()

[profile/ivi/weston.git] / clients / flower.c

diff --git a/clients/flower.c b/clients/flower.c
index a87e20f..dac52d5 100644 (file)
--- a/clients/flower.c
+++ b/clients/flower.c
@@ -25,18 +25,22 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <math.h>
 #include <time.h>
 #include <cairo.h>
 #include <sys/time.h>
-#include <glib.h>
 
-#include "wayland-client.h"
-#include "wayland-glib.h"
+#include <linux/input.h>
+#include <wayland-client.h>
 #include "window.h"
 
+struct flower {
+       struct display *display;
+       struct window *window;
+       struct widget *widget;
+       int width, height;
+};
+
 static void
 set_random_color(cairo_t *cr)
 {
@@ -98,38 +102,71 @@ draw_stuff(cairo_surface_t *surface, int width, int height)
        cairo_destroy(cr);
 }
 
+static void
+resize_handler(struct widget *widget,
+              int32_t width, int32_t height, void *data)
+{
+       struct flower *flower = data;
+
+       /* Dont resize me */
+       widget_set_size(flower->widget, flower->width, flower->height);
+}
+
+static void
+redraw_handler(struct widget *widget, void *data)
+{
+       struct flower *flower = data;
+       cairo_surface_t *surface;
+
+       surface = window_get_surface(flower->window);
+       if (surface == NULL ||
+           cairo_surface_status(surface) != CAIRO_STATUS_SUCCESS) {
+               fprintf(stderr, "failed to create cairo egl surface\n");
+               return;
+       }
+
+       draw_stuff(surface, flower->width, flower->height);
+       cairo_surface_destroy(surface);
+}
+
 static int
-motion_handler(struct window *window,
-              struct input *input, uint32_t time,
-              int32_t x, int32_t y,
-              int32_t sx, int32_t sy, void *data)
+motion_handler(struct widget *widget, struct input *input,
+              uint32_t time, float x, float y, void *data)
 {
-       return POINTER_HAND1;
+       return CURSOR_HAND1;
 }
 
 static void
-button_handler(struct window *window,
+button_handler(struct widget *widget,
               struct input *input, uint32_t time,
-              int button, int state, void *data)
+              uint32_t button, enum wl_pointer_button_state state, void *data)
 {
-       if (state)
-               window_move(window, input, time);
+       struct flower *flower = data;
+
+       switch (button) {
+       case BTN_LEFT:
+               if (state == WL_POINTER_BUTTON_STATE_PRESSED)
+                       window_move(flower->window, input,
+                                   display_get_serial(flower->display));
+               break;
+       case BTN_MIDDLE:
+               if (state == WL_POINTER_BUTTON_STATE_PRESSED)
+                       widget_schedule_redraw(widget);
+               break;
+       case BTN_RIGHT:
+               if (state == WL_POINTER_BUTTON_STATE_PRESSED)
+                       window_show_frame_menu(flower->window, input, time);
+               break;
+       }
 }
 
-struct flower {
-       struct display *display;
-       struct window *window;
-       int width, height;
-};
-
 int main(int argc, char *argv[])
 {
-       cairo_surface_t *s;
        struct flower flower;
        struct display *d;
        struct timeval tv;
 
-       d = display_create(&argc, &argv, NULL);
+       d = display_create(argc, argv);
        if (d == NULL) {
                fprintf(stderr, "failed to create display: %m\n");
                return -1;
@@ -141,25 +178,17 @@ int main(int argc, char *argv[])
        flower.width = 200;
        flower.height = 200;
        flower.display = d;
-       flower.window = window_create(d, flower.width, flower.height);
+       flower.window = window_create(d);
+       flower.widget = window_add_widget(flower.window, &flower);
+       window_set_title(flower.window, "Flower");
 
-       window_set_title(flower.window, "flower");
-       window_set_decoration(flower.window, 0);
-       window_draw(flower.window);
-       s = window_get_surface(flower.window);
-       if (s == NULL || cairo_surface_status (s) != CAIRO_STATUS_SUCCESS) {
-               fprintf(stderr, "failed to create cairo egl surface\n");
-               return -1;
-       }
+       widget_set_resize_handler(flower.widget, resize_handler);
+       widget_set_redraw_handler(flower.widget, redraw_handler);
+       widget_set_motion_handler(flower.widget, motion_handler);
+       widget_set_button_handler(flower.widget, button_handler);
 
-       draw_stuff(s, flower.width, flower.height);
-       cairo_surface_flush(s);
-       cairo_surface_destroy(s);
-       window_flush(flower.window);
+       window_schedule_resize(flower.window, flower.width, flower.height);
 
-       window_set_motion_handler(flower.window, motion_handler);
-       window_set_button_handler(flower.window, button_handler);
-       window_set_user_data(flower.window, &flower);
        display_run(d);
 
        return 0;