]> Pileus Git - ~andy/gtk/blobdiff - tests/cellareascaffold.c
Added event handling to GtkCellAreaBox
[~andy/gtk] / tests / cellareascaffold.c
index b199d7cf6ec47a83a30fe019642bdd8381f14ff8..3e3787ab4deae1c70ae9aac1767a4646ad1c45d9 100644 (file)
@@ -37,6 +37,8 @@ static void      cell_area_scaffold_get_property                   (GObject
                                                                    GParamSpec           *pspec);
 
 /* GtkWidgetClass */
+static void      cell_area_scaffold_realize                        (GtkWidget       *widget);
+static void      cell_area_scaffold_unrealize                      (GtkWidget       *widget);
 static gboolean  cell_area_scaffold_draw                           (GtkWidget       *widget,
                                                                    cairo_t         *cr);
 static void      cell_area_scaffold_size_allocate                  (GtkWidget       *widget,
@@ -55,8 +57,41 @@ static void      cell_area_scaffold_get_preferred_width_for_height (GtkWidget
                                                                    gint             for_size,
                                                                    gint            *minimum_size,
                                                                    gint            *natural_size);
-
-
+static void      cell_area_scaffold_map                            (GtkWidget       *widget);
+static void      cell_area_scaffold_unmap                          (GtkWidget       *widget);
+static gint      cell_area_scaffold_focus                          (GtkWidget       *widget,
+                                                                   GtkDirectionType direction);
+static gboolean  cell_area_scaffold_button_press                   (GtkWidget       *widget,
+                                                                   GdkEventButton  *event);
+
+
+/* CellAreaScaffoldClass */
+static void      cell_area_scaffold_activate                       (CellAreaScaffold *scaffold);
+
+/* CellArea/GtkTreeModel callbacks */
+static void      size_changed_cb                                   (GtkCellAreaIter *iter,
+                                                                   GParamSpec       *pspec,
+                                                                   CellAreaScaffold *scaffold);
+static void      focus_changed_cb                                  (GtkCellArea      *area,
+                                                                   GtkCellRenderer  *renderer,
+                                                                   const gchar      *path,
+                                                                   CellAreaScaffold *scaffold);
+static void      row_changed_cb                                    (GtkTreeModel     *model,
+                                                                   GtkTreePath      *path,
+                                                                   GtkTreeIter      *iter,
+                                                                   CellAreaScaffold *scaffold);
+static void      row_inserted_cb                                    (GtkTreeModel     *model,
+                                                                    GtkTreePath      *path,
+                                                                    GtkTreeIter      *iter,
+                                                                    CellAreaScaffold *scaffold);
+static void      row_deleted_cb                                     (GtkTreeModel     *model,
+                                                                    GtkTreePath      *path,
+                                                                    CellAreaScaffold *scaffold);
+static void      rows_reordered_cb                                  (GtkTreeModel     *model,
+                                                                    GtkTreePath      *parent,
+                                                                    GtkTreeIter      *iter,
+                                                                    gint             *new_order,
+                                                                    CellAreaScaffold *scaffold);
 
 typedef struct {
   gint    size; /* The size of the row in the scaffold's opposing orientation */
@@ -64,8 +99,15 @@ typedef struct {
 
 struct _CellAreaScaffoldPrivate {
 
+  /* Window for catching events and dispatching them to the cell area */
+  GdkWindow       *event_window;
+
   /* The model we're showing data for */
   GtkTreeModel    *model;
+  gulong           row_changed_id;
+  gulong           row_inserted_id;
+  gulong           row_deleted_id;
+  gulong           rows_reordered_id;
 
   /* The area rendering the data and a global iter */
   GtkCellArea     *area;
@@ -73,16 +115,40 @@ struct _CellAreaScaffoldPrivate {
 
   /* Cache some info about rows (hieghts etc) */
   GArray          *row_data;
-};
 
+  /* Focus handling */
+  gint             focus_row;
+  gulong           focus_changed_id;
 
-#define ROW_SPACING  2
+  /* Check when the underlying area changes the size and
+   * we need to queue a redraw */
+  gulong           size_changed_id;
+
+
+};
 
 enum {
   PROP_0,
   PROP_ORIENTATION
 };
 
+enum {
+  ACTIVATE,
+  N_SIGNALS
+};
+
+static guint scaffold_signals[N_SIGNALS] = { 0 };
+
+#define ROW_SPACING  2
+
+#define DIRECTION_STR(dir)                             \
+  ((dir) == GTK_DIR_TAB_FORWARD  ? "tab forward" :     \
+   (dir) == GTK_DIR_TAB_BACKWARD ? "tab backward" :    \
+   (dir) == GTK_DIR_UP           ? "up" :              \
+   (dir) == GTK_DIR_DOWN         ? "down" :            \
+   (dir) == GTK_DIR_LEFT         ? "left" :            \
+   (dir) == GTK_DIR_RIGHT        ? "right" : "invalid")
+
 G_DEFINE_TYPE_WITH_CODE (CellAreaScaffold, cell_area_scaffold, GTK_TYPE_WIDGET,
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL));
 
@@ -103,6 +169,15 @@ cell_area_scaffold_init (CellAreaScaffold *scaffold)
   priv->row_data = g_array_new (FALSE, FALSE, sizeof (RowData));
 
   gtk_widget_set_has_window (GTK_WIDGET (scaffold), FALSE);
+  gtk_widget_set_can_focus (GTK_WIDGET (scaffold), TRUE);
+
+  priv->focus_changed_id =
+    g_signal_connect (priv->area, "focus-changed",
+                     G_CALLBACK (focus_changed_cb), scaffold);
+
+  priv->size_changed_id = 
+    g_signal_connect (priv->iter, "notify",
+                     G_CALLBACK (size_changed_cb), scaffold);
 }
 
 static void
@@ -118,15 +193,34 @@ cell_area_scaffold_class_init (CellAreaScaffoldClass *class)
   gobject_class->set_property = cell_area_scaffold_set_property;
 
   widget_class = GTK_WIDGET_CLASS(class);
+  widget_class->realize = cell_area_scaffold_realize;
+  widget_class->unrealize = cell_area_scaffold_unrealize;
   widget_class->draw = cell_area_scaffold_draw;
   widget_class->size_allocate = cell_area_scaffold_size_allocate;
   widget_class->get_preferred_width = cell_area_scaffold_get_preferred_width;
   widget_class->get_preferred_height_for_width = cell_area_scaffold_get_preferred_height_for_width;
   widget_class->get_preferred_height = cell_area_scaffold_get_preferred_height;
   widget_class->get_preferred_width_for_height = cell_area_scaffold_get_preferred_width_for_height;
+  widget_class->map = cell_area_scaffold_map;
+  widget_class->unmap = cell_area_scaffold_unmap;
+  widget_class->focus = cell_area_scaffold_focus;
+  widget_class->button_press_event = cell_area_scaffold_button_press;
+
+  class->activate = cell_area_scaffold_activate;
 
   g_object_class_override_property (gobject_class, PROP_ORIENTATION, "orientation");
 
+  scaffold_signals[ACTIVATE] =
+    g_signal_new ("activate",
+                 G_OBJECT_CLASS_TYPE (gobject_class),
+                 G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                 G_STRUCT_OFFSET (CellAreaScaffoldClass, activate),
+                 NULL, NULL,
+                 g_cclosure_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
+  widget_class->activate_signal = scaffold_signals[ACTIVATE];
+
+
   g_type_class_add_private (gobject_class, sizeof (CellAreaScaffoldPrivate));
 }
 
@@ -158,14 +252,22 @@ cell_area_scaffold_dispose (GObject *object)
 
   if (priv->iter)
     {
+      /* Disconnect signals */
+      g_signal_handler_disconnect (priv->iter, priv->size_changed_id);
+
       g_object_unref (priv->iter);
       priv->iter = NULL;
+      priv->size_changed_id = 0;
     }
 
   if (priv->area)
     {
+      /* Disconnect signals */
+      g_signal_handler_disconnect (priv->area, priv->focus_changed_id);
+
       g_object_unref (priv->area);
       priv->area = NULL;
+      priv->focus_changed_id = 0;
     }
 
   G_OBJECT_CLASS (cell_area_scaffold_parent_class)->dispose (object);  
@@ -217,10 +319,63 @@ cell_area_scaffold_get_property (GObject    *object,
     }
 }
 
