AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

GDK W32: Ensure that selection request is processed

Browse Source 
To do that, run the message loop for one second or until the side-effect
of running the selection request handler is achieved (as opposed to
running it until the event is no longer queued).

The disavantage of this method is that if the event handling is
somehow missed (due to a variety of reasons - after all, it's not
a straight path from an event being queued to property_change()
being called), this will loop for one second. Since we do process
events during that time, this will not hang the application, but
might still restrict some of the functionality.

https://bugzilla.gnome.org/show_bug.cgi?id=786509
This commit is contained in:
Руслан Ижбулатов 2017-09-18 16:49:11 +00:00
parent a66017a6a0
commit 5d0bfdd840
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdk/win32/gdkdnd-win32.c
View File

@ -1042,6 +1042,7 @@ idataobject_getdata (LPDATAOBJECT This,
GdkEvent e;
gint i;
GdkAtom target;
gint64 loopend;
GDK_NOTE (DND, g_print ("idataobject_getdata %p %s ",
This, _gdk_win32_cf_to_string (pFormatEtc->cfFormat)));
@ -1105,10 +1106,12 @@ idataobject_getdata (LPDATAOBJECT This,
gdk_event_put (&e);
process_pending_events (gdk_device_get_display (gdk_drag_context_get_device (ctx->context)));
/* Don't hold up longer than one second */
loopend = g_get_monotonic_time () + 1000000000;
win32_sel->property_change_format = 0;
win32_sel->property_change_data = 0;
while (win32_sel->property_change_data != 0 &&
g_get_monotonic_time () < loopend)
process_pending_events (gdk_device_get_display (gdk_drag_context_get_device (ctx->context)));
if (pMedium->hGlobal == NULL) {
GDK_NOTE (DND, g_print (" E_UNEXPECTED\n"));

3
gdk/win32/gdkselection-win32.c
View File

@ -2393,6 +2393,9 @@ _gdk_win32_selection_property_change (GdkWin32Selection *win32_sel,
g_free (set_data);
}
win32_sel->property_change_format = 0;
win32_sel->property_change_data = 0;
}
else
{