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

x11: Handle events on drag side differently

Browse Source 
Instead of using the filters that the drop side uses, handle events in
the event filter installed by the DragContext.
This commit is contained in:
Benjamin Otte 2018-06-13 21:36:23 +02:00
parent 14f0a25531
commit 005781021e
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gdk/x11/gdkdnd-x11.c
View File

@ -173,10 +173,6 @@ static gboolean xdnd_leave_filter (GdkSurface *surface,
const XEvent *xevent); const XEvent *xevent);
static gboolean xdnd_position_filter (GdkSurface *surface, static gboolean xdnd_position_filter (GdkSurface *surface,
const XEvent *xevent); const XEvent *xevent);
static gboolean xdnd_status_filter (GdkSurface *surface,
const XEvent *xevent);
static gboolean xdnd_finished_filter (GdkSurface *surface,
const XEvent *xevent);
static gboolean xdnd_drop_filter (GdkSurface *surface, static gboolean xdnd_drop_filter (GdkSurface *surface,
const XEvent *xevent); const XEvent *xevent);
@ -199,8 +195,6 @@ static const struct {
{ "XdndEnter", xdnd_enter_filter }, { "XdndEnter", xdnd_enter_filter },
{ "XdndLeave", xdnd_leave_filter }, { "XdndLeave", xdnd_leave_filter },
{ "XdndPosition", xdnd_position_filter }, { "XdndPosition", xdnd_position_filter },
{ "XdndStatus", xdnd_status_filter },
{ "XdndFinished", xdnd_finished_filter },
{ "XdndDrop", xdnd_drop_filter }, { "XdndDrop", xdnd_drop_filter },
}; };
@ -1041,16 +1035,14 @@ xdnd_action_to_atom (GdkDisplay *display,
/* Source side */ /* Source side */
static gboolean static gboolean
xdnd_status_filter (GdkSurface *surface, xdnd_status_filter (GdkDisplay *display,
const XEvent *xevent) const XEvent *xevent)
{ {
GdkDisplay *display;
guint32 dest_surface = xevent->xclient.data.l[0]; guint32 dest_surface = xevent->xclient.data.l[0];
guint32 flags = xevent->xclient.data.l[1]; guint32 flags = xevent->xclient.data.l[1];
Atom action = xevent->xclient.data.l[4]; Atom action = xevent->xclient.data.l[4];
GdkDragContext *context; GdkDragContext *context;
display = gdk_surface_get_display (surface);
context = gdk_drag_context_find (display, xevent->xclient.window, dest_surface); context = gdk_drag_context_find (display, xevent->xclient.window, dest_surface);
GDK_DISPLAY_NOTE (display, DND, GDK_DISPLAY_NOTE (display, DND,
@ -1083,15 +1075,13 @@ xdnd_status_filter (GdkSurface *surface,
} }
static gboolean static gboolean
xdnd_finished_filter (GdkSurface *surface, xdnd_finished_filter (GdkDisplay *display,
const XEvent *xevent) const XEvent *xevent)
{ {
GdkDisplay *display;
guint32 dest_surface = xevent->xclient.data.l[0]; guint32 dest_surface = xevent->xclient.data.l[0];
GdkDragContext *context; GdkDragContext *context;
GdkX11DragContext *context_x11; GdkX11DragContext *context_x11;
display = gdk_surface_get_display (surface);
context = gdk_drag_context_find (display, xevent->xclient.window, dest_surface); context = gdk_drag_context_find (display, xevent->xclient.window, dest_surface);
GDK_DISPLAY_NOTE (display, DND, GDK_DISPLAY_NOTE (display, DND,
@ -2372,7 +2362,7 @@ gdk_x11_drag_context_status (GdkDrop *drop,
if (gdk_drop_get_drag (drop)) if (gdk_drop_get_drag (drop))
{ {
xdnd_status_filter (context->source_surface, &xev); xdnd_status_filter (display, &xev);
} }
else else
{ {
@ -2427,7 +2417,7 @@ gdk_x11_drag_context_finish (GdkDrop *drop,
if (gdk_drop_get_drag (drop)) if (gdk_drop_get_drag (drop))
{ {
xdnd_finished_filter (context->source_surface, &xev); xdnd_finished_filter (display, &xev);
} }
else else
{ {
@ -2587,6 +2577,14 @@ gdk_x11_drag_context_xevent (GdkDisplay *display,
return TRUE; return TRUE;
} }
case ClientMessage:
if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name_for_display (display, "XdndStatus"))
return xdnd_status_filter (display, xevent);
else if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name_for_display (display, "XdndFinished"))
return xdnd_finished_filter (display, xevent);
else
return FALSE;
default: default:
return FALSE; return FALSE;
} }