-
 /*********************************************************
  *                    GtkWidgetClass                     *
  *********************************************************/
+static void
+cell_area_scaffold_realize (GtkWidget *widget)
+{
+  CellAreaScaffold        *scaffold = CELL_AREA_SCAFFOLD (widget);
+  CellAreaScaffoldPrivate *priv     = scaffold->priv;
+  GtkAllocation            allocation;
+  GdkWindow               *window;
+  GdkWindowAttr            attributes;
+  gint                     attributes_mask;
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  gtk_widget_set_realized (widget, TRUE);
+
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.x = allocation.x;
+  attributes.y = allocation.y;
+  attributes.width = allocation.width;
+  attributes.height = allocation.height;
+  attributes.wclass = GDK_INPUT_ONLY;
+  attributes.event_mask = gtk_widget_get_events (widget);
+  attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
+                           GDK_BUTTON_RELEASE_MASK |
+                           GDK_KEY_PRESS_MASK |
+                           GDK_KEY_RELEASE_MASK);
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+  window = gtk_widget_get_parent_window (widget);
+  gtk_widget_set_window (widget, window);
+  g_object_ref (window);
+
+  priv->event_window = gdk_window_new (window, &attributes, attributes_mask);
+  gdk_window_set_user_data (priv->event_window, widget);
+
+  gtk_widget_style_attach (widget);
+}
+
+static void
+cell_area_scaffold_unrealize (GtkWidget *widget)
+{
+  CellAreaScaffold        *scaffold = CELL_AREA_SCAFFOLD (widget);
+  CellAreaScaffoldPrivate *priv     = scaffold->priv;
+
+  if (priv->event_window)
+    {
+      gdk_window_set_user_data (priv->event_window, NULL);
+      gdk_window_destroy (priv->event_window);
+      priv->event_window = NULL;
+    }
+  
+  GTK_WIDGET_CLASS (cell_area_scaffold_parent_class)->unrealize (widget);
+}
+
 static gboolean
 cell_area_scaffold_draw (GtkWidget       *widget,
                         cairo_t         *cr)
