Commit: 65c5b65f088f639bcb8c2a7314c4f8d3efffc2c5 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 65c5b65f088f639bcb8c2a7314c4f8d3efffc2c5 (tree)
• Time: 2004-04-02 21:43:43
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Arrow persistence, xfig fixes, abs dirs.

Change Summary

• modified: ChangeLog
• modified: app/interface.c
• modified: app/recent_files.c
• modified: lib/arrows.c
• modified: lib/arrows.h
• modified: lib/attributes.c
• modified: lib/dia_dirs.c
• modified: lib/diaarrowchooser.c
• modified: lib/diaarrowchooser.h
• modified: lib/persistence.c
• modified: lib/widgets.c
• modified: plug-ins/xfig/xfig-import.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,29 @@
-2004-04-01  Lars Clausen  <[e-mail]>
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/recent_files.c: Use absolute name for recent files list.
+
+	* lib/attributes.c: Set start and end arrow types, correctly.
+
+	* lib/widgets.c (dia_arrow_selector_set_arrow): Use new function
+	to get arrow index.
+
+	* lib/diaarrowchooser.[ch]: Support for setting arrow info.
+
+	* app/interface.c (create_lineprops_area): Set persistently stored
+	arrow info.
+
+	* lib/arrows.[ch]: New function to get arrow index (in arrow_types)
+	from arrow type.
+
+	* lib/dia_dirs.c: dia_get_absolute_path now creates a canonical
+	path (i.e. without '.' or '..').  Not tuned for Win32 yet.
+
+	* plug-ins/xfig/xfig-import.c: Redone ordering of import to comply
+	with what xfig does.  Text now converted from latin-1 to utf-8
+	(latin-1, since that's what xfig seems to use.  Would like to see
+	examples of non-latin-1 figs).  String case problems fixed.
+
[phone]  Lars Clausen  <[e-mail]>
 
 	* lib/attributes.c: 
 	* app/interface.c: Default arrows now stored persistently, too.

--- a/app/interface.c
+++ b/app/interface.c
@@ -1117,7 +1117,7 @@ create_lineprops_area(GtkWidget *parent)
   arrow.width = persistence_register_real("start-arrow-width", DEFAULT_ARROW_WIDTH);
   arrow.length = persistence_register_real("start-arrow-length", DEFAULT_ARROW_LENGTH);
   arrow.type = arrow_type_from_name(persistence_register_string("start-arrow-type", "None"));
-  dia_arrow_chooser_set_arrow_type(DIA_ARROW_CHOOSER(chooser), arrow.type);
+  dia_arrow_chooser_set_arrow(DIA_ARROW_CHOOSER(chooser), &arrow);
   attributes_set_default_start_arrow(arrow);
   gtk_tooltips_set_tip(tool_tips, chooser, _("Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details..."), NULL);
   gtk_widget_show(chooser);
@@ -1131,7 +1131,7 @@ create_lineprops_area(GtkWidget *parent)
   arrow.width = persistence_register_real("end-arrow-width", DEFAULT_ARROW_WIDTH);
   arrow.length = persistence_register_real("end-arrow-length", DEFAULT_ARROW_LENGTH);
   arrow.type = arrow_type_from_name(persistence_register_string("end-arrow-type", "Filled Concave"));
-  dia_arrow_chooser_set_arrow_type(DIA_ARROW_CHOOSER(chooser), arrow.type);
+  dia_arrow_chooser_set_arrow(DIA_ARROW_CHOOSER(chooser), &arrow);
   attributes_set_default_end_arrow(arrow);
 
   gtk_wrap_box_pack(GTK_WRAP_BOX(parent), chooser, FALSE, TRUE, FALSE, TRUE);

--- a/app/recent_files.c
+++ b/app/recent_files.c
@@ -167,8 +167,10 @@ recent_file_history_make_menu()
 void
 recent_file_history_add(const char *fname)
 {
+    gchar *absname = dia_get_absolute_filename(fname);
     recent_file_history_clear_menu();
-    persistent_list_add("recent-files", fname);
+    persistent_list_add("recent-files", absname);
+    g_free(absname);
     
     recent_file_history_make_menu();
 }
