コミット: 27af282284221ac79aa7b518a934f40ef4d7e909 - dia (git)

作図ソフト dia の改良版

コミットメタ情報

• リビジョン: 27af282284221ac79aa7b518a934f40ef4d7e909 (tree)
• 日時: 2004-04-28 22:44:44
• 作者: Lars Clausen <lclausen@src....>
• コミッター: Lars Clausen

ログメッセージ

Number of ongoing projects: Text edit, persistence, undo for properties and
pagesetup, rotation even.

変更サマリ

• modified: ChangeLog
• modified: app/Makefile.am
• modified: app/disp_callbacks.c
• modified: app/interface.c
• modified: app/layer_dialog.c
• modified: app/modify_tool.c
• modified: app/undo.c
• modified: lib/diagramdata.h
• modified: lib/object.h
• modified: lib/text.c
• modified: lib/text.h
• modified: objects/network/bus.c
• modified: objects/standard/box.c
• modified: objects/standard/ellipse.c

差分

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/Makefile.am: New files diacanvas.[ch]
+
+	* app/interface.c (create_display_shell): Use new diacanvas that
+	allows placing widgets on canvas, for text edit.
+
+	* lib/object.h: 
+	Early work towards rotation.  No implementation yet.
+
+	* app/layer_dialog.c (undo_layer): 
+	* objects/network/bus.c (bus_create_change): 
+	* objects/standard/box.c (aspect_create_change): 
+	* objects/standard/ellipse.c (aspect_create_change): 
+	Use g_new0 for change struct.
+
+	* app/undo.c (diagram_change_apply_or_revert): 
+	Support for undo of diagram properties and page setup.
+
+	* app/disp_callbacks.c (ddisplay_canvas_events): 
+	* lib/text.h: 
+	* lib/diagramdata.h: 
+	* app/modify_tool.c (click_select_object): 
+	* lib/text.c (text_register_editable): 
+	Starting work on new text editing model.  Guarded by #ifdef so
+	far. 
+
 2004-04-07  Lars Clausen  <[e-mail]>
 
 	* app/recent_files.c (open_recent_file_callback): 

--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -147,6 +147,8 @@ dia_core_files = \
 	    diapsft2renderer.c \
 	    navigation.h \
 	    navigation.c \
+	    diacanvas.c \
+	    diacanvas.h \
 	    highlight.c \
 	    highlight.h \
 	    $(print_files)

--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -435,6 +435,8 @@ void ddisplay_im_context_preedit_changed(GtkIMContext *context,
 */
 }
 