@@ -233,10 +388,13 @@ cell_area_scaffold_draw (GtkWidget       *widget,
   GdkRectangle             render_area;
   GtkAllocation            allocation;
   gint                     i = 0;
+  gboolean                 have_focus;
+  GtkCellRendererState     flags;
 
   if (!priv->model)
     return FALSE;
 
+  have_focus  = gtk_widget_has_focus (widget);
   orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (priv->area));
 
   gtk_widget_get_allocation (widget, &allocation);
@@ -251,6 +409,11 @@ cell_area_scaffold_draw (GtkWidget       *widget,
     {
       RowData *data = &g_array_index (priv->row_data, RowData, i);
 
+      if (have_focus && i == priv->focus_row)
+       flags = GTK_CELL_RENDERER_FOCUSED;
+      else
+       flags = 0;
+
       if (orientation == GTK_ORIENTATION_HORIZONTAL)
        {
          render_area.height = data->size;
@@ -261,7 +424,9 @@ cell_area_scaffold_draw (GtkWidget       *widget,
        }
 
       gtk_cell_area_apply_attributes (priv->area, priv->model, &iter, FALSE, FALSE);
-      gtk_cell_area_render (priv->area, priv->iter, widget, cr, &render_area, 0);
+      gtk_cell_area_render (priv->area, priv->iter, widget, cr, 
+                           &render_area, &render_area, flags,
+                           (have_focus && i == priv->focus_row));
 
       if (orientation == GTK_ORIENTATION_HORIZONTAL)
        {
@@ -293,6 +458,8 @@ request_all_base (CellAreaScaffold *scaffold)
   if (!priv->model)
     return;
 
+  g_signal_handler_block (priv->iter, priv->size_changed_id);
+
   orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (priv->area));
 
   valid = gtk_tree_model_get_iter_first (priv->model, &iter);
@@ -314,6 +481,8 @@ request_all_base (CellAreaScaffold *scaffold)
     gtk_cell_area_iter_sum_preferred_width (priv->iter);
   else
     gtk_cell_area_iter_sum_preferred_height (priv->iter);
+
+  g_signal_handler_unblock (priv->iter, priv->size_changed_id);
 }
 
 static void 
@@ -360,11 +529,18 @@ cell_area_scaffold_size_allocate (GtkWidget           *widget,
   CellAreaScaffoldPrivate *priv     = scaffold->priv;
   GtkOrientation           orientation;
 
+  gtk_widget_set_allocation (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    gdk_window_move_resize (priv->event_window,
+                            allocation->x,
+                            allocation->y,
+                            allocation->width,
+                            allocation->height);
+
   if (!priv->model)
     return;
 
-  gtk_widget_set_allocation (widget, allocation);
-
   orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (priv->area));
 
   /* Cache the per-row sizes and allocate the iter */
@@ -543,7 +719,376 @@ cell_area_scaffold_get_preferred_width_for_height (GtkWidget       *widget,
     }
 }
 
+static void
+cell_area_scaffold_map (GtkWidget       *widget)
+{
+  CellAreaScaffold        *scaffold = CELL_AREA_SCAFFOLD (widget);
+  CellAreaScaffoldPrivate *priv     = scaffold->priv;
+  
+  GTK_WIDGET_CLASS (cell_area_scaffold_parent_class)->map (widget);
+
+  if (priv->event_window)
+    gdk_window_show (priv->event_window);
+}
+
+static void
+cell_area_scaffold_unmap (GtkWidget       *widget)
+{
+  CellAreaScaffold        *scaffold = CELL_AREA_SCAFFOLD (widget);
+  CellAreaScaffoldPrivate *priv     = scaffold->priv;
+  
+  GTK_WIDGET_CLASS (cell_area_scaffold_parent_class)->unmap (widget);
+
+  if (priv->event_window)
+    gdk_window_hide (priv->event_window);
+}
+
+
+static gint
+cell_area_scaffold_focus (GtkWidget       *widget,
+                         GtkDirectionType direction)
+{
+  CellAreaScaffold        *scaffold = CELL_AREA_SCAFFOLD (widget);
+  CellAreaScaffoldPrivate *priv     = scaffold->priv;
+  GtkTreeIter              iter;
+  gboolean                 valid;
+  gint                     focus_row;
+  GtkOrientation           orientation;
+  gboolean                 changed = FALSE;
+
+  /* Grab focus on ourself if we dont already have focus */
+  if (!gtk_widget_has_focus (widget))
+    gtk_widget_grab_focus (widget);
+
+  /* Move focus from cell to cell and row to row */
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (priv->area));
+  
+  focus_row = priv->focus_row;
+
+  g_signal_handler_block (priv->area, priv->focus_changed_id);
+  
+  valid = gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, priv->focus_row);
+  while (valid)
+    {
+      gtk_cell_area_apply_attributes (priv->area, priv->model, &iter, FALSE, FALSE);
+      
+      /* If focus stays in the area we dont need to do any more */
+      if (gtk_cell_area_focus (priv->area, direction))
+       {
+         priv->focus_row = focus_row;
+
+         /* XXX A smarter implementation would only invalidate the rectangles where
+          * focus was removed from and new focus was placed */
+         gtk_widget_queue_draw (widget);
+         changed = TRUE;
+         break;
+       }
+      else
+       {
+         if (orientation == GTK_ORIENTATION_HORIZONTAL)
+           {
+             if (direction == GTK_DIR_RIGHT ||
+                 direction == GTK_DIR_LEFT)
+               break;
+             else if (direction == GTK_DIR_UP ||
+                      direction == GTK_DIR_TAB_BACKWARD)
+               {
+                 if (focus_row == 0)
+                   break;
+                 else
+                   {
+                     /* XXX A real implementation should check if the
+                      * previous row can focus with it's attributes setup */
+                     focus_row--;
+                     valid = gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, focus_row);
+                   }
+               }
+             else /* direction == GTK_DIR_DOWN || GTK_DIR_TAB_FORWARD */
+               {
+                 if (focus_row == priv->row_data->len - 1)
+                   break;
+                 else
+                   {
+                     /* XXX A real implementation should check if the
+                      * previous row can focus with it's attributes setup */
+                     focus_row++;
+                     valid = gtk_tree_model_iter_next (priv->model, &iter);
+                   }
+               }
+           }
+         else  /* (orientation == GTK_ORIENTATION_HORIZONTAL) */
+           {
+             if (direction == GTK_DIR_UP ||
+                 direction == GTK_DIR_DOWN)
+               break;
+             else if (direction == GTK_DIR_LEFT ||
+                      direction == GTK_DIR_TAB_BACKWARD)
+               {
+                 if (focus_row == 0)
+                   break;
+                 else
+                   {
+                     /* XXX A real implementation should check if the
+                      * previous row can focus with it's attributes setup */
+                     focus_row--;
+                     valid = gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, focus_row);
+                   }
+               }
+             else /* direction == GTK_DIR_RIGHT || GTK_DIR_TAB_FORWARD */
+               {
+                 if (focus_row == priv->row_data->len - 1)
+                   break;
+                 else
+                   {
+                     /* XXX A real implementation should check if the
+                      * previous row can focus with it's attributes setup */
+                     focus_row++;
+                     valid = gtk_tree_model_iter_next (priv->model, &iter);
+                   }
+               }
+           }
+       }
+    }
+
+  g_signal_handler_unblock (priv->area, priv->focus_changed_id);
+
+  /* XXX A smarter implementation would only invalidate the rectangles where
+   * focus was removed from and new focus was placed */
+  gtk_widget_queue_draw (widget);
+
+  return changed;
+}
+
+static gboolean
+cell_area_scaffold_button_press (GtkWidget       *widget,
+                                GdkEventButton  *event)
+{
+  CellAreaScaffold        *scaffold = CELL_AREA_SCAFFOLD (widget);
+  CellAreaScaffoldPrivate *priv     = scaffold->priv;
+  GtkTreeIter              iter;
+  gboolean                 valid;
+  GtkOrientation           orientation;
+  gint                     i = 0;
+  GdkRectangle             event_area;
+  GtkAllocation            allocation;
+  gboolean                 handled = FALSE;
+
+  /* Move focus from cell to cell and row to row */
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (priv->area));
+
+  gtk_widget_get_allocation (widget, &allocation);
+
+  event_area.x      = 0;
+  event_area.y      = 0;
+  event_area.width  = allocation.width;
+  event_area.height = allocation.height;
+
+  valid = gtk_tree_model_get_iter_first (priv->model, &iter);
+  while (valid)
+    {
+      RowData *data = &g_array_index (priv->row_data, RowData, i);
+
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
+       {
+         event_area.height = data->size;
+
+         if (event->y >= allocation.y + event_area.y && 
+             event->y <= allocation.y + event_area.y + event_area.height)
+           {
+             /* XXX A real implementation would assemble GtkCellRendererState flags here */
+             gtk_cell_area_apply_attributes (priv->area, priv->model, &iter, FALSE, FALSE);
+             handled = gtk_cell_area_event (priv->area, priv->iter, GTK_WIDGET (scaffold),
+                                            (GdkEvent *)event, &event_area, 0);
+             break;
+           }
+
+         event_area.y += data->size;
+         event_area.y += ROW_SPACING;
+       }
+      else
+       {
+         event_area.width = data->size;
+
+         if (event->x >= allocation.x + event_area.x && 
+             event->x <= allocation.x + event_area.x + event_area.width)
+           {
+             /* XXX A real implementation would assemble GtkCellRendererState flags here */
+             gtk_cell_area_apply_attributes (priv->area, priv->model, &iter, FALSE, FALSE);
+             handled = gtk_cell_area_event (priv->area, priv->iter, GTK_WIDGET (scaffold),
+                                            (GdkEvent *)event, &event_area, 0);
+             break;
+           }
+
+         event_area.x += data->size;
+         event_area.x += ROW_SPACING;
+       }
+
+      i++;
+      valid = gtk_tree_model_iter_next (priv->model, &iter);
+    }
+
+  return handled;
+}
+
+/*********************************************************
+ *                CellAreaScaffoldClass                  *
+ *********************************************************/
+static void
+cell_area_scaffold_activate (CellAreaScaffold *scaffold)
+{
+  CellAreaScaffoldPrivate *priv     = scaffold->priv;
+  GtkWidget               *widget   = GTK_WIDGET (scaffold);
+  GtkAllocation            allocation;
+  GtkOrientation           orientation;
+  GdkRectangle             cell_area;
+  GtkTreeIter              iter;
+  gboolean                 valid;
+  gint                     i = 0;
+
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (priv->area));
+  gtk_widget_get_allocation (widget, &allocation);
+
+  cell_area.x = 0;
+  cell_area.y = 0;
+  cell_area.width  = allocation.width;
+  cell_area.height = allocation.height;
+
+  valid = gtk_tree_model_get_iter_first (priv->model, &iter);
+  while (valid)
+    {
+      RowData *data = &g_array_index (priv->row_data, RowData, i);
+
+      if (i == priv->focus_row)
+       {
+         if (orientation == GTK_ORIENTATION_HORIZONTAL)
+           cell_area.height = data->size;
+         else
+           cell_area.width = data->size;
+
+         gtk_cell_area_apply_attributes (priv->area, priv->model, &iter, FALSE, FALSE);
+         gtk_cell_area_activate (priv->area, priv->iter, widget, &cell_area, GTK_CELL_RENDERER_FOCUSED);
+
+         break;
+       }
+
+      if (orientation == GTK_ORIENTATION_HORIZONTAL)
+       cell_area.y += data->size + ROW_SPACING;
+      else
+       cell_area.x += data->size + ROW_SPACING;
+
+      i++;
+      valid = gtk_tree_model_iter_next (priv->model, &iter);
+    }
+}
+
+/*********************************************************
+ *           CellArea/GtkTreeModel callbacks             *
+ *********************************************************/
+static void
+size_changed_cb (GtkCellAreaIter  *iter,
+                GParamSpec       *pspec,
+                CellAreaScaffold *scaffold)
+{
+  if (!strcmp (pspec->name, "minimum-width") ||
+      !strcmp (pspec->name, "natural-width") ||
+      !strcmp (pspec->name, "minimum-height") ||
+      !strcmp (pspec->name, "natural-height"))
+    gtk_widget_queue_resize (GTK_WIDGET (scaffold));
+}
+
+static void
+focus_changed_cb (GtkCellArea      *area,
+                 GtkCellRenderer  *renderer,
+                 const gchar      *path,
+                 CellAreaScaffold *scaffold)
+{
+  CellAreaScaffoldPrivate *priv = scaffold->priv;
+  GtkWidget               *widget = GTK_WIDGET (scaffold);
+  GtkTreePath             *treepath;
+  gboolean                 found = FALSE;
+  gint                    *indices;
+
+  if (!priv->model)
+    return;
+
+  /* We can be signaled that a renderer lost focus, here
+   * we dont care */
+  if (!renderer)
+    return;
+  
+  treepath = gtk_tree_path_new_from_string (path);
+  indices = gtk_tree_path_get_indices (treepath);
+
+  priv->focus_row = indices[0];
+
+  gtk_tree_path_free (treepath);
+
+  g_print ("Focus changed signal, new focus row %d\n", priv->focus_row);
+
+  /* Make sure we have focus now */
+  if (!gtk_widget_has_focus (widget))
+    gtk_widget_grab_focus (widget);
+
+  gtk_widget_queue_draw (widget);
+}
+
+static void 
+rebuild_and_flush_internals (CellAreaScaffold *scaffold)
+{
+  CellAreaScaffoldPrivate *priv = scaffold->priv;
+  gint n_rows;
+
+  if (priv->model)
+    {
+      n_rows = gtk_tree_model_iter_n_children (priv->model, NULL);
+
+      /* Clear/reset the array */
+      g_array_set_size (priv->row_data, n_rows);
+      memset (priv->row_data->data, 0x0, n_rows * sizeof (RowData));
+    }
+  else
+    g_array_set_size (priv->row_data, 0);
+
+  /* Data changed, lets flush the iter and consequently queue resize and
+   * start everything over again (note this is definitly far from optimized) */
+  gtk_cell_area_iter_flush (priv->iter);
+}
+
+static void
+row_changed_cb (GtkTreeModel     *model,
+               GtkTreePath      *path,
+               GtkTreeIter      *iter,
+               CellAreaScaffold *scaffold)
+{
+  rebuild_and_flush_internals (scaffold);
+}
+
+static void
+row_inserted_cb (GtkTreeModel     *model,
+                GtkTreePath      *path,
+                GtkTreeIter      *iter,
+                CellAreaScaffold *scaffold)
+{
+  rebuild_and_flush_internals (scaffold);
+}
+
+static void
+row_deleted_cb (GtkTreeModel     *model,
+               GtkTreePath      *path,
+               CellAreaScaffold *scaffold)
+{
+  rebuild_and_flush_internals (scaffold);
+}
 
