From d09d8de870b6697c8a8b262e7e077b871a69b315 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 10 Dec 2012 08:09:59 -0500 Subject: Consolidate base utility libraries into libeutil. Evolution consists of entirely too many small utility libraries, which increases linking and loading time, places a burden on higher layers of the application (e.g. modules) which has to remember to link to all the small in-tree utility libraries, and makes it difficult to generate API documentation for these utility libraries in one Gtk-Doc module. Merge the following utility libraries under the umbrella of libeutil, and enforce a single-include policy on libeutil so we can reorganize the files as desired without disrupting its pseudo-public API. libemail-utils/libemail-utils.la libevolution-utils/libevolution-utils.la filter/libfilter.la widgets/e-timezone-dialog/libetimezonedialog.la widgets/menus/libmenus.la widgets/misc/libemiscwidgets.la widgets/table/libetable.la widgets/text/libetext.la This also merges libedataserverui from the Evolution-Data-Server module, since Evolution is its only consumer nowadays, and I'd like to make some improvements to those APIs without concern for backward-compatibility. And finally, start a Gtk-Doc module for libeutil. It's going to be a project just getting all the symbols _listed_ much less _documented_. But the skeletal structure is in place and I'm off to a good start. --- e-util/e-table-sorted-variable.c | 235 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 e-util/e-table-sorted-variable.c (limited to 'e-util/e-table-sorted-variable.c') diff --git a/e-util/e-table-sorted-variable.c b/e-util/e-table-sorted-variable.c new file mode 100644 index 0000000000..17c10d5328 --- /dev/null +++ b/e-util/e-table-sorted-variable.c @@ -0,0 +1,235 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "e-table-sorted-variable.h" +#include "e-table-sorting-utils.h" + +#define d(x) + +#define INCREMENT_AMOUNT 100 + +/* maximum insertions between an idle event that we will do without scheduling an idle sort */ +#define ETSV_INSERT_MAX (4) + +/* workaround for avoiding API breakage */ +#define etsv_get_type e_table_sorted_variable_get_type +G_DEFINE_TYPE (ETableSortedVariable, etsv, E_TYPE_TABLE_SUBSET_VARIABLE) + +static void etsv_sort_info_changed (ETableSortInfo *info, ETableSortedVariable *etsv); +static void etsv_sort (ETableSortedVariable *etsv); +static void etsv_add (ETableSubsetVariable *etssv, gint row); +static void etsv_add_all (ETableSubsetVariable *etssv); + +static void +etsv_dispose (GObject *object) +{ + ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (object); + + if (etsv->sort_info_changed_id) + g_signal_handler_disconnect ( + etsv->sort_info, + etsv->sort_info_changed_id); + etsv->sort_info_changed_id = 0; + + if (etsv->sort_idle_id) { + g_source_remove (etsv->sort_idle_id); + etsv->sort_idle_id = 0; + } + if (etsv->insert_idle_id) { + g_source_remove (etsv->insert_idle_id); + etsv->insert_idle_id = 0; + } + + if (etsv->sort_info) + g_object_unref (etsv->sort_info); + etsv->sort_info = NULL; + + if (etsv->full_header) + g_object_unref (etsv->full_header); + etsv->full_header = NULL; + + G_OBJECT_CLASS (etsv_parent_class)->dispose (object); +} + +static void +etsv_class_init (ETableSortedVariableClass *class) +{ + ETableSubsetVariableClass *etssv_class = E_TABLE_SUBSET_VARIABLE_CLASS (class); + GObjectClass *object_class = G_OBJECT_CLASS (class); + + object_class->dispose = etsv_dispose; + + etssv_class->add = etsv_add; + etssv_class->add_all = etsv_add_all; +} + +static void +etsv_init (ETableSortedVariable *etsv) +{ + etsv->full_header = NULL; + etsv->sort_info = NULL; + + etsv->sort_info_changed_id = 0; + + etsv->sort_idle_id = 0; + etsv->insert_count = 0; +} + +static gboolean +etsv_sort_idle (ETableSortedVariable *etsv) +{ + g_object_ref (etsv); + etsv_sort (etsv); + etsv->sort_idle_id = 0; + etsv->insert_count = 0; + g_object_unref (etsv); + return FALSE; +} + +static gboolean +etsv_insert_idle (ETableSortedVariable *etsv) +{ + etsv->insert_count = 0; + etsv->insert_idle_id = 0; + return FALSE; +} + +static void +etsv_add (ETableSubsetVariable *etssv, + gint row) +{ + ETableModel *etm = E_TABLE_MODEL (etssv); + ETableSubset *etss = E_TABLE_SUBSET (etssv); + ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv); + gint i; + + e_table_model_pre_change (etm); + + if (etss->n_map + 1 > etssv->n_vals_allocated) { + etssv->n_vals_allocated += INCREMENT_AMOUNT; + etss->map_table = g_realloc (etss->map_table, (etssv->n_vals_allocated) * sizeof (gint)); + } + i = etss->n_map; + if (etsv->sort_idle_id == 0) { + /* this is to see if we're inserting a lot of things between idle loops. + * If we are, we're busy, its faster to just append and perform a full sort later */ + etsv->insert_count++; + if (etsv->insert_count > ETSV_INSERT_MAX) { + /* schedule a sort, and append instead */ + etsv->sort_idle_id = g_idle_add_full (50, (GSourceFunc) etsv_sort_idle, etsv, NULL); + } else { + /* make sure we have an idle handler to reset the count every now and then */ + if (etsv->insert_idle_id == 0) { + etsv->insert_idle_id = g_idle_add_full (40, (GSourceFunc) etsv_insert_idle, etsv, NULL); + } + i = e_table_sorting_utils_insert (etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map, row); + memmove (etss->map_table + i + 1, etss->map_table + i, (etss->n_map - i) * sizeof (gint)); + } + } + etss->map_table[i] = row; + etss->n_map++; + + e_table_model_row_inserted (etm, i); +} + +static void +etsv_add_all (ETableSubsetVariable *etssv) +{ + ETableModel *etm = E_TABLE_MODEL (etssv); + ETableSubset *etss = E_TABLE_SUBSET (etssv); + ETableSortedVariable *etsv = E_TABLE_SORTED_VARIABLE (etssv); + gint rows; + gint i; + + e_table_model_pre_change (etm); + + rows = e_table_model_row_count (etss->source); + + if (etss->n_map + rows > etssv->n_vals_allocated) { + etssv->n_vals_allocated += MAX (INCREMENT_AMOUNT, rows); + etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof (gint)); + } + for (i = 0; i < rows; i++) + etss->map_table[etss->n_map++] = i; + + if (etsv->sort_idle_id == 0) { + etsv->sort_idle_id = g_idle_add_full (50, (GSourceFunc) etsv_sort_idle, etsv, NULL); + } + + e_table_model_changed (etm); +} + +ETableModel * +e_table_sorted_variable_new (ETableModel *source, + ETableHeader *full_header, + ETableSortInfo *sort_info) +{ + ETableSortedVariable *etsv = g_object_new (E_TYPE_TABLE_SORTED_VARIABLE, NULL); + ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv); + + if (e_table_subset_variable_construct (etssv, source) == NULL) { + g_object_unref (etsv); + return NULL; + } + + etsv->sort_info = sort_info; + g_object_ref (etsv->sort_info); + etsv->full_header = full_header; + g_object_ref (etsv->full_header); + + etsv->sort_info_changed_id = g_signal_connect ( + sort_info, "sort_info_changed", + G_CALLBACK (etsv_sort_info_changed), etsv); + + return E_TABLE_MODEL (etsv); +} + +static void +etsv_sort_info_changed (ETableSortInfo *info, + ETableSortedVariable *etsv) +{ + etsv_sort (etsv); +} + +static void +etsv_sort (ETableSortedVariable *etsv) +{ + ETableSubset *etss = E_TABLE_SUBSET (etsv); + static gint reentering = 0; + if (reentering) + return; + reentering = 1; + + e_table_model_pre_change (E_TABLE_MODEL (etsv)); + + e_table_sorting_utils_sort (etss->source, etsv->sort_info, etsv->full_header, etss->map_table, etss->n_map); + + e_table_model_changed (E_TABLE_MODEL (etsv)); + reentering = 0; +} -- cgit v1.2.3