+/** Main input handler for a diagram canvas.
+ */
 gint
 ddisplay_canvas_events (GtkWidget *canvas,
 			GdkEvent  *event,
@@ -671,24 +673,24 @@ ddisplay_canvas_events (GtkWidget *canvas,
         key_handled = FALSE;
 
         focus = active_focus();
-        if ((focus != NULL) &&
-            !(state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) ) {
-              /* Keys goes to the active focus. */
-          obj = focus->obj;
-          if (diagram_is_selected(ddisp->diagram, obj)) {
-
-            if (!gtk_im_context_filter_keypress(
-                  GTK_IM_CONTEXT(ddisp->im_context), kevent)) {
-              
-                  /*! key event not swallowed by the input method ? */
-              handle_key_event(ddisp, focus, kevent->keyval,
-                               kevent->string, kevent->length);
-
-              diagram_flush(ddisp->diagram);
-            }
-          }
-          return_val = key_handled = TRUE;
-        }
+        if (focus != NULL) {
+          if ((state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) ) {
+	    /* Keys goes to the active focus. */
+	    obj = focus->obj;
+	    if (diagram_is_selected(ddisp->diagram, obj)) {
+	      
+	      if (!gtk_im_context_filter_keypress
+		  (GTK_IM_CONTEXT(ddisp->im_context), kevent)) {
+		/*! key event not swallowed by the input method ? */
+		handle_key_event(ddisp, focus, kevent->keyval,
+				 kevent->string, kevent->length);
+		
+		diagram_flush(ddisp->diagram);
+	      }
+	    }
+	    return_val = key_handled = TRUE;
+	  }
+	}
 
         if (!key_handled) {
               /* No focus to receive keys, take care of it ourselves. */
@@ -736,8 +738,13 @@ ddisplay_canvas_events (GtkWidget *canvas,
               default:
                 if (kevent->string && 0 == strcmp(" ",kevent->string)) {
                   tool_select_former();
-                } else { 
+                } else if ((kevent->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0 && 
+			   kevent->length != 0) {
+		  /* Find first editable */
+#ifdef NEW_TEXT_EDIT
+		  modify_edit_first_text(ddisp);
                   return_val = FALSE;
+#endif
                 }
           }
         }

--- a/app/interface.c
+++ b/app/interface.c
@@ -41,7 +41,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include "dia-app-icons.h"
-
+#include "diacanvas.h"
 
 static const GtkTargetEntry create_object_targets[] = {
   { "application/x-dia-object", 0, 0 },
@@ -430,10 +430,11 @@ create_display_shell(DDisplay *ddisp,
   gtk_widget_show(navigation_button);
 
   /*  Canvas  */
-  ddisp->canvas = gtk_drawing_area_new ();
+  /*  ddisp->canvas = gtk_drawing_area_new ();*/
+  ddisp->canvas = dia_canvas_new();
   /* Dia's canvas does it' double buffering alone so switch off GTK's */
   gtk_widget_set_double_buffered (ddisp->canvas, FALSE);
-
+  dia_canvas_set_size(ddisp->canvas, width, height);
   gtk_widget_set_events (ddisp->canvas, CANVAS_EVENT_MASK);
   GTK_WIDGET_SET_FLAGS (ddisp->canvas, GTK_CAN_FOCUS);
   g_signal_connect (GTK_OBJECT (ddisp->canvas), "event",
@@ -448,6 +449,7 @@ create_display_shell(DDisplay *ddisp,
 		    G_CALLBACK(display_data_received_callback), ddisp);
 
   gtk_object_set_user_data (GTK_OBJECT (ddisp->canvas), (gpointer) ddisp);
+
   /*  pack all the widgets  */
   gtk_table_attach (GTK_TABLE (table), ddisp->origin, 0, 1, 0, 1,
                     GTK_FILL, GTK_FILL, 0, 0);

--- a/app/layer_dialog.c
+++ b/app/layer_dialog.c
@@ -1113,7 +1113,7 @@ undo_layer(Diagram *dia, Layer *layer, enum LayerChangeType type, int index)
 {
   struct LayerChange *change;
 
-  change = g_new(struct LayerChange, 1);
+  change = g_new0(struct LayerChange, 1);
   
   change->change.apply = (UndoApplyFunc) layer_change_apply;
   change->change.revert = (UndoRevertFunc) layer_change_revert;

--- a/app/modify_tool.c
+++ b/app/modify_tool.c
@@ -31,6 +31,10 @@
 #include "cursor.h"
 #include "highlight.h"
 
+#include "diacanvas.h"
+#include "prop_text.h"
+#include "gtk/gtk.h"
+
 static Object *click_select_object(DDisplay *ddisp, Point *clickedpoint,
 				   GdkEventButton *event);
 static int do_if_clicked_handle(DDisplay *ddisp, ModifyTool *tool,
@@ -44,6 +48,9 @@ static void modify_motion(ModifyTool *tool, GdkEventMotion *event,
 			  DDisplay *ddisp);
 static void modify_double_click(ModifyTool *tool, GdkEventButton *event,
 				DDisplay *ddisp);
+void modify_make_text_edit(DDisplay *ddisp, Object *obj, 
+			   Point *clickedpoint);
+
 
 Tool *
 create_modify_tool(void)
@@ -66,7 +73,6 @@ create_modify_tool(void)
   return (Tool *)tool;
 }
 
-
 void
 free_modify_tool(Tool *tool)
 {
@@ -159,6 +165,8 @@ click_select_object(DDisplay *ddisp, Point *clickedpoint,
 	diagram_unselect_object(ddisp->diagram, (Object *)already->data);
 	diagram_flush(ddisp->diagram);
       } else {
+	/* Maybe start editing text */
+	modify_make_text_edit(ddisp, obj, clickedpoint);
 	return obj;
       }
     }
@@ -707,8 +715,195 @@ modify_button_release(ModifyTool *tool, GdkEventButton *event,
   }
 }
 
+#define EDIT_BORDER_WIDTH 5
 
+gboolean
+modify_edit_end(GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+  int foo = printf("Ending focus\n");
+  GtkTextView *view = GTK_TEXT_VIEW(widget);
+  Object *obj = (Object*)data;
+  GQuark quark = g_quark_from_string(PROP_TYPE_TEXT);
+  PropDescription *props = obj->ops->describe_props(obj);
+  int i;
 
+  for (i = 0; props[i].name != NULL; i++) {
+    printf("Testing to remove: %s\n", props[i].name);
+    if (props[i].type_quark == quark) {
+      GPtrArray *textprops = g_ptr_array_sized_new(1);
+      TextProperty *textprop;
+      Property *prop = props[i].ops->new_prop(&props[i], pdtpp_true);
+      GtkTextBuffer *buf;
+      GtkTextIter start, end;
+      ObjectChange *change;
+
+      printf("Going to stop %d\n", i);
+      buf = gtk_text_view_get_buffer(view);
+      g_ptr_array_add(textprops, prop);
+      obj->ops->get_props(obj, textprops);
+      textprop = (TextProperty*)prop;
+      if (textprop->text_data != NULL) g_free(textprop->text_data);
+      gtk_text_buffer_get_bounds(buf, &start, &end);
+      textprop->text_data = gtk_text_buffer_get_text(buf, &start, &end, TRUE);
+      printf("Setting text %s\n", textprop->text_data);
+      obj->ops->set_props(obj, textprops);
+      gtk_widget_destroy(widget);
+    }
+  }
+  return FALSE;
+}
 
+/** Start editing the first text among selected objects, if any */
+void
+modify_edit_first_text(DDisplay *ddisp)
+{
+  GList *edits = ddisp->diagram->data->text_edits;
 
+  if (edits != NULL) {
+    Text *text = (Text*)edits->data;
+    modify_start_text_edit(ddisp, text, text->parent_object, NULL);
+  }
+}
+
+void
+modify_start_text_edit(DDisplay *ddisp, Text *text, Object *obj, Point *clickedpoint)
+{
+  GtkWidget *view = gtk_text_view_new();
+  int x, y, i;
+  GtkTextBuffer *buf;
+  GtkTextTag *fonttag;
+  GtkTextIter start, end;
+  real ascent;
+  int ascent_pixels;
+
+  printf("modify_start_text_edit\n");
+  ddisplay_transform_coords(ddisp,
+			    text->position.x,
+			    text->position.y,
+			    &x, &y);
+  ascent = dia_font_scaled_ascent(text->line[0], 
+				  text->font,
+				  text->height,
+				  ddisp->zoom_factor);
+  printf("Text prop string %s pos %d, %d ascent %f\n",
+	 text->line[0], x, y, ascent);
+  ascent_pixels = ddisplay_transform_length(ddisp, ascent);
+  y -= ascent_pixels;
+  dia_canvas_put(DIA_CANVAS(ddisp->canvas), view, 
+		 x-EDIT_BORDER_WIDTH, y-EDIT_BORDER_WIDTH);
+  buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view));
+  for (i = 0; i < text->numlines; i++) {
+    gtk_text_buffer_insert_at_cursor(buf, text->line[i], -1);
+  }
+  fonttag = 
+    gtk_text_buffer_create_tag(buf,
+			       NULL,
+			       "font-desc",
+			       text->font->pfd,
+			       NULL);
+  gtk_text_buffer_get_bounds(buf, &start, &end);
+  gtk_text_buffer_apply_tag(buf, fonttag, &start, &end);
+
+  printf("Above lines %d below %d\n",
+	 gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(view)),
+	 gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(view)));
+
+  gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+				       GTK_TEXT_WINDOW_LEFT, 
+				       EDIT_BORDER_WIDTH);
+  gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+				       GTK_TEXT_WINDOW_RIGHT, 
+				       EDIT_BORDER_WIDTH);
+  gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+				       GTK_TEXT_WINDOW_TOP,
+				       EDIT_BORDER_WIDTH);
+  gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+				       GTK_TEXT_WINDOW_BOTTOM,
+				       EDIT_BORDER_WIDTH);
+  /* Using deprecated function because the fucking gobject documentation
+   * fucking sucks. */
+#ifdef NEW_TEXT_EDIT
+  gtk_signal_connect(GTK_OBJECT(view), "focus-out-event",
+		     modify_edit_end, obj);
+｣endif
+  gtk_widget_grab_focus(view);
+  gtk_widget_show(view);
+}
 
