dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed drag source stuff to allow multiple data types. Changed DND source 

2003-11-20  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpdnd.[ch]: changed drag source stuff to allow
	multiple data types. Changed DND source API to speak in terms of
	add()/remove() instead of set()/unset(). Added GimpDndDragFileFunc
	typedef and gimp_dnd_file_source_add().

	Unfortunately GTK+'s DND API lacks symmetry here (no GtkTargetList
	based API for drag sources), so we cannot really change drag
	sources on-the-fly and need to set GtkTargetEntry arrays manually.

	* app/widgets/gimpcolormapeditor.c
	* app/widgets/gimpcontainertreeview.c
	* app/widgets/gimpmenuitem.c
	* app/widgets/gimppaletteeditor.c
	* app/widgets/gimppreview.c
	* app/widgets/gimptoolbox-color-area.c: changed accordingly.

	* app/widgets/gimpdocumentview.c: ditto. Additionally offer
	"text/uri-list" so it's possible to drag images from the document
	history to the file manager or browser.
This commit is contained in:
Michael Natterer 2003-11-20 16:26:15 +00:00 committed by Michael Natterer
parent b86143f2e8
commit c5865e497c
11 changed files with 419 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
2003-11-20 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdnd.[ch]: changed drag source stuff to allow
multiple data types. Changed DND source API to speak in terms of
add()/remove() instead of set()/unset(). Added GimpDndDragFileFunc
typedef and gimp_dnd_file_source_add().
Unfortunately GTK+'s DND API lacks symmetry here (no GtkTargetList
based API for drag sources), so we cannot really change drag
sources on-the-fly and need to set GtkTargetEntry arrays manually.
* app/widgets/gimpcolormapeditor.c
* app/widgets/gimpcontainertreeview.c
* app/widgets/gimpmenuitem.c
* app/widgets/gimppaletteeditor.c
* app/widgets/gimppreview.c
* app/widgets/gimptoolbox-color-area.c: changed accordingly.
* app/widgets/gimpdocumentview.c: ditto. Additionally offer
"text/uri-list" so it's possible to drag images from the document
history to the file manager or browser.
2003-11-20 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdnd.c: cleanup before doing real changes.

13
app/widgets/gimpcolormapeditor.c
View File

