aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/table/e-table-click-to-add.c8
-rw-r--r--widgets/table/e-table-defines.h11
-rw-r--r--widgets/table/e-table-group-container.c6
-rw-r--r--widgets/table/e-table-group-container.h2
-rw-r--r--widgets/table/e-table-group-leaf.c2
-rw-r--r--widgets/table/e-table-group-leaf.h2
-rw-r--r--widgets/table/e-table-item.c48
-rw-r--r--widgets/table/e-table-item.h2
-rw-r--r--widgets/table/e-table-selection-model.c731
-rw-r--r--widgets/table/e-table-selection-model.h47
-rw-r--r--widgets/table/e-table-sorter.c117
-rw-r--r--widgets/table/e-table-sorter.h20
-rw-r--r--widgets/table/e-table-specification.c10
-rw-r--r--widgets/table/e-table-specification.h3
-rw-r--r--widgets/table/e-table.c32
-rw-r--r--widgets/table/e-table.h4
-rw-r--r--widgets/text/e-completion-view.c2
17 files changed, 154 insertions, 893 deletions
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 4e2d71f9d6..cdaa446f90 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -294,7 +294,7 @@ finish_editing (ETableClickToAdd *etcta)
etcta_add_one (etcta, one);
gtk_object_unref(GTK_OBJECT(one));
- e_table_selection_model_clear(etcta->selection);
+ e_selection_model_clear(E_SELECTION_MODEL(etcta->selection));
etcta->row = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
e_table_item_get_type(),
@@ -303,7 +303,7 @@ finish_editing (ETableClickToAdd *etcta)
"minimum_width", etcta->width,
"drawgrid", TRUE,
"table_selection_model", etcta->selection,
- "cursor_mode", E_TABLE_CURSOR_SPREADSHEET,
+ "cursor_mode", E_CURSOR_SPREADSHEET,
NULL);
gtk_signal_connect(GTK_OBJECT(etcta->row), "key_press",
@@ -339,7 +339,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e)
etcta_add_one (etcta, one);
gtk_object_unref(GTK_OBJECT(one));
- e_table_selection_model_clear(etcta->selection);
+ e_selection_model_clear(E_SELECTION_MODEL(etcta->selection));
etcta->row = gnome_canvas_item_new(GNOME_CANVAS_GROUP(item),
e_table_item_get_type(),
@@ -348,7 +348,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e)
"minimum_width", etcta->width,
"drawgrid", TRUE,
"table_selection_model", etcta->selection,
- "cursor_mode", E_TABLE_CURSOR_SPREADSHEET,
+ "cursor_mode", E_CURSOR_SPREADSHEET,
NULL);
gtk_signal_connect(GTK_OBJECT(etcta->row), "key_press",
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
index 6c01e17a69..23bca8bc64 100644
--- a/widgets/table/e-table-defines.h
+++ b/widgets/table/e-table-defines.h
@@ -14,17 +14,6 @@ extern "C" {
#define MIN_ARROW_SIZE 10
-typedef void (*ETableForeachFunc) (int model_row,
- gpointer closure);
-
-/* list selection modes */
-typedef enum
-{
- E_TABLE_CURSOR_LINE,
- E_TABLE_CURSOR_SIMPLE,
- E_TABLE_CURSOR_SPREADSHEET,
-} ETableCursorMode;
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 9f2efb290a..42d8fa0f49 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -533,11 +533,11 @@ static void
etgc_add_all (ETableGroup *etg)
{
ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
- ETableSorter *sorter = etgc->table_selection_model->sorter;
+ ESorter *sorter = E_SELECTION_MODEL(etgc->table_selection_model)->sorter;
int *array;
int count;
- e_table_sorter_get_sorted_to_model_array(sorter, &array, &count);
+ e_sorter_get_sorted_to_model_array(sorter, &array, &count);
etgc_add_array(etg, array, count);
}
@@ -917,7 +917,7 @@ etgc_init (GtkObject *object)
container->draw_grid = 1;
container->draw_focus = 1;
- container->cursor_mode = E_TABLE_CURSOR_SIMPLE;
+ container->cursor_mode = E_CURSOR_SIMPLE;
container->length_threshold = -1;
container->table_selection_model = NULL;
}
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index d273ac94b2..27ed807ffc 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -47,7 +47,7 @@ typedef struct {
guint draw_grid : 1;
guint draw_focus : 1;
- ETableCursorMode cursor_mode;
+ ECursorMode cursor_mode;
/*
* State: the ETableGroup is open or closed
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index ccc9f6dfc4..35e7ef4f45 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -452,7 +452,7 @@ etgl_init (GtkObject *object)
etgl->draw_grid = 1;
etgl->draw_focus = 1;
- etgl->cursor_mode = E_TABLE_CURSOR_SIMPLE;
+ etgl->cursor_mode = E_CURSOR_SIMPLE;
etgl->length_threshold = -1;
etgl->table_selection_model = NULL;
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 3ceedbe8a2..680ee37347 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -34,7 +34,7 @@ typedef struct {
guint draw_grid : 1;
guint draw_focus : 1;
- ETableCursorMode cursor_mode;
+ ECursorMode cursor_mode;
ETableSelectionModel *table_selection_model;
} ETableGroupLeaf;
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index b2e3d36372..3296287ce7 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1063,7 +1063,7 @@ eti_init (GnomeCanvasItem *item)
eti->source_model = NULL;
eti->row_guess = -1;
- eti->cursor_mode = E_TABLE_CURSOR_SIMPLE;
+ eti->cursor_mode = E_CURSOR_SIMPLE;
eti->selection_change_id = 0;
eti->cursor_change_id = 0;
@@ -1302,7 +1302,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width,
xd = x_offset;
/* printf ("paint: %d %d\n", yd, yd + height); */
- selected = e_table_selection_model_is_row_selected(eti->selection, view_to_model_row(eti,row));
+ selected = e_selection_model_is_row_selected(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti,row));
gtk_object_get(GTK_OBJECT(eti->selection),
"cursor_col", &cursor_col,
@@ -1315,12 +1315,12 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width,
gboolean col_selected = selected;
ECellFlags flags;
switch (eti->cursor_mode) {
- case E_TABLE_CURSOR_SIMPLE:
- case E_TABLE_CURSOR_SPREADSHEET:
+ case E_CURSOR_SIMPLE:
+ case E_CURSOR_SPREADSHEET:
if (cursor_col == ecol->col_idx && cursor_row == view_to_model_row(eti, row))
col_selected = !col_selected;
break;
- case E_TABLE_CURSOR_LINE:
+ case E_CURSOR_LINE:
/* Nothing */
break;
}
@@ -1367,7 +1367,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width,
if (!f_found) {
switch (eti->cursor_mode) {
- case E_TABLE_CURSOR_LINE:
+ case E_CURSOR_LINE:
if (view_to_model_row(eti, row) == cursor_row) {
f_x1 = floor (eti_base.x) - x;
f_x2 = floor (lower_right.x) - x;
@@ -1376,8 +1376,8 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width,
f_found = TRUE;
}
break;
- case E_TABLE_CURSOR_SIMPLE:
- case E_TABLE_CURSOR_SPREADSHEET:
+ case E_CURSOR_SIMPLE:
+ case E_CURSOR_SPREADSHEET:
if (view_to_model_col(eti, col) == cursor_col && view_to_model_row(eti, row) == cursor_row) {
f_x1 = xd;
f_x2 = xd + ecol->width;
@@ -1657,7 +1657,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
if (return_val)
return TRUE;
- e_table_selection_model_do_something(eti->selection, view_to_model_row(eti, row), view_to_model_col(eti, col), button.state);
+ e_selection_model_do_something(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti, row), view_to_model_col(eti, col), button.state);
gtk_object_get(GTK_OBJECT(eti->selection),
"cursor_row", &cursor_row,
@@ -1686,7 +1686,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
return TRUE;
- e_table_selection_model_maybe_do_something(eti->selection, view_to_model_row(eti, row), view_to_model_col(eti, col), 0);
+ e_selection_model_maybe_do_something(E_SELECTION_MODEL (eti->selection), view_to_model_row(eti, row), view_to_model_col(eti, col), 0);
gtk_signal_emit (GTK_OBJECT (eti), eti_signals [RIGHT_CLICK],
row, view_to_model_col(eti, col), e, &return_val);
@@ -1852,7 +1852,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
break;
}
- if (eti->cursor_mode != E_TABLE_CURSOR_LINE && cursor_col != view_to_model_col(eti, 0))
+ if (eti->cursor_mode != E_CURSOR_LINE && cursor_col != view_to_model_col(eti, 0))
eti_cursor_move_left (eti);
break;
@@ -1862,13 +1862,13 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
break;
}
- if (eti->cursor_mode != E_TABLE_CURSOR_LINE && cursor_col != view_to_model_col(eti, eti->cols - 1))
+ if (eti->cursor_mode != E_CURSOR_LINE && cursor_col != view_to_model_col(eti, eti->cols - 1))
eti_cursor_move_right (eti);
break;
case GDK_Up:
case GDK_Down:
- return_val = e_table_selection_model_key_press(eti->selection, (GdkEventKey *) e);
+ return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
break;
#if 0
case GDK_Up:
@@ -1887,24 +1887,24 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
#endif
case GDK_Home:
case GDK_KP_Home:
- if (eti->cursor_mode != E_TABLE_CURSOR_LINE) {
+ if (eti->cursor_mode != E_CURSOR_LINE) {
eti_cursor_move (eti, model_to_view_row(eti, cursor_row), 0);
return_val = TRUE;
} else
- return_val = e_table_selection_model_key_press(eti->selection, (GdkEventKey *) e);
+ return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
break;
case GDK_End:
case GDK_KP_End:
- if (eti->cursor_mode != E_TABLE_CURSOR_LINE) {
+ if (eti->cursor_mode != E_CURSOR_LINE) {
eti_cursor_move (eti, model_to_view_row(eti, cursor_row), eti->cols - 1);
return_val = TRUE;
} else
- return_val = e_table_selection_model_key_press(eti->selection, (GdkEventKey *) e);
+ return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
break;
case GDK_Tab:
case GDK_KP_Tab:
case GDK_ISO_Left_Tab:
- if (eti->cursor_mode == E_TABLE_CURSOR_SPREADSHEET) {
+ if (eti->cursor_mode == E_CURSOR_SPREADSHEET) {
if ((e->key.state & GDK_SHIFT_MASK) != 0){
/* shift tab */
if (cursor_col != view_to_model_col(eti, 0))
@@ -1953,7 +1953,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
if (!return_val)
- return_val = e_table_selection_model_key_press(eti->selection, (GdkEventKey *) e);
+ return_val = e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
break;
default:
@@ -1973,14 +1973,14 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
gtk_signal_emit (GTK_OBJECT (eti), eti_signals [KEY_PRESS],
model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
if (!return_val)
- e_table_selection_model_key_press(eti->selection, (GdkEventKey *) e);
+ e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
} else {
ecell_view = eti->cell_views [eti->editing_col];
return_val = eti_e_cell_event (eti, ecell_view, e, e->key.time,
view_to_model_col(eti, eti->editing_col),
eti->editing_col, eti->editing_row, E_CELL_EDITING);
if (!return_val)
- e_table_selection_model_key_press(eti->selection, (GdkEventKey *) e);
+ e_selection_model_key_press(E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
}
}
eti->in_key_press = FALSE;
@@ -2180,9 +2180,9 @@ e_table_item_focus (ETableItem *eti, int col, int row, GdkModifierType state)
}
if (row != -1) {
- e_table_selection_model_do_something(eti->selection,
- row, col,
- state);
+ e_selection_model_do_something(E_SELECTION_MODEL (eti->selection),
+ row, col,
+ state);
}
}
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 7d6c6919e6..3c29691c22 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -83,7 +83,7 @@ typedef struct {
int length_threshold;
gint row_guess;
- ETableCursorMode cursor_mode;
+ ECursorMode cursor_mode;
/*
* During editing
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 42734bd74e..a2a0f99aa9 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -15,112 +15,34 @@
#define ETSM_CLASS(e) ((ETableSelectionModelClass *)((GtkObject *)e)->klass)
-#define PARENT_TYPE gtk_object_get_type ()
+#define PARENT_TYPE e_selection_model_get_type ()
-#define ONES ((guint32) 0xffffffff)
+static ESelectionModel *parent_class;
-#define BOX(n) ((n) / 32)
-#define OFFSET(n) (31 - ((n) % 32))
-#define BITMASK(n) ((guint32)(((guint32) 0x1) << OFFSET((n))))
-#define BITMASK_LEFT(n) ((((n) % 32) == 0) ? 0 : (ONES << (32 - ((n) % 32))))
-#define BITMASK_RIGHT(n) ((guint32)(((guint32) ONES) >> ((n) % 32)))
-
-static GtkObjectClass *e_table_selection_model_parent_class;
-
-static void etsm_select_single_row (ETableSelectionModel *selection, int row);
-
-enum {
- CURSOR_CHANGED,
- CURSOR_ACTIVATED,
- SELECTION_CHANGED,
- LAST_SIGNAL
-};
-
-static guint e_table_selection_model_signals [LAST_SIGNAL] = { 0, };
+static gint etsm_get_row_count (ESelectionModel *esm);
enum {
ARG_0,
ARG_MODEL,
- ARG_SORTER,
- ARG_CURSOR_ROW,
- ARG_CURSOR_COL,
- ARG_SELECTION_MODE,
- ARG_CURSOR_MODE,
};
static void
model_changed(ETableModel *etm, ETableSelectionModel *etsm)
{
- e_table_selection_model_clear(etsm);
+ e_selection_model_clear(E_SELECTION_MODEL(etsm));
}
#if 1
static void
model_row_inserted(ETableModel *etm, int row, ETableSelectionModel *etsm)
{
- int box;
- int i;
- if(etsm->row_count >= 0) {
- /* Add another word if needed. */
- if ((etsm->row_count & 0x1f) == 0) {
- etsm->selection = g_renew(gint, etsm->selection, (etsm->row_count >> 5) + 1);
- etsm->selection[etsm->row_count >> 5] = 0;
- }
-
- /* The box is the word that our row is in. */
- box = BOX(row);
- /* Shift all words to the right of our box right one bit. */
- for (i = etsm->row_count >> 5; i > box; i--) {
- etsm->selection[i] = (etsm->selection[i] >> 1) | (etsm->selection[i - 1] << 31);
- }
-
- /* Shift right half of box one bit to the right. */
- etsm->selection[box] = (etsm->selection[box] & BITMASK_LEFT(row)) | ((etsm->selection[box] & BITMASK_RIGHT(row)) >> 1);
- etsm->row_count ++;
- }
- if (etsm->cursor_row >= row)
- etsm->cursor_row ++;
+ e_selection_model_insert_row(E_SELECTION_MODEL(etsm), row);
}
static void
model_row_deleted(ETableModel *etm, int row, ETableSelectionModel *etsm)
{
- int box;
- int i;
- int last;
- int selected = FALSE;
- if(etsm->row_count >= 0) {
- guint32 bitmask;
- box = row >> 5;
- last = etsm->row_count >> 5;
-
- /* Build bitmasks for the left and right half of the box */
- bitmask = BITMASK_RIGHT(row) >> 1;
- selected = e_table_selection_model_is_row_selected(etsm, row);
- /* Shift right half of box one bit to the left. */
- etsm->selection[box] = (etsm->selection[box] & BITMASK_LEFT(row))| ((etsm->selection[box] & bitmask) << 1);
-
- /* Shift all words to the right of our box left one bit. */
- if (box < last) {
- etsm->selection[box] &= etsm->selection[box + 1] >> 31;
-
- for (i = box + 1; i < last; i++) {
- etsm->selection[i] = (etsm->selection[i] << 1) | (etsm->selection[i + 1] >> 31);
- }
- /* this over-runs our memory! */
- /*etsm->selection[i] = etsm->selection[i] << 1; */
- }
- etsm->row_count --;
- /* Remove the last word if not needed. */
- if ((etsm->row_count & 0x1f) == 0) {
- etsm->selection = g_renew(gint, etsm->selection, etsm->row_count >> 5);
- }
- if (selected && etsm->mode == GTK_SELECTION_SINGLE) {
- etsm_select_single_row (etsm, row > 0 ? row - 1 : 0);
- }
- }
- if (etsm->cursor_row >= row && etsm->cursor_row > 0)
- etsm->cursor_row --;
+ e_selection_model_delete_row(E_SELECTION_MODEL(etsm), row);
}
#else
@@ -168,24 +90,6 @@ drop_model(ETableSelectionModel *etsm)
etsm->model = NULL;
}
-inline static void
-add_sorter(ETableSelectionModel *etsm, ETableSorter *sorter)
-{
- etsm->sorter = sorter;
- if (sorter) {
- gtk_object_ref(GTK_OBJECT(sorter));
- }
-}
-
-inline static void
-drop_sorter(ETableSelectionModel *etsm)
-{
- if (etsm->sorter) {
- gtk_object_unref(GTK_OBJECT(etsm->sorter));
- }
- etsm->sorter = NULL;
-}
-
static void
etsm_destroy (GtkObject *object)
{
@@ -194,9 +98,9 @@ etsm_destroy (GtkObject *object)
etsm = E_TABLE_SELECTION_MODEL (object);
drop_model(etsm);
- drop_sorter(etsm);
- g_free(etsm->selection);
+ if (GTK_OBJECT_CLASS(parent_class)->destroy)
+ GTK_OBJECT_CLASS(parent_class)->destroy (object);
}
static void
@@ -208,26 +112,6 @@ etsm_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
case ARG_MODEL:
GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etsm->model);
break;
-
- case ARG_SORTER:
- GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(etsm->sorter);
- break;
-
- case ARG_CURSOR_ROW:
- GTK_VALUE_INT(*arg) = etsm->cursor_row;
- break;
-
- case ARG_CURSOR_COL:
- GTK_VALUE_INT(*arg) = etsm->cursor_col;
- break;
-
- case ARG_SELECTION_MODE:
- GTK_VALUE_ENUM(*arg) = etsm->mode;
- break;
-
- case ARG_CURSOR_MODE:
- GTK_VALUE_ENUM(*arg) = etsm->cursor_mode;
- break;
}
}
@@ -241,101 +125,34 @@ etsm_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
drop_model(etsm);
add_model(etsm, GTK_VALUE_OBJECT (*arg) ? E_TABLE_MODEL(GTK_VALUE_OBJECT (*arg)) : NULL);
break;
-
- case ARG_SORTER:
- drop_sorter(etsm);
- add_sorter(etsm, GTK_VALUE_OBJECT (*arg) ? E_TABLE_SORTER(GTK_VALUE_OBJECT (*arg)) : NULL);
- break;
-
- case ARG_CURSOR_ROW:
- e_table_selection_model_do_something(etsm, GTK_VALUE_INT(*arg), etsm->cursor_col, 0);
- break;
-
- case ARG_CURSOR_COL:
- e_table_selection_model_do_something(etsm, etsm->cursor_row, GTK_VALUE_INT(*arg), 0);
- break;
-
- case ARG_SELECTION_MODE:
- etsm->mode = GTK_VALUE_ENUM(*arg);
- if (etsm->mode == GTK_SELECTION_SINGLE) {
- e_table_selection_model_do_something(etsm, etsm->cursor_row, etsm->cursor_col, 0);
- }
- break;
-
- case ARG_CURSOR_MODE:
- etsm->cursor_mode = GTK_VALUE_ENUM(*arg);
- break;
}
}
static void
e_table_selection_model_init (ETableSelectionModel *selection)
{
- selection->selection = NULL;
- selection->row_count = -1;
selection->model = NULL;
- selection->selection_start_row = 0;
- selection->cursor_row = -1;
- selection->cursor_col = -1;
- selection->mode = GTK_SELECTION_MULTIPLE;
- selection->cursor_mode = E_TABLE_CURSOR_SIMPLE;
}
static void
e_table_selection_model_class_init (ETableSelectionModelClass *klass)
{
GtkObjectClass *object_class;
+ ESelectionModelClass *esm_class;
- e_table_selection_model_parent_class = gtk_type_class (gtk_object_get_type ());
-
- object_class = GTK_OBJECT_CLASS(klass);
-
- object_class->destroy = etsm_destroy;
- object_class->get_arg = etsm_get_arg;
- object_class->set_arg = etsm_set_arg;
-
- e_table_selection_model_signals [CURSOR_CHANGED] =
- gtk_signal_new ("cursor_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (ETableSelectionModelClass, cursor_changed),
- gtk_marshal_NONE__INT_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ parent_class = gtk_type_class (PARENT_TYPE);
- e_table_selection_model_signals [CURSOR_ACTIVATED] =
- gtk_signal_new ("cursor_activated",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (ETableSelectionModelClass, cursor_activated),
- gtk_marshal_NONE__INT_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ object_class = GTK_OBJECT_CLASS(klass);
+ esm_class = E_SELECTION_MODEL_CLASS(klass);
- e_table_selection_model_signals [SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (ETableSelectionModelClass, selection_changed),
- gtk_marshal_NONE__NONE,
- GTK_TYPE_NONE, 0);
+ object_class->destroy = etsm_destroy;
+ object_class->get_arg = etsm_get_arg;
+ object_class->set_arg = etsm_set_arg;
- klass->cursor_changed = NULL;
- klass->cursor_activated = NULL;
- klass->selection_changed = NULL;
-
- gtk_object_class_add_signals (object_class, e_table_selection_model_signals, LAST_SIGNAL);
+ esm_class->get_row_count = etsm_get_row_count;
gtk_object_add_arg_type ("ETableSelectionModel::model", GTK_TYPE_OBJECT,
GTK_ARG_READWRITE, ARG_MODEL);
- gtk_object_add_arg_type ("ETableSelectionModel::sorter", GTK_TYPE_OBJECT,
- GTK_ARG_READWRITE, ARG_SORTER);
- gtk_object_add_arg_type ("ETableSelectionModel::cursor_row", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_CURSOR_ROW);
- gtk_object_add_arg_type ("ETableSelectionModel::cursor_col", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_CURSOR_COL);
- gtk_object_add_arg_type ("ETableSelectionModel::selection_mode", GTK_TYPE_ENUM,
- GTK_ARG_READWRITE, ARG_SELECTION_MODE);
- gtk_object_add_arg_type ("ETableSelectionModel::cursor_mode", GTK_TYPE_ENUM,
- GTK_ARG_READWRITE, ARG_CURSOR_MODE);
}
E_MAKE_TYPE(e_table_selection_model, "ETableSelectionModel", ETableSelectionModel,
@@ -354,520 +171,10 @@ e_table_selection_model_new (void)
return gtk_type_new (e_table_selection_model_get_type ());
}
-/**
- * e_table_selection_model_is_row_selected
- * @selection: #ETableSelectionModel to check
- * @n: The row to check
- *
- * This routine calculates whether the given row is selected.
- *
- * Returns: %TRUE if the given row is selected
- */
-gboolean
-e_table_selection_model_is_row_selected (ETableSelectionModel *selection,
- gint n)
-{
- if (selection->row_count < n)
- return 0;
- else
- return (selection->selection[BOX(n)] >> OFFSET(n)) & 0x1;
-}
-
-/**
- * e_table_selection_model_foreach
- * @selection: #ETableSelectionModel to traverse
- * @callback: The callback function to call back.
- * @closure: The closure
- *
- * This routine calls the given callback function once for each
- * selected row, passing closure as the closure.
- */
-void
-e_table_selection_model_foreach (ETableSelectionModel *selection,
- ETableForeachFunc callback,
- gpointer closure)
-{
- int i;
- int last = (selection->row_count + 31) / 32;
- for (i = 0; i < last; i++) {
- if (selection->selection[i]) {
- int j;
- guint32 value = selection->selection[i];
- for (j = 0; j < 32; j++) {
- if (value & 0x80000000) {
- callback(i * 32 + j, closure);
- }
- value <<= 1;
- }
- }
- }
-}
-
-#define OPERATE(object, i,mask,grow) ((grow) ? (((object)->selection[(i)]) |= ((guint32) ~(mask))) : (((object)->selection[(i)]) &= (mask)))
-
-static void
-change_one_row(ETableSelectionModel *selection, int row, gboolean grow)
-{
- int i;
- i = BOX(row);
-
- OPERATE(selection, i, ~BITMASK(row), grow);
-}
-
-static void
-change_selection(ETableSelectionModel *selection, int start, int end, gboolean grow)
-{
- int i, last;
- if (start != end) {
- if (selection->sorter && e_table_sorter_needs_sorting(selection->sorter)) {
- for ( i = start; i < end; i++) {
- change_one_row(selection, e_table_sorter_sorted_to_model(selection->sorter, i), grow);
- }
- } else {
- i = BOX(start);
- last = BOX(end);
-
- if (i == last) {
- OPERATE(selection, i, BITMASK_LEFT(start) | BITMASK_RIGHT(end), grow);
- } else {
- OPERATE(selection, i, BITMASK_LEFT(start), grow);
- if (grow)
- for (i ++; i < last; i++)
- selection->selection[i] = ONES;
- else
- for (i ++; i < last; i++)
- selection->selection[i] = 0;
- OPERATE(selection, i, BITMASK_RIGHT(end), grow);
- }
- }
- }
-}
-
-static void
-etsm_select_single_row (ETableSelectionModel *selection, int row)
-{
- int i;
- for (i = 0; i < ((selection->row_count + 31) / 32); i++) {
- if (!((i == BOX(row) && selection->selection[i] == BITMASK(row)) ||
- (i != BOX(row) && selection->selection[i] == 0))) {
- g_free(selection->selection);
- selection->selection = g_new0(gint, (selection->row_count + 31) / 32);
- selection->selection[BOX(row)] = BITMASK(row);
-
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals [SELECTION_CHANGED]);
- break;
- }
- }
-
- selection->selection_start_row = row;
-}
-
-static void
-etsm_toggle_single_row (ETableSelectionModel *selection, int row)
-{
- if (selection->selection[BOX(row)] & BITMASK(row))
- selection->selection[BOX(row)] &= ~BITMASK(row);
- else
- selection->selection[BOX(row)] |= BITMASK(row);
- selection->selection_start_row = row;
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals [SELECTION_CHANGED]);
-}
-
-static void
-etsm_move_selection_end (ETableSelectionModel *selection, int row)
-{
- int old_start;
- int old_end;
- int new_start;
- int new_end;
- if (selection->sorter && e_table_sorter_needs_sorting(selection->sorter)) {
- old_start = MIN (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
- e_table_sorter_model_to_sorted(selection->sorter, selection->cursor_row));
- old_end = MAX (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
- e_table_sorter_model_to_sorted(selection->sorter, selection->cursor_row)) + 1;
- new_start = MIN (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
- e_table_sorter_model_to_sorted(selection->sorter, row));
- new_end = MAX (e_table_sorter_model_to_sorted(selection->sorter, selection->selection_start_row),
- e_table_sorter_model_to_sorted(selection->sorter, row)) + 1;
- } else {
- old_start = MIN (selection->selection_start_row, selection->cursor_row);
- old_end = MAX (selection->selection_start_row, selection->cursor_row) + 1;
- new_start = MIN (selection->selection_start_row, row);
- new_end = MAX (selection->selection_start_row, row) + 1;
- }
- /* This wouldn't work nearly so smoothly if one end of the selection weren't held in place. */
- if (old_start < new_start)
- change_selection(selection, old_start, new_start, FALSE);
- if (new_start < old_start)
- change_selection(selection, new_start, old_start, TRUE);
- if (old_end < new_end)
- change_selection(selection, old_end, new_end, TRUE);
- if (new_end < old_end)
- change_selection(selection, new_end, old_end, FALSE);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals [SELECTION_CHANGED]);
-}
-
-static void
-etsm_set_selection_end (ETableSelectionModel *selection, int row)
-{
- etsm_select_single_row(selection, selection->selection_start_row);
- selection->cursor_row = selection->selection_start_row;
- etsm_move_selection_end(selection, row);
-}
-
-/**
- * e_table_selection_model_do_something
- * @selection: #ETableSelectionModel to do something to.
- * @row: The row to do something in.
- * @col: The col to do something in.
- * @state: The state in which to do something.
- *
- * This routine does whatever is appropriate as if the user clicked
- * the mouse in the given row and column.
- */
-void
-e_table_selection_model_do_something (ETableSelectionModel *selection,
- guint row,
- guint col,
- GdkModifierType state)
-{
- gint shift_p = state & GDK_SHIFT_MASK;
- gint ctrl_p = state & GDK_CONTROL_MASK;
-
- if (row == -1 && col != -1)
- row = 0;
- if (col == -1 && row != -1)
- col = 0;
-
- if (selection->row_count < 0) {
- if (selection->model) {
- selection->row_count = e_table_model_row_count(selection->model);
- g_free(selection->selection);
- selection->selection = g_new0(gint, (selection->row_count + 31) / 32);
- }
- }
- if (selection->row_count >= 0 && row < selection->row_count) {
- switch (selection->mode) {
- case GTK_SELECTION_SINGLE:
- etsm_select_single_row (selection, row);
- break;
- case GTK_SELECTION_BROWSE:
- case GTK_SELECTION_MULTIPLE:
- case GTK_SELECTION_EXTENDED:
- if (shift_p) {
- etsm_set_selection_end (selection, row);
- } else {
- if (ctrl_p) {
- etsm_toggle_single_row (selection, row);
- } else {
- etsm_select_single_row (selection, row);
- }
- }
- break;
- }
- if (selection->cursor_row != row ||
- selection->cursor_col != col) {
- selection->cursor_row = row;
- selection->cursor_col = col;
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_CHANGED], row, col);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_ACTIVATED], row, col);
- }
- }
-}
-
-/**
- * e_table_selection_model_maybe_do_something
- * @selection: #ETableSelectionModel to do something to.
- * @row: The row to do something in.
- * @col: The col to do something in.
- * @state: The state in which to do something.
- *
- * If this row is selected, this routine just moves the cursor row and
- * column. Otherwise, it does the same thing as
- * e_table_selection_model_do_something(). This is for being used on
- * right clicks and other events where if the user hit the selection,
- * they don't want it to change.
- */
-void
-e_table_selection_model_maybe_do_something (ETableSelectionModel *selection,
- guint row,
- guint col,
- GdkModifierType state)
-{
- if (e_table_selection_model_is_row_selected(selection, row)) {
- selection->cursor_row = row;
- selection->cursor_col = col;
- } else {
- e_table_selection_model_do_something(selection, row, col, state);
- }
-}
-
static gint
-move_selection (ETableSelectionModel *selection,
- gboolean up,
- GdkModifierType state)
-{
- int row = selection->cursor_row;
- int col = selection->cursor_col;
- int cursor_activated = TRUE;
-
- gint shift_p = state & GDK_SHIFT_MASK;
- gint ctrl_p = state & GDK_CONTROL_MASK;
-
- row = e_table_sorter_model_to_sorted(selection->sorter, row);
- if (up)
- row--;
- else
- row++;
- if (row < 0)
- row = 0;
- if (row >= selection->row_count)
- row = selection->row_count - 1;
- row = e_table_sorter_sorted_to_model(selection->sorter, row);
-
- switch (selection->mode) {
- case GTK_SELECTION_BROWSE:
- if (shift_p) {
- etsm_set_selection_end (selection, row);
- } else if (!ctrl_p) {
- etsm_select_single_row (selection, row);
- } else
- cursor_activated = FALSE;
- break;
- case GTK_SELECTION_SINGLE:
- case GTK_SELECTION_MULTIPLE:
- case GTK_SELECTION_EXTENDED:
- etsm_select_single_row (selection, row);
- break;
- }
- if (row != -1) {
- selection->cursor_row = row;
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_CHANGED], row, col);
- if (cursor_activated)
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_ACTIVATED], row, col);
- }
- return TRUE;
-}
-
-/**
- * e_table_selection_model_key_press
- * @selection: #ETableSelectionModel to affect.
- * @key: The event.
- *
- * This routine does whatever is appropriate as if the user pressed
- * the given key.
- *
- * Returns: %TRUE if the #ETableSelectionModel used the key.
- */
-gint
-e_table_selection_model_key_press (ETableSelectionModel *selection,
- GdkEventKey *key)
+etsm_get_row_count (ESelectionModel *esm)
{
- switch (key->keyval) {
- case GDK_Up:
- return move_selection(selection, TRUE, key->state);
- break;
- case GDK_Down:
- return move_selection(selection, FALSE, key->state);
- break;
- case GDK_space:
- case GDK_KP_Space:
- if (selection->mode != GTK_SELECTION_SINGLE) {
- etsm_toggle_single_row (selection, selection->cursor_row);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
- return TRUE;
- }
- break;
- case GDK_Return:
- case GDK_KP_Enter:
- if (selection->mode != GTK_SELECTION_SINGLE) {
- etsm_select_single_row (selection, selection->cursor_row);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
- return TRUE;
- }
- break;
- case GDK_Home:
- case GDK_KP_Home:
- if (selection->cursor_mode == E_TABLE_CURSOR_LINE) {
- int row = 0;
-
- row = e_table_sorter_sorted_to_model(selection->sorter, row);
- selection->cursor_row = row;
-
- etsm_select_single_row (selection, selection->cursor_row);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_CHANGED], selection->cursor_row, selection->cursor_col);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
- return TRUE;
- }
- break;
- case GDK_End:
- case GDK_KP_End:
- if (selection->cursor_mode == E_TABLE_CURSOR_LINE) {
- int row = selection->row_count - 1;
-
- row = e_table_sorter_sorted_to_model(selection->sorter, row);
- selection->cursor_row = row;
+ ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL(esm);
- etsm_select_single_row (selection, selection->cursor_row);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_CHANGED], selection->cursor_row, selection->cursor_col);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals[CURSOR_ACTIVATED], selection->cursor_row, selection->cursor_col);
- return TRUE;
- }
- break;
- }
- return FALSE;
-}
-
-/**
- * e_table_selection_model_clear
- * @selection: #ETableSelectionModel to clear
- *
- * This routine clears the selection to no rows selected.
- */
-void
-e_table_selection_model_clear(ETableSelectionModel *selection)
-{
- g_free(selection->selection);
- selection->selection = NULL;
- selection->row_count = -1;
- selection->cursor_row = -1;
- selection->cursor_col = -1;
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals [CURSOR_CHANGED], -1, -1);
- gtk_signal_emit(GTK_OBJECT(selection),
- e_table_selection_model_signals [SELECTION_CHANGED]);
-}
-
-#define PART(x,n) (((x) & (0x01010101 << n)) >> n)
-#define SECTION(x, n) (((x) >> (n * 8)) & 0xff)
-
-/**
- * e_table_selection_model_selected_count
- * @selection: #ETableSelectionModel to count
- *
- * This routine calculates the number of rows selected.
- *
- * Returns: The number of rows selected in the given model.
- */
-gint
-e_table_selection_model_selected_count (ETableSelectionModel *selection)
-{
- gint count;
- int i;
- int last;
-
- if (!selection->selection)
- return 0;
-
- count = 0;
-
- last = BOX(selection->row_count - 1);
-
- for (i = 0; i <= last; i++) {
- int j;
- guint32 thiscount = 0;
- for (j = 0; j < 8; j++)
- thiscount += PART(selection->selection[i], j);
- for (j = 0; j < 4; j++)
- count += SECTION(thiscount, j);
- }
-
- return count;
-}
-
-/**
- * e_table_selection_model_select_all
- * @selection: #ETableSelectionModel to select all
- *
- * This routine selects all the rows in the given
- * #ETableSelectionModel.
- */
-void
-e_table_selection_model_select_all (ETableSelectionModel *selection)
-{
- int i;
-
- if (selection->row_count < 0) {
- if (selection->model) {
- selection->row_count = e_table_model_row_count (selection->model);
- g_free (selection->selection);
- selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
- }
- }
-
- if (!selection->selection)
- selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
-
- for (i = 0; i < (selection->row_count + 31) / 32; i ++) {
- selection->selection[i] = ONES;
- }
-
- /* need to zero out the bits corresponding to the rows not
- selected in the last full 32 bit mask */
- if (selection->row_count % 32) {
- int unselected_mask = 0;
- int num_unselected_in_last_byte = 32 - selection->row_count % 32;
-
- for (i = 0; i < num_unselected_in_last_byte; i ++)
- unselected_mask |= 1 << i;
-
- selection->selection[(selection->row_count + 31) / 32 - 1] &= ~unselected_mask;
- }
-
- selection->cursor_col = 0;
- selection->cursor_row = 0;
- selection->selection_start_row = 0;
- gtk_signal_emit (GTK_OBJECT (selection),
- e_table_selection_model_signals [CURSOR_CHANGED], 0, 0);
- gtk_signal_emit (GTK_OBJECT (selection),
- e_table_selection_model_signals [SELECTION_CHANGED]);
-}
-
-/**
- * e_table_selection_model_invert_selection
- * @selection: #ETableSelectionModel to invert
- *
- * This routine inverts all the rows in the given
- * #ETableSelectionModel.
- */
-void
-e_table_selection_model_invert_selection (ETableSelectionModel *selection)
-{
- int i;
-
- if (selection->row_count < 0) {
- if (selection->model) {
- selection->row_count = e_table_model_row_count (selection->model);
- g_free (selection->selection);
- selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
- }
- }
-
- if (!selection->selection)
- selection->selection = g_new0 (gint, (selection->row_count + 31) / 32);
-
- for (i = 0; i < (selection->row_count + 31) / 32; i ++) {
- selection->selection[i] = ~selection->selection[i];
- }
-
- selection->cursor_col = -1;
- selection->cursor_row = -1;
- selection->selection_start_row = 0;
- gtk_signal_emit (GTK_OBJECT (selection),
- e_table_selection_model_signals [CURSOR_CHANGED], -1, -1);
- gtk_signal_emit (GTK_OBJECT (selection),
- e_table_selection_model_signals [SELECTION_CHANGED]);
+ return e_table_model_row_count (etsm->model);
}
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 2bfa5c6e7d..42333b2493 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -3,6 +3,7 @@
#define _E_TABLE_SELECTION_MODEL_H_
#include <gtk/gtkobject.h>
+#include <gal/widgets/e-selection-model.h>
#include <gal/e-table/e-table-model.h>
#include <gal/e-table/e-table-defines.h>
#include <gal/e-table/e-table-sorter.h>
@@ -18,17 +19,9 @@ extern "C" {
#define E_IS_TABLE_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SELECTION_MODEL_TYPE))
typedef struct {
- GtkObject base;
+ ESelectionModel base;
ETableModel *model;
- ETableSorter *sorter;
-
- gint row_count;
- guint32 *selection;
-
- gint cursor_row;
- gint cursor_col;
- gint selection_start_row;
guint model_changed_id;
guint model_row_inserted_id, model_row_deleted_id;
@@ -36,47 +29,13 @@ typedef struct {
guint frozen : 1;
guint selection_model_changed : 1;
guint group_info_changed : 1;
-
- GtkSelectionMode mode;
- ETableCursorMode cursor_mode;
} ETableSelectionModel;
typedef struct {
- GtkObjectClass parent_class;
-
- /*
- * Signals
- */
-
- void (*cursor_changed) (ETableSelectionModel *selection, int row, int col);
- void (*cursor_activated) (ETableSelectionModel *selection, int row, int col);
- void (*selection_changed) (ETableSelectionModel *selection);
-
+ ESelectionModelClass parent_class;
} ETableSelectionModelClass;
GtkType e_table_selection_model_get_type (void);
-gboolean e_table_selection_model_is_row_selected (ETableSelectionModel *selection,
- gint n);
-void e_table_selection_model_foreach (ETableSelectionModel *selection,
- ETableForeachFunc callback,
- gpointer closure);
-
-void e_table_selection_model_do_something (ETableSelectionModel *selection,
- guint row,
- guint col,
- GdkModifierType state);
-void e_table_selection_model_maybe_do_something (ETableSelectionModel *selection,
- guint row,
- guint col,
- GdkModifierType state);
-gint e_table_selection_model_key_press (ETableSelectionModel *selection,
- GdkEventKey *key);
-void e_table_selection_model_clear (ETableSelectionModel *selection);
-gint e_table_selection_model_selected_count (ETableSelectionModel *selection);
-
-void e_table_selection_model_select_all (ETableSelectionModel *selection);
-void e_table_selection_model_invert_selection (ETableSelectionModel *selection);
-
ETableSelectionModel *e_table_selection_model_new (void);
#ifdef __cplusplus
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 08c7c1b120..2dbbddf366 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -22,19 +22,25 @@ enum {
ARG_SORT_INFO
};
-#define PARENT_TYPE gtk_object_get_type()
+#define PARENT_TYPE e_sorter_get_type()
#define INCREMENT_AMOUNT 100
-static GtkObjectClass *parent_class;
+static ESorterClass *parent_class;
-static void ets_model_changed (ETableModel *etm, ETableSorter *ets);
-static void ets_model_row_changed (ETableModel *etm, int row, ETableSorter *ets);
-static void ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets);
-static void ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets);
-static void ets_clean (ETableSorter *ets);
-static void ets_sort (ETableSorter *ets);
-static void ets_backsort (ETableSorter *ets);
+static void ets_model_changed (ETableModel *etm, ETableSorter *ets);
+static void ets_model_row_changed (ETableModel *etm, int row, ETableSorter *ets);
+static void ets_model_cell_changed (ETableModel *etm, int col, int row, ETableSorter *ets);
+static void ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets);
+static void ets_clean (ETableSorter *ets);
+static void ets_sort (ETableSorter *ets);
+static void ets_backsort (ETableSorter *ets);
+
+static gint ets_model_to_sorted (ESorter *sorter, int row);
+static gint ets_sorted_to_model (ESorter *sorter, int row);
+static void ets_get_model_to_sorted_array (ESorter *sorter, int **array, int *count);
+static void ets_get_sorted_to_model_array (ESorter *sorter, int **array, int *count);
+static gboolean ets_needs_sorting (ESorter *ets);
static void
ets_destroy (GtkObject *object)
@@ -105,12 +111,19 @@ static void
ets_class_init (ETableSorterClass *klass)
{
GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
+ ESorterClass *sorter_class = E_SORTER_CLASS(klass);
+
+ parent_class = gtk_type_class (PARENT_TYPE);
- parent_class = gtk_type_class (PARENT_TYPE);
+ object_class->destroy = ets_destroy;
+ object_class->set_arg = ets_set_arg;
+ object_class->get_arg = ets_get_arg;
- object_class->destroy = ets_destroy;
- object_class->set_arg = ets_set_arg;
- object_class->get_arg = ets_get_arg;
+ sorter_class->model_to_sorted = ets_model_to_sorted ;
+ sorter_class->sorted_to_model = ets_sorted_to_model ;
+ sorter_class->get_model_to_sorted_array = ets_get_model_to_sorted_array ;
+ sorter_class->get_sorted_to_model_array = ets_get_sorted_to_model_array ;
+ sorter_class->needs_sorting = ets_needs_sorting ;
gtk_object_add_arg_type ("ETableSorter::sort_info", GTK_TYPE_OBJECT,
GTK_ARG_READWRITE, ARG_SORT_INFO);
@@ -478,75 +491,81 @@ ets_backsort(ETableSorter *ets)
}
}
-gboolean
-e_table_sorter_needs_sorting(ETableSorter *ets)
-{
- if (ets->needs_sorting < 0) {
- if (e_table_sort_info_sorting_get_count(ets->sort_info) + e_table_sort_info_grouping_get_count(ets->sort_info))
- ets->needs_sorting = 1;
- else
- ets->needs_sorting = 0;
- }
- return ets->needs_sorting;
-}
-
-gint
-e_table_sorter_model_to_sorted (ETableSorter *sorter, int row)
+static gint
+ets_model_to_sorted (ESorter *es, int row)
{
- int rows = e_table_model_row_count(sorter->source);
+ ETableSorter *ets = E_TABLE_SORTER(es);
+ int rows = e_table_model_row_count(ets->source);
g_return_val_if_fail(row >= 0, -1);
g_return_val_if_fail(row < rows, -1);
- if (e_table_sorter_needs_sorting(sorter))
- ets_backsort(sorter);
+ if (ets_needs_sorting(es))
+ ets_backsort(ets);
- if (sorter->backsorted)
- return sorter->backsorted[row];
+ if (ets->backsorted)
+ return ets->backsorted[row];
else
return row;
}
-gint
-e_table_sorter_sorted_to_model (ETableSorter *sorter, int row)
+static gint
+ets_sorted_to_model (ESorter *es, int row)
{
- int rows = e_table_model_row_count(sorter->source);
+ ETableSorter *ets = E_TABLE_SORTER(es);
+ int rows = e_table_model_row_count(ets->source);
g_return_val_if_fail(row >= 0, -1);
g_return_val_if_fail(row < rows, -1);
- if (e_table_sorter_needs_sorting(sorter))
- ets_sort(sorter);
+ if (ets_needs_sorting(es))
+ ets_sort(ets);
- if (sorter->sorted)
- return sorter->sorted[row];
+ if (ets->sorted)
+ return ets->sorted[row];
else
return row;
}
-void
-e_table_sorter_get_model_to_sorted_array (ETableSorter *sorter, int **array, int *count)
+static void
+ets_get_model_to_sorted_array (ESorter *es, int **array, int *count)
{
+ ETableSorter *ets = E_TABLE_SORTER(es);
if (array || count) {
- ets_backsort(sorter);
+ ets_backsort(ets);
if (array)
- *array = sorter->backsorted;
+ *array = ets->backsorted;
if (count)
- *count = e_table_model_row_count(sorter->source);
+ *count = e_table_model_row_count(ets->source);
}
}
-void
-e_table_sorter_get_sorted_to_model_array (ETableSorter *sorter, int **array, int *count)
+static void
+ets_get_sorted_to_model_array (ESorter *es, int **array, int *count)
{
+ ETableSorter *ets = E_TABLE_SORTER(es);
if (array || count) {
- ets_sort(sorter);
+ ets_sort(ets);
if (array)
- *array = sorter->sorted;
+ *array = ets->sorted;
if (count)
- *count = e_table_model_row_count(sorter->source);
+ *count = e_table_model_row_count(ets->source);
}
}
+
+
+static gboolean
+ets_needs_sorting(ESorter *es)
+{
+ ETableSorter *ets = E_TABLE_SORTER(es);
+ if (ets->needs_sorting < 0) {
+ if (e_table_sort_info_sorting_get_count(ets->sort_info) + e_table_sort_info_grouping_get_count(ets->sort_info))
+ ets->needs_sorting = 1;
+ else
+ ets->needs_sorting = 0;
+ }
+ return ets->needs_sorting;
+}
diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h
index 3bb2a63a6a..a6c999f744 100644
--- a/widgets/table/e-table-sorter.h
+++ b/widgets/table/e-table-sorter.h
@@ -3,6 +3,7 @@
#define _E_TABLE_SORTER_H_
#include <gtk/gtkobject.h>
+#include <gal/util/e-sorter.h>
#include <gal/e-table/e-table-model.h>
#include <gal/e-table/e-table-subset-variable.h>
#include <gal/e-table/e-table-sort-info.h>
@@ -17,7 +18,7 @@ BEGIN_GNOME_DECLS
#define E_IS_TABLE_SORTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SORTER_TYPE))
typedef struct {
- GtkObject base;
+ ESorter base;
ETableModel *source;
ETableHeader *full_header;
@@ -36,28 +37,13 @@ typedef struct {
} ETableSorter;
typedef struct {
- GtkObjectClass parent_class;
+ ESorterClass parent_class;
} ETableSorterClass;
GtkType e_table_sorter_get_type (void);
ETableSorter *e_table_sorter_new (ETableModel *etm,
ETableHeader *full_header,
ETableSortInfo *sort_info);
-
-gint e_table_sorter_model_to_sorted (ETableSorter *sorter,
- int row);
-gint e_table_sorter_sorted_to_model (ETableSorter *sorter,
- int row);
-
-void e_table_sorter_get_model_to_sorted_array (ETableSorter *sorter,
- int **array,
- int *count);
-void e_table_sorter_get_sorted_to_model_array (ETableSorter *sorter,
- int **array,
- int *count);
-
-gboolean e_table_sorter_needs_sorting (ETableSorter *sorter);
-
END_GNOME_DECLS
#endif /* _E_TABLE_SORTER_H_ */
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 165f17ae04..cfeda97b68 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -65,7 +65,7 @@ etsp_init (ETableSpecification *etsp)
etsp->draw_focus = TRUE;
etsp->horizontal_scrolling = FALSE;
- etsp->cursor_mode = E_TABLE_CURSOR_SIMPLE;
+ etsp->cursor_mode = E_CURSOR_SIMPLE;
etsp->selection_mode = GTK_SELECTION_MULTIPLE;
etsp->click_to_add_message = NULL;
@@ -175,12 +175,12 @@ e_table_specification_load_from_node (ETableSpecification *specification,
}
g_free (temp);
- specification->cursor_mode = E_TABLE_CURSOR_SIMPLE;
+ specification->cursor_mode = E_CURSOR_SIMPLE;
temp = e_xml_get_string_prop_by_name (node, "cursor-mode");
if (temp && !strcasecmp (temp, "line")) {
- specification->cursor_mode = E_TABLE_CURSOR_LINE;
+ specification->cursor_mode = E_CURSOR_LINE;
} else if (temp && !strcasecmp (temp, "spreadsheet")) {
- specification->cursor_mode = E_TABLE_CURSOR_SPREADSHEET;
+ specification->cursor_mode = E_CURSOR_SPREADSHEET;
}
g_free (temp);
g_free (specification->click_to_add_message);
@@ -315,7 +315,7 @@ e_table_specification_save_to_node (ETableSpecification *specification,
s = "extended";
}
xmlSetProp (node, "selection-mode", s);
- if (specification->cursor_mode == E_TABLE_CURSOR_LINE)
+ if (specification->cursor_mode == E_CURSOR_LINE)
s = "line";
else
s = "cell";
diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h
index feba63cc7a..c6cbb27dcf 100644
--- a/widgets/table/e-table-specification.h
+++ b/widgets/table/e-table-specification.h
@@ -4,6 +4,7 @@
#include <gtk/gtkobject.h>
#include <gnome-xml/tree.h>
+#include <gal/widgets/e-selection-model.h>
#include <gal/e-table/e-table-state.h>
#include <gal/e-table/e-table-column-specification.h>
#include <gal/e-table/e-table-defines.h>
@@ -30,7 +31,7 @@ typedef struct {
guint draw_focus : 1;
guint horizontal_scrolling : 1;
GtkSelectionMode selection_mode;
- ETableCursorMode cursor_mode;
+ ECursorMode cursor_mode;
char *click_to_add_message;
} ETableSpecification;
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index ec58ad5186..9a2073f3e6 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -202,7 +202,7 @@ e_table_init (GtkObject *object)
e_table->draw_grid = 1;
e_table->draw_focus = 1;
- e_table->cursor_mode = E_TABLE_CURSOR_SIMPLE;
+ e_table->cursor_mode = E_CURSOR_SIMPLE;
e_table->length_threshold = 200;
e_table->need_rebuild = 0;
@@ -382,7 +382,7 @@ static void
click_to_add_cursor_change (ETableClickToAdd *etcta, int row, int col, ETable *et)
{
if (et->cursor_loc == E_TABLE_CURSOR_LOC_TABLE) {
- e_table_selection_model_clear(et->selection);
+ e_selection_model_clear(E_SELECTION_MODEL (et->selection));
}
et->cursor_loc = E_TABLE_CURSOR_LOC_ETCTA;
}
@@ -1382,15 +1382,15 @@ e_table_get_cursor_row (ETable *e_table)
void
e_table_selected_row_foreach (ETable *e_table,
- ETableForeachFunc callback,
+ EForeachFunc callback,
gpointer closure)
{
g_return_if_fail(e_table != NULL);
g_return_if_fail(E_IS_TABLE(e_table));
- e_table_selection_model_foreach(e_table->selection,
- callback,
- closure);
+ e_selection_model_foreach(E_SELECTION_MODEL (e_table->selection),
+ callback,
+ closure);
}
gint
@@ -1399,7 +1399,7 @@ e_table_selected_count (ETable *e_table)
g_return_val_if_fail(e_table != NULL, -1);
g_return_val_if_fail(E_IS_TABLE(e_table), -1);
- return e_table_selection_model_selected_count(e_table->selection);
+ return e_selection_model_selected_count(E_SELECTION_MODEL (e_table->selection));
}
void
@@ -1408,7 +1408,7 @@ e_table_select_all (ETable *table)
g_return_if_fail (table != NULL);
g_return_if_fail (E_IS_TABLE (table));
- e_table_selection_model_select_all (table->selection);
+ e_selection_model_select_all (E_SELECTION_MODEL (table->selection));
}
void
@@ -1417,7 +1417,7 @@ e_table_invert_selection (ETable *table)
g_return_if_fail (table != NULL);
g_return_if_fail (E_IS_TABLE (table));
- e_table_selection_model_invert_selection (table->selection);
+ e_selection_model_invert_selection (E_SELECTION_MODEL (table->selection));
}
@@ -1491,10 +1491,10 @@ e_table_get_next_row (ETable *e_table,
if (e_table->sorter) {
int i;
- i = e_table_sorter_model_to_sorted(e_table->sorter, model_row);
+ i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
i++;
if (i < e_table_model_row_count(e_table->model)) {
- return e_table_sorter_sorted_to_model(e_table->sorter, i);
+ return e_sorter_sorted_to_model(E_SORTER (e_table->sorter), i);
} else
return -1;
} else
@@ -1513,10 +1513,10 @@ e_table_get_prev_row (ETable *e_table,
if (e_table->sorter) {
int i;
- i = e_table_sorter_model_to_sorted(e_table->sorter, model_row);
+ i = e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
i--;
if (i >= 0)
- return e_table_sorter_sorted_to_model(e_table->sorter, i);
+ return e_sorter_sorted_to_model(E_SORTER (e_table->sorter), i);
else
return -1;
} else
@@ -1531,7 +1531,7 @@ e_table_model_to_view_row (ETable *e_table,
g_return_val_if_fail(E_IS_TABLE(e_table), -1);
if (e_table->sorter)
- return e_table_sorter_model_to_sorted(e_table->sorter, model_row);
+ return e_sorter_model_to_sorted(E_SORTER (e_table->sorter), model_row);
else
return model_row;
}
@@ -1544,7 +1544,7 @@ e_table_view_to_model_row (ETable *e_table,
g_return_val_if_fail(E_IS_TABLE(e_table), -1);
if (e_table->sorter)
- return e_table_sorter_sorted_to_model(e_table->sorter, view_row);
+ return e_sorter_sorted_to_model (E_SORTER (e_table->sorter), view_row);
else
return view_row;
}
@@ -1727,7 +1727,7 @@ e_table_drag_source_set (ETable *table,
gtk_widget_add_events (canvas,
gtk_widget_get_events (canvas) |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_BUTTON_MOTION_MASK);
+ GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK);
if (site) {
if (site->target_list)
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 7364768559..6918023581 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -85,7 +85,7 @@ typedef struct {
GnomeCanvasItem *click_to_add;
gboolean use_click_to_add;
- ETableCursorMode cursor_mode;
+ ECursorMode cursor_mode;
int drag_get_data_row;
int drag_get_data_col;
@@ -211,7 +211,7 @@ void e_table_set_cursor_row (ETable *e_table
/* -1 means we don't have the cursor. */
int e_table_get_cursor_row (ETable *e_table);
void e_table_selected_row_foreach (ETable *e_table,
- ETableForeachFunc callback,
+ EForeachFunc callback,
gpointer closure);
gint e_table_selected_count (ETable *e_table);
EPrintable *e_table_get_printable (ETable *e_table);
diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c
index 407ff57459..e2352ec7a9 100644
--- a/widgets/text/e-completion-view.c
+++ b/widgets/text/e-completion-view.c
@@ -243,7 +243,7 @@ e_completion_view_set_cursor_row (ECompletionView *cv, gint r)
table = e_completion_view_table (cv);
if (r < 0) {
- e_table_selection_model_clear (table->selection);
+ e_selection_model_clear (E_SELECTION_MODEL(table->selection));
/* Move back to the top when we clear the selection */
gtk_adjustment_set_value (adj, adj->lower);