+void
+modify_make_text_edit(DDisplay *ddisp, Object *obj, Point *clickedpoint)
+{
+  PropDescription *props = obj->ops->describe_props(obj);
+  int i;
+  for (i = 0; props[i].name != NULL; i++) {
+    GQuark type = g_quark_from_string(PROP_TYPE_TEXT);
+    printf("Testing %s\n", props[i].type);
+    if (props[i].type_quark == type) {
+      GtkWidget *view = gtk_text_view_new();
+      GPtrArray *textprops = g_ptr_array_sized_new(1);
+      TextProperty *textprop;
+      Property *prop = props[i].ops->new_prop(&props[i], pdtpp_true);
+      int x, y;
+      GtkTextBuffer *buf;
+      GtkTextTag *fonttag;
+      GtkTextIter start, end;
+      real ascent;
+      int ascent_pixels;
+
+      g_ptr_array_add(textprops, prop);
+
+      printf("Found text prop %d\n", i);
+      obj->ops->get_props(obj, textprops);
+      textprop = (TextProperty*)prop;
+      ddisplay_transform_coords(ddisp,
+				textprop->attr.position.x,
+				textprop->attr.position.y,
+				&x, &y);
+      ascent = dia_font_scaled_ascent(textprop->text_data, 
+				      textprop->attr.font,
+				      textprop->attr.height,
+				      ddisp->zoom_factor);
+      printf("Text prop string %s pos %d, %d ascent %f\n",
+	     textprop->text_data, x, y, ascent);
+      ascent_pixels = ddisplay_transform_length(ddisp, ascent);
+      y -= ascent_pixels;
+      dia_canvas_put(DIA_CANVAS(ddisp->canvas), view, 
+		     x-EDIT_BORDER_WIDTH, y-EDIT_BORDER_WIDTH);
+      buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view));
+      gtk_text_buffer_insert_at_cursor(buf, textprop->text_data, -1);
+      fonttag = 
+	gtk_text_buffer_create_tag(buf,
+				   NULL,
+				   "font-desc",
+				   textprop->attr.font->pfd,
+				   NULL);
+      gtk_text_buffer_get_bounds(buf, &start, &end);
+      gtk_text_buffer_apply_tag(buf, fonttag, &start, &end);
+
+      printf("Above lines %d below %d\n",
+	     gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(view)),
+	     gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(view)));
+
+      gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+					   GTK_TEXT_WINDOW_LEFT, 
+					   EDIT_BORDER_WIDTH);
+      gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+					   GTK_TEXT_WINDOW_RIGHT, 
+					   EDIT_BORDER_WIDTH);
+      gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+					   GTK_TEXT_WINDOW_TOP,
+					   EDIT_BORDER_WIDTH);
+      gtk_text_view_set_border_window_size(GTK_TEXT_VIEW(view), 
+					   GTK_TEXT_WINDOW_BOTTOM,
+					   EDIT_BORDER_WIDTH);
+      /* Using deprecated function because the fucking gobject documentation
+       * fucking sucks. */
+#ifdef NEW_TEXT_EDIT
+      gtk_signal_connect(GTK_OBJECT(view), "focus-out-event",
+			 modify_edit_end, obj);
+#endif
+      gtk_widget_grab_focus(view);
+      gtk_widget_show(view);
+    }
+  }  
+}

