diff options
| -rw-r--r-- | e-util/e-bit-array.c | 386 | ||||
| -rw-r--r-- | e-util/e-bit-array.h | 80 | ||||
| -rw-r--r-- | widgets/misc/e-selection-model-array.c | 301 | ||||
| -rw-r--r-- | widgets/misc/e-selection-model-array.h | 6 | ||||
| -rw-r--r-- | widgets/misc/e-selection-model-simple.c | 6 | ||||
| -rw-r--r-- | widgets/misc/e-selection-model.h | 3 |
6 files changed, 558 insertions, 224 deletions
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c new file mode 100644 index 0000000000..ba65c53120 --- /dev/null +++ b/e-util/e-bit-array.c @@ -0,0 +1,386 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * e-selection-model-array.c: a Selection Model + * + * Author: + * Christopher James Lahey <clahey@ximian.com> + * + * (C) 2000, 2001 Ximian, Inc. + */ +#include <config.h> +#include <gtk/gtksignal.h> +#include "e-bit-array.h" +#include "gal/util/e-util.h" + +#define EBA_CLASS(e) ((EBitArrayClass *)((GtkObject *)e)->klass) + +#define PARENT_TYPE (gtk_object_get_type ()) + +#define ONES ((guint32) 0xffffffff) + +#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 *parent_class; + +static void +e_bit_array_insert_real(EBitArray *eba, int row) +{ + int box; + int i; + if(eba->bit_count >= 0) { + /* Add another word if needed. */ + if ((eba->bit_count & 0x1f) == 0) { + eba->data = g_renew(gint, eba->data, (eba->bit_count >> 5) + 1); + eba->data[eba->bit_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 = eba->bit_count >> 5; i > box; i--) { + eba->data[i] = (eba->data[i] >> 1) | (eba->data[i - 1] << 31); + } + + /* Shift right half of box one bit to the right. */ + eba->data[box] = (eba->data[box] & BITMASK_LEFT(row)) | ((eba->data[box] & BITMASK_RIGHT(row)) >> 1); + eba->bit_count ++; + } +} + +static void +e_bit_array_delete_real(EBitArray *eba, int row, gboolean move_selection_mode) +{ + int box; + int i; + int last; + int selected = FALSE; + if(eba->bit_count >= 0) { + guint32 bitmask; + box = row >> 5; + last = eba->bit_count >> 5; + + /* Build bitmasks for the left and right half of the box */ + bitmask = BITMASK_RIGHT(row) >> 1; + if (move_selection_mode) + selected = e_bit_array_value_at(eba, row); + /* Shift right half of box one bit to the left. */ + eba->data[box] = (eba->data[box] & BITMASK_LEFT(row))| ((eba->data[box] & bitmask) << 1); + + /* Shift all words to the right of our box left one bit. */ + if (box < last) { + eba->data[box] &= eba->data[box + 1] >> 31; + + for (i = box + 1; i < last; i++) { + eba->data[i] = (eba->data[i] << 1) | (eba->data[i + 1] >> 31); + } + /* this over-runs our memory! */ + /*eba->data[i] = eba->data[i] << 1; */ + } + eba->bit_count --; + /* Remove the last word if not needed. */ + if ((eba->bit_count & 0x1f) == 0) { + eba->data = g_renew(gint, eba->data, eba->bit_count >> 5); + } + if (move_selection_mode && selected) { + e_bit_array_select_single_row (eba, row > 0 ? row - 1 : 0); + } + } +} + +/* FIXME : Improve efficiency here. */ +void +e_bit_array_delete(EBitArray *eba, int row, int count) +{ + int i; + for (i = 0; i < count; i++) + e_bit_array_delete_real(eba, row, FALSE); +} + +/* FIXME : Improve efficiency here. */ +void +e_bit_array_delete_single_mode(EBitArray *eba, int row, int count) +{ + int i; + for (i = 0; i < count; i++) + e_bit_array_delete_real(eba, row, TRUE); +} + +/* FIXME : Improve efficiency here. */ +void +e_bit_array_insert(EBitArray *eba, int row, int count) +{ + int i; + for (i = 0; i < count; i++) + e_bit_array_insert_real(eba, row); +} + +/* FIXME: Implement this more efficiently. */ +void +e_bit_array_move_row(EBitArray *eba, int old_row, int new_row) +{ + e_bit_array_delete_real(eba, old_row, FALSE); + e_bit_array_insert_real(eba, new_row); +} + +static void +eba_destroy (GtkObject *object) +{ + EBitArray *eba; + + eba = E_BIT_ARRAY (object); + + g_free(eba->data); +} + +/** + * e_selection_model_is_row_selected + * @selection: #EBitArray 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_bit_array_value_at (EBitArray *eba, + gint n) +{ + if (eba->bit_count < n || eba->bit_count == 0) + return 0; + else + return (eba->data[BOX(n)] >> OFFSET(n)) & 0x1; +} + +/** + * e_selection_model_foreach + * @selection: #EBitArray 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_bit_array_foreach (EBitArray *eba, + EForeachFunc callback, + gpointer closure) +{ + int i; + int last = (eba->bit_count + 31) / 32; + for (i = 0; i < last; i++) { + if (eba->data[i]) { + int j; + guint32 value = eba->data[i]; + for (j = 0; j < 32; j++) { + if (value & 0x80000000) { + callback(i * 32 + j, closure); + } + value <<= 1; + } + } + } +} + +/** + * e_selection_model_clear + * @selection: #EBitArray to clear + * + * This routine clears the selection to no rows selected. + */ +void +e_bit_array_clear(EBitArray *eba) +{ + g_free(eba->data); + eba->data = NULL; + eba->bit_count = 0; +} + +#define PART(x,n) (((x) & (0x01010101 << n)) >> n) +#define SECTION(x, n) (((x) >> (n * 8)) & 0xff) + +/** + * e_selection_model_selected_count + * @selection: #EBitArray to count + * + * This routine calculates the number of rows selected. + * + * Returns: The number of rows selected in the given model. + */ +gint +e_bit_array_selected_count (EBitArray *eba) +{ + gint count; + int i; + int last; + + if (!eba->data) + return 0; + + count = 0; + + last = BOX(eba->bit_count - 1); + + for (i = 0; i <= last; i++) { + int j; + guint32 thiscount = 0; + for (j = 0; j < 8; j++) + thiscount += PART(eba->data[i], j); + for (j = 0; j < 4; j++) + count += SECTION(thiscount, j); + } + + return count; +} + +/** + * e_selection_model_select_all + * @selection: #EBitArray to select all + * + * This routine selects all the rows in the given + * #EBitArray. + */ +void +e_bit_array_select_all (EBitArray *eba) +{ + int i; + + if (!eba->data) + eba->data = g_new0 (gint, (eba->bit_count + 31) / 32); + + for (i = 0; i < (eba->bit_count + 31) / 32; i ++) { + eba->data[i] = ONES; + } + + /* need to zero out the bits corresponding to the rows not + selected in the last full 32 bit mask */ + if (eba->bit_count % 32) { + int unselected_mask = 0; + int num_unselected_in_last_byte = 32 - eba->bit_count % 32; + + for (i = 0; i < num_unselected_in_last_byte; i ++) + unselected_mask |= 1 << i; + + eba->data[(eba->bit_count + 31) / 32 - 1] &= ~unselected_mask; + } +} + +/** + * e_selection_model_invert_selection + * @selection: #EBitArray to invert + * + * This routine inverts all the rows in the given + * #EBitArray. + */ +void +e_bit_array_invert_selection (EBitArray *eba) +{ + int i; + + if (!eba->data) + eba->data = g_new0 (gint, (eba->bit_count + 31) / 32); + + for (i = 0; i < (eba->bit_count + 31) / 32; i ++) { + eba->data[i] = ~eba->data[i]; + } +} + +int +e_bit_array_bit_count (EBitArray *eba) +{ + return eba->bit_count; +} + +#define OPERATE(object, i,mask,grow) ((grow) ? (((object)->data[(i)]) |= ((guint32) ~(mask))) : (((object)->data[(i)]) &= (mask))) + +void +e_bit_array_change_one_row(EBitArray *eba, int row, gboolean grow) +{ + int i; + i = BOX(row); + + OPERATE(eba, i, ~BITMASK(row), grow); +} + +void +e_bit_array_change_range(EBitArray *eba, int start, int end, gboolean grow) +{ + int i, last; + if (start != end) { + i = BOX(start); + last = BOX(end); + + if (i == last) { + OPERATE(eba, i, BITMASK_LEFT(start) | BITMASK_RIGHT(end), grow); + } else { + OPERATE(eba, i, BITMASK_LEFT(start), grow); + if (grow) + for (i ++; i < last; i++) + eba->data[i] = ONES; + else + for (i ++; i < last; i++) + eba->data[i] = 0; + OPERATE(eba, i, BITMASK_RIGHT(end), grow); + } + } +} + +void +e_bit_array_select_single_row (EBitArray *eba, int row) +{ + int i; + for (i = 0; i < ((eba->bit_count + 31) / 32); i++) { + if (!((i == BOX(row) && eba->data[i] == BITMASK(row)) || + (i != BOX(row) && eba->data[i] == 0))) { + g_free(eba->data); + eba->data = g_new0(gint, (eba->bit_count + 31) / 32); + eba->data[BOX(row)] = BITMASK(row); + + break; + } + } +} + +void +e_bit_array_toggle_single_row (EBitArray *eba, int row) +{ + if (eba->data[BOX(row)] & BITMASK(row)) + eba->data[BOX(row)] &= ~BITMASK(row); + else + eba->data[BOX(row)] |= BITMASK(row); +} + + +static void +e_bit_array_init (EBitArray *eba) +{ + eba->data = NULL; + eba->bit_count = 0; +} + +static void +e_bit_array_class_init (EBitArrayClass *klass) +{ + GtkObjectClass *object_class; + + parent_class = gtk_type_class (PARENT_TYPE); + + object_class = GTK_OBJECT_CLASS(klass); + + object_class->destroy = eba_destroy; +} + +E_MAKE_TYPE(e_bit_array, "EBitArray", EBitArray, + e_bit_array_class_init, e_bit_array_init, PARENT_TYPE); + +EBitArray * +e_bit_array_new (int count) +{ + EBitArray *eba = gtk_type_new (e_bit_array_get_type ()); + eba->bit_count = count; + eba->data = g_new0(gint, (eba->bit_count + 31) / 32); + return eba; +} diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h new file mode 100644 index 0000000000..5cb33b22b7 --- /dev/null +++ b/e-util/e-bit-array.h @@ -0,0 +1,80 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +#ifndef _E_BIT_ARRAY_H_ +#define _E_BIT_ARRAY_H_ + +#include <gtk/gtkobject.h> + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#define E_BIT_ARRAY_TYPE (e_bit_array_get_type ()) +#define E_BIT_ARRAY(o) (GTK_CHECK_CAST ((o), E_BIT_ARRAY_TYPE, EBitArray)) +#define E_BIT_ARRAY_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_BIT_ARRAY_TYPE, EBitArrayClass)) +#define E_IS_BIT_ARRAY(o) (GTK_CHECK_TYPE ((o), E_BIT_ARRAY_TYPE)) +#define E_IS_BIT_ARRAY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BIT_ARRAY_TYPE)) + +#ifndef _E_FOREACH_FUNC_H_ +#define _E_FOREACH_FUNC_H_ +typedef void (*EForeachFunc) (int model_row, + gpointer closure); +#endif + +typedef struct { + GtkObject base; + + gint bit_count; + guint32 *data; +} EBitArray; + +typedef struct { + GtkObjectClass parent_class; +} EBitArrayClass; + + +GtkType e_bit_array_get_type (void); +EBitArray *e_bit_array_new (int count); + +gboolean e_bit_array_value_at (EBitArray *selection, + gint n); +void e_bit_array_foreach (EBitArray *selection, + EForeachFunc callback, + gpointer closure); +void e_bit_array_clear (EBitArray *selection); +gint e_bit_array_selected_count (EBitArray *selection); +void e_bit_array_select_all (EBitArray *selection); +void e_bit_array_invert_selection (EBitArray *selection); +int e_bit_array_bit_count (EBitArray *selection); +void e_bit_array_change_one_row (EBitArray *selection, + int row, + gboolean grow); +void e_bit_array_change_range (EBitArray *selection, + int start, + int end, + gboolean grow); +void e_bit_array_select_single_row (EBitArray *eba, + int row); +void e_bit_array_toggle_single_row (EBitArray *eba, + int row); + +/* Protected Functions */ +void e_bit_array_insert (EBitArray *esm, + int row, + int count); +void e_bit_array_delete (EBitArray *esm, + int row, + int count); +void e_bit_array_delete_single_mode (EBitArray *esm, + int row, + int count); +void e_bit_array_move_row (EBitArray *esm, + int old_row, + int new_row); +gint e_bit_array_bit_count (EBitArray *esm); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* _E_BIT_ARRAY_H_ */ diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index ecdbe35e5f..de8265ce2a 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -11,20 +11,11 @@ #include <gtk/gtksignal.h> #include "e-selection-model-array.h" #include "gal/util/e-util.h" -#include <gdk/gdkkeysyms.h> #define ESMA_CLASS(e) ((ESelectionModelArrayClass *)((GtkObject *)e)->klass) #define PARENT_TYPE e_selection_model_get_type () -#define ONES ((guint32) 0xffffffff) - -#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 ESelectionModelClass *parent_class; enum { @@ -36,125 +27,75 @@ enum { void e_selection_model_array_confirm_row_count(ESelectionModelArray *esma) { - if (esma->row_count < 0) { - esma->row_count = e_selection_model_array_get_row_count(esma); - g_free(esma->selection); - esma->selection = g_new0(gint, (esma->row_count + 31) / 32); + if (esma->eba == NULL) { + int row_count = e_selection_model_array_get_row_count(esma); + esma->eba = e_bit_array_new(row_count); } } -static void -e_selection_model_array_insert_row_real(ESelectionModelArray *esma, int row) +/* FIXME: Should this deal with moving the selection if it's in single mode? */ +void +e_selection_model_array_delete_rows(ESelectionModelArray *esma, int row, int count) { - int box; - int i; - if(esma->row_count >= 0) { - /* Add another word if needed. */ - if ((esma->row_count & 0x1f) == 0) { - esma->selection = g_renew(gint, esma->selection, (esma->row_count >> 5) + 1); - esma->selection[esma->row_count >> 5] = 0; - } + if (esma->eba) { - /* 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 = esma->row_count >> 5; i > box; i--) { - esma->selection[i] = (esma->selection[i] >> 1) | (esma->selection[i - 1] << 31); - } + if (E_SELECTION_MODEL(esma)->mode == GTK_SELECTION_SINGLE) + e_bit_array_delete_single_mode(esma->eba, row, count); + else + e_bit_array_delete(esma->eba, row, count); - /* Shift right half of box one bit to the right. */ - esma->selection[box] = (esma->selection[box] & BITMASK_LEFT(row)) | ((esma->selection[box] & BITMASK_RIGHT(row)) >> 1); - esma->row_count ++; - } - if (esma->cursor_row >= row) - esma->cursor_row ++; -} + if (esma->cursor_row > row + count) + esma->cursor_row -= count; + else if (esma->cursor_row > row) + esma->cursor_row = row; -static void -e_selection_model_array_delete_row_real(ESelectionModelArray *esma, int row) -{ - int box; - int i; - int last; - int selected = FALSE; - if(esma->row_count >= 0) { - guint32 bitmask; - box = row >> 5; - last = esma->row_count >> 5; - - /* Build bitmasks for the left and right half of the box */ - bitmask = BITMASK_RIGHT(row) >> 1; - selected = e_selection_model_is_row_selected(E_SELECTION_MODEL(esma), row); - /* Shift right half of box one bit to the left. */ - esma->selection[box] = (esma->selection[box] & BITMASK_LEFT(row))| ((esma->selection[box] & bitmask) << 1); - - /* Shift all words to the right of our box left one bit. */ - if (box < last) { - esma->selection[box] &= esma->selection[box + 1] >> 31; - - for (i = box + 1; i < last; i++) { - esma->selection[i] = (esma->selection[i] << 1) | (esma->selection[i + 1] >> 31); - } - /* this over-runs our memory! */ - /*esma->selection[i] = esma->selection[i] << 1; */ - } - esma->row_count --; - /* Remove the last word if not needed. */ - if ((esma->row_count & 0x1f) == 0) { - esma->selection = g_renew(gint, esma->selection, esma->row_count >> 5); - } - if (selected && E_SELECTION_MODEL(esma)->mode == GTK_SELECTION_SINGLE) { - e_selection_model_select_single_row (E_SELECTION_MODEL(esma), row > 0 ? row - 1 : 0); - } + e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); + e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), esma->cursor_row, esma->cursor_col); } - if (esma->cursor_row >= row && esma->cursor_row > 0) - esma->cursor_row --; -} - -/* FIXME : Improve efficiency here. */ -void -e_selection_model_array_delete_rows(ESelectionModelArray *esma, int row, int count) -{ - int i; - for (i = 0; i < count; i++) - e_selection_model_array_delete_row_real(esma, row); - e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); - e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), esma->cursor_row, esma->cursor_col); } -/* FIXME : Improve efficiency here. */ void e_selection_model_array_insert_rows(ESelectionModelArray *esma, int row, int count) { - int i; - for (i = 0; i < count; i++) - e_selection_model_array_insert_row_real(esma, row); - e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); - e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), esma->cursor_row, esma->cursor_col); + if (esma->eba) { + e_bit_array_insert(esma->eba, row, count); + + if (esma->cursor_row >= row) + esma->cursor_row += count; + + e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); + e_selection_model_cursor_changed(E_SELECTION_MODEL(esma), esma->cursor_row, esma->cursor_col); + } } -/* FIXME: Implement this more efficiently. */ void e_selection_model_array_move_row(ESelectionModelArray *esma, int old_row, int new_row) { ESelectionModel *esm = E_SELECTION_MODEL(esma); - gint selected = e_selection_model_is_row_selected(esm, old_row); - gint cursor = esma->cursor_row == old_row; - e_selection_model_array_delete_row_real(esma, old_row); - e_selection_model_array_insert_row_real(esma, new_row); + if (esma->eba) { + gboolean selected = e_bit_array_value_at(esma->eba, old_row); + gboolean cursor = (esma->cursor_row == old_row); - if (selected) { - if (esm->mode == GTK_SELECTION_SINGLE) - e_selection_model_select_single_row (esm, new_row); - else - e_selection_model_change_one_row(esm, new_row, TRUE); - } - if (cursor) { - esma->cursor_row = new_row; + if (old_row < esma->cursor_row && esma->cursor_row < new_row) + esma->cursor_row --; + else if (new_row < esma->cursor_row && esma->cursor_row < old_row) + esma->cursor_row ++; + + e_bit_array_move_row(esma->eba, old_row, new_row); + + if (selected) { + if (esm->mode == GTK_SELECTION_SINGLE) + e_bit_array_select_single_row (esma->eba, new_row); + else + e_bit_array_change_one_row(esma->eba, new_row, TRUE); + } + if (cursor) { + esma->cursor_row = new_row; + } + e_selection_model_selection_changed(esm); + e_selection_model_cursor_changed(esm, esma->cursor_row, esma->cursor_col); } - e_selection_model_selection_changed(esm); - e_selection_model_cursor_changed(esm, esma->cursor_row, esma->cursor_col); } static void @@ -164,7 +105,10 @@ esma_destroy (GtkObject *object) esma = E_SELECTION_MODEL_ARRAY (object); - g_free(esma->selection); + if (esma->eba) { + gtk_object_unref(GTK_OBJECT(esma->eba)); + esma->eba = NULL; + } } static void @@ -214,10 +158,10 @@ esma_is_row_selected (ESelectionModel *selection, gint n) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - if (esma->row_count < n || esma->row_count == 0) - return 0; + if (esma->eba) + return e_bit_array_value_at(esma->eba, n); else - return (esma->selection[BOX(n)] >> OFFSET(n)) & 0x1; + return FALSE; } /** @@ -235,20 +179,8 @@ esma_foreach (ESelectionModel *selection, gpointer closure) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - int i; - int last = (esma->row_count + 31) / 32; - for (i = 0; i < last; i++) { - if (esma->selection[i]) { - int j; - guint32 value = esma->selection[i]; - for (j = 0; j < 32; j++) { - if (value & 0x80000000) { - callback(i * 32 + j, closure); - } - value <<= 1; - } - } - } + if (esma->eba) + e_bit_array_foreach(esma->eba, callback, closure); } /** @@ -261,9 +193,10 @@ static void esma_clear(ESelectionModel *selection) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - g_free(esma->selection); - esma->selection = NULL; - esma->row_count = -1; + if (esma->eba) { + gtk_object_unref(GTK_OBJECT(esma->eba)); + esma->eba = NULL; + } esma->cursor_row = -1; esma->cursor_col = -1; e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); @@ -285,27 +218,10 @@ static gint esma_selected_count (ESelectionModel *selection) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - gint count; - int i; - int last; - - if (!esma->selection) + if (esma->eba) + return e_bit_array_selected_count(esma->eba); + else return 0; - - count = 0; - - last = BOX(esma->row_count - 1); - - for (i = 0; i <= last; i++) { - int j; - guint32 thiscount = 0; - for (j = 0; j < 8; j++) - thiscount += PART(esma->selection[i], j); - for (j = 0; j < 4; j++) - count += SECTION(thiscount, j); - } - - return count; } /** @@ -318,29 +234,11 @@ esma_selected_count (ESelectionModel *selection) static void esma_select_all (ESelectionModel *selection) { - int i; ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); e_selection_model_array_confirm_row_count(esma); - - if (!esma->selection) - esma->selection = g_new0 (gint, (esma->row_count + 31) / 32); - - for (i = 0; i < (esma->row_count + 31) / 32; i ++) { - esma->selection[i] = ONES; - } - /* need to zero out the bits corresponding to the rows not - selected in the last full 32 bit mask */ - if (esma->row_count % 32) { - int unselected_mask = 0; - int num_unselected_in_last_byte = 32 - esma->row_count % 32; - - for (i = 0; i < num_unselected_in_last_byte; i ++) - unselected_mask |= 1 << i; - - esma->selection[(esma->row_count + 31) / 32 - 1] &= ~unselected_mask; - } + e_bit_array_select_all(esma->eba); esma->cursor_col = 0; esma->cursor_row = 0; @@ -359,17 +257,11 @@ esma_select_all (ESelectionModel *selection) static void esma_invert_selection (ESelectionModel *selection) { - int i; ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); e_selection_model_array_confirm_row_count(esma); - - if (!esma->selection) - esma->selection = g_new0 (gint, (esma->row_count + 31) / 32); - - for (i = 0; i < (esma->row_count + 31) / 32; i ++) { - esma->selection[i] = ~esma->selection[i]; - } + + e_bit_array_invert_selection(esma->eba); esma->cursor_col = -1; esma->cursor_row = -1; @@ -383,18 +275,15 @@ esma_row_count (ESelectionModel *selection) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); e_selection_model_array_confirm_row_count(esma); - return esma->row_count; + return e_bit_array_bit_count(esma->eba); } -#define OPERATE(object, i,mask,grow) ((grow) ? (((object)->selection[(i)]) |= ((guint32) ~(mask))) : (((object)->selection[(i)]) &= (mask))) - static void esma_change_one_row(ESelectionModel *selection, int row, gboolean grow) { - int i; - i = BOX(row); - - OPERATE(E_SELECTION_MODEL_ARRAY(selection), i, ~BITMASK(row), grow); + ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); + e_selection_model_array_confirm_row_count(esma); + e_bit_array_change_one_row(esma->eba, row, grow); } static void @@ -414,29 +303,16 @@ esma_change_cursor (ESelectionModel *selection, int row, int col) static void esma_change_range(ESelectionModel *selection, int start, int end, gboolean grow) { - int i, last; + int i; ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); if (start != end) { if (selection->sorter && e_sorter_needs_sorting(selection->sorter)) { for ( i = start; i < end; i++) { - e_selection_model_change_one_row(selection, e_sorter_sorted_to_model(selection->sorter, i), grow); + e_bit_array_change_one_row(esma->eba, e_sorter_sorted_to_model(selection->sorter, i), grow); } } else { - i = BOX(start); - last = BOX(end); - - if (i == last) { - OPERATE(esma, i, BITMASK_LEFT(start) | BITMASK_RIGHT(end), grow); - } else { - OPERATE(esma, i, BITMASK_LEFT(start), grow); - if (grow) - for (i ++; i < last; i++) - esma->selection[i] = ONES; - else - for (i ++; i < last; i++) - esma->selection[i] = 0; - OPERATE(esma, i, BITMASK_RIGHT(end), grow); - } + e_selection_model_array_confirm_row_count(esma); + e_bit_array_change_range(esma->eba, start, end, grow); } } } @@ -458,20 +334,12 @@ esma_cursor_col (ESelectionModel *selection) static void esma_select_single_row (ESelectionModel *selection, int row) { - int i; ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - for (i = 0; i < ((esma->row_count + 31) / 32); i++) { - if (!((i == BOX(row) && esma->selection[i] == BITMASK(row)) || - (i != BOX(row) && esma->selection[i] == 0))) { - g_free(esma->selection); - esma->selection = g_new0(gint, (esma->row_count + 31) / 32); - esma->selection[BOX(row)] = BITMASK(row); - - e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); - break; - } - } + e_selection_model_array_confirm_row_count(esma); + e_bit_array_select_single_row(esma->eba, row); + + e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); esma->selection_start_row = row; } @@ -479,10 +347,10 @@ static void esma_toggle_single_row (ESelectionModel *selection, int row) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); - if (esma->selection[BOX(row)] & BITMASK(row)) - esma->selection[BOX(row)] &= ~BITMASK(row); - else - esma->selection[BOX(row)] |= BITMASK(row); + + e_selection_model_array_confirm_row_count(esma); + e_bit_array_toggle_single_row(esma->eba, row); + esma->selection_start_row = row; e_selection_model_selection_changed(E_SELECTION_MODEL(esma)); } @@ -528,7 +396,7 @@ esma_set_selection_end (ESelectionModel *selection, int row) ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(selection); esma_select_single_row(selection, esma->selection_start_row); esma->cursor_row = esma->selection_start_row; - e_selection_model_move_selection_end(selection, row); + esma_move_selection_end(selection, row); } int @@ -547,8 +415,7 @@ e_selection_model_array_get_row_count (ESelectionModelArray *esma) static void e_selection_model_array_init (ESelectionModelArray *esma) { - esma->selection = NULL; - esma->row_count = -1; + esma->eba = NULL; esma->selection_start_row = 0; esma->cursor_row = -1; esma->cursor_col = -1; diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index 33250e347f..990f688060 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -3,9 +3,8 @@ #define _E_SELECTION_MODEL_ARRAY_H_ #include <gtk/gtkobject.h> -#include <gal/util/e-sorter.h> -#include <gdk/gdktypes.h> #include <gal/widgets/e-selection-model.h> +#include <gal/util/e-bit-array.h> #ifdef __cplusplus extern "C" { @@ -20,8 +19,7 @@ extern "C" { typedef struct { ESelectionModel base; - gint row_count; - guint32 *selection; + EBitArray *eba; gint cursor_row; gint cursor_col; diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c index bb20aafaf6..80654e3097 100644 --- a/widgets/misc/e-selection-model-simple.c +++ b/widgets/misc/e-selection-model-simple.c @@ -60,9 +60,9 @@ e_selection_model_simple_set_row_count (ESelectionModelSimple *esms, { if (esms->row_count != row_count) { ESelectionModelArray *esma = E_SELECTION_MODEL_ARRAY(esms); - g_free(esma->selection); - esma->selection = NULL; - esma->row_count = -1; + if (esma->eba) + gtk_object_unref(GTK_OBJECT(esma->eba)); + esma->eba = NULL; } esms->row_count = row_count; } diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index 3fb027e1a7..0fc7b27be3 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -16,8 +16,11 @@ extern "C" { #define E_IS_SELECTION_MODEL(o) (GTK_CHECK_TYPE ((o), E_SELECTION_MODEL_TYPE)) #define E_IS_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECTION_MODEL_TYPE)) +#ifndef _E_FOREACH_FUNC_H_ +#define _E_FOREACH_FUNC_H_ typedef void (*EForeachFunc) (int model_row, gpointer closure); +#endif /* list selection modes */ typedef enum { |