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

gdk: Add GdkDragCancelReason enum as argument to GdkDragContext::cancel

Browse Source 
We should conform to a minimal set of reasons for the gtk side to emit
a better GtkDragResult than GTK_DRAG_RESULT_ERROR. This fixes the notebook
tab DnD feature, where we rely on GTK_DRAG_RESULT_NO_TARGET.

In the wayland side, unfortunately we can't honor either NO_TARGET nor
USER_CANCELLED, we don't know of the latter, so we could return false
positives on the former.

https://bugzilla.gnome.org/show_bug.cgi?id=761954
This commit is contained in:
Carlos Garnacho 2016-02-15 17:02:14 +01:00
parent 1ee3df5161
commit aad3135e4c
8 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gdk/gdk3-sections.txt
View File

@ -976,6 +976,7 @@ gdk_cursor_get_type
<TITLE>Drag and Drop</TITLE>
<FILE>dnd</FILE>
GdkDragContext
GdkDragCancelReason
gdk_drag_get_selection
gdk_drag_abort
gdk_drop_reply

9
gdk/gdkdnd.c
View File

@ -288,8 +288,8 @@ gdk_drag_context_class_init (GdkDragContextClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GdkDragContextClass, cancel),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
g_cclosure_marshal_VOID__ENUM,
G_TYPE_NONE, 1, GDK_TYPE_DRAG_CANCEL_REASON);
/**
* GdkDragContext::drop-performed:
@ -704,11 +704,12 @@ gdk_drag_context_set_cursor (GdkDragContext *context,
}
void
gdk_drag_context_cancel (GdkDragContext *context)
gdk_drag_context_cancel (GdkDragContext *context,
GdkDragCancelReason reason)
{
g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
g_signal_emit (context, signals[CANCEL], 0);
g_signal_emit (context, signals[CANCEL], 0, reason);
}
GList *

16
gdk/gdkdnd.h
View File

@ -64,6 +64,22 @@ typedef enum
GDK_ACTION_ASK = 1 << 5
} GdkDragAction;
/**
* GdkDragCancelReason:
* @GDK_DRAG_CANCEL_NO_TARGET: There is no suitable drop target.
* @GDK_DRAG_CANCEL_USER_CANCELLED: Drag cancelled by the user
* @GDK_DRAG_CANCEL_ERROR: Unspecified error.
*
* Used in #GdkDragContext to the reason of a cancelled DND operation.
*
* Since: 3.20
*/
typedef enum {
GDK_DRAG_CANCEL_NO_TARGET,
GDK_DRAG_CANCEL_USER_CANCELLED,
GDK_DRAG_CANCEL_ERROR
} GdkDragCancelReason;
/**
* GdkDragProtocol:
* @GDK_DRAG_PROTO_NONE: no protocol.

6
gdk/gdkdndprivate.h
View File

@ -74,7 +74,8 @@ struct _GdkDragContextClass {
GdkDragAction actions);
void (*set_cursor) (GdkDragContext *context,
GdkCursor *cursor);
void (*cancel) (GdkDragContext *context);
void (*cancel) (GdkDragContext *context,
GdkDragCancelReason reason);
void (*drop_performed) (GdkDragContext *context,
guint32 time);
void (*dnd_finished) (GdkDragContext *context);
@ -110,7 +111,8 @@ GList * gdk_drag_context_list (void);
void gdk_drag_context_set_cursor (GdkDragContext *context,
GdkCursor *cursor);
void gdk_drag_context_cancel (GdkDragContext *context);
void gdk_drag_context_cancel (GdkDragContext *context,
GdkDragCancelReason reason);
gboolean gdk_drag_context_handle_source_event (GdkEvent *event);
GdkCursor * gdk_drag_get_cursor (GdkDragAction action);

3
gdk/wayland/gdkdnd-wayland.c
View File

@ -441,7 +441,8 @@ gdk_wayland_drag_context_drop_performed (GdkDragContext *context,
}
static void
gdk_wayland_drag_context_cancel (GdkDragContext *context)
gdk_wayland_drag_context_cancel (GdkDragContext *context,
GdkDragCancelReason reason)
{
gdk_drag_context_set_cursor (context, NULL);
}

2
gdk/wayland/gdkselection-wayland.c
View File

@ -847,7 +847,7 @@ data_source_cancelled (void *data,
context = gdk_wayland_drag_context_lookup_by_data_source (source);
if (context)
gdk_drag_context_cancel (context);
gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_ERROR);
gdk_selection_owner_set (NULL, atom, GDK_CURRENT_TIME, TRUE);
gdk_wayland_selection_unset_data_source (display, atom);

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

@ -240,7 +240,8 @@ static gboolean gdk_x11_drag_context_manage_dnd (GdkDragContext *context,
GdkDragAction actions);
static void gdk_x11_drag_context_set_cursor (GdkDragContext *context,
GdkCursor *cursor);
static void gdk_x11_drag_context_cancel (GdkDragContext *context);
static void gdk_x11_drag_context_cancel (GdkDragContext *context,
GdkDragCancelReason reason);
static void gdk_x11_drag_context_drop_performed (GdkDragContext *context,
guint32 time);
@ -2821,7 +2822,8 @@ gdk_x11_drag_context_set_cursor (GdkDragContext *context,
}
static void
gdk_x11_drag_context_cancel (GdkDragContext *context)
gdk_x11_drag_context_cancel (GdkDragContext *context,
GdkDragCancelReason reason)
{
drag_context_ungrab (context);
gdk_drag_drop_done (context, FALSE);
@ -2951,7 +2953,7 @@ gdk_dnd_handle_key_event (GdkDragContext *context,
switch (event->keyval)
{
case GDK_KEY_Escape:
gdk_drag_context_cancel (context);
gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_USER_CANCELLED);
return TRUE;
case GDK_KEY_space:
@ -2966,7 +2968,7 @@ gdk_dnd_handle_key_event (GdkDragContext *context,
gdk_event_get_time ((GdkEvent *) event));
}
else
gdk_drag_context_cancel (context);
gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_NO_TARGET);
return TRUE;
@ -3029,7 +3031,7 @@ gdk_dnd_handle_grab_broken_event (GdkDragContext *context,
event->grab_window == x11_context->ipc_window)
return FALSE;
gdk_drag_context_cancel (context);
gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_ERROR);
return TRUE;
}
@ -3050,7 +3052,7 @@ gdk_dnd_handle_button_event (GdkDragContext *context,
gdk_event_get_time ((GdkEvent *) event));
}
else
gdk_drag_context_cancel (context);
gdk_drag_context_cancel (context, GDK_DRAG_CANCEL_NO_TARGET);
return TRUE;
}

27
gtk/gtkdnd.c
View File

@ -243,8 +243,9 @@ static void gtk_drag_source_info_destroy (GtkDragSourceInfo *info);
static void gtk_drag_context_drop_performed_cb (GdkDragContext *context,
guint time,
GtkDragSourceInfo *info);
static void gtk_drag_context_cancel_cb (GdkDragContext *context,
GtkDragSourceInfo *info);
static void gtk_drag_context_cancel_cb (GdkDragContext *context,
GdkDragCancelReason reason,
GtkDragSourceInfo *info);
static void gtk_drag_context_action_cb (GdkDragContext *context,
GdkDragAction action,
GtkDragSourceInfo *info);
@ -3454,10 +3455,26 @@ gtk_drag_context_drop_performed_cb (GdkDragContext *context,
}
static void
gtk_drag_context_cancel_cb (GdkDragContext *context,
GtkDragSourceInfo *info)
gtk_drag_context_cancel_cb (GdkDragContext *context,
GdkDragCancelReason reason,
GtkDragSourceInfo *info)
{
gtk_drag_cancel_internal (info, GTK_DRAG_RESULT_ERROR, GDK_CURRENT_TIME);
GtkDragResult result;
switch (reason)
{
case GDK_DRAG_CANCEL_NO_TARGET:
result = GTK_DRAG_RESULT_NO_TARGET;
break;
case GDK_DRAG_CANCEL_USER_CANCELLED:
result = GTK_DRAG_RESULT_USER_CANCELLED;
break;
case GDK_DRAG_CANCEL_ERROR:
default:
result = GTK_DRAG_RESULT_ERROR;
break;
}
gtk_drag_cancel_internal (info, result, GDK_CURRENT_TIME);
}
static void