+static void
+rows_reordered_cb (GtkTreeModel     *model,
+                  GtkTreePath      *parent,
+                  GtkTreeIter      *iter,
+                  gint             *new_order,
+                  CellAreaScaffold *scaffold)
+{
+  rebuild_and_flush_internals (scaffold);
+}
 
 /*********************************************************
  *                         API                           *
@@ -580,7 +1125,11 @@ cell_area_scaffold_set_model (CellAreaScaffold *scaffold,
     {
       if (priv->model)
        {
-         /* XXX disconnect signals */
+         g_signal_handler_disconnect (priv->model, priv->row_changed_id);
+         g_signal_handler_disconnect (priv->model, priv->row_inserted_id);
+         g_signal_handler_disconnect (priv->model, priv->row_deleted_id);
+         g_signal_handler_disconnect (priv->model, priv->rows_reordered_id);
+
          g_object_unref (priv->model);
        }
 
@@ -588,25 +1137,26 @@ cell_area_scaffold_set_model (CellAreaScaffold *scaffold,
 
       if (priv->model)
        {
-         gint n_rows;
-
-         /* XXX connect signals */
          g_object_ref (priv->model);
 
-         n_rows = gtk_tree_model_iter_n_children (priv->model, NULL);
+         priv->row_changed_id = 
+           g_signal_connect (priv->model, "row-changed",
+                             G_CALLBACK (row_changed_cb), scaffold);
 
-         /* Clear/reset the array */
-         g_array_set_size (priv->row_data, n_rows);
-         memset (priv->row_data->data, 0x0, n_rows * sizeof (RowData));
-       }
-      else
-       {
-         g_array_set_size (priv->row_data, 0);
-       }
+         priv->row_inserted_id = 
+           g_signal_connect (priv->model, "row-inserted",
+                             G_CALLBACK (row_inserted_cb), scaffold);
+
+         priv->row_deleted_id = 
+           g_signal_connect (priv->model, "row-deleted",
+                             G_CALLBACK (row_deleted_cb), scaffold);
 
-      gtk_cell_area_iter_flush (priv->iter);
+         priv->rows_reordered_id = 
+           g_signal_connect (priv->model, "rows-reordered",
+                             G_CALLBACK (rows_reordered_cb), scaffold);
+       }
 
-      gtk_widget_queue_resize (GTK_WIDGET (scaffold));
+      rebuild_and_flush_internals (scaffold);
     }
 }