@ -138,11 +138,6 @@ static guint editor_signals[LAST_SIGNAL] = { 0 };
static GimpImageEditorClass *parent_class = NULL;
static GtkTargetEntry color_palette_target_table[] =
{
GIMP_TARGET_COLOR
};
GType
gimp_colormap_editor_get_type (void)
@ -367,13 +362,7 @@ gimp_colormap_editor_new (GimpImage *gimage,
G_CALLBACK (gimp_colormap_preview_button_press),
editor);
/* dnd stuff */
gtk_drag_source_set (editor->palette,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
color_palette_target_table,
G_N_ELEMENTS (color_palette_target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
gimp_dnd_color_source_set (editor->palette, gimp_colormap_preview_drag_color,
gimp_dnd_color_source_add (editor->palette, gimp_colormap_preview_drag_color,
editor);
gimp_dnd_color_dest_add (editor->palette, gimp_colormap_preview_drop_color,
editor);

6
app/widgets/gimpcontainertreeview.c
View File

@ -442,8 +442,8 @@ gimp_container_tree_view_set_container (GimpContainerView *view,
if (! container)
{
if (gimp_dnd_viewable_source_unset (GTK_WIDGET (tree_view->view),
view->container->children_type))
if (gimp_dnd_viewable_source_remove (GTK_WIDGET (tree_view->view),
view->container->children_type))
{
gtk_drag_source_unset (GTK_WIDGET (tree_view->view));
}
@ -460,7 +460,7 @@ gimp_container_tree_view_set_container (GimpContainerView *view,
container->children_type,
GDK_ACTION_COPY))
{
gimp_dnd_viewable_source_set (GTK_WIDGET (tree_view->view),
gimp_dnd_viewable_source_add (GTK_WIDGET (tree_view->view),
container->children_type,
gimp_container_tree_view_drag_viewable,
tree_view);

419
app/widgets/gimpdnd.c
View File

@ -85,6 +85,9 @@ struct _GimpDndDataDef
{
GtkTargetEntry target_entry;
gchar *get_data_func_name;
gchar *get_data_data_name;
gchar *set_data_func_name;
gchar *set_data_data_name;
@ -101,9 +104,14 @@ static GtkWidget * gimp_dnd_get_color_icon (GtkWidget *widget,
GCallback get_color_func,
gpointer get_color_data);
static guchar * gimp_dnd_get_file_data (GtkWidget *widget,
GCallback get_file_func,
gpointer get_file_data,
gint *format,
gint *length);
static void gimp_dnd_set_file_data (GtkWidget *widget,
GCallback set_color_func,
gpointer set_color_data,
GCallback set_file_func,
gpointer set_file_data,
guchar *vals,
gint format,
gint length);
@ -222,17 +230,23 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_URI_LIST,
"gimp-dnd-get-file-func",
"gimp-dnd-get-file-data",
"gimp-dnd-set-file-func",
"gimp-dnd-set-file-data",
NULL,
NULL,
gimp_dnd_get_file_data,
gimp_dnd_set_file_data
},
{
GIMP_TARGET_TEXT_PLAIN,
NULL,
NULL,
"gimp-dnd-set-file-func",
"gimp-dnd-set-file-data",
@ -244,6 +258,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_NETSCAPE_URL,
NULL,
NULL,
"gimp-dnd-set-file-func",
"gimp-dnd-set-file-data",
@ -255,6 +272,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_COLOR,
"gimp-dnd-get-color-func",
"gimp-dnd-get-color-data",
"gimp-dnd-set-color-func",
"gimp-dnd-set-color-data",
@ -266,6 +286,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_IMAGE,
"gimp-dnd-get-image-func",
"gimp-dnd-get-image-data",
"gimp-dnd-set-image-func",
"gimp-dnd-set-image-data",
@ -277,6 +300,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_LAYER,
"gimp-dnd-get-layer-func",
"gimp-dnd-get-layer-data",
"gimp-dnd-set-layer-func",
"gimp-dnd-set-layer-data",
@ -288,6 +314,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_CHANNEL,
"gimp-dnd-get-channel-func",
"gimp-dnd-get-channel-data",
"gimp-dnd-set-channel-func",
"gimp-dnd-set-channel-data",
@ -299,6 +328,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_LAYER_MASK,
"gimp-dnd-get-layer-mask-func",
"gimp-dnd-get-layer-mask-data",
"gimp-dnd-set-layer-mask-func",
"gimp-dnd-set-layer-mask-data",
@ -313,6 +345,9 @@ static GimpDndDataDef dnd_data_defs[] =
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
@ -321,6 +356,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_VECTORS,
"gimp-dnd-get-vectors-func",
"gimp-dnd-get-vectors-data",
"gimp-dnd-set-vectors-func",
"gimp-dnd-set-vectors-data",
@ -332,6 +370,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_BRUSH,
"gimp-dnd-get-brush-func",
"gimp-dnd-get-brush-data",
"gimp-dnd-set-brush-func",
"gimp-dnd-set-brush-data",
@ -343,6 +384,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_PATTERN,
"gimp-dnd-get-pattern-func",
"gimp-dnd-get-pattern-data",
"gimp-dnd-set-pattern-func",
"gimp-dnd-set-pattern-data",
@ -354,6 +398,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_GRADIENT,
"gimp-dnd-get-gradient-func",
"gimp-dnd-get-gradient-data",
"gimp-dnd-set-gradient-func",
"gimp-dnd-set-gradient-data",
@ -365,6 +412,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_PALETTE,
"gimp-dnd-get-palette-func",
"gimp-dnd-get-palette-data",
"gimp-dnd-set-palette-func",
"gimp-dnd-set-palette-data",
@ -376,6 +426,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_FONT,
"gimp-dnd-get-font-func",
"gimp-dnd-get-font-data",
"gimp-dnd-set-font-func",
"gimp-dnd-set-font-data",
@ -387,6 +440,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_BUFFER,
"gimp-dnd-get-buffer-func",
"gimp-dnd-get-buffer-data",
"gimp-dnd-set-buffer-func",
"gimp-dnd-set-buffer-data",
@ -398,6 +454,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_IMAGEFILE,
"gimp-dnd-get-imagefile-func",
"gimp-dnd-get-imagefile-data",
"gimp-dnd-set-imagefile-func",
"gimp-dnd-set-imagefile-data",
@ -409,6 +468,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_TEMPLATE,
"gimp-dnd-get-template-func",
"gimp-dnd-get-template-data",
"gimp-dnd-set-template-func",
"gimp-dnd-set-template-data",
@ -420,6 +482,9 @@ static GimpDndDataDef dnd_data_defs[] =
{
GIMP_TARGET_TOOL,
"gimp-dnd-get-tool-func",
"gimp-dnd-get-tool-data",
"gimp-dnd-set-tool-func",
"gimp-dnd-set-tool-data",
@ -434,6 +499,9 @@ static GimpDndDataDef dnd_data_defs[] =
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
@ -463,10 +531,11 @@ gimp_dnd_data_drag_begin (GtkWidget *widget,
GdkDragContext *context,
gpointer data)
{
GimpDndType data_type;
GCallback get_data_func;
gpointer get_data_data;
GtkWidget *icon_widget;
GimpDndType data_type;
GimpDndDataDef *dnd_data;
GCallback get_data_func = NULL;
gpointer get_data_data = NULL;
GtkWidget *icon_widget;
data_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-type"));
@ -474,17 +543,22 @@ gimp_dnd_data_drag_begin (GtkWidget *widget,
if (! data_type)
return;
get_data_func = g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-func");
get_data_data = g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-data");
dnd_data = dnd_data_defs + data_type;
if (dnd_data->get_data_func_name)
get_data_func = g_object_get_data (G_OBJECT (widget),
dnd_data->get_data_func_name);
if (dnd_data->get_data_data_name)
get_data_data = g_object_get_data (G_OBJECT (widget),
dnd_data->get_data_data_name);
if (! get_data_func)
return;
icon_widget = (* dnd_data_defs[data_type].get_icon_func) (widget,
get_data_func,
get_data_data);
icon_widget = dnd_data->get_icon_func (widget,
get_data_func,
get_data_data);
if (icon_widget)
{
@ -525,43 +599,55 @@ gimp_dnd_data_drag_handle (GtkWidget *widget,
guint time,
gpointer data)
{
GCallback get_data_func = NULL;
gpointer get_data_data = NULL;
GimpDndType data_type;
GCallback get_data_func;
gpointer get_data_data;
gint format;
guchar *vals;
gint length;
data_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-type"));
if (! data_type)
return;
g_assert (data_type == info);
get_data_func = g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-func");
get_data_data = g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-data");
if (! get_data_func)
return;
vals = (* dnd_data_defs[data_type].get_data_func) (widget,
get_data_func,
get_data_data,
&format,
&length);
if (vals)
for (data_type = GIMP_DND_TYPE_NONE + 1;
data_type <= GIMP_DND_TYPE_LAST;
data_type++)
{
gtk_selection_data_set
(selection_data,
gdk_atom_intern (dnd_data_defs[data_type].target_entry.target, FALSE),
format, vals, length);
GimpDndDataDef *dnd_data = dnd_data_defs + data_type;
g_free (vals);
if (dnd_data->target_entry.info == info)
{
gint format;
guchar *vals;
gint length;
g_print ("gimp_dnd_data_drag_handle(%s)\n",
dnd_data->target_entry.target);
if (dnd_data->get_data_func_name)
get_data_func = g_object_get_data (G_OBJECT (widget),
dnd_data->get_data_func_name);
if (dnd_data->get_data_data_name)
get_data_data = g_object_get_data (G_OBJECT (widget),
dnd_data->get_data_data_name);
if (! get_data_func)
return;
vals = dnd_data->get_data_func (widget,
get_data_func,
get_data_data,
&format,
&length);
if (vals)
{
GdkAtom atom;
atom = gdk_atom_intern (dnd_data->target_entry.target, FALSE);
gtk_selection_data_set (selection_data, atom,
format, vals, length);
g_free (vals);
}
return;
}
}
}
@ -617,12 +703,21 @@ gimp_dnd_data_drop_handle (GtkWidget *widget,
}
static void
gimp_dnd_data_source_set (GimpDndType data_type,
GtkWidget *widget,
GCallback get_data_func,
gpointer get_data_data)
gimp_dnd_data_source_add (GimpDndType data_type,
GtkWidget *widget,
GCallback get_data_func,
gpointer get_data_data)
{
gboolean drag_connected;
GimpDndDataDef *dnd_data;
gboolean drag_connected;
dnd_data = dnd_data_defs + data_type;
/* set a default drag source if not already done */
if (! g_object_get_data (G_OBJECT (widget), "gtk-site-data"))
gtk_drag_source_set (widget, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
&dnd_data->target_entry, 1,
GDK_ACTION_COPY | GDK_ACTION_MOVE);
drag_connected =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
@ -644,18 +739,42 @@ gimp_dnd_data_source_set (GimpDndType data_type,
GINT_TO_POINTER (TRUE));
}
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-type",
GINT_TO_POINTER (data_type));
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-func",
g_object_set_data (G_OBJECT (widget), dnd_data->get_data_func_name,
get_data_func);
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-data",
g_object_set_data (G_OBJECT (widget), dnd_data->get_data_data_name,
get_data_data);
/* remember the first set source type for drag preview creation */
if (! g_object_get_data (G_OBJECT (widget), "gimp-dnd-get-data-type"))
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-type",
GINT_TO_POINTER (data_type));
#ifdef __GNUC__
#warning FIXME: missing GTK+ dnd API
#endif
#if 0
target_list = gtk_drag_source_get_target_list (widget);
if (target_list)
{
gtk_target_list_add_table (target_list, &dnd_data->target_entry, 1);
}
else
{
target_list = gtk_target_list_new (&dnd_data->target_entry, 1);
gtk_drag_source_set_target_list (widget, target_list);
gtk_target_list_unref (target_list);
}
#endif
}
static void
gimp_dnd_data_source_unset (GtkWidget *widget)
gimp_dnd_data_source_remove (GimpDndType data_type,
GtkWidget *widget)
{
gboolean drag_connected;
GimpDndDataDef *dnd_data;
gboolean drag_connected;
drag_connected =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
@ -664,9 +783,33 @@ gimp_dnd_data_source_unset (GtkWidget *widget)
if (! drag_connected)
return;
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-type", NULL);
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-func", NULL);
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-data", NULL);
dnd_data = dnd_data_defs + data_type;
g_object_set_data (G_OBJECT (widget), dnd_data->get_data_func_name, NULL);
g_object_set_data (G_OBJECT (widget), dnd_data->get_data_data_name, NULL);
/* remove the dnd type remembered for the dnd icon */
if (data_type ==
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-type")))
g_object_set_data (G_OBJECT (widget), "gimp-dnd-get-data-type", NULL);
#ifdef __GNUC__
#warning FIXME: missing GTK+ dnd API
#endif
#if 0
target_list = gtk_drag_source_get_target_list (widget);
if (target_list)
{
GdkAtom atom;
atom = gdk_atom_intern (dnd_data->target_entry.target, TRUE);
if (atom != GDK_NONE)
gtk_target_list_remove (target_list, atom);
}
#endif
}
static void
@ -675,8 +818,9 @@ gimp_dnd_data_dest_add (GimpDndType data_type,
gpointer set_data_func,
gpointer set_data_data)
{
GtkTargetList *target_list;
gboolean drop_connected;
GimpDndDataDef *dnd_data;
GtkTargetList *target_list;
gboolean drop_connected;
/* set a default drag dest if not already done */
if (! g_object_get_data (G_OBJECT (widget), "gtk-drag-dest"))
@ -696,24 +840,22 @@ gimp_dnd_data_dest_add (GimpDndType data_type,
GINT_TO_POINTER (TRUE));
}
g_object_set_data (G_OBJECT (widget),
dnd_data_defs[data_type].set_data_func_name,
dnd_data = dnd_data_defs + data_type;
g_object_set_data (G_OBJECT (widget), dnd_data->set_data_func_name,
set_data_func);
g_object_set_data (G_OBJECT (widget),
dnd_data_defs[data_type].set_data_data_name,
g_object_set_data (G_OBJECT (widget), dnd_data->set_data_data_name,
set_data_data);
target_list = gtk_drag_dest_get_target_list (widget);
if (target_list)
{
gtk_target_list_add_table (target_list,
&dnd_data_defs[data_type].target_entry, 1);
gtk_target_list_add_table (target_list, &dnd_data->target_entry, 1);
}
else
{
target_list = gtk_target_list_new (&dnd_data_defs[data_type].target_entry,
1);
target_list = gtk_target_list_new (&dnd_data->target_entry, 1);
gtk_drag_dest_set_target_list (widget, target_list);
gtk_target_list_unref (target_list);
@ -724,8 +866,9 @@ static void
gimp_dnd_data_dest_remove (GimpDndType data_type,
GtkWidget *widget)
{
GtkTargetList *target_list;
gboolean drop_connected;
GimpDndDataDef *dnd_data;
GtkTargetList *target_list;
gboolean drop_connected;
drop_connected =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
@ -734,12 +877,10 @@ gimp_dnd_data_dest_remove (GimpDndType data_type,
if (! drop_connected)
return;
g_object_set_data (G_OBJECT (widget),
dnd_data_defs[data_type].set_data_func_name,
NULL);
g_object_set_data (G_OBJECT (widget),
dnd_data_defs[data_type].set_data_data_name,
NULL);
dnd_data = dnd_data_defs + data_type;
g_object_set_data (G_OBJECT (widget), dnd_data->set_data_func_name, NULL);
g_object_set_data (G_OBJECT (widget), dnd_data->set_data_data_name, NULL);
target_list = gtk_drag_dest_get_target_list (widget);
@ -747,8 +888,7 @@ gimp_dnd_data_dest_remove (GimpDndType data_type,
{
GdkAtom atom;
atom = gdk_atom_intern (dnd_data_defs[data_type].target_entry.target,
TRUE);
atom = gdk_atom_intern (dnd_data->target_entry.target, TRUE);
if (atom != GDK_NONE)
gtk_target_list_remove (target_list, atom);
@ -760,6 +900,44 @@ gimp_dnd_data_dest_remove (GimpDndType data_type,
/* file dnd functions */
/************************/
static guchar *
gimp_dnd_get_file_data (GtkWidget *widget,
GCallback get_file_func,
gpointer get_file_data,
gint *format,
gint *length)
{
GList *file_list;
GList *list;
gchar *vals = NULL;
file_list = (* (GimpDndDragFileFunc) get_file_func) (widget, get_file_data);
if (! file_list)
return NULL;
for (list = file_list; list; list = g_list_next (list))
{
if (vals)
{
gchar *tmp = g_strconcat (vals, list->data, "\n", NULL);
g_free (vals);
vals = tmp;
}
else
{
vals = g_strconcat (list->data, "\n", NULL);
}
}
g_list_free (file_list);
*format = 8;
*length = strlen (vals) + 1;
return (guchar *) vals;
}
static void
gimp_dnd_set_file_data (GtkWidget *widget,
GCallback set_file_func,
@ -817,6 +995,22 @@ gimp_dnd_set_file_data (GtkWidget *widget,
}
}
void
gimp_dnd_file_source_add (GtkWidget *widget,
GimpDndDragFileFunc get_file_func,
gpointer data)
{
gimp_dnd_data_source_add (GIMP_DND_TYPE_URI_LIST, widget,
G_CALLBACK (get_file_func),
data);
}
void
gimp_dnd_file_source_remove (GtkWidget *widget)
{
gimp_dnd_data_source_remove (GIMP_DND_TYPE_URI_LIST, widget);
}
void
gimp_dnd_file_dest_add (GtkWidget *widget,
GimpDndDropFileFunc set_file_func,
@ -1124,15 +1318,21 @@ gimp_dnd_set_color_data (GtkWidget *widget,
}
void
gimp_dnd_color_source_set (GtkWidget *widget,
gimp_dnd_color_source_add (GtkWidget *widget,
GimpDndDragColorFunc get_color_func,
gpointer data)
{
gimp_dnd_data_source_set (GIMP_DND_TYPE_COLOR, widget,
gimp_dnd_data_source_add (GIMP_DND_TYPE_COLOR, widget,
G_CALLBACK (get_color_func),
data);
}
void
gimp_dnd_color_source_remove (GtkWidget *widget)
{
gimp_dnd_data_source_remove (GIMP_DND_TYPE_COLOR, widget);
}
void
gimp_dnd_color_dest_add (GtkWidget *widget,
GimpDndDropColorFunc set_color_func,
@ -1254,9 +1454,8 @@ gimp_dnd_drag_source_set_by_type (GtkWidget *widget,
return FALSE;
gtk_drag_source_set (widget, start_button_mask,
&dnd_data_defs[dnd_type].target_entry,
1,
actions);
&dnd_data_defs[dnd_type].target_entry, 1,
actions);
return TRUE;
}
@ -1277,15 +1476,14 @@ gimp_dnd_drag_dest_set_by_type (GtkWidget *widget,
return FALSE;
gtk_drag_dest_set (widget, flags,
&dnd_data_defs[dnd_type].target_entry,
1,
actions);
&dnd_data_defs[dnd_type].target_entry, 1,
actions);
return TRUE;
}
gboolean
gimp_dnd_viewable_source_set (GtkWidget *widget,
gimp_dnd_viewable_source_add (GtkWidget *widget,
GType type,
GimpDndDragViewableFunc get_viewable_func,
gpointer data)
@ -1300,16 +1498,16 @@ gimp_dnd_viewable_source_set (GtkWidget *widget,
if (dnd_type == GIMP_DND_TYPE_NONE)
return FALSE;
gimp_dnd_data_source_set (dnd_type, widget,
G_CALLBACK (get_viewable_func),
data);
gimp_dnd_data_source_add (dnd_type, widget,
G_CALLBACK (get_viewable_func),
data);
return TRUE;
}
gboolean
gimp_dnd_viewable_source_unset (GtkWidget *widget,
GType type)
gimp_dnd_viewable_source_remove (GtkWidget *widget,
GType type)
{
GimpDndType dnd_type;
@ -1320,7 +1518,7 @@ gimp_dnd_viewable_source_unset (GtkWidget *widget,
if (dnd_type == GIMP_DND_TYPE_NONE)
return FALSE;
gimp_dnd_data_source_unset (widget);
gimp_dnd_data_source_remove (dnd_type, widget);
return TRUE;
}
@ -1342,8 +1540,8 @@ gimp_dnd_viewable_dest_add (GtkWidget *widget,
return FALSE;
gimp_dnd_data_dest_add (dnd_type, widget,
G_CALLBACK (set_viewable_func),
data);
G_CALLBACK (set_viewable_func),
data);
return TRUE;
}
@ -1370,24 +1568,27 @@ GimpViewable *
gimp_dnd_get_drag_data (GtkWidget *widget)
{
GimpDndType data_type;
GimpDndDragViewableFunc get_data_func;
gpointer get_data_data;
GimpDndDataDef *dnd_data;
GimpDndDragViewableFunc get_data_func = NULL;
gpointer get_data_data = NULL;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
data_type =
(GimpDndType) g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-type");
data_type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-type"));
if (! data_type)
return NULL;
get_data_func =
(GimpDndDragViewableFunc) g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-func");
get_data_data =
(gpointer) g_object_get_data (G_OBJECT (widget),
"gimp-dnd-get-data-data");
dnd_data = dnd_data_defs + data_type;
if (dnd_data->get_data_func_name)
get_data_func = g_object_get_data (G_OBJECT (widget),
dnd_data->get_data_func_name);
if (dnd_data->get_data_data_name)
get_data_data = g_object_get_data (G_OBJECT (widget),
dnd_data->get_data_data_name);
if (! get_data_func)
return NULL;

45
app/widgets/gimpdnd.h
View File

@ -116,33 +116,42 @@ void gimp_dnd_init (Gimp *gimp);
/* file / url dnd functions */
typedef void (* GimpDndDropFileFunc) (GtkWidget *widget,
GList *files,
gpointer data);
typedef GList * (* GimpDndDragFileFunc) (GtkWidget *widget,
gpointer data);
typedef void (* GimpDndDropFileFunc) (GtkWidget *widget,
GList *files,
gpointer data);
void gimp_dnd_file_dest_add (GtkWidget *widget,
GimpDndDropFileFunc set_file_func,
gpointer data);
void gimp_dnd_file_dest_remove (GtkWidget *widget);
void gimp_dnd_file_source_add (GtkWidget *widget,
GimpDndDragFileFunc get_file_func,
gpointer data);
void gimp_dnd_file_source_remove (GtkWidget *widget);
void gimp_dnd_file_dest_add (GtkWidget *widget,
GimpDndDropFileFunc set_file_func,
gpointer data);
void gimp_dnd_file_dest_remove (GtkWidget *widget);
/* standard callback */
void gimp_dnd_open_files (GtkWidget *widget,
GList *files,
gpointer data);
void gimp_dnd_open_files (GtkWidget *widget,
GList *files,
gpointer data);
/* color dnd functions */
typedef void (* GimpDndDropColorFunc) (GtkWidget *widget,
const GimpRGB *color,
gpointer data);
typedef void (* GimpDndDragColorFunc) (GtkWidget *widget,
GimpRGB *color,
gpointer data);
typedef void (* GimpDndDropColorFunc) (GtkWidget *widget,
const GimpRGB *color,
gpointer data);
void gimp_dnd_color_source_set (GtkWidget *widget,
void gimp_dnd_color_source_add (GtkWidget *widget,
GimpDndDragColorFunc get_color_func,
gpointer data);
void gimp_dnd_color_source_remove (GtkWidget *widget);
void gimp_dnd_color_dest_add (GtkWidget *widget,
GimpDndDropColorFunc set_color_func,
gpointer data);
@ -151,22 +160,22 @@ void gimp_dnd_color_dest_remove (GtkWidget *widget);
/* GimpViewable (by GType) dnd functions */
typedef GimpViewable * (* GimpDndDragViewableFunc) (GtkWidget *widget,
gpointer data);
typedef void (* GimpDndDropViewableFunc) (GtkWidget *widget,
GimpViewable *viewable,
gpointer data);
typedef GimpViewable * (* GimpDndDragViewableFunc) (GtkWidget *widget,
gpointer data);
gboolean gimp_dnd_drag_source_set_by_type (GtkWidget *widget,
GdkModifierType start_button_mask,
GType type,
GdkDragAction actions);
gboolean gimp_dnd_viewable_source_set (GtkWidget *widget,
gboolean gimp_dnd_viewable_source_add (GtkWidget *widget,
GType type,
GimpDndDragViewableFunc get_viewable_func,
gpointer data);
gboolean gimp_dnd_viewable_source_unset (GtkWidget *widget,
gboolean gimp_dnd_viewable_source_remove (GtkWidget *widget,
GType type);
gboolean gimp_dnd_drag_dest_set_by_type (GtkWidget *widget,

39
app/widgets/gimpdocumentview.c
View File

@ -76,6 +76,8 @@ static void gimp_document_view_activate_item (GimpContainerEditor *editor,
GimpViewable *viewable);
static void gimp_document_view_open_image (GimpDocumentView *view,
GimpImagefile *imagefile);
static GList * gimp_document_view_drag_file (GtkWidget *widget,
gpointer data);
static GimpContainerEditorClass *parent_class = NULL;
@ -214,6 +216,24 @@ gimp_document_view_new (GimpViewType view_type,
GTK_BUTTON (document_view->remove_button),
GIMP_TYPE_IMAGEFILE);
if (view_type == GIMP_VIEW_TYPE_LIST)
{
static const GtkTargetEntry document_view_target_entries[] =
{
GIMP_TARGET_IMAGEFILE,
GIMP_TARGET_URI_LIST
};
gtk_drag_source_set (editor->view->dnd_widget,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
document_view_target_entries,
G_N_ELEMENTS (document_view_target_entries),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
gimp_dnd_file_source_add (editor->view->dnd_widget,
gimp_document_view_drag_file,
editor);
}
return GTK_WIDGET (document_view);
}
@ -357,7 +377,7 @@ gimp_document_view_delete_dangling_foreach (GimpImagefile *imagefile,
if (imagefile->state == GIMP_IMAGEFILE_STATE_NOT_FOUND)
{
gimp_container_remove (container_view->container,
gimp_container_remove (container_view->container,
GIMP_OBJECT (imagefile));
}
}
@ -461,3 +481,20 @@ gimp_document_view_open_image (GimpDocumentView *view,
}
}
static GList *
gimp_document_view_drag_file (GtkWidget *widget,
gpointer data)
{
GimpViewable *viewable;
viewable = gimp_dnd_get_drag_data (widget);
if (viewable)
{
GList *list = NULL;
return g_list_append (list, g_strdup (gimp_object_get_name (GIMP_OBJECT (viewable))));
}
return NULL;
}

18
app/widgets/gimpmenuitem.c
View File

@ -165,14 +165,16 @@ gimp_menu_item_real_set_viewable (GimpMenuItem *menu_item,
G_CALLBACK (gimp_menu_item_name_changed),
menu_item, 0);
gimp_dnd_drag_source_set_by_type (GTK_WIDGET (menu_item),
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
G_TYPE_FROM_INSTANCE (viewable),
GDK_ACTION_MOVE | GDK_ACTION_COPY);
gimp_dnd_viewable_source_set (GTK_WIDGET (menu_item),
G_TYPE_FROM_INSTANCE (viewable),
gimp_menu_item_drag_viewable,
NULL);
if (gimp_dnd_drag_source_set_by_type (GTK_WIDGET (menu_item),
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
G_TYPE_FROM_INSTANCE (viewable),
GDK_ACTION_MOVE | GDK_ACTION_COPY))
{
gimp_dnd_viewable_source_add (GTK_WIDGET (menu_item),
G_TYPE_FROM_INSTANCE (viewable),
gimp_menu_item_drag_viewable,
NULL);
}
}
static void

16
app/widgets/gimppaletteeditor.c
View File

@ -146,13 +146,6 @@ static void palette_editor_color_notebook_callback (ColorNotebook *color_not
gpointer data);
/* dnd stuff */
static GtkTargetEntry color_palette_target_table[] =
{
GIMP_TARGET_COLOR
};
static GimpDataEditorClass *parent_class = NULL;
static GimpDockedInterface *parent_docked_iface = NULL;
@ -271,16 +264,9 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
G_CALLBACK (palette_editor_color_area_button_press),
editor);
/* dnd stuff */
gtk_drag_source_set (editor->color_area,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
color_palette_target_table,
G_N_ELEMENTS (color_palette_target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
gimp_dnd_color_source_set (editor->color_area,
gimp_dnd_color_source_add (editor->color_area,
palette_editor_drag_color,
editor);
gimp_dnd_color_dest_add (eventbox, palette_editor_drop_color, editor);
gimp_dnd_viewable_dest_add (eventbox, GIMP_TYPE_PALETTE,
palette_editor_drop_palette,

6
app/widgets/gimppreview.c
View File

@ -712,8 +712,8 @@ gimp_preview_set_viewable (GimpPreview *preview,
if (! viewable && ! preview->renderer->is_popup)
{
if (gimp_dnd_viewable_source_unset (GTK_WIDGET (preview),
G_TYPE_FROM_INSTANCE (preview->viewable)))
if (gimp_dnd_viewable_source_remove (GTK_WIDGET (preview),
G_TYPE_FROM_INSTANCE (preview->viewable)))
{
gtk_drag_source_unset (GTK_WIDGET (preview));
}
@ -726,7 +726,7 @@ gimp_preview_set_viewable (GimpPreview *preview,
viewable_type,
GDK_ACTION_COPY))
{
gimp_dnd_viewable_source_set (GTK_WIDGET (preview),
gimp_dnd_viewable_source_add (GTK_WIDGET (preview),
viewable_type,
gimp_preview_drag_viewable,
NULL);

15
app/widgets/gimptoolbox-color-area.c
View File

@ -100,12 +100,6 @@ static gint edit_color;
static GimpRGB revert_fg;
static GimpRGB revert_bg;
/* dnd stuff */
static GtkTargetEntry color_area_target_table[] =
{
GIMP_TARGET_COLOR
};
/* public functions */
@ -136,14 +130,7 @@ gimp_toolbox_color_area_create (GimpToolbox *toolbox,
G_CALLBACK (color_area_expose_event),
context);
/* dnd stuff */
gtk_drag_source_set (color_area,
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
color_area_target_table,
G_N_ELEMENTS (color_area_target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
gimp_dnd_color_source_set (color_area, color_area_drag_color, context);
gimp_dnd_color_source_add (color_area, color_area_drag_color, context);
gimp_dnd_color_dest_add (color_area, color_area_drop_color, context);
g_signal_connect_swapped (context, "foreground_changed",

6
app/widgets/gimpview.c
View File

@ -712,8 +712,8 @@ gimp_preview_set_viewable (GimpPreview *preview,
if (! viewable && ! preview->renderer->is_popup)
{
if (gimp_dnd_viewable_source_unset (GTK_WIDGET (preview),
G_TYPE_FROM_INSTANCE (preview->viewable)))
if (gimp_dnd_viewable_source_remove (GTK_WIDGET (preview),
G_TYPE_FROM_INSTANCE (preview->viewable)))
{
gtk_drag_source_unset (GTK_WIDGET (preview));
}
@ -726,7 +726,7 @@ gimp_preview_set_viewable (GimpPreview *preview,
viewable_type,
GDK_ACTION_COPY))
{
gimp_dnd_viewable_source_set (GTK_WIDGET (preview),
gimp_dnd_viewable_source_add (GTK_WIDGET (preview),
viewable_type,
gimp_preview_drag_viewable,
NULL);