system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-05 17:29:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_animation_crash' into 'main'

Browse Source 
libweston: Return NULL from creation of animations that have finished

See merge request wayland/weston!1545
This commit is contained in:
Derek Foreman 2024-06-27 20:37:09 +00:00
commit 7abe5a62f1
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libweston/animation.c
View File

@ -167,10 +167,10 @@ handle_animation_view_destroy(struct wl_listener *listener, void *data)
weston_view_animation_destroy(animation);
}
static void
weston_view_animation_frame(struct weston_animation *base,
struct weston_output *output,
const struct timespec *time)
static bool
weston_view_animation_frame_internal(struct weston_animation *base,
struct weston_output *output,
const struct timespec *time)
{
struct weston_view_animation *animation =
container_of(base,
@ -188,7 +188,7 @@ weston_view_animation_frame(struct weston_animation *base,
wl_event_source_remove(animation->idle_destroy_source);
weston_view_animation_destroy(animation);
return;
return true;
}
if (animation->frame)
@ -207,6 +207,16 @@ weston_view_animation_frame(struct weston_animation *base,
*/
if (animation->view->output_mask == 0)
weston_compositor_schedule_repaint(compositor);
return false;
}
static void
weston_view_animation_frame(struct weston_animation *base,
struct weston_output *output,
const struct timespec *time)
{
weston_view_animation_frame_internal(base, output, time);
}
static void
@ -265,13 +275,13 @@ weston_view_animation_create(struct weston_view *view,
return animation;
}
static void
static bool __attribute__ ((warn_unused_result))
weston_view_animation_run(struct weston_view_animation *animation)
{
struct timespec zero_time = { 0 };
animation->animation.frame_counter = 0;
weston_view_animation_frame(&animation->animation, NULL, &zero_time);
return weston_view_animation_frame_internal(&animation->animation, NULL, &zero_time);
}
static void
@ -321,7 +331,8 @@ weston_zoom_run(struct weston_view *view, float start, float stop,
zoom->spring.friction = 1400;
zoom->spring.previous = start - (stop - start) * 0.03;
weston_view_animation_run(zoom);
if (weston_view_animation_run(zoom))
return NULL;
return zoom;
}
@ -362,7 +373,8 @@ weston_fade_run(struct weston_view *view,
weston_view_set_alpha(view, start);
weston_view_update_transform(view);
weston_view_animation_run(fade);
if (weston_view_animation_run(fade))
return NULL;
return fade;
}
@ -415,7 +427,8 @@ weston_stable_fade_run(struct weston_view *front_view, float start,
weston_view_set_alpha(front_view, start);
weston_view_set_alpha(back_view, end);
weston_view_animation_run(fade);
if (weston_view_animation_run(fade))
return NULL;
return fade;
}
@ -448,7 +461,8 @@ weston_slide_run(struct weston_view *view, float start, float stop,
animation->spring.friction = 600;
animation->spring.clip = WESTON_SPRING_BOUNCE;
weston_view_animation_run(animation);
if (weston_view_animation_run(animation))
return NULL;
return animation;
}
@ -523,7 +537,8 @@ weston_move_scale_run_internal(struct weston_view *view, int dx, int dy,
weston_spring_init(&animation->spring, 400.0, 0.0, 1.0);
animation->spring.friction = 1150;
weston_view_animation_run(animation);
if (weston_view_animation_run(animation))
return NULL;
return animation;
}