AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 14:00:09 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Disconnect the frame callback when hiding

Browse Source 
Do not leave spurious frame callbacks around wen hiding surfaces.
Instead, store the callback and remove it.
This commit is contained in:
Benjamin Otte 2023-04-28 22:21:42 +02:00
parent 76777cdd18
commit 45216e1c88
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/wayland/gdksurface-wayland-private.h
View File

@ -42,11 +42,11 @@ struct _GdkWaylandSurface
} display_server; } display_server;
struct wl_event_queue *event_queue; struct wl_event_queue *event_queue;
struct wl_callback *frame_callback;
unsigned int initial_configure_received : 1; unsigned int initial_configure_received : 1;
unsigned int has_uncommitted_ack_configure : 1; unsigned int has_uncommitted_ack_configure : 1;
unsigned int mapped : 1; unsigned int mapped : 1;
unsigned int awaiting_frame : 1;
unsigned int awaiting_frame_frozen : 1; unsigned int awaiting_frame_frozen : 1;
int pending_buffer_offset_x; int pending_buffer_offset_x;

30
gdk/wayland/gdksurface-wayland.c
View File

@ -272,17 +272,13 @@ frame_callback (void *data,
gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "wayland", "frame event"); gdk_profiler_add_mark (GDK_PROFILER_CURRENT_TIME, 0, "wayland", "frame event");
GDK_DISPLAY_DEBUG (GDK_DISPLAY (display_wayland), EVENTS, "frame %p", surface); GDK_DISPLAY_DEBUG (GDK_DISPLAY (display_wayland), EVENTS, "frame %p", surface);
wl_callback_destroy (callback); g_assert (impl->frame_callback == callback);
g_assert (!GDK_SURFACE_DESTROYED (surface));
if (GDK_SURFACE_DESTROYED (surface)) g_clear_pointer (&impl->frame_callback, wl_callback_destroy);
return;
if (!impl->awaiting_frame)
return;
GDK_WAYLAND_SURFACE_GET_CLASS (impl)->handle_frame (impl); GDK_WAYLAND_SURFACE_GET_CLASS (impl)->handle_frame (impl);
impl->awaiting_frame = FALSE;
if (impl->awaiting_frame_frozen) if (impl->awaiting_frame_frozen)
{ {
impl->awaiting_frame_frozen = FALSE; impl->awaiting_frame_frozen = FALSE;
@ -370,20 +366,17 @@ gdk_wayland_surface_request_layout (GdkSurface *surface)
void void
gdk_wayland_surface_request_frame (GdkSurface *surface) gdk_wayland_surface_request_frame (GdkSurface *surface)
{ {
GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); GdkWaylandSurface *self = GDK_WAYLAND_SURFACE (surface);
struct wl_callback *callback;
GdkFrameClock *clock; GdkFrameClock *clock;
if (impl->awaiting_frame) g_assert (self->frame_callback == NULL);
return;
clock = gdk_surface_get_frame_clock (surface); clock = gdk_surface_get_frame_clock (surface);
callback = wl_surface_frame (impl->display_server.wl_surface); self->frame_callback = wl_surface_frame (self->display_server.wl_surface);
wl_proxy_set_queue ((struct wl_proxy *) callback, NULL); wl_proxy_set_queue ((struct wl_proxy *) self->frame_callback, NULL);
wl_callback_add_listener (callback, &frame_listener, surface); wl_callback_add_listener (self->frame_callback, &frame_listener, surface);
impl->pending_frame_counter = gdk_frame_clock_get_frame_counter (clock); self->pending_frame_counter = gdk_frame_clock_get_frame_counter (clock);
impl->awaiting_frame = TRUE;
} }
gboolean gboolean
@ -422,9 +415,10 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
gdk_wayland_surface_notify_committed (surface); gdk_wayland_surface_notify_committed (surface);
} }
if (impl->awaiting_frame && if (impl->frame_callback &&
impl->pending_frame_counter == gdk_frame_clock_get_frame_counter (clock)) impl->pending_frame_counter == gdk_frame_clock_get_frame_counter (clock))
{ {
g_assert (!impl->awaiting_frame_frozen);
impl->awaiting_frame_frozen = TRUE; impl->awaiting_frame_frozen = TRUE;
gdk_surface_freeze_updates (surface); gdk_surface_freeze_updates (surface);
} }
@ -973,7 +967,7 @@ gdk_wayland_surface_hide_surface (GdkSurface *surface)
unmap_popups_for_surface (surface); unmap_popups_for_surface (surface);
impl->awaiting_frame = FALSE; g_clear_pointer (&impl->frame_callback, wl_callback_destroy);
if (impl->awaiting_frame_frozen) if (impl->awaiting_frame_frozen)
{ {
impl->awaiting_frame_frozen = FALSE; impl->awaiting_frame_frozen = FALSE;