@@ -193,9 +195,11 @@ recent_file_history_init() {
 void
 recent_file_history_remove (const char *fname) 
 {
+    gchar *absname = dia_get_absolute_filename(fname);
     recent_file_history_clear_menu();
 
-    persistent_list_remove("recent-files", fname);
+    persistent_list_remove("recent-files", absname);
+    g_free(absname);
 
     recent_file_history_make_menu();
 }

--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -1407,8 +1407,24 @@ arrow_type_from_name(gchar *name)
 {
   int i;
   for (i = 0; arrow_types[i].name != NULL; i++) {
-    if (!strcmp(arrow_types[i].name, name)) return arrow_types[i].enum_value;
+    if (!strcmp(arrow_types[i].name, name)) {
+      return arrow_types[i].enum_value;
+    }
   }
   printf("Unknown arrow type %s\n", name);
   return 0;
 }
+
+gint
+arrow_index_from_type(ArrowType atype)
+{
+  int i = 0;
+
+  for (i = 0; arrow_types[i].name != NULL; i++) {
+    if (arrow_types[i].enum_value == atype) {
+      return i;
+    }
+  }
+  printf("Can't find arrow index for type %d\n", atype);
+  return 0;
+}

--- a/lib/arrows.h
+++ b/lib/arrows.h
@@ -65,7 +65,7 @@ typedef enum {
 
 struct menudesc {
   char *name;
-  int enum_value;
+  ArrowType enum_value;
 };
 
 /** The number of centimeters long and wide an arrow starts with by default.
@@ -103,5 +103,7 @@ void arrow_transform_points(Arrow *arrow, Point *start, Point *to,
 
 /** Returns the ArrowType for a given name of an arrow, or 0 if not found. */
 ArrowType arrow_type_from_name(gchar *name);
+/** Returns the index in arrow_types of the given arrow type. */
+gint arrow_index_from_type(ArrowType type);
 
 #endif /* ARROWS_H */

--- a/lib/attributes.c
+++ b/lib/attributes.c
@@ -101,7 +101,8 @@ void
 attributes_set_default_start_arrow(Arrow arrow)
 {
   attributes_start_arrow = arrow;
-  persistence_set_string("start-arrow-type", arrow_types[arrow.type].name);
+  persistence_set_string("start-arrow-type", 
+			 arrow_types[arrow_index_from_type(arrow.type)].name);
   persistence_set_real("start-arrow-width", arrow.width);
   persistence_set_real("start-arrow-length", arrow.length);
 }
@@ -115,6 +116,10 @@ void
 attributes_set_default_end_arrow(Arrow arrow)
 {
   attributes_end_arrow = arrow;
+  persistence_set_string("end-arrow-type", 
+			 arrow_types[arrow_index_from_type(arrow.type)].name);
+  persistence_set_real("end-arrow-width", arrow.width);
+  persistence_set_real("end-arrow-length", arrow.length);
 }
 
 void

--- a/lib/dia_dirs.c
+++ b/lib/dia_dirs.c
@@ -126,6 +126,54 @@ dia_config_ensure_dir(const gchar *filename)
   return exists;
 }
 
+/** Remove all instances of . and .. from an absolute path.
+ * This is not a cheap function.
+ * Returns a newly allocated string, or NULL if too many ..'s were found */
+static gchar *
+dia_get_canonical_path (gchar *path) {
+  if (g_str_has_suffix(path, "/..")) {
+    gchar *prev = g_path_get_dirname(path);
+    path = prev;
+    prev = dia_get_canonical_path(path);
+    g_free(path);
+    if (prev == NULL) return NULL;
+    path = prev;
+    /* Snip! */
+    prev = g_path_get_dirname(prev);
+    if (!strcmp(path, prev)) {
+      /* .. ran over / */
+      return NULL;
+    }
+    g_free(path);
+    return prev;
+  } else if (g_str_has_suffix(path, "/.")) {
+    gchar *prev = g_path_get_dirname(path);
+    path = prev;
+    prev = dia_get_canonical_path(path);
+    g_free(path);
+    return prev;
+  } else {
+    gchar *end = g_path_get_basename(path);
+    gchar *prev = g_path_get_dirname(path);
+    gchar *tmp;
+    if (strcmp(path, prev)) { /* Something got removed */
+      tmp = prev;
+      prev = dia_get_canonical_path(tmp);
+      if (prev == NULL) return NULL;
+      g_free(tmp);
+      tmp = prev;
+      prev = g_build_filename(tmp, end, NULL);
+      g_free(tmp);
+      g_free(end);
+      return prev;
+    } else {
+      g_free(end);
+      g_free(prev);
+      return g_strdup(path);
+    }
+  }
+}
+
 /** Return an absolute filename from an absolute or relative filename.
  * The value returned is newly allocated. 
  */
@@ -134,10 +182,18 @@ dia_get_absolute_filename (const gchar *filename)
 {
   gchar *current_dir;
   gchar *fullname;
+  gchar *canonical;
   if (filename == NULL) return NULL;
   if (g_path_is_absolute(filename)) return g_strdup(filename);
   current_dir = g_get_current_dir();
   fullname = g_build_filename(current_dir, filename, NULL);
   g_free(current_dir);
-  return fullname;
+  if (strchr(fullname, '.') == NULL) return fullname;
+  canonical = dia_get_canonical_path(fullname);
+  if (canonical == NULL) {
+    message_warning("Too many ..'s in filename %s\n", filename);
+    return filename;
+  }
+  free(fullname);
+  return canonical;
 }

--- a/lib/diaarrowchooser.c
+++ b/lib/diaarrowchooser.c
@@ -363,25 +363,31 @@ dia_arrow_chooser_dialog_destroy (DiaArrowChooser *chooser)
 }
 
 static void
-dia_arrow_chooser_change_arrow_type(GtkMenuItem *mi, DiaArrowChooser *arrow)
+dia_arrow_chooser_change_arrow_type(GtkMenuItem *mi, DiaArrowChooser *chooser)
 {
   ArrowType atype = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mi),
 							menuitem_enum_key));
-  dia_arrow_chooser_set_arrow_type(arrow, atype);
+  Arrow arrow;
+  arrow.width = chooser->arrow.width;
+  arrow.length = chooser->arrow.length;
+  arrow.type = atype;
+  dia_arrow_chooser_set_arrow(chooser, &arrow);
 }
 
 /** Set the type of arrow shown by the arrow chooser.
  */
 void
-dia_arrow_chooser_set_arrow_type(DiaArrowChooser *arrow, ArrowType atype) {
-  if (arrow->arrow.type != atype) {
-    dia_arrow_preview_set(arrow->preview, atype, arrow->left);
-    arrow->arrow.type = atype;
-    if (arrow->dialog != NULL)
-      dia_arrow_selector_set_arrow(arrow->selector, arrow->arrow);
-    if (arrow->callback)
-      (* arrow->callback)(arrow->arrow, arrow->user_data);
+dia_arrow_chooser_set_arrow(DiaArrowChooser *chooser, Arrow *arrow) {
+  if (chooser->arrow.type != arrow->type) {
+    dia_arrow_preview_set(chooser->preview, arrow->type, chooser->left);
+    chooser->arrow.type = arrow->type;
+    if (chooser->dialog != NULL)
+      dia_arrow_selector_set_arrow(chooser->selector, chooser->arrow);
+    if (chooser->callback)
+      (* chooser->callback)(chooser->arrow, chooser->user_data);
   }
+  chooser->arrow.width = arrow->width;
+  chooser->arrow.length = arrow->length;
 }
 
 ArrowType dia_arrow_chooser_get_arrow_type(DiaArrowChooser *arrow) {

--- a/lib/diaarrowchooser.h
+++ b/lib/diaarrowchooser.h
@@ -85,7 +85,7 @@ struct _DiaArrowChooserClass
 GtkWidget *dia_arrow_chooser_new (gboolean left,
 				  DiaChangeArrowCallback callback,
 				  gpointer user_data, GtkTooltips *tool_tips);
-void dia_arrow_chooser_set_arrow_type(DiaArrowChooser *arrow, ArrowType atype);
-ArrowType dia_arrow_chooser_get_arrow_type(DiaArrowChooser *arrow);
+void dia_arrow_chooser_set_arrow(DiaArrowChooser *chooser, Arrow *arrow);
+ArrowType dia_arrow_chooser_get_arrow_type(DiaArrowChooser *chooser);
 
 #endif

--- a/lib/persistence.c
+++ b/lib/persistence.c
@@ -750,7 +750,6 @@ persistent_list_add(const gchar *role, const gchar *item)
   PersistentList *plist = persistent_list_get(role);
   if(plist == NULL) printf("Can't find list for %s when adding %s\n", 
 			   role, item);
-  printf("Adding item %s to %s, first is %s\n", item, role, (plist->glist!=NULL?plist->glist->data:""));
   if (plist->sorted) {
     /* Sorting not implemented yet. */
   } else {

--- a/lib/widgets.c
+++ b/lib/widgets.c
@@ -1402,16 +1402,8 @@ void
 dia_arrow_selector_set_arrow (DiaArrowSelector *as,
 			      Arrow arrow)
 {
-  int arrow_type_index = 0,i = 0;
-  const struct menudesc *md = arrow_types;
-  
-  while (md->name) {
-    if (md->enum_value == arrow.type) {
-      arrow_type_index = i;
-      break;
-    }
-    md++; i++;
-  }
+  int arrow_type_index = arrow_index_from_type(arrow.type);
+
   gtk_menu_set_active(GTK_MENU (as->arrow_type_menu), arrow_type_index);
   gtk_option_menu_set_history (GTK_OPTION_MENU(as->omenu), arrow_type_index);
 /* TODO: restore CheckMenu version of menu */

--- a/plug-ins/xfig/xfig-import.c
+++ b/plug-ins/xfig/xfig-import.c
@@ -622,16 +622,20 @@ fig_read_arrow(FILE *file) {
     return arrow;
 }
 
-static void
-fig_fix_text(char *text) {
+static gchar *
+fig_fix_text(gchar *text) {
     int i, j;
     int asciival;
+    GError *err = NULL;
+    gchar *converted;
+    gboolean needs_conversion = FALSE;
 
     for (i = 0, j = 0; text[i] != 0; i++, j++) {
 	if (text[i] == '\\') {
 	    sscanf(text+i+1, "%3o", &asciival);
 	    text[j] = asciival;
 	    i+=3;
+	    needs_conversion = TRUE;
 	} else {
 	    text[j] = text[i];
 	}
@@ -641,6 +645,21 @@ fig_fix_text(char *text) {
     if (text[j-2] == '\001') {
 	text[j-2] = 0;
     }
+    if (needs_conversion) {
+	/* Crudely assuming that fig uses Latin-1 */
+	converted = g_convert(text, strlen(text), "UTF-8", "ISO-8859-1",
+			      NULL, NULL, &err);
+	if (err != NULL) {
+	    printf("Error converting %s: %s\n", text, err->message);
+	    return text;
+	}
+	if (!g_utf8_validate(converted, -1, NULL)) {
+	    printf("Fails to validate %s\n", converted);
+	    return text;
+	}
+	if (text != converted) g_free(text);
+	return converted;
+    } else return text;
 }
 
 static char *
@@ -659,7 +678,7 @@ fig_read_text_line(FILE *file) {
 	text_buf = (char *)g_realloc(text_buf, text_alloc*sizeof(char));
     }
 
-    fig_fix_text(text_buf);
+    text_buf = fig_fix_text(text_buf);
 
     return text_buf;
 }
@@ -1379,8 +1398,9 @@ fig_read_line_choice(FILE *file, char *choice1, char *choice2) {
     }
 
     buf[strlen(buf)-1] = 0; /* Remove trailing newline */
-    if (!strcmp(buf, choice1)) return 0;
-    if (!strcmp(buf, choice2)) return 1;
+    g_strstrip(buf); /* And any other whitespace */
+    if (!g_strcasecmp(buf, choice1)) return 0;
+    if (!g_strcasecmp(buf, choice2)) return 1;
     message_warning(_("`%s' is not one of `%s' or `%s'\n"), buf, choice1, choice2);
     return 0;
 }
@@ -1396,6 +1416,7 @@ fig_read_paper_size(FILE *file, DiagramData *dia) {
     }
 
     buf[strlen(buf)-1] = 0; /* Remove trailing newline */
+    g_strstrip(buf); /* And any other whitespace */
     if ((paper = find_paper(buf)) != -1) {
 	get_paper_info(&dia->paper, paper, NULL);
 	return TRUE;
@@ -1563,7 +1584,7 @@ import_fig(const gchar *filename, DiagramData *dia, void* user_data) {
     } while (TRUE);
 
     /* Now we can reorder for the depth fields */
-    for (i = 999; i >= 0; i--) {
+    for (i = 0; i < 1000; i++) {
 	if (depths[i] != NULL)
 	    layer_add_objects_first(dia->active_layer, depths[i]);
     }