AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GDK W32: Special handling for DELETE requests

Browse Source 
1) Ensure that any DELETE requests from the target are sent to GDK, even if
   both the source and the target are in the same process and it
   is therefore possible to use a shortcut and call the handler directly
   in GTK layer
2) Ensure that target GDK doesn't do anything when GTK asks it to send
   a DELETE request, just report back immediately (the code up the stack
   does not check for successfullness when request is DELETE, so not giving
   it any data is OK).

The source code already synthesizes a DELETE request, so that side is
also taken care of.

https://bugzilla.gnome.org/show_bug.cgi?id=786509
This commit is contained in:
Руслан Ижбулатов 2017-11-26 13:06:24 +00:00
parent 5e2e0af8b4
commit f0d04f82f8
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2168,6 +2168,15 @@ convert_dnd_selection_to_target (GdkAtom target,
fmt.lindex = -1;
fmt.tymed = TYMED_HGLOBAL;
/* We rely on GTK+ applications to synthesize the DELETE request
* for themselves, since they do know whether a DnD operation was a
* move and whether was successful. Therefore, we do not need to
* actually send anything here. Just report back without storing
* any data.
*/
if (target == _gdk_win32_selection_atom (GDK_WIN32_ATOM_INDEX_DELETE))
return result;
for (format = 0, with_transmute = 0; format == 0 && with_transmute < 2; with_transmute++)
{
for (i = 0;

9
gtk/gtkselection.c
View File

@ -830,6 +830,15 @@ gtk_selection_convert (GtkWidget *widget,
display = gtk_widget_get_display (widget);
owner_window = gdk_selection_owner_get_for_display (display, selection);
#ifdef GDK_WINDOWING_WIN32
/* Special handling for DELETE requests,
* make sure this goes down into GDK layer.
*/
if (GDK_IS_WIN32_DISPLAY (display) &&
target == gdk_atom_intern_static_string ("DELETE"))
owner_window = NULL;
#endif
if (owner_window != NULL)
{
GtkWidget *owner_widget;