callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/carlosg/flush-uncompressed-motion' into 'gtk-3-24'

Browse Source 
gdk: Ensure GdkFrameClock::flush-events with uncompressed motion

See merge request GNOME/gtk!5075
This commit is contained in:
Matthias Clasen
2022-10-03 20:48:10 +00:00
parent 1ad49f238c 5ea961ed93
commit 293cee1724
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gdk/gdkevents.c
View File

@ -258,6 +258,7 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
GList *pending_motions = NULL; GList *pending_motions = NULL;
GdkWindow *pending_motion_window = NULL; GdkWindow *pending_motion_window = NULL;
GdkDevice *pending_motion_device = NULL; GdkDevice *pending_motion_device = NULL;
gboolean uncompressed_motion = FALSE;
/* If the last N events in the event queue are motion notify /* If the last N events in the event queue are motion notify
* events for the same window, drop all but the last */ * events for the same window, drop all but the last */
@ -282,10 +283,14 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
pending_motion_device != event->event.motion.device) pending_motion_device != event->event.motion.device)
break; break;
if (!event->event.motion.window->event_compression)
break;
pending_motion_window = event->event.motion.window; pending_motion_window = event->event.motion.window;
if (!event->event.motion.window->event_compression)
{
uncompressed_motion = TRUE;
break;
}
pending_motion_device = event->event.motion.device; pending_motion_device = event->event.motion.device;
pending_motions = tmp_list; pending_motions = tmp_list;
@ -301,9 +306,10 @@ _gdk_event_queue_handle_motion_compression (GdkDisplay *display)
pending_motions = next; pending_motions = next;
} }
if (pending_motions && if (uncompressed_motion ||
pending_motions == display->queued_events && (pending_motions &&
pending_motions == display->queued_tail) pending_motions == display->queued_events &&
pending_motions == display->queued_tail))
{ {
GdkFrameClock *clock = gdk_window_get_frame_clock (pending_motion_window); GdkFrameClock *clock = gdk_window_get_frame_clock (pending_motion_window);
if (clock) /* might be NULL if window was destroyed */ if (clock) /* might be NULL if window was destroyed */