提交: 6d96da135d83ad049c7047e5e907df359b1c83f4 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: 6d96da135d83ad049c7047e5e907df359b1c83f4 (tree)
• 時間: 2004-04-01 22:49:52
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

More persistence. Yay!

Change Summary

• modified: ChangeLog
• modified: app/preferences.c
• modified: lib/persistence.c
• modified: lib/persistence.h

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/preferences.c:   All preferences are now
+	handled by persistence, old prefs load and store code is gone.
+
+	* lib/persistence.[ch]: Added string and color persistents.  This is
+	a different string from the one used in the printer dialog, that
+	one has a GtkEntry attached -- may want to make that one an
+	encapsulation of this one or something.
+
 2004-03-31  Lars Clausen  <[e-mail]>
 
 	* app/app_procs.c: Do persistence before prefs.  Prefs are to be

--- a/app/preferences.c
+++ b/app/preferences.c
@@ -190,51 +190,6 @@ DiaPrefData prefs_data[] =
 
 #define NUM_PREFS_DATA (sizeof(prefs_data)/sizeof(DiaPrefData))
 
-static const GScannerConfig     dia_prefs_scanner_config =
-{
-  (
-   " \t\n"
-   )                    /* cset_skip_characters */,
-  (
-   G_CSET_a_2_z
-   "_"
-   G_CSET_A_2_Z
-   )                    /* cset_identifier_first */,
-  (
-   G_CSET_a_2_z
-   "_-0123456789"
-   G_CSET_A_2_Z
-   )                    /* cset_identifier_nth */,
-  ( "#\n" )             /* cpair_comment_single */,
-  
-  TRUE                  /* case_sensitive */,
-  
-  FALSE                 /* skip_comment_multi */,
-  TRUE                  /* skip_comment_single */,
-  FALSE                 /* scan_comment_multi */,
-  TRUE                  /* scan_identifier */,
-  TRUE                  /* scan_identifier_1char */,
-  FALSE                 /* scan_identifier_NULL */,
-  TRUE                  /* scan_symbols */,
-  FALSE                 /* scan_binary */,
-  FALSE                 /* scan_octal */,
-  TRUE                  /* scan_float */,
-  TRUE                  /* scan_hex */,
-  FALSE                 /* scan_hex_dollar */,
-  FALSE                 /* scan_string_sq */,
-  TRUE                  /* scan_string_dq */,
-  TRUE                  /* numbers_2_int */,
-  FALSE                 /* int_2_float */,
-  FALSE                 /* identifier_2_string */,
-  TRUE                  /* char_2_token */,
-  FALSE                 /* symbol_2_token */,
-  FALSE                 /* scope_0_fallback */,
-};
-
-typedef enum {
-  DIA_PREFS_TOKEN_BOOLEAN = G_TOKEN_LAST
-} DiaPrefsTokenType;
-
 static void prefs_create_dialog(void);
 static void prefs_set_value_in_widget(GtkWidget * widget, DiaPrefData *data,  char *ptr);
 static void prefs_get_value_from_widget(GtkWidget * widget, DiaPrefData *data, char *ptr);
