window: Allocate and flush the window surface in window.c
No need to push this to the toolkit users.
diff --git a/clients/gears.c b/clients/gears.c
index bc85f54..b5e7bd4 100644
--- a/clients/gears.c
+++ b/clients/gears.c
@@ -195,13 +195,30 @@
}
static void
-draw_gears(struct gears *gears)
+frame_callback(void *data, struct wl_callback *callback, uint32_t time)
+{
+ struct gears *gears = data;
+
+ gears->angle = (GLfloat) (time % 8192) * 360 / 8192.0;
+
+ window_schedule_redraw(gears->window);
+
+ if (callback)
+ wl_callback_destroy(callback);
+}
+
+static const struct wl_callback_listener listener = {
+ frame_callback
+};
+
+static void
+redraw_handler(struct window *window, void *data)
{
GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
struct rectangle window_allocation;
struct rectangle allocation;
-
- window_draw(gears->window);
+ struct wl_callback *callback;
+ struct gears *gears = data;
window_get_child_allocation(gears->window, &allocation);
window_get_allocation(gears->window, &window_allocation);
@@ -254,7 +271,9 @@
glFlush();
display_release_window_surface(gears->d, gears->window);
- window_flush(gears->window);
+
+ callback = wl_surface_frame(window_get_wl_surface(gears->window));
+ wl_callback_add_listener(callback, &listener, gears);
}
static void
@@ -287,25 +306,6 @@
resize_handler(window, allocation.width, allocation.height, gears);
}
-static void
-frame_callback(void *data, struct wl_callback *callback, uint32_t time)
-{
- static const struct wl_callback_listener listener = {
- frame_callback
- };
- struct gears *gears = data;
-
- gears->angle = (GLfloat) (time % 8192) * 360 / 8192.0;
-
- draw_gears(gears);
-
- if (callback)
- wl_callback_destroy(callback);
-
- callback = wl_surface_frame(window_get_wl_surface(gears->window));
- wl_callback_add_listener(callback, &listener, gears);
-}
-
static struct gears *
gears_create(struct display *display)
{
@@ -359,6 +359,7 @@
window_set_user_data(gears->window, gears);
window_set_resize_handler(gears->window, resize_handler);
+ window_set_redraw_handler(gears->window, redraw_handler);
window_set_keyboard_focus_handler(gears->window, keyboard_focus_handler);
frame_callback(gears, NULL, 0);