diff options
| -rw-r--r-- | widgets/e-table/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/e-table/e-table.c | 517 | ||||
| -rw-r--r-- | widgets/e-table/e-table.h | 9 | ||||
| -rw-r--r-- | widgets/table/e-table.c | 517 | ||||
| -rw-r--r-- | widgets/table/e-table.h | 9 |
5 files changed, 1040 insertions, 18 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 8216e0df66..e263060158 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,9 @@ +2000-07-25 Christopher James Lahey <clahey@helixcode.com> + + * e-table.c, e-table.h: Implemented some of the drag & drop code. + Drops all report as being on row 0, col 0. Also, automatic drags + don't set the row and column being dragged from. + 2000-07-23 Damon Chaplin <damon@helixcode.com> * e-cell-text.c: added a color_column where the color can be specified diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c index 8a93577dbf..2eb7cfe3c9 100644 --- a/widgets/e-table/e-table.c +++ b/widgets/e-table/e-table.c @@ -45,6 +45,17 @@ enum { DOUBLE_CLICK, RIGHT_CLICK, KEY_PRESS, + + DRAG_BEGIN, + DRAG_END, + DRAG_DATA_GET, + DRAG_DATA_DELETE, + + DRAG_LEAVE, + DRAG_MOTION, + DRAG_DROP, + DRAG_DATA_RECEIVED, + LAST_SIGNAL }; @@ -62,6 +73,47 @@ static gint et_signals [LAST_SIGNAL] = { 0, }; static void e_table_fill_table (ETable *e_table, ETableModel *model); static gboolean changed_idle (gpointer data); +static void et_drag_begin (GtkWidget *widget, + GdkDragContext *context, + ETable *et); +static void et_drag_end (GtkWidget *widget, + GdkDragContext *context, + ETable *et); +static void et_drag_data_get(GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et); +static void et_drag_data_delete(GtkWidget *widget, + GdkDragContext *context, + ETable *et); + +static void et_drag_leave(GtkWidget *widget, + GdkDragContext *context, + guint time, + ETable *et); +static gboolean et_drag_motion(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et); +static gboolean et_drag_drop(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et); +static void et_drag_data_received(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et); + static void et_destroy (GtkObject *object) { @@ -124,6 +176,13 @@ e_table_init (GtkObject *object) e_table->rebuild_idle_id = 0; e_table->click_to_add_message = NULL; + + e_table->drag_get_data_row = -1; + e_table->drag_get_data_col = -1; + e_table->drag_row = -1; + e_table->drag_col = -1; + e_table->drop_row = -1; + e_table->drop_col = -1; } static void @@ -356,6 +415,31 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h gtk_signal_connect ( GTK_OBJECT (e_table->table_canvas), "size_allocate", GTK_SIGNAL_FUNC (table_canvas_size_allocate), e_table); + + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_begin", + GTK_SIGNAL_FUNC (et_drag_begin), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_end", + GTK_SIGNAL_FUNC (et_drag_end), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_data_get", + GTK_SIGNAL_FUNC (et_drag_data_get), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_data_delete", + GTK_SIGNAL_FUNC (et_drag_data_delete), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_motion", + GTK_SIGNAL_FUNC (et_drag_motion), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_leave", + GTK_SIGNAL_FUNC (et_drag_leave), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_drop", + GTK_SIGNAL_FUNC (et_drag_drop), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_data_received", + GTK_SIGNAL_FUNC (et_drag_data_received), e_table); gtk_signal_connect (GTK_OBJECT(e_table->table_canvas), "reflow", GTK_SIGNAL_FUNC (table_canvas_reflow), e_table); @@ -836,6 +920,314 @@ set_scroll_adjustments (ETable *table, hadjustment); } +/* Drag & drop stuff. */ +/* Target */ +void e_table_drag_get_data (ETable *table, + int row, + int col, + GdkDragContext *context, + GdkAtom target, + guint32 time) +{ + table->drag_get_data_row = row; + table->drag_get_data_col = col; + gtk_drag_get_data(GTK_WIDGET(table), + context, + target, + time); + +} + +void e_table_drag_highlight (ETable *table, + int row, + int col) /* col == -1 to highlight entire row. */ +{ +} + +void e_table_drag_unhighlight (ETable *table) +{ +} + +void e_table_drag_dest_set (ETable *table, + GtkDestDefaults flags, + const GtkTargetEntry *targets, + gint n_targets, + GdkDragAction actions) +{ + gtk_drag_dest_set(GTK_WIDGET(table), + flags, + targets, + n_targets, + actions); +} + +void e_table_drag_dest_set_proxy (ETable *table, + GdkWindow *proxy_window, + GdkDragProtocol protocol, + gboolean use_coordinates) +{ + gtk_drag_dest_set_proxy(GTK_WIDGET(table), + proxy_window, + protocol, + use_coordinates); +} + +/* There probably should be functions for setting the targets + * as a GtkTargetList + */ + +void e_table_drag_dest_unset (GtkWidget *widget) +{ + gtk_drag_dest_unset(widget); +} + +/* Source side */ + +void e_table_drag_source_set (ETable *table, + GdkModifierType start_button_mask, + const GtkTargetEntry *targets, + gint n_targets, + GdkDragAction actions) +{ + gtk_drag_source_set(GTK_WIDGET(table), + start_button_mask, + targets, + n_targets, + actions); +} + +void e_table_drag_source_unset (ETable *table) +{ + gtk_drag_source_unset(GTK_WIDGET(table)); +} + +/* There probably should be functions for setting the targets + * as a GtkTargetList + */ + +GdkDragContext * +e_table_drag_begin (ETable *table, + int row, + int col, + GtkTargetList *targets, + GdkDragAction actions, + gint button, + GdkEvent *event) +{ + table->drag_row = row; + table->drag_col = col; + + return gtk_drag_begin(GTK_WIDGET(table), + targets, + actions, + button, + event); +} + +static void +e_table_compute_location(ETable *table, + GtkWidget *widget, + int x, + int y, + int *row, + int *col) +{ + if (!(row || col)) + return; + if (row) + *row = 0; + if (col) + *col = 0; +} + +static void +et_drag_begin (GtkWidget *widget, + GdkDragContext *context, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_BEGIN], + et->drag_row, + et->drag_col, + context); +} + +static void +et_drag_end (GtkWidget *widget, + GdkDragContext *context, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_END], + et->drag_row, + et->drag_col, + context); +} + +static void +et_drag_data_get(GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_DATA_GET], + et->drag_row, + et->drag_col, + context, + selection_data, + info, + time); +} + +static void +et_drag_data_delete(GtkWidget *widget, + GdkDragContext *context, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_DATA_DELETE], + et->drag_row, + et->drag_col, + context); +} + +static void +et_drag_leave(GtkWidget *widget, + GdkDragContext *context, + guint time, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_LEAVE], + et->drop_row, + et->drop_col, + context, + time); + et->drop_row = -1; + et->drop_col = -1; +} + +static gboolean +et_drag_motion(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et) +{ + gboolean ret_val; + int row, col; + e_table_compute_location(et, + widget, + x, + y, + &row, + &col); + if (et->drop_row >= 0 && et->drop_col >= 0 && + row != et->drop_row && col != et->drop_row) { + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_LEAVE], + et->drop_row, + et->drop_col, + context, + time); + } + et->drop_row = row; + et->drop_col = col; + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_MOTION], + et->drop_row, + et->drop_col, + context, + x, + y, + time, + &ret_val); + return ret_val; +} + +static gboolean +et_drag_drop(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et) +{ + gboolean ret_val; + int row, col; + e_table_compute_location(et, + widget, + x, + y, + &row, + &col); + if (et->drop_row >= 0 && et->drop_col >= 0 && + row != et->drop_row && col != et->drop_row) { + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_LEAVE], + et->drop_row, + et->drop_col, + context, + time); + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_MOTION], + row, + col, + context, + x, + y, + time, + &ret_val); + } + et->drop_row = row; + et->drop_col = col; + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_DROP], + et->drop_row, + et->drop_col, + context, + x, + y, + time, + &ret_val); + et->drop_row = -1; + et->drop_col = -1; + return ret_val; +} + +static void +et_drag_data_received(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et) +{ + int row, col; + e_table_compute_location(et, + widget, + x, + y, + &row, + &col); + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_MOTION], + row, + col, + context, + x, + y, + selection_data, + info, + time); +} + static void e_table_class_init (GtkObjectClass *object_class) { @@ -844,15 +1236,25 @@ e_table_class_init (GtkObjectClass *object_class) e_table_parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = et_destroy; - object_class->set_arg = et_set_arg; - object_class->get_arg = et_get_arg; - - klass->row_selection = NULL; - klass->cursor_change = NULL; - klass->double_click = NULL; - klass->right_click = NULL; - klass->key_press = NULL; + object_class->destroy = et_destroy; + object_class->set_arg = et_set_arg; + object_class->get_arg = et_get_arg; + + klass->row_selection = NULL; + klass->cursor_change = NULL; + klass->double_click = NULL; + klass->right_click = NULL; + klass->key_press = NULL; + + klass->drag_begin = NULL; + klass->drag_end = NULL; + klass->drag_data_get = NULL; + klass->drag_data_delete = NULL; + + klass->drag_leave = NULL; + klass->drag_motion = NULL; + klass->drag_drop = NULL; + klass->drag_data_received = NULL; et_signals [ROW_SELECTION] = gtk_signal_new ("row_selection", @@ -894,6 +1296,103 @@ e_table_class_init (GtkObjectClass *object_class) e_marshal_INT__INT_INT_POINTER, GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER); + et_signals[DRAG_BEGIN] = + gtk_signal_new ("drag_begin", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_begin), + gtk_marshal_NONE__INT_INT_POINTER, + GTK_TYPE_NONE, 3, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT); + et_signals[DRAG_END] = + gtk_signal_new ("drag_end", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_end), + gtk_marshal_NONE__INT_INT_POINTER, + GTK_TYPE_NONE, 3, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT); + et_signals[DRAG_DATA_GET] = + gtk_signal_new ("drag_data_get", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_data_get), + e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT, + GTK_TYPE_NONE, 6, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_SELECTION_DATA, + GTK_TYPE_UINT, + GTK_TYPE_UINT); + et_signals[DRAG_DATA_DELETE] = + gtk_signal_new ("drag_data_delete", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_data_delete), + gtk_marshal_NONE__INT_INT_POINTER, + GTK_TYPE_NONE, 3, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT); + + et_signals[DRAG_LEAVE] = + gtk_signal_new ("drag_leave", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_leave), + e_marshal_NONE__INT_INT_POINTER_UINT, + GTK_TYPE_NONE, 4, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_UINT); + et_signals[DRAG_MOTION] = + gtk_signal_new ("drag_motion", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_motion), + e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT, + GTK_TYPE_BOOL, 6, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_UINT); + et_signals[DRAG_DROP] = + gtk_signal_new ("drag_drop", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_drop), + e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT, + GTK_TYPE_BOOL, 6, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_UINT); + et_signals[DRAG_DATA_RECEIVED] = + gtk_signal_new ("drag_data_received", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_data_received), + e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT, + GTK_TYPE_NONE, 8, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_SELECTION_DATA, + GTK_TYPE_UINT, + GTK_TYPE_UINT); + gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL); klass->set_scroll_adjustments = set_scroll_adjustments; diff --git a/widgets/e-table/e-table.h b/widgets/e-table/e-table.h index 34eb5e921a..85d0e387bd 100644 --- a/widgets/e-table/e-table.h +++ b/widgets/e-table/e-table.h @@ -63,6 +63,15 @@ typedef struct { gboolean use_click_to_add; ETableCursorMode cursor_mode; + + int drag_get_data_row; + int drag_get_data_col; + + int drag_row; + int drag_col; + + int drop_row; + int drop_col; } ETable; typedef struct { diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 8a93577dbf..2eb7cfe3c9 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -45,6 +45,17 @@ enum { DOUBLE_CLICK, RIGHT_CLICK, KEY_PRESS, + + DRAG_BEGIN, + DRAG_END, + DRAG_DATA_GET, + DRAG_DATA_DELETE, + + DRAG_LEAVE, + DRAG_MOTION, + DRAG_DROP, + DRAG_DATA_RECEIVED, + LAST_SIGNAL }; @@ -62,6 +73,47 @@ static gint et_signals [LAST_SIGNAL] = { 0, }; static void e_table_fill_table (ETable *e_table, ETableModel *model); static gboolean changed_idle (gpointer data); +static void et_drag_begin (GtkWidget *widget, + GdkDragContext *context, + ETable *et); +static void et_drag_end (GtkWidget *widget, + GdkDragContext *context, + ETable *et); +static void et_drag_data_get(GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et); +static void et_drag_data_delete(GtkWidget *widget, + GdkDragContext *context, + ETable *et); + +static void et_drag_leave(GtkWidget *widget, + GdkDragContext *context, + guint time, + ETable *et); +static gboolean et_drag_motion(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et); +static gboolean et_drag_drop(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et); +static void et_drag_data_received(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et); + static void et_destroy (GtkObject *object) { @@ -124,6 +176,13 @@ e_table_init (GtkObject *object) e_table->rebuild_idle_id = 0; e_table->click_to_add_message = NULL; + + e_table->drag_get_data_row = -1; + e_table->drag_get_data_col = -1; + e_table->drag_row = -1; + e_table->drag_col = -1; + e_table->drop_row = -1; + e_table->drop_col = -1; } static void @@ -356,6 +415,31 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h gtk_signal_connect ( GTK_OBJECT (e_table->table_canvas), "size_allocate", GTK_SIGNAL_FUNC (table_canvas_size_allocate), e_table); + + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_begin", + GTK_SIGNAL_FUNC (et_drag_begin), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_end", + GTK_SIGNAL_FUNC (et_drag_end), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_data_get", + GTK_SIGNAL_FUNC (et_drag_data_get), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_data_delete", + GTK_SIGNAL_FUNC (et_drag_data_delete), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_motion", + GTK_SIGNAL_FUNC (et_drag_motion), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_leave", + GTK_SIGNAL_FUNC (et_drag_leave), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_drop", + GTK_SIGNAL_FUNC (et_drag_drop), e_table); + gtk_signal_connect ( + GTK_OBJECT (e_table->table_canvas), "drag_data_received", + GTK_SIGNAL_FUNC (et_drag_data_received), e_table); gtk_signal_connect (GTK_OBJECT(e_table->table_canvas), "reflow", GTK_SIGNAL_FUNC (table_canvas_reflow), e_table); @@ -836,6 +920,314 @@ set_scroll_adjustments (ETable *table, hadjustment); } +/* Drag & drop stuff. */ +/* Target */ +void e_table_drag_get_data (ETable *table, + int row, + int col, + GdkDragContext *context, + GdkAtom target, + guint32 time) +{ + table->drag_get_data_row = row; + table->drag_get_data_col = col; + gtk_drag_get_data(GTK_WIDGET(table), + context, + target, + time); + +} + +void e_table_drag_highlight (ETable *table, + int row, + int col) /* col == -1 to highlight entire row. */ +{ +} + +void e_table_drag_unhighlight (ETable *table) +{ +} + +void e_table_drag_dest_set (ETable *table, + GtkDestDefaults flags, + const GtkTargetEntry *targets, + gint n_targets, + GdkDragAction actions) +{ + gtk_drag_dest_set(GTK_WIDGET(table), + flags, + targets, + n_targets, + actions); +} + +void e_table_drag_dest_set_proxy (ETable *table, + GdkWindow *proxy_window, + GdkDragProtocol protocol, + gboolean use_coordinates) +{ + gtk_drag_dest_set_proxy(GTK_WIDGET(table), + proxy_window, + protocol, + use_coordinates); +} + +/* There probably should be functions for setting the targets + * as a GtkTargetList + */ + +void e_table_drag_dest_unset (GtkWidget *widget) +{ + gtk_drag_dest_unset(widget); +} + +/* Source side */ + +void e_table_drag_source_set (ETable *table, + GdkModifierType start_button_mask, + const GtkTargetEntry *targets, + gint n_targets, + GdkDragAction actions) +{ + gtk_drag_source_set(GTK_WIDGET(table), + start_button_mask, + targets, + n_targets, + actions); +} + +void e_table_drag_source_unset (ETable *table) +{ + gtk_drag_source_unset(GTK_WIDGET(table)); +} + +/* There probably should be functions for setting the targets + * as a GtkTargetList + */ + +GdkDragContext * +e_table_drag_begin (ETable *table, + int row, + int col, + GtkTargetList *targets, + GdkDragAction actions, + gint button, + GdkEvent *event) +{ + table->drag_row = row; + table->drag_col = col; + + return gtk_drag_begin(GTK_WIDGET(table), + targets, + actions, + button, + event); +} + +static void +e_table_compute_location(ETable *table, + GtkWidget *widget, + int x, + int y, + int *row, + int *col) +{ + if (!(row || col)) + return; + if (row) + *row = 0; + if (col) + *col = 0; +} + +static void +et_drag_begin (GtkWidget *widget, + GdkDragContext *context, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_BEGIN], + et->drag_row, + et->drag_col, + context); +} + +static void +et_drag_end (GtkWidget *widget, + GdkDragContext *context, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_END], + et->drag_row, + et->drag_col, + context); +} + +static void +et_drag_data_get(GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_DATA_GET], + et->drag_row, + et->drag_col, + context, + selection_data, + info, + time); +} + +static void +et_drag_data_delete(GtkWidget *widget, + GdkDragContext *context, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_DATA_DELETE], + et->drag_row, + et->drag_col, + context); +} + +static void +et_drag_leave(GtkWidget *widget, + GdkDragContext *context, + guint time, + ETable *et) +{ + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_LEAVE], + et->drop_row, + et->drop_col, + context, + time); + et->drop_row = -1; + et->drop_col = -1; +} + +static gboolean +et_drag_motion(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et) +{ + gboolean ret_val; + int row, col; + e_table_compute_location(et, + widget, + x, + y, + &row, + &col); + if (et->drop_row >= 0 && et->drop_col >= 0 && + row != et->drop_row && col != et->drop_row) { + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_LEAVE], + et->drop_row, + et->drop_col, + context, + time); + } + et->drop_row = row; + et->drop_col = col; + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_MOTION], + et->drop_row, + et->drop_col, + context, + x, + y, + time, + &ret_val); + return ret_val; +} + +static gboolean +et_drag_drop(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + ETable *et) +{ + gboolean ret_val; + int row, col; + e_table_compute_location(et, + widget, + x, + y, + &row, + &col); + if (et->drop_row >= 0 && et->drop_col >= 0 && + row != et->drop_row && col != et->drop_row) { + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_LEAVE], + et->drop_row, + et->drop_col, + context, + time); + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_MOTION], + row, + col, + context, + x, + y, + time, + &ret_val); + } + et->drop_row = row; + et->drop_col = col; + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_DROP], + et->drop_row, + et->drop_col, + context, + x, + y, + time, + &ret_val); + et->drop_row = -1; + et->drop_col = -1; + return ret_val; +} + +static void +et_drag_data_received(GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time, + ETable *et) +{ + int row, col; + e_table_compute_location(et, + widget, + x, + y, + &row, + &col); + gtk_signal_emit (GTK_OBJECT (et), + et_signals [DRAG_MOTION], + row, + col, + context, + x, + y, + selection_data, + info, + time); +} + static void e_table_class_init (GtkObjectClass *object_class) { @@ -844,15 +1236,25 @@ e_table_class_init (GtkObjectClass *object_class) e_table_parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = et_destroy; - object_class->set_arg = et_set_arg; - object_class->get_arg = et_get_arg; - - klass->row_selection = NULL; - klass->cursor_change = NULL; - klass->double_click = NULL; - klass->right_click = NULL; - klass->key_press = NULL; + object_class->destroy = et_destroy; + object_class->set_arg = et_set_arg; + object_class->get_arg = et_get_arg; + + klass->row_selection = NULL; + klass->cursor_change = NULL; + klass->double_click = NULL; + klass->right_click = NULL; + klass->key_press = NULL; + + klass->drag_begin = NULL; + klass->drag_end = NULL; + klass->drag_data_get = NULL; + klass->drag_data_delete = NULL; + + klass->drag_leave = NULL; + klass->drag_motion = NULL; + klass->drag_drop = NULL; + klass->drag_data_received = NULL; et_signals [ROW_SELECTION] = gtk_signal_new ("row_selection", @@ -894,6 +1296,103 @@ e_table_class_init (GtkObjectClass *object_class) e_marshal_INT__INT_INT_POINTER, GTK_TYPE_INT, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_POINTER); + et_signals[DRAG_BEGIN] = + gtk_signal_new ("drag_begin", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_begin), + gtk_marshal_NONE__INT_INT_POINTER, + GTK_TYPE_NONE, 3, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT); + et_signals[DRAG_END] = + gtk_signal_new ("drag_end", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_end), + gtk_marshal_NONE__INT_INT_POINTER, + GTK_TYPE_NONE, 3, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT); + et_signals[DRAG_DATA_GET] = + gtk_signal_new ("drag_data_get", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_data_get), + e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT, + GTK_TYPE_NONE, 6, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_SELECTION_DATA, + GTK_TYPE_UINT, + GTK_TYPE_UINT); + et_signals[DRAG_DATA_DELETE] = + gtk_signal_new ("drag_data_delete", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_data_delete), + gtk_marshal_NONE__INT_INT_POINTER, + GTK_TYPE_NONE, 3, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT); + + et_signals[DRAG_LEAVE] = + gtk_signal_new ("drag_leave", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_leave), + e_marshal_NONE__INT_INT_POINTER_UINT, + GTK_TYPE_NONE, 4, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_UINT); + et_signals[DRAG_MOTION] = + gtk_signal_new ("drag_motion", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_motion), + e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT, + GTK_TYPE_BOOL, 6, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_UINT); + et_signals[DRAG_DROP] = + gtk_signal_new ("drag_drop", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_drop), + e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT, + GTK_TYPE_BOOL, 6, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_UINT); + et_signals[DRAG_DATA_RECEIVED] = + gtk_signal_new ("drag_data_received", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (ETableClass, drag_data_received), + e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT, + GTK_TYPE_NONE, 8, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_GDK_DRAG_CONTEXT, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_SELECTION_DATA, + GTK_TYPE_UINT, + GTK_TYPE_UINT); + gtk_object_class_add_signals (object_class, et_signals, LAST_SIGNAL); klass->set_scroll_adjustments = set_scroll_adjustments; diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 34eb5e921a..85d0e387bd 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -63,6 +63,15 @@ typedef struct { gboolean use_click_to_add; ETableCursorMode cursor_mode; + + int drag_get_data_row; + int drag_get_data_col; + + int drag_row; + int drag_col; + + int drop_row; + int drop_col; } ETable; typedef struct { |