@@ -271,20 +226,27 @@ prefs_set_defaults(void)
 
     switch (prefs_data[i].type) {
     case PREF_BOOLEAN:
+      *(int *)ptr = *(int *)prefs_data[i].default_value;
+      *(int *)ptr = persistence_register_boolean(prefs_data[i].name, *(int *)ptr);
+      break;
     case PREF_INT:
     case PREF_UINT:
       *(int *)ptr = *(int *)prefs_data[i].default_value;
+      *(int *)ptr = persistence_register_integer(prefs_data[i].name, *(int *)ptr);
       break;
     case PREF_REAL:
     case PREF_UREAL:
       *(real *)ptr = *(real *)prefs_data[i].default_value;
+      *(real *)ptr = persistence_register_real(prefs_data[i].name, *(real *)ptr);
       break;
     case PREF_COLOUR:
       *(Color *)ptr = *(Color *)prefs_data[i].default_value;
+      *(Color *)ptr = *persistence_register_color(prefs_data[i].name, (Color *)ptr);
       break;
     case PREF_CHOICE:
     case PREF_STRING:
       *(gchar **)ptr = *(gchar **)prefs_data[i].default_value;
+      *(gchar **)ptr = persistence_register_string(prefs_data[i].name, *(gchar **)ptr);
       break;
     case PREF_NONE:
     case PREF_END_GROUP:
@@ -298,213 +260,46 @@ prefs_save(void)
 {
   int i;
   char *ptr;
-  gchar *filename;
-  char *old_locale;
-  FILE *file;
-
-  filename = dia_config_filename("diarc");
-
-  file = fopen(filename, "w");
-
-  if (!file) {
-    message_error(_("Could not open `%s' for writing"), filename);
-    g_free(filename);
-    return;
-  }
-  
-  g_free(filename);
-
-  old_locale = setlocale(LC_NUMERIC, "C");
-  fprintf(file, "# Note: This file is automatically generated by Dia\n");
   for (i=0;i<NUM_PREFS_DATA;i++) {
     if ((prefs_data[i].type == PREF_NONE) || (prefs_data[i].type == PREF_END_GROUP))
       continue;
     
-    fprintf(file, "%s=", prefs_data[i].name);
-    
     ptr = (char *)&prefs + prefs_data[i].offset;
 
     switch (prefs_data[i].type) {
     case PREF_BOOLEAN:
-      fprintf(file, (*(int *)ptr)?"true\n":"false\n");
       persistence_set_boolean(prefs_data[i].name, *(gint *)ptr);
       break;
     case PREF_INT:
     case PREF_UINT:
-      fprintf(file, "%d\n", *(int *)ptr);
       persistence_set_integer(prefs_data[i].name, *(gint *)ptr);
       break;
     case PREF_REAL:
     case PREF_UREAL:
       
-      fprintf(file, "%f\n", (double) *(real *)ptr);
       persistence_set_real(prefs_data[i].name, *(real *)ptr);
       break;
     case PREF_COLOUR:
-      fprintf(file, "%f %f %f\n", (double) ((Color *)ptr)->red,
-	      (double) ((Color *)ptr)->green, (double) ((Color *)ptr)->blue);
+      persistence_set_color(prefs_data[i].name, (Color *)ptr);
       break;
     case PREF_CHOICE:
     case PREF_STRING:
-      fprintf(file, "\"%s\"\n", *(gchar **)ptr);
+      persistence_set_string(prefs_data[i].name, *(gchar **)ptr);
       break;
     case PREF_NONE:
     case PREF_END_GROUP:
       break;
     }
   }
-  setlocale(LC_NUMERIC, old_locale);
-  fclose(file);
 }
 
 
-static guint
-prefs_parse_line(GScanner *scanner)
-{
-  guint token;
-  int symbol_nr;
-  char *ptr;
-  
-  token = g_scanner_get_next_token(scanner);
-  if (token != G_TOKEN_SYMBOL)
-    return G_TOKEN_SYMBOL;
-
-  symbol_nr = GPOINTER_TO_INT(scanner->value.v_symbol);
-  
-  token = g_scanner_get_next_token(scanner);
-  if (token != G_TOKEN_EQUAL_SIGN)
-    return G_TOKEN_EQUAL_SIGN;
-
-  token = g_scanner_get_next_token(scanner);
-
-  ptr = (unsigned char *)&prefs + prefs_data[symbol_nr].offset;
-  
-  switch (prefs_data[symbol_nr].type) {
-  case PREF_BOOLEAN:
-    if (token != G_TOKEN_IDENTIFIER)
-      return G_TOKEN_IDENTIFIER;
-    
-    if (strcmp(scanner->value.v_string, "true")==0)
-      *(int *)ptr = 1;
-    else
-    *(int *)ptr = 0;
-    persistence_register_boolean(prefs_data[symbol_nr].name, *(int *)ptr);
-    break;
-    
-  case PREF_INT:
-  case PREF_UINT:
-    if (token != G_TOKEN_INT)
-      return G_TOKEN_INT;
-    
-    *(int *)ptr = scanner->value.v_int;
-    persistence_register_integer(prefs_data[symbol_nr].name, *(int *)ptr);
-    break;
-
-  case PREF_REAL:
-  case PREF_UREAL:
-    if (token != G_TOKEN_FLOAT)
-      return G_TOKEN_FLOAT;
-    
-    *(real *)ptr = scanner->value.v_float;
-    printf("Real is %f\n", scanner->value.v_float);
-    persistence_register_real(prefs_data[symbol_nr].name, scanner->value.v_float);
-    break;
-  case PREF_COLOUR:
-    if (token != G_TOKEN_FLOAT)
-      return G_TOKEN_FLOAT;
-    ((Color *)ptr)->red = scanner->value.v_float;
-
-    token = g_scanner_get_next_token(scanner);
-    if (token != G_TOKEN_FLOAT)
-      return G_TOKEN_FLOAT;
-    ((Color *)ptr)->green = scanner->value.v_float;
-
-    token = g_scanner_get_next_token(scanner);
-    if (token != G_TOKEN_FLOAT)
-      return G_TOKEN_FLOAT;
-    ((Color *)ptr)->blue = scanner->value.v_float;
-
-    break;
-  case PREF_CHOICE:
-  case PREF_STRING:
-    if (token != G_TOKEN_STRING)
-      return G_TOKEN_STRING;
-
-    *(char **)ptr = g_strdup(scanner->value.v_string);
-    break;
-  case PREF_NONE:
-  case PREF_END_GROUP:
-    break;
-  }
-
-  return G_TOKEN_NONE;
-}
-
 
 void
 prefs_load(void)
 {
-  int i;
-  gchar *filename;
-  int fd;
-  GScanner *scanner;
-  guint expected_token;
-
-  filename = dia_config_filename("diarc");
-
-  fd = open(filename, O_RDONLY);
-
-  if (fd < 0) {
-    const gchar *homedir = g_get_home_dir();
-
-    g_free(filename);
-    filename = g_strconcat(homedir, G_DIR_SEPARATOR_S ".diarc", NULL);
-    fd = open(filename, O_RDONLY);
-  }
-  g_free(filename);
-
   prefs_set_defaults();
 
-  if (fd < 0) {
-    return;
-  }
-
-  scanner = g_scanner_new ((GScannerConfig *) &dia_prefs_scanner_config);
- 
-  g_scanner_input_file (scanner, fd);
-
-  scanner->input_name = filename;
-  for (i = 0; i < NUM_PREFS_DATA; i++)
-    if (prefs_data[i].name != NULL) {
-      g_scanner_add_symbol(scanner, prefs_data[i].name,
-			   GINT_TO_POINTER(i));
-    }
-  while (1) {
-    if (g_scanner_peek_next_token(scanner) == G_TOKEN_EOF) {
-      break;
-    } 
-
-    expected_token = prefs_parse_line(scanner);
-      
-    if (expected_token != G_TOKEN_NONE) {
-      gchar *symbol_name;
-      gchar *msg;
-      
-      msg = NULL;
-      symbol_name = NULL;
-      g_scanner_unexp_token (scanner,
-			     expected_token,
-			     NULL,
-			     "keyword",
-			     symbol_name,
-			     msg,
-			     TRUE);
-    }
-  }
-  
-  g_scanner_destroy (scanner);
- 
-  close(fd);
   render_bounding_boxes = prefs.render_bounding_boxes;
 }
 
@@ -561,8 +356,7 @@ prefs_get_value_from_widget(GtkWidget * widget, DiaPrefData *data,
     break;
   case PREF_INT:
   case PREF_UINT:
-    *((int *)ptr) =
-      gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
+    *((int *)ptr) = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
     break;
   case PREF_REAL:
   case PREF_UREAL:
@@ -579,8 +373,7 @@ prefs_get_value_from_widget(GtkWidget * widget, DiaPrefData *data,
     break;
   }
   case PREF_STRING:
-    *((gchar **)ptr) = (gchar *)
-      gtk_entry_get_text(GTK_ENTRY(widget));
+    *((gchar **)ptr) = (gchar *)gtk_entry_get_text(GTK_ENTRY(widget));
     break;
   case PREF_NONE:
   case PREF_END_GROUP:

--- a/lib/persistence.c
+++ b/lib/persistence.c
@@ -40,9 +40,10 @@
 
 /* Hash table from window role (string) to PersistentWindow structure.
  */
-static GHashTable *persistent_windows, *persistent_strings, *persistent_lists;
+static GHashTable *persistent_windows, *persistent_entrystrings, *persistent_lists;
 static GHashTable *persistent_integers, *persistent_reals;
-static GHashTable *persistent_booleans, *persistent_enums;
+static GHashTable *persistent_booleans, *persistent_strings;
+static GHashTable *persistent_colors;
 
 /* *********************** LOADING FUNCTIONS *********************** */
 
@@ -75,7 +76,7 @@ persistence_load_window(gchar *role, xmlNodePtr node)
 
 /** Load a persistent string into the strings hashtable */
 static void
-persistence_load_string(gchar *role, xmlNodePtr node)
+persistence_load_entrystring(gchar *role, xmlNodePtr node)
 {
   AttributeNode attr;
   gchar *string = NULL;
@@ -88,7 +89,7 @@ persistence_load_string(gchar *role, xmlNodePtr node)
     return;
 
   if (string != NULL)
-    g_hash_table_insert(persistent_strings, role, string);
+    g_hash_table_insert(persistent_entrystrings, role, string);
 }
 
 static void
@@ -182,6 +183,45 @@ persistence_load_boolean(gchar *role, xmlNodePtr node)
     printf("Boolean %s registered before loading persistence!\n", role);
 }
 
+static void
+persistence_load_string(gchar *role, xmlNodePtr node)
+{
+  AttributeNode attr;
+  gchar *stringval;
+
+  /* Find the contents? */
+  attr = composite_find_attribute(node, "stringvalue");
+  if (attr != NULL) {
+    stringval = data_string(attribute_first_data(attr));
+  } else 
+    return;
+
+  if (g_hash_table_lookup(persistent_strings, role) == NULL) 
+    g_hash_table_insert(persistent_strings, role, stringval);
+  else 
+    printf("String %s registered before loading persistence!\n", role);
+}
+
+static void
+persistence_load_color(gchar *role, xmlNodePtr node)
+{
+  AttributeNode attr;
+  Color *colorval;
+
+  /* Find the contents? */
+  attr = composite_find_attribute(node, "colorvalue");
+  if (attr != NULL) {
+    colorval = g_new(Color, 1);
+    data_color(attribute_first_data(attr), colorval);
+  } else 
+    return;
+
+  if (g_hash_table_lookup(persistent_colors, role) == NULL) 
+    g_hash_table_insert(persistent_colors, role, colorval);
+  else 
+    printf("Color %s registered before loading persistence!\n", role);
+}
+
 static xmlNodePtr
 find_node_named (xmlNodePtr p, const char *name)
 {
@@ -229,17 +269,19 @@ static void
 persistence_init()
 {
   persistence_set_type_handler("window", persistence_load_window);
-  persistence_set_type_handler("entrystring", persistence_load_string);
+  persistence_set_type_handler("entrystring", persistence_load_entrystring);
   persistence_set_type_handler("list", persistence_load_list);
   persistence_set_type_handler("integer", persistence_load_integer);
   persistence_set_type_handler("real", persistence_load_real);
   persistence_set_type_handler("boolean", persistence_load_boolean);
+  persistence_set_type_handler("string", persistence_load_string);
+  persistence_set_type_handler("color", persistence_load_color);
 
   if (persistent_windows == NULL) {
     persistent_windows = g_hash_table_new(g_str_hash, g_str_equal);
   }
-  if (persistent_strings == NULL) {
-    persistent_strings = g_hash_table_new(g_str_hash, g_str_equal);
+  if (persistent_entrystrings == NULL) {
+    persistent_entrystrings = g_hash_table_new(g_str_hash, g_str_equal);
   }
   if (persistent_lists == NULL) {
     persistent_lists = g_hash_table_new(g_str_hash, g_str_equal);
@@ -253,6 +295,12 @@ persistence_init()
   if (persistent_booleans == NULL) {
     persistent_booleans = g_hash_table_new(g_str_hash, g_str_equal);
   }
+  if (persistent_strings == NULL) {
+    persistent_strings = g_hash_table_new(g_str_hash, g_str_equal);
+  }
+  if (persistent_colors == NULL) {
+    persistent_colors = g_hash_table_new(g_str_hash, g_str_equal);
+  }
 }
 
 /* Load all persistent data. */
@@ -306,18 +354,6 @@ persistence_save_window(gpointer key, gpointer value, gpointer data)
 
 /* Save the contents of a string  */
 static void
-persistence_save_string(gpointer key, gpointer value, gpointer data)
-{  
-  xmlNodePtr tree = (xmlNodePtr)data;
-  ObjectNode stringnode;
-
-  stringnode = (ObjectNode)xmlNewChild(tree, NULL, "entrystring", NULL);
-
-  xmlSetProp(stringnode, "role", (char *)key);
-  data_add_string(new_attribute(stringnode, "stringvalue"), (char *)value);
-}
-
-static void
 persistence_save_list(gpointer key, gpointer value, gpointer data)
 {  
   xmlNodePtr tree = (xmlNodePtr)data;
@@ -342,6 +378,18 @@ persistence_save_list(gpointer key, gpointer value, gpointer data)
 }
 
 static void
+persistence_save_entrystring(gpointer key, gpointer value, gpointer data)
+{  
+  xmlNodePtr tree = (xmlNodePtr)data;
+  ObjectNode stringnode;
+
+  stringnode = (ObjectNode)xmlNewChild(tree, NULL, "entrystring", NULL);
+
+  xmlSetProp(stringnode, "role", (char *)key);
+  data_add_string(new_attribute(stringnode, "stringvalue"), (char *)value);
+}
+
+static void
 persistence_save_integer(gpointer key, gpointer value, gpointer data)
 {  
   xmlNodePtr tree = (xmlNodePtr)data;
@@ -377,6 +425,30 @@ persistence_save_boolean(gpointer key, gpointer value, gpointer data)
   data_add_boolean(new_attribute(booleannode, "booleanvalue"), *(gboolean *)value);
 }
 
+static void
+persistence_save_string(gpointer key, gpointer value, gpointer data)
+{  
+  xmlNodePtr tree = (xmlNodePtr)data;
+  ObjectNode stringnode;
+
+  stringnode = (ObjectNode)xmlNewChild(tree, NULL, "string", NULL);
+
+  xmlSetProp(stringnode, "role", (char *)key);
+  data_add_string(new_attribute(stringnode, "stringvalue"), (gchar *)value);
+}
+
+static void
+persistence_save_color(gpointer key, gpointer value, gpointer data)
+{  
+  xmlNodePtr tree = (xmlNodePtr)data;
+  ObjectNode colornode;
+
+  colornode = (ObjectNode)xmlNewChild(tree, NULL, "color", NULL);
+
+  xmlSetProp(colornode, "role", (char *)key);
+  data_add_color(new_attribute(colornode, "colorvalue"), (Color *)value);
+}
+
 
 void
 persistence_save_type(xmlDocPtr doc, GHashTable *entries, GHFunc func)
@@ -403,18 +475,14 @@ persistence_save()
 			"dia");
   xmlSetNs(doc->xmlRootNode, name_space);
 
-  printf("Saving windows\n");
   persistence_save_type(doc, persistent_windows, persistence_save_window);
-  printf("Saving strings\n");
-  persistence_save_type(doc, persistent_strings, persistence_save_string);
-  printf("Saving lists\n");
+  persistence_save_type(doc, persistent_entrystrings, persistence_save_string);
   persistence_save_type(doc, persistent_lists, persistence_save_list);
-  printf("Saving integers\n");
   persistence_save_type(doc, persistent_integers, persistence_save_integer);
-  printf("Saving reals\n");
   persistence_save_type(doc, persistent_reals, persistence_save_real);
-  printf("Saving booleans\n");
   persistence_save_type(doc, persistent_booleans, persistence_save_boolean);
+  persistence_save_type(doc, persistent_strings, persistence_save_string);
+  persistence_save_type(doc, persistent_colors, persistence_save_color);
 
   xmlDiaSaveFile(filename, doc);
   g_free(filename);
@@ -559,10 +627,10 @@ persistence_update_string_entry(GtkWidget *widget, GdkEvent *event,
   gchar *role = (gchar*)userdata;
 
   if (event->type == GDK_FOCUS_CHANGE) {
-    gchar *string = (gchar *)g_hash_table_lookup(persistent_strings, role);
+    gchar *string = (gchar *)g_hash_table_lookup(persistent_entrystrings, role);
     gchar *entrystring = gtk_entry_get_text(GTK_ENTRY(widget));
     if (string == NULL || strcmp(string, entrystring)) {
-      g_hash_table_insert(persistent_strings, role, g_strdup(entrystring));
+      g_hash_table_insert(persistent_entrystrings, role, g_strdup(entrystring));
       if (string != NULL) g_free(string);
     }
   }
@@ -579,12 +647,12 @@ gboolean
 persistence_change_string_entry(gchar *role, gchar *string,
 				GtkWidget *widget)
 {
-  gchar *old_string = (gchar*)g_hash_table_lookup(persistent_strings, role);
+  gchar *old_string = (gchar*)g_hash_table_lookup(persistent_entrystrings, role);
   if (old_string != NULL) {
     if (widget != NULL) {
       gtk_entry_set_text(GTK_ENTRY(widget), string);
     }
-    g_hash_table_insert(persistent_strings, role, g_strdup(string));
+    g_hash_table_insert(persistent_entrystrings, role, g_strdup(string));
     g_free(old_string);
   }
 
@@ -600,15 +668,15 @@ persistence_register_string_entry(gchar *role, GtkWidget *entry)
 {
   gchar *string;
   if (role == NULL) return;
-  if (persistent_strings == NULL) {
-    persistent_strings = g_hash_table_new(g_str_hash, g_str_equal);
+  if (persistent_entrystrings == NULL) {
+    persistent_entrystrings = g_hash_table_new(g_str_hash, g_str_equal);
   }    
-  string = (gchar *)g_hash_table_lookup(persistent_strings, role);
+  string = (gchar *)g_hash_table_lookup(persistent_entrystrings, role);
   if (string != NULL) {
     gtk_entry_set_text(GTK_ENTRY(entry), string);
   } else {
     string = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
-    g_hash_table_insert(persistent_strings, role, string);
+    g_hash_table_insert(persistent_entrystrings, role, string);
   }
   g_signal_connect(G_OBJECT(entry), "event", 
 		   G_CALLBACK(persistence_update_string_entry), role);
@@ -626,7 +694,6 @@ persistence_register_list(const gchar *role)
 {
   PersistentList *list;
   if (role == NULL) return NULL;
-  printf("Registering %s\n", role);
   if (persistent_lists == NULL) {
     persistent_lists = g_hash_table_new(g_str_hash, g_str_equal);
   } else {   
@@ -794,7 +861,7 @@ persistence_get_real(gchar *role)
   realval = (real *)g_hash_table_lookup(persistent_reals, role);
   if (realval != NULL) return *realval;
   printf("No real to get for %s\n", role);
-  return 0;
+  return 0.0;
 }
 
 void
@@ -806,7 +873,6 @@ persistence_set_real(gchar *role, real newvalue)
     return;
   }
   realval = (real *)g_hash_table_lookup(persistent_reals, role);
-  printf("Setting real %s to %f\n", role, newvalue);
   if (realval != NULL) *realval = newvalue;
   else printf("No real to set for %s\n", role);
 }
@@ -841,7 +907,7 @@ persistence_get_boolean(gchar *role)
   booleanval = (gboolean *)g_hash_table_lookup(persistent_booleans, role);
   if (booleanval != NULL) return *booleanval;
   printf("No boolean to get for %s\n", role);
-  return 0;
+  return FALSE;
 }
 
 void
@@ -853,7 +919,100 @@ persistence_set_boolean(gchar *role, gboolean newvalue)
     return;
   }
   booleanval = (gboolean *)g_hash_table_lookup(persistent_booleans, role);
-  printf("Setting boolean %s to %d\n", role, newvalue);
   if (booleanval != NULL) *booleanval = newvalue;
   else printf("No boolean to set for %s\n", role);
 }
+
+/* ********* STRINGS ********** */
+gchar *
+persistence_register_string(gchar *role, gchar *defaultvalue)
+{
+  gchar *stringval;
+  if (role == NULL) return 0;
+  if (persistent_strings == NULL) {
+    persistent_strings = g_hash_table_new(g_str_hash, g_str_equal);
+  }    
+  stringval = (gchar *)g_hash_table_lookup(persistent_strings, role);
+  if (stringval == NULL) {
+    stringval = g_strdup(defaultvalue);
+    g_hash_table_insert(persistent_strings, role, stringval);
+  }
+  return stringval;
+}
+
+gchar *
+persistence_get_string(gchar *role)
+{
+  gchar *stringval;
+  if (persistent_strings == NULL) {
+    printf("No persistent strings to get for %s!\n", role);
+    return 0;
+  }
+  stringval = (gchar *)g_hash_table_lookup(persistent_strings, role);
+  if (stringval != NULL) return stringval;
+  printf("No string to get for %s\n", role);
+  return NULL;
+}
+
+void
+persistence_set_string(gchar *role, gchar *newvalue)
+{
+  gchar *stringval;
+  if (persistent_strings == NULL) {
+    printf("No persistent strings yet for %s!\n", role);
+    return;
+  }
+  stringval = (gchar *)g_hash_table_lookup(persistent_strings, role);
+  if (stringval != NULL) {
+    g_hash_table_insert(persistent_strings, role, g_strdup(newvalue));
+    g_free(stringval);
+  }
+  else printf("No string to set for %s\n", role);
+}
+
+/* ********* COLORS ********** */
+/* Remember that colors returned are private, not to be deallocated.
+ * They will be smashed in some undefined way by persistence_set_color */
+Color *
+persistence_register_color(gchar *role, Color *defaultvalue)
+{
+  Color *colorval;
+  if (role == NULL) return 0;
+  if (persistent_colors == NULL) {
+    persistent_colors = g_hash_table_new(g_str_hash, g_str_equal);
+  }    
+  colorval = (Color *)g_hash_table_lookup(persistent_colors, role);
+  if (colorval == NULL) {
+    colorval = g_new(Color, 1);
+    *colorval = *defaultvalue;
+    g_hash_table_insert(persistent_colors, role, colorval);
+  }
+  return colorval;
+}
+
+Color *
+persistence_get_color(gchar *role)
+{
+  Color *colorval;
+  if (persistent_colors == NULL) {
+    printf("No persistent colors to get for %s!\n", role);
+    return 0;
+  }
+  colorval = (Color *)g_hash_table_lookup(persistent_colors, role);
+  if (colorval != NULL) return colorval;
+  printf("No color to get for %s\n", role);
+  return 0;
+}
+
+void
+persistence_set_color(gchar *role, Color *newvalue)
+{
+  Color *colorval;
+  if (persistent_colors == NULL) {
+    printf("No persistent colors yet for %s!\n", role);
+    return;
+  }
+  colorval = (Color *)g_hash_table_lookup(persistent_colors, role);
+  if (colorval != NULL) *colorval = *newvalue;
+  else printf("No color to set for %s\n", role);
+}

--- a/lib/persistence.h
+++ b/lib/persistence.h
@@ -77,4 +77,12 @@ gboolean persistence_register_boolean(gchar *role, gboolean defaultvalue);
 gboolean persistence_get_boolean(gchar *role);
 void persistence_set_boolean(gchar *role, gboolean newvalue);
 
+gchar *persistence_register_string(gchar *role, gchar *defaultvalue);
+gchar *persistence_get_string(gchar *role);
+void persistence_set_string(gchar *role, gchar *newvalue);
+
+Color *persistence_register_color(gchar *role, Color *defaultvalue);
+Color *persistence_get_color(gchar *role);
+void persistence_set_color(gchar *role, Color *newvalue);
+
 #endif