--- a/app/undo.c
+++ b/app/undo.c
@@ -48,7 +48,7 @@ is_transactionpoint(Change *change)
 static Change *
 new_transactionpoint(void)
 {
-  Change *transaction = g_new(Change, 1);
+  Change *transaction = g_new0(Change, 1);
 
   if (transaction) {
     transaction->apply = transaction_point_pointer;
@@ -373,7 +373,7 @@ undo_move_objects(Diagram *dia, Point *orig_pos, Point *dest_pos,
 {
   struct MoveObjectsChange *change;
 
-  change = g_new(struct MoveObjectsChange, 1);
+  change = g_new0(struct MoveObjectsChange, 1);
   
   change->change.apply = (UndoApplyFunc) move_objects_apply;
   change->change.revert = (UndoRevertFunc) move_objects_revert;
@@ -434,7 +434,7 @@ undo_move_handle(Diagram *dia,
 {
   struct MoveHandleChange *change;
 
-  change = g_new(struct MoveHandleChange, 1);
+  change = g_new0(struct MoveHandleChange, 1);
   
   change->change.apply = (UndoApplyFunc) move_handle_apply;
   change->change.revert = (UndoRevertFunc) move_handle_revert;
@@ -500,7 +500,7 @@ undo_connect(Diagram *dia, Object *obj, Handle *handle,
 {
   struct ConnectChange *change;
 
-  change = g_new(struct ConnectChange, 1);
+  change = g_new0(struct ConnectChange, 1);
   
   change->change.apply = (UndoApplyFunc) connect_apply;
   change->change.revert = (UndoRevertFunc) connect_revert;
@@ -552,7 +552,7 @@ undo_unconnect(Diagram *dia, Object *obj, Handle *handle)
 {
   struct UnconnectChange *change;
 
-  change = g_new(struct UnconnectChange, 1);
+  change = g_new0(struct UnconnectChange, 1);
   
   change->change.apply = (UndoApplyFunc) unconnect_apply;
   change->change.revert = (UndoRevertFunc) unconnect_revert;
@@ -662,7 +662,7 @@ undo_delete_objects(Diagram *dia, GList *obj_list)
 {
   struct DeleteObjectsChange *change;
 
-  change = g_new(struct DeleteObjectsChange, 1);
+  change = g_new0(struct DeleteObjectsChange, 1);
   
   change->change.apply = (UndoApplyFunc) delete_objects_apply;
   change->change.revert = (UndoRevertFunc) delete_objects_revert;
@@ -743,7 +743,7 @@ undo_insert_objects(Diagram *dia, GList *obj_list, int applied)
 {
   struct InsertObjectsChange *change;
 
-  change = g_new(struct InsertObjectsChange, 1);
+  change = g_new0(struct InsertObjectsChange, 1);
   
   change->change.apply = (UndoApplyFunc) insert_objects_apply;
   change->change.revert = (UndoRevertFunc) insert_objects_revert;
@@ -801,7 +801,7 @@ undo_reorder_objects(Diagram *dia, GList *changed_list, GList *orig_list)
 {
   struct ReorderObjectsChange *change;
 
-  change = g_new(struct ReorderObjectsChange, 1);
+  change = g_new0(struct ReorderObjectsChange, 1);
   
   change->change.apply = (UndoApplyFunc) reorder_objects_apply;
   change->change.revert = (UndoRevertFunc) reorder_objects_revert;
@@ -876,7 +876,7 @@ undo_object_change(Diagram *dia, Object *obj,
 {
   struct ObjectChangeChange *change;
 
-  change = g_new(struct ObjectChangeChange, 1);
+  change = g_new0(struct ObjectChangeChange, 1);
   
   change->change.apply = (UndoApplyFunc) object_change_apply;
   change->change.revert = (UndoRevertFunc) object_change_revert;
@@ -987,7 +987,7 @@ undo_group_objects(Diagram *dia, GList *obj_list, Object *group,
 {
   struct GroupObjectsChange *change;
 
-  change = g_new(struct GroupObjectsChange, 1);
+  change = g_new0(struct GroupObjectsChange, 1);
   
   change->change.apply = (UndoApplyFunc) group_objects_apply;
   change->change.revert = (UndoRevertFunc) group_objects_revert;
@@ -1088,7 +1088,7 @@ undo_ungroup_objects(Diagram *dia, GList *obj_list, Object *group,
 {
   struct UngroupObjectsChange *change;
 
-  change = g_new(struct UngroupObjectsChange, 1);
+  change = g_new0(struct UngroupObjectsChange, 1);
   
   change->change.apply = (UndoApplyFunc) ungroup_objects_apply;
   change->change.revert = (UndoRevertFunc) ungroup_objects_revert;
@@ -1183,3 +1183,244 @@ undo_parenting(Diagram *dia, Object* parentobj, Object* childobj,
   undo_push_change(dia->undo, change);
   return change;
 }
+
+/* ******* DIAGRAM PROPERTIES ******** */
+
+typedef enum { DYNAMIC_GRID, SPACING, BG_COLOR, GRID_COLOR, PAGE_COLOR,
+	       PAPER_SIZE, PORTRAIT, MARGINS, SCALING } DiagramChangeType;
+typedef union {
+    /* Diagram properties dialog */
+    gboolean dynamic_grid;
+    struct { real space_x, space_y; int visible_x, visible_y; } spacing;
+    Color bg_color, grid_color, page_color;
+    /* Page setup dialog */
+    gchar *paper_size;
+    gboolean portrait;
+    struct { real top, bottom, left, right; } margins;
+    struct { real scale; int fit_x, fit_y; } scaling;    
+} DiagramChangeData;
+
+typedef struct {
+  Change change;
+  DiagramChangeType t;
+  DiagramChangeData change_from, change_to;
+} DiagramChange;
+
+static void
+diagram_update_properties(Diagram *dia)
+{
+  /* If diagram properties window open */
+  /*diagram_properties_retrieve(dia);*/
+  diagram_set_modified(dia, TRUE);
+  diagram_add_update_all(dia);
+  diagram_flush(dia);
+}
+
+static void
+diagram_update_pagesetup(Diagram *dia) 
+{
+  /* update diagram -- this is needed to reposition page boundaries */
+  diagram_set_modified(dia, TRUE);
+  diagram_add_update_all(dia);
+  diagram_flush(dia);
+}
+
+static void
+diagram_change_apply_or_revert(Diagram *dia, DiagramChangeType t,
+			       DiagramChangeData *to)
+{
+  switch (t) {
+  case DYNAMIC_GRID:
+    dia->data->grid.dynamic = to->dynamic_grid;
+    diagram_update_properties(dia);
+    break;
+  case SPACING:
+    dia->data->grid.width_x = to->spacing.space_x;
+    dia->data->grid.width_y = to->spacing.space_y;
+    dia->data->grid.visible_x = to->spacing.visible_x;
+    dia->data->grid.visible_y = to->spacing.visible_y;
+    diagram_update_properties(dia);
+    break;
+  case BG_COLOR:
+    dia->data->bg_color = to->bg_color;
+    diagram_update_properties(dia);
+    break;
+  case GRID_COLOR:
+    dia->data->grid.colour = to->grid_color;
+    diagram_update_properties(dia);
+    break;
+  case PAGE_COLOR:
+    dia->data->pagebreak_color = to->page_color;
+    diagram_update_properties(dia);
+    break;
+  case PAPER_SIZE:
+    g_free(dia->data->paper.name);
+    dia->data->paper.name = g_strdup(to->paper_size);
+    diagram_update_pagesetup(dia);
+    break;
+  case PORTRAIT:
+    dia->data->paper.is_portrait = to->portrait;
+    diagram_update_pagesetup(dia);
+    break;
+  case MARGINS:
+    dia->data->paper.tmargin = to->margins.top;
+    dia->data->paper.bmargin = to->margins.bottom;
+    dia->data->paper.lmargin = to->margins.left;
+    dia->data->paper.rmargin = to->margins.right;
+    diagram_update_pagesetup(dia);
+    break;
+  case SCALING:
+    if (to->scaling.scale != 0) {
+      dia->data->paper.fitto = TRUE;
+      dia->data->paper.scaling = to->scaling.scale;
+    } else {
+      dia->data->paper.fitto = FALSE;
+      dia->data->paper.fitwidth = to->scaling.fit_x;
+      dia->data->paper.fitheight = to->scaling.fit_y;
+    }
+    diagram_update_pagesetup(dia);
+    break;
+  }  
+}
+
+static void
+diagram_change_apply(Change *change, Diagram *dia) 
+{
+  DiagramChange *diachange = (DiagramChange *)change;
+  diagram_change_apply_or_revert(dia, diachange->t, &diachange->change_to);
+}
+
+static void
+diagram_change_revert(Change *change, Diagram *dia) 
+{
+  DiagramChange *diachange = (DiagramChange *)change;
+  diagram_change_apply_or_revert(dia, diachange->t, &diachange->change_from);
+}
+
+static void
+diagram_change_free(Change *change)
+{
+  DiagramChange *diachange = (DiagramChange *)change;
+  if (diachange->t == PAPER_SIZE) {
+    g_free(diachange->change_to.paper_size);
+    g_free(diachange->change_from.paper_size);
+  }
+}
+
+Change *
+undo_diagram(Diagram *dia, DiagramChangeType t,
+	     DiagramChangeData from, DiagramChangeData to)
+{
+  DiagramChange *change = g_new0(DiagramChange, 1);
+  change->t = t;
+  change->change_from = from;
+  change->change_to = to;
+
+  return (Change*)change;
+}
+
+Change *
+undo_diagram_grid(Diagram *dia, gboolean on)
+{
+  DiagramChangeData from, to;
+  from.dynamic_grid = dia->data->grid.dynamic;
+  to.dynamic_grid = on;
+  return undo_diagram(dia, DYNAMIC_GRID, from, to);
+}
+
+Change *
+undo_diagram_spacing(Diagram *dia, real space_x, real space_y, 
+		     int visible_x, int visible_y)
+{
+  DiagramChangeData from, to;
+  from.spacing.space_x = dia->data->grid.width_x;
+  to.spacing.space_x = space_x;
+  from.spacing.space_y = dia->data->grid.width_y;
+  to.spacing.space_y = space_y;
+  from.spacing.visible_x = dia->data->grid.visible_x;
+  to.spacing.visible_x = visible_x;
+  from.spacing.visible_x = dia->data->grid.visible_y;
+  to.spacing.visible_x = visible_x;
+  return undo_diagram(dia, DYNAMIC_GRID, from, to);
+}
+
+Change *
+undo_diagram_bg_color(Diagram *dia, Color *bg_color)
+{
+  DiagramChangeData from, to;
+  from.bg_color = dia->data->bg_color;
+  to.bg_color = *bg_color;
+  return undo_diagram(dia, BG_COLOR, from, to);
+}
+
+Change *
+undo_diagram_grid_color(Diagram *dia, Color *grid_color)
+{
+  DiagramChangeData from, to;
+  from.grid_color = dia->data->grid.colour;
+  to.grid_color = *grid_color;
+  return undo_diagram(dia, GRID_COLOR, from, to);
+}
+
+Change *
+undo_diagram_page_color(Diagram *dia, Color *page_color)
+{
+  DiagramChangeData from, to;
+  from.page_color = dia->data->pagebreak_color;
+  to.page_color = *page_color;
+  return undo_diagram(dia, PAGE_COLOR, from, to);
+}
+
+Change *
+undo_diagram_paper_size(Diagram *dia, gchar *size)
+{
+  DiagramChangeData from, to;
+  from.paper_size = g_strdup(dia->data->paper.name);
+  to.paper_size = g_strdup(size);
+  return undo_diagram(dia, PAPER_SIZE, from, to);
+}
+
+Change *
+undo_diagram_portrait(Diagram *dia, gboolean portrait)
+{
+  DiagramChangeData from, to;
+  from.portrait = dia->data->paper.is_portrait;
+  to.portrait = portrait;
+  return undo_diagram(dia, PORTRAIT, from, to);
+}
+
+Change *
+undo_diagram_margins(Diagram *dia, real top, real bottom, 
+		     real left, real right)
+{
+  DiagramChangeData from, to;
+  from.margins.top = dia->data->paper.tmargin;
+  to.margins.top = top ;
+  from.margins.bottom = dia->data->paper.bmargin;
+  to.margins.bottom = bottom ;
+  from.margins.left = dia->data->paper.lmargin;
+  to.margins.left = left ;
+  from.margins.right = dia->data->paper.rmargin;
+  to.margins.right = right ;
+  return undo_diagram(dia, MARGINS, from, to);
+}
+
+Change *
+undo_diagram_scaling(Diagram *dia, real scale,
+		     int fit_x, int fit_y)
+{
+  DiagramChangeData from, to;
+  if (dia->data->paper.fitto) {
+    from.scaling.scale = 0;
+    from.scaling.fit_x = dia->data->paper.fitwidth;
+    from.scaling.fit_y = dia->data->paper.fitheight;
+  } else {
+    from.scaling.scale = dia->data->paper.scaling;
+    from.scaling.fit_x = 0;
+    from.scaling.fit_y = 0;
+  }
+  to.scaling.scale = scale;
+  to.scaling.fit_x = fit_x;
+  to.scaling.fit_y = fit_y;
+  return undo_diagram(dia, SCALING, from, to);
+}

--- a/lib/diagramdata.h
+++ b/lib/diagramdata.h
@@ -79,6 +79,10 @@ struct _DiagramData {
   guint selected_count;
   GList *selected;        /* List of objects that are selected,
 			     all from the active layer! */
+
+  /** List of text fields that can be edited in the diagram.
+   *  Updated by text_register_focusable. */
+  GList *text_edits;
 };
 
 struct _Layer {

--- a/lib/object.h
+++ b/lib/object.h
@@ -277,6 +277,12 @@ void object_load(Object *obj, ObjectNode obj_node);
 GList *object_copy_list(GList *list);
 ObjectChange* object_list_move_delta_r(GList *objects, Point *delta, gboolean affected);
 ObjectChange* object_list_move_delta(GList *objects, Point *delta);
+/** Rotate an object around a point.  If center is NULL, the position of
+ * the object is used. */
+ObjectChange* object_list_rotate(GList *objects, Point *center, real angle);
+/** Scale an object around a point.  If center is NULL, the position of
+ * the object is used. */
+ObjectChange* object_list_scale(GList *objects, Point *center, real factor);
 void destroy_object_list(GList *list);
 void object_add_handle(Object *obj, Handle *handle);
 void object_add_handle_at(Object *obj, Handle *handle, int pos);
@@ -315,6 +321,17 @@ Object *object_copy_using_properties(Object *obj);
  **  The structures used to define an object
  *****************************************/
 
+/** This structure defines an affine transformation that has been applied
+ * to this object.  Affine transformations done on a group are performed
+ * on all objects in the group.
+ */
+
+typedef struct _Affine {
+  real rotation;
+  real scale;
+  real translation;
+} Affine;
+
 
 /*
   This structure gives access to the functions used to manipulate an object
@@ -361,6 +378,7 @@ struct _Object {
   ObjectType       *type;
   Point             position;
   Rectangle         bounding_box;
+  Affine            affine;
   
   int               num_handles;
   Handle          **handles;

--- a/lib/text.c
+++ b/lib/text.c
@@ -29,6 +29,7 @@
 #include "text.h"
 #include "message.h"
 #include "diarenderer.h"
+#include "diagramdata.h"
 
 static int text_key_event(Focus *focus, guint keysym,
 			  const gchar *str, int strlen,
@@ -460,6 +461,29 @@ text_draw(Text *text, DiaRenderer *renderer)
   }
 }
 
+/** Register that an object has a text that can be edited.
+ *  This text will be inserted in the chain traversed by tabbing.
+ *  The registration is temporary, intended to be done when the 
+ *  object is selected.
+ */
+void
+text_register_editable(Text *text, Object *obj)
+{
+  DiagramData *dia;
+
+  text->parent_object = obj;
+  dia = text->parent_object->parent_layer->parent_diagram;
+  dia->text_edits = g_list_append(dia->text_edits, text);
+}
+
+/** Reset the list of editable texts. */
+void
+text_reset_editable(DiagramData *dia)
+{
+  g_list_free(dia->text_edits);
+  dia->text_edits = NULL;
+}
+
 void
 text_grab_focus(Text *text, Object *object)
 {
@@ -485,6 +509,9 @@ text_set_cursor(Text *text, Point *clicked_point,
   int row;
   int i;
 
+  /* New edit model doesn't use this. */
+  return;
+
   top = text->position.y - text->ascent;
   
   row = (int)floor((clicked_point->y - top) / text->height);
@@ -1097,7 +1124,7 @@ text_create_change(Text *text, enum change_type type,
 {
   struct TextObjectChange *change;
 
-  change = g_new(struct TextObjectChange, 1);
+  change = g_new0(struct TextObjectChange, 1);
 
   change->obj_change.apply = (ObjectChangeApplyFunc) text_change_apply;
   change->obj_change.revert = (ObjectChangeRevertFunc) text_change_revert;

--- a/lib/text.h
+++ b/lib/text.h
@@ -26,6 +26,8 @@
 
 
 struct _Text {
+  /** The object that owns this text. */
+  Object *parent_object;
   /* don't change these values directly, use the text_set* functions */
   
   /* Text data: */

--- a/objects/network/bus.c
+++ b/objects/network/bus.c
@@ -737,7 +737,7 @@ bus_create_change(Bus *bus, enum change_type type,
 {
   struct PointChange *change;
 
-  change = g_new(struct PointChange, 1);
+  change = g_new0(struct PointChange, 1);
 
   change->obj_change.apply = (ObjectChangeApplyFunc) bus_change_apply;
   change->obj_change.revert = (ObjectChangeRevertFunc) bus_change_revert;

--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -652,7 +652,7 @@ aspect_create_change(Box *box, AspectType aspect)
 {
   struct AspectChange *change;
 
-  change = g_new(struct AspectChange, 1);
+  change = g_new0(struct AspectChange, 1);
 
   change->obj_change.apply = (ObjectChangeApplyFunc) aspect_change_apply;
   change->obj_change.revert = (ObjectChangeRevertFunc) aspect_change_revert;

--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -628,7 +628,7 @@ aspect_create_change(Ellipse *ellipse, AspectType aspect)
 {
   struct AspectChange *change;
 
-  change = g_new(struct AspectChange, 1);
+  change = g_new0(struct AspectChange, 1);
 
   change->obj_change.apply = (ObjectChangeApplyFunc) aspect_change_apply;
   change->obj_change.revert = (ObjectChangeRevertFunc) aspect_change_revert;