mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Send frame event after redraw

Browse Source
This commit is contained in:
Benjamin Franzke
2011-06-21 16:33:27 +02:00
parent fb4b5a293a
commit d72037cc78
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor.c
+19 -8
View File
@@ -578,16 +578,8 @@ WL_EXPORT void
wlsc_output_finish_frame(struct wlsc_output *output, int msecs) wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
{ {
struct wlsc_compositor *compositor = output->compositor; struct wlsc_compositor *compositor = output->compositor;
struct wlsc_surface *es;
struct wlsc_animation *animation, *next; struct wlsc_animation *animation, *next;
wl_list_for_each(es, &compositor->surface_list, link) {
if (es->output == output) {
wl_display_post_frame(compositor->wl_display,
&es->surface, msecs);
}
}
output->finished = 1; output->finished = 1;
wl_event_source_timer_update(compositor->timer_source, 5); wl_event_source_timer_update(compositor->timer_source, 5);
@@ -598,6 +590,20 @@ wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
animation->frame(animation, output, msecs); animation->frame(animation, output, msecs);
} }
static void
wlsc_output_finish_redraw(struct wlsc_output *output, int msecs)
{
struct wlsc_compositor *compositor = output->compositor;
struct wlsc_surface *es;
wl_list_for_each(es, &compositor->surface_list, link) {
if (es->output == output) {
wl_display_post_frame(compositor->wl_display,
&es->surface, msecs);
}
}
}
WL_EXPORT void WL_EXPORT void
wlsc_output_damage(struct wlsc_output *output) wlsc_output_damage(struct wlsc_output *output)
{ {
@@ -709,6 +715,9 @@ wlsc_output_repaint(struct wlsc_output *output)
pixman_region32_union(&ec->damage_region, pixman_region32_union(&ec->damage_region,
&ec->damage_region, &ec->damage_region,
&total_damage); &total_damage);
wlsc_output_finish_redraw(output,
wlsc_compositor_get_time());
return; return;
} }
} }
@@ -747,6 +756,8 @@ wlsc_output_repaint(struct wlsc_output *output)
if (ec->fade.spring.current > 0.001) if (ec->fade.spring.current > 0.001)
fade_output(output, ec->fade.spring.current, &total_damage); fade_output(output, ec->fade.spring.current, &total_damage);
wlsc_output_finish_redraw(output, wlsc_compositor_get_time());
} }
static int static int