diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-11 16:47:50 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-04-11 16:47:50 -0400 |
commit | 11e2828bdcf3ec4d59482a35fb510c51cc26acf6 (patch) | |
tree | c5dfb56f016b350f0a3e757701563c71240fc7de /clients/smoke.c | |
parent | 3555d09813cfe97ad2170bbb58655f7bb2aae7b0 (diff) | |
parent | ec4d342aa9b536c71bcf0d75249549860941793b (diff) | |
download | weston-11e2828bdcf3ec4d59482a35fb510c51cc26acf6.tar.gz |
Merge remote-tracking branch 'bnf/surface-frame-event'
Conflicts:
compositor/compositor.c
Diffstat (limited to 'clients/smoke.c')
-rw-r--r-- | clients/smoke.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clients/smoke.c b/clients/smoke.c index e132229a..1f22e59d 100644 --- a/clients/smoke.c +++ b/clients/smoke.c @@ -173,7 +173,7 @@ static void render(struct smoke *smoke) } static void -frame_callback(void *data, uint32_t time) +frame_callback(struct wl_surface *surface, void *data, uint32_t time) { struct smoke *smoke = data; @@ -201,6 +201,7 @@ frame_callback(void *data, uint32_t time) window_damage(smoke->window, 0, 0, smoke->width, smoke->height); wl_display_frame_callback(display_get_display(smoke->display), + window_get_wl_surface(smoke->window), frame_callback, smoke); } @@ -288,6 +289,7 @@ int main(int argc, char *argv[]) window_set_user_data(smoke.window, &smoke); wl_display_frame_callback(display_get_display(d), + window_get_wl_surface(smoke.window), frame_callback, &smoke); display_run(d); |