diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 13 | ||||
| -rw-r--r-- | gtk/gtkliststore.c | 64 | ||||
| -rw-r--r-- | gtk/gtktreedatalist.c | 2 | ||||
| -rw-r--r-- | gtk/gtktreedatalist.h | 14 | ||||
| -rw-r--r-- | gtk/gtktreestore.c | 291 | ||||
| -rw-r--r-- | gtk/gtktreestore.h | 5 |
12 files changed, 410 insertions, 57 deletions
@@ -1,3 +1,8 @@ +Sun Apr 1 00:52:06 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktreestore.c: Initial work on implementing the + GtkTreeSortable interface. Basicaly a big cut'n'paste job. + Sun Apr 1 03:28:14 2001 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c: fixed a bunch of notifications, added @@ -132,7 +137,7 @@ Wed Mar 28 20:30:26 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_render_icon): remove bogus g_return_if_fail -Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@webwynk.net> +Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive reordering/sorting work. Now pretty much works. @@ -253,7 +258,7 @@ Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT signal return a boolean. -Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to reordered signal. @@ -557,7 +562,7 @@ Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org> * gtk/gtkimagemenuitem.[c]: Add gtk_image_menu_item_new_from_stock() -Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Fix buglet in meeting. @@ -1649,7 +1654,7 @@ Tue Feb 27 13:37:38 GMT 2001 Tony Gale <gale@gtk.org> for everthing built here, but for gtk-x.x.dll only. This solves problem of indifferent gtk type definitions -Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@webwynk.net> +Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkclipboard.h: actually put /* */ around #endif comment. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5b845ec060..18999dc5b0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Apr 1 00:52:06 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktreestore.c: Initial work on implementing the + GtkTreeSortable interface. Basicaly a big cut'n'paste job. + Sun Apr 1 03:28:14 2001 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c: fixed a bunch of notifications, added @@ -132,7 +137,7 @@ Wed Mar 28 20:30:26 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_render_icon): remove bogus g_return_if_fail -Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@webwynk.net> +Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive reordering/sorting work. Now pretty much works. @@ -253,7 +258,7 @@ Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT signal return a boolean. -Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to reordered signal. @@ -557,7 +562,7 @@ Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org> * gtk/gtkimagemenuitem.[c]: Add gtk_image_menu_item_new_from_stock() -Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Fix buglet in meeting. @@ -1649,7 +1654,7 @@ Tue Feb 27 13:37:38 GMT 2001 Tony Gale <gale@gtk.org> for everthing built here, but for gtk-x.x.dll only. This solves problem of indifferent gtk type definitions -Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@webwynk.net> +Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkclipboard.h: actually put /* */ around #endif comment. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5b845ec060..18999dc5b0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Apr 1 00:52:06 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktreestore.c: Initial work on implementing the + GtkTreeSortable interface. Basicaly a big cut'n'paste job. + Sun Apr 1 03:28:14 2001 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c: fixed a bunch of notifications, added @@ -132,7 +137,7 @@ Wed Mar 28 20:30:26 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_render_icon): remove bogus g_return_if_fail -Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@webwynk.net> +Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive reordering/sorting work. Now pretty much works. @@ -253,7 +258,7 @@ Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT signal return a boolean. -Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to reordered signal. @@ -557,7 +562,7 @@ Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org> * gtk/gtkimagemenuitem.[c]: Add gtk_image_menu_item_new_from_stock() -Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Fix buglet in meeting. @@ -1649,7 +1654,7 @@ Tue Feb 27 13:37:38 GMT 2001 Tony Gale <gale@gtk.org> for everthing built here, but for gtk-x.x.dll only. This solves problem of indifferent gtk type definitions -Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@webwynk.net> +Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkclipboard.h: actually put /* */ around #endif comment. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5b845ec060..18999dc5b0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Apr 1 00:52:06 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktreestore.c: Initial work on implementing the + GtkTreeSortable interface. Basicaly a big cut'n'paste job. + Sun Apr 1 03:28:14 2001 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c: fixed a bunch of notifications, added @@ -132,7 +137,7 @@ Wed Mar 28 20:30:26 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_render_icon): remove bogus g_return_if_fail -Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@webwynk.net> +Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive reordering/sorting work. Now pretty much works. @@ -253,7 +258,7 @@ Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT signal return a boolean. -Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to reordered signal. @@ -557,7 +562,7 @@ Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org> * gtk/gtkimagemenuitem.[c]: Add gtk_image_menu_item_new_from_stock() -Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Fix buglet in meeting. @@ -1649,7 +1654,7 @@ Tue Feb 27 13:37:38 GMT 2001 Tony Gale <gale@gtk.org> for everthing built here, but for gtk-x.x.dll only. This solves problem of indifferent gtk type definitions -Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@webwynk.net> +Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkclipboard.h: actually put /* */ around #endif comment. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5b845ec060..18999dc5b0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Apr 1 00:52:06 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktreestore.c: Initial work on implementing the + GtkTreeSortable interface. Basicaly a big cut'n'paste job. + Sun Apr 1 03:28:14 2001 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c: fixed a bunch of notifications, added @@ -132,7 +137,7 @@ Wed Mar 28 20:30:26 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_render_icon): remove bogus g_return_if_fail -Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@webwynk.net> +Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive reordering/sorting work. Now pretty much works. @@ -253,7 +258,7 @@ Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT signal return a boolean. -Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to reordered signal. @@ -557,7 +562,7 @@ Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org> * gtk/gtkimagemenuitem.[c]: Add gtk_image_menu_item_new_from_stock() -Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Fix buglet in meeting. @@ -1649,7 +1654,7 @@ Tue Feb 27 13:37:38 GMT 2001 Tony Gale <gale@gtk.org> for everthing built here, but for gtk-x.x.dll only. This solves problem of indifferent gtk type definitions -Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@webwynk.net> +Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkclipboard.h: actually put /* */ around #endif comment. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5b845ec060..18999dc5b0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Apr 1 00:52:06 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktreestore.c: Initial work on implementing the + GtkTreeSortable interface. Basicaly a big cut'n'paste job. + Sun Apr 1 03:28:14 2001 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c: fixed a bunch of notifications, added @@ -132,7 +137,7 @@ Wed Mar 28 20:30:26 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_render_icon): remove bogus g_return_if_fail -Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@webwynk.net> +Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive reordering/sorting work. Now pretty much works. @@ -253,7 +258,7 @@ Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT signal return a boolean. -Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to reordered signal. @@ -557,7 +562,7 @@ Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org> * gtk/gtkimagemenuitem.[c]: Add gtk_image_menu_item_new_from_stock() -Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Fix buglet in meeting. @@ -1649,7 +1654,7 @@ Tue Feb 27 13:37:38 GMT 2001 Tony Gale <gale@gtk.org> for everthing built here, but for gtk-x.x.dll only. This solves problem of indifferent gtk type definitions -Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@webwynk.net> +Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkclipboard.h: actually put /* */ around #endif comment. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5b845ec060..18999dc5b0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Apr 1 00:52:06 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktreestore.c: Initial work on implementing the + GtkTreeSortable interface. Basicaly a big cut'n'paste job. + Sun Apr 1 03:28:14 2001 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c: fixed a bunch of notifications, added @@ -132,7 +137,7 @@ Wed Mar 28 20:30:26 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkwidget.c (gtk_widget_render_icon): remove bogus g_return_if_fail -Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@webwynk.net> +Thu Mar 29 16:29:12 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive reordering/sorting work. Now pretty much works. @@ -253,7 +258,7 @@ Tue Mar 27 22:36:07 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT signal return a boolean. -Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 27 22:07:44 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to reordered signal. @@ -557,7 +562,7 @@ Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org> * gtk/gtkimagemenuitem.[c]: Add gtk_image_menu_item_new_from_stock() -Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@webwynk.net> +Tue Mar 20 15:00:43 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render): Fix buglet in meeting. @@ -1649,7 +1654,7 @@ Tue Feb 27 13:37:38 GMT 2001 Tony Gale <gale@gtk.org> for everthing built here, but for gtk-x.x.dll only. This solves problem of indifferent gtk type definitions -Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@webwynk.net> +Sat Feb 24 20:11:39 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtkclipboard.h: actually put /* */ around #endif comment. diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 910ac9499c..6a876067ff 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -83,7 +83,8 @@ static gboolean gtk_list_store_row_drop_possible (GtkTreeDragDest *drag_dest, /* sortable */ static void gtk_list_store_sort (GtkListStore *list_store); static void gtk_list_store_sort_iter_changed (GtkListStore *list_store, - GtkTreeIter *iter); + GtkTreeIter *iter, + gint column); static gboolean gtk_list_store_get_sort_column_id (GtkTreeSortable *sortable, gint *sort_column_id, GtkTreeSortOrder *order); @@ -674,7 +675,7 @@ gtk_list_store_set_value (GtkListStore *list_store, g_value_unset (&real_value); if (GTK_LIST_STORE_IS_SORTED (list_store)) - gtk_list_store_sort_iter_changed (list_store, iter); + gtk_list_store_sort_iter_changed (list_store, iter, column); } /** @@ -1460,17 +1461,22 @@ gtk_list_store_sort (GtkListStore *list_store) static void gtk_list_store_sort_iter_changed (GtkListStore *list_store, - GtkTreeIter *iter) + GtkTreeIter *iter, + gint column) { GtkTreeDataSortHeader *header; GSList *prev = NULL; GSList *next = NULL; GSList *list = G_SLIST (list_store->root); - + GtkTreePath *tmp_path; GtkTreeIter tmp_iter; gint cmp_a = 0; gint cmp_b = 0; + gint i; + gint old_location; + gint new_location; + gint *new_order; if (list_store->length < 2) return; @@ -1480,7 +1486,13 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, list_store->sort_column_id); g_return_if_fail (header != NULL); g_return_if_fail (header->func != NULL); - + + /* If it's the built in function, we don't sort. */ + if (header->func == gtk_tree_data_list_compare_func && + list_store->sort_column_id != column) + return; + + old_location = 0; /* First we find the iter, its prev, and its next */ while (list) { @@ -1488,6 +1500,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, break; prev = list; list = list->next; + old_location++; } g_assert (list != NULL); @@ -1522,7 +1535,6 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, cmp_b = 1; else if (cmp_b > 0) cmp_b = -1; - } if (prev == NULL && cmp_b <= 0) @@ -1547,7 +1559,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, /* FIXME: as an optimization, we can potentially start at next */ prev = NULL; list = G_SLIST (list_store->root); - + new_location = 0; tmp_iter.user_data = list; if (list_store->order == GTK_TREE_SORT_DESCENDING) cmp_a = (* header->func) (GTK_TREE_MODEL (list_store), @@ -1560,6 +1572,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, { prev = list; list = list->next; + new_location++; tmp_iter.user_data = list; if (list_store->order == GTK_TREE_SORT_DESCENDING) cmp_a = (* header->func) (GTK_TREE_MODEL (list_store), @@ -1584,6 +1597,43 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, G_SLIST (iter->user_data)->next = G_SLIST (list_store->root); list_store->root = G_SLIST (iter->user_data); } + + /* Emit the reordered signal. */ + new_order = g_new (int, list_store->length); + if (old_location < new_location) + for (i = 0; i < list_store->length; i++) + { + if (i < old_location || + i > new_location) + new_order[i] = i; + else if (i >= old_location && + i < new_location) + new_order[i] = i + 1; + else if (i == new_location) + new_order[i] = old_location; + } + else + for (i = 0; i < list_store->length; i++) + { + if (i < new_location || + i > old_location) + new_order[i] = i; + else if (i > new_location && + i <= old_location) + new_order[i] = i - 1; + else if (i == new_location) + new_order[i] = old_location; + } + + tmp_path = gtk_tree_path_new (); + tmp_iter.user_data = NULL; + + gtk_tree_model_reordered (GTK_TREE_MODEL (list_store), + tmp_path, &tmp_iter, + new_order); + + gtk_tree_path_free (tmp_path); + g_free (new_order); } static gboolean diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c index 81596e6ede..b4f400fb42 100644 --- a/gtk/gtktreedatalist.c +++ b/gtk/gtktreedatalist.c @@ -253,7 +253,7 @@ _gtk_tree_data_list_node_copy (GtkTreeDataList *list, return new_list; } -static gint +gint gtk_tree_data_list_compare_func (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h index 7d725d8d3e..16997d4856 100644 --- a/gtk/gtktreedatalist.h +++ b/gtk/gtktreedatalist.h @@ -63,11 +63,15 @@ GtkTreeDataList *_gtk_tree_data_list_node_copy (GtkTreeDataList *list, GType type); /* Header code */ -GList * _gtk_tree_data_list_header_new (gint n_columns, - GType *types); -void _gtk_tree_data_list_header_free (GList *header_list); -GtkTreeDataSortHeader *_gtk_tree_data_list_get_header (GList *header_list, - gint sort_column_id); +gint gtk_tree_data_list_compare_func (GtkTreeModel *model, + GtkTreeIter *a, + GtkTreeIter *b, + gpointer user_data); +GList * _gtk_tree_data_list_header_new (gint n_columns, + GType *types); +void _gtk_tree_data_list_header_free (GList *header_list); +GtkTreeDataSortHeader *_gtk_tree_data_list_get_header (GList *header_list, + gint sort_column_id); #endif /* __GTK_TREE_DATA_LIST_H__ */ diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 7ae33b88ae..bf80bfe1e0 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -76,18 +76,21 @@ static gboolean gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest, /* Sortable Interfaces */ -static void gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable, - gint *sort_column_id, - GtkTreeSortOrder *order); -static void gtk_tree_store_set_sort_column_id (GtkTreeSortable *sortable, - gint sort_column_id, - GtkTreeSortOrder order); -static void gtk_tree_store_sort_column_id_set_func (GtkTreeSortable *sortable, - gint sort_column_id, - GtkTreeIterCompareFunc func, - gpointer data, - GtkDestroyNotify destroy); - +static void gtk_tree_store_sort (GtkTreeStore *tree_store); +static void gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gint column); +static gboolean gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable, + gint *sort_column_id, + GtkTreeSortOrder *order); +static void gtk_tree_store_set_sort_column_id (GtkTreeSortable *sortable, + gint sort_column_id, + GtkTreeSortOrder order); +static void gtk_tree_store_sort_column_id_set_func (GtkTreeSortable *sortable, + gint sort_column_id, + GtkTreeIterCompareFunc func, + gpointer data, + GtkDestroyNotify destroy); static void validate_gnode (GNode *node); @@ -213,9 +216,9 @@ gtk_tree_store_drag_dest_init (GtkTreeDragDestIface *iface) static void gtk_tree_store_sortable_init (GtkTreeSortableIface *iface) { - iface->get_sort_column_id = NULL; - iface->set_sort_column_id = NULL; - iface->sort_column_id_set_func = NULL; + iface->get_sort_column_id = gtk_tree_store_get_sort_column_id; + iface->set_sort_column_id = gtk_tree_store_set_sort_column_id; + iface->sort_column_id_set_func = gtk_tree_store_sort_column_id_set_func; } static void @@ -686,6 +689,9 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store, gtk_tree_path_free (path); if (converted) g_value_unset (&real_value); + + if (GTK_TREE_STORE_IS_SORTED (tree_store)) + gtk_tree_store_sort_iter_changed (list_store, iter, column); } /** @@ -1323,10 +1329,213 @@ gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest, static void +gtk_tree_store_sort (GtkTreeStore *tree_store) +{ + +} + +static void +gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gint column) +{ + GtkTreeDataSortHeader *header; + GNode *prev = NULL; + GNode *next = NULL; + GNode *list; + GtkTreePath *tmp_path; + GtkTreeIter tmp_iter; + gint cmp_a = 0; + gint cmp_b = 0; + gint i; + gint old_location; + gint new_location; + gint *new_order; + + if (list_store->length < 2) + return; + + /* FIX*/ + if (G_NODE (iter->user_data)->parent) + node = G_NODE (iter->user_data)->parent->children; + else + node = G_NODE (tree_store->root); + + tmp_iter.stamp = list_store->stamp; + header = _gtk_tree_data_list_get_header (list_store->sort_list, + list_store->sort_column_id); + g_return_if_fail (header != NULL); + g_return_if_fail (header->func != NULL); + + /* If it's the built in function, we don't sort. */ + if (header->func == gtk_tree_data_list_compare_func && + list_store->sort_column_id != column) + return; + + old_location = 0; + /* First we find the iter, its prev, and its next */ + while (list) + { + if (list == G_SLIST (iter->user_data)) + break; + prev = list; + list = list->next; + old_location++; + } + g_assert (list != NULL); + + next = list->next; + + /* Check the common case, where we don't need to sort it moved. */ + if (prev != NULL) + { + tmp_iter.user_data = prev; + cmp_a = (* header->func) (GTK_TREE_MODEL (list_store), + &tmp_iter, iter, + header->data); + } + + if (next != NULL) + { + tmp_iter.user_data = next; + cmp_b = (* header->func) (GTK_TREE_MODEL (list_store), + iter, &tmp_iter, + header->data); + } + + + if (list_store->order == GTK_TREE_SORT_DESCENDING) + { + if (cmp_a < 0) + cmp_a = 1; + else if (cmp_a > 0) + cmp_a = -1; + + if (cmp_b < 0) + cmp_b = 1; + else if (cmp_b > 0) + cmp_b = -1; + } + + if (prev == NULL && cmp_b <= 0) + return; + else if (next == NULL && cmp_a <= 0) + return; + else if (prev != NULL && next != NULL && + cmp_a <= 0 && cmp_b <= 0) + return; + + /* We actually need to sort it */ + /* First, remove the old link. */ + + if (prev == NULL) + list_store->root = next; + else + prev->next = next; + if (next == NULL) + list_store->tail = prev; + list->next = NULL; + + /* FIXME: as an optimization, we can potentially start at next */ + prev = NULL; + list = G_SLIST (list_store->root); + new_location = 0; + tmp_iter.user_data = list; + if (list_store->order == GTK_TREE_SORT_DESCENDING) + cmp_a = (* header->func) (GTK_TREE_MODEL (list_store), + &tmp_iter, iter, header->data); + else + cmp_a = (* header->func) (GTK_TREE_MODEL (list_store), + iter, &tmp_iter, header->data); + + while ((list->next) && (cmp_a > 0)) + { + prev = list; + list = list->next; + new_location++; + tmp_iter.user_data = list; + if (list_store->order == GTK_TREE_SORT_DESCENDING) + cmp_a = (* header->func) (GTK_TREE_MODEL (list_store), + &tmp_iter, iter, header->data); + else + cmp_a = (* header->func) (GTK_TREE_MODEL (list_store), + iter, &tmp_iter, header->data); + } + + if ((!list->next) && (cmp_a > 0)) + { + list->next = G_SLIST (iter->user_data); + list_store->tail = list->next; + } + else if (prev) + { + prev->next = G_SLIST (iter->user_data); + G_SLIST (iter->user_data)->next = list; + } + else + { + G_SLIST (iter->user_data)->next = G_SLIST (list_store->root); + list_store->root = G_SLIST (iter->user_data); + } + + /* Emit the reordered signal. */ + new_order = g_new (int, list_store->length); + if (old_location < new_location) + for (i = 0; i < list_store->length; i++) + { + if (i < old_location || + i > new_location) + new_order[i] = i; + else if (i >= old_location && + i < new_location) + new_order[i] = i + 1; + else if (i == new_location) + new_order[i] = old_location; + } + else + for (i = 0; i < list_store->length; i++) + { + if (i < new_location || + i > old_location) + new_order[i] = i; + else if (i > new_location && + i <= old_location) + new_order[i] = i - 1; + else if (i == new_location) + new_order[i] = old_location; + } + + + tmp_path = gtk_tree_path_new (); + tmp_iter.user_data = NULL; + + gtk_tree_model_reordered (GTK_TREE_MODEL (list_store), + tmp_path, &tmp_iter, + new_order); + + gtk_tree_path_free (tmp_path); + g_free (new_order); +} + + +static gboolean gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable, gint *sort_column_id, GtkTreeSortOrder *order) { + GtkTreeStore *tree_store = (GtkTreeStore *) sortable; + + g_return_val_if_fail (sortable != NULL, FALSE); + g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE); + + if (tree_store->sort_column_id == -1) + return FALSE; + + if (sort_column_id) + * sort_column_id = tree_store->sort_column_id; + if (order) + * order = tree_store->order; + return TRUE; } @@ -1335,7 +1544,31 @@ gtk_tree_store_set_sort_column_id (GtkTreeSortable *sortable, gint sort_column_id, GtkTreeSortOrder order) { + GtkTreeStore *tree_store = (GtkTreeStore *) sortable; + GList *list; + + g_return_if_fail (sortable != NULL); + g_return_if_fail (GTK_IS_TREE_STORE (sortable)); + + for (list = tree_store->sort_list; list; list = list->next) + { + GtkTreeDataSortHeader *header = (GtkTreeDataSortHeader*) list->data; + if (header->sort_column_id == sort_column_id) + break; + } + g_return_if_fail (list != NULL); + + if ((tree_store->sort_column_id == sort_column_id) && + (tree_store->order == order)) + return; + + tree_store->sort_column_id = sort_column_id; + tree_store->order = order; + if (tree_store->sort_column_id >= 0) + gtk_tree_store_sort (tree_store); + + gtk_tree_sortable_sort_column_changed (sortable); } static void @@ -1345,6 +1578,34 @@ gtk_tree_store_sort_column_id_set_func (GtkTreeSortable *sortable, gpointer data, GtkDestroyNotify destroy) { + GtkTreeStore *tree_store = (GtkTreeStore *) sortable; + GtkTreeDataSortHeader *header = NULL; + GList *list; + + g_return_if_fail (sortable != NULL); + g_return_if_fail (GTK_IS_TREE_STORE (sortable)); + g_return_if_fail (func != NULL); + + for (list = tree_store->sort_list; list; list = list->next) + { + header = (GtkTreeDataSortHeader*) list->data; + if (header->sort_column_id == sort_column_id) + break; + } + + if (header == NULL) + { + header = g_new0 (GtkTreeDataSortHeader, 1); + header->sort_column_id = sort_column_id; + tree_store->sort_list = g_list_append (tree_store->sort_list, header); + } + + if (header->destroy) + (* header->destroy) (header->data); + + header->func = func; + header->data = data; + header->destroy = destroy; } diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index 9ae6940298..0240597019 100644 --- a/gtk/gtktreestore.h +++ b/gtk/gtktreestore.h @@ -21,6 +21,7 @@ #define __GTK_TREE_STORE_H__ #include <gtk/gtktreemodel.h> +#include <gtk/gtktreesortable.h> #include <stdarg.h> #ifdef __cplusplus @@ -40,11 +41,13 @@ struct _GtkTreeStore { GObject parent; - GList *sort_list; gint stamp; gpointer root; gpointer last; gint n_columns; + gint sort_column_id; + GList *sort_list; + GtkTreeSortOrder order; GType *column_headers; }; |