From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 11 Nov 2007 17:50:22 +0000 (+0000)
Subject: save/load new style settings
X-Git-Tag: debian-1_5_99dev8~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/b4f8eba142c9bcd17597494361d48b2e249215ff

save/load new style settings
---

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index eb8135f..9ae8eff 100644
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -449,8 +449,8 @@ int main(int argc, char **argv) {
     }
   }
   signal(SIGPIPE, SIG_IGN);
-  load_settings();
   init_styles();
+  load_settings();
   /* create the event loop */
   D(("create main loop"));
   mainloop = g_main_loop_new(0, 0);
diff --git a/disobedience/settings.c b/disobedience/settings.c
index a5ea53f..0fe1237 100644
--- a/disobedience/settings.c
+++ b/disobedience/settings.c
@@ -37,9 +37,124 @@
 /** @brief HTML displayer */
 const char *browser = BROWSER;
 
+/** @brief Default style for layouts */
+GtkStyle *layout_style;
+
+/** @brief Title-row style for layouts */
+GtkStyle *title_style;
+
+/** @brief Even-row style for layouts */
+GtkStyle *even_style;
+
+/** @brief Odd-row style for layouts */
+GtkStyle *odd_style;
+
+/** @brief Active-row style for layouts */
+GtkStyle *active_style;
+
+/** @brief Style for tools */
+GtkStyle *tool_style;
+
+/** @brief Style for search results */
+GtkStyle *search_style;
+
+/** @brief Style for drag targets */
+GtkStyle *drag_style;
+
+/** @brief Table of styles */
+static const struct {
+  const char *name;
+  GtkStyle **style;
+} styles[] = {
+  { "layout", &layout_style },
+  { "title", &title_style },
+  { "even", &even_style },
+  { "odd", &odd_style },
+  { "active", &active_style },
+  { "tool", &tool_style },
+  { "search", &search_style },
+  { "drag", &drag_style },
+};
+
+#define NSTYLES (sizeof styles / sizeof *styles)
+
+/** @brief Table of state types */
+static const char *const states[] = {
+  "normal",
+  "active",
+  "prelight",
+  "selected",
+  "insensitive"
+};
+
+#define NSTATES (sizeof states / sizeof *states)
+
+/** @brief Table of colors */
+static const struct {
+  const char *name;
+  size_t offset;
+} colors[] = {
+  { "fg", offsetof(GtkStyle, fg) },
+  { "bg", offsetof(GtkStyle, bg) },
+};
+
+#define NCOLORS (sizeof colors / sizeof *colors)
+
+/** @brief Initialize styles */
+void init_styles(void) {
+  layout_style = gtk_style_new();
+  title_style = gtk_style_new();
+  even_style = gtk_style_new();
+  odd_style = gtk_style_new();
+  active_style = gtk_style_new();
+  search_style = gtk_style_new();
+  tool_style = gtk_style_new();
+  drag_style = gtk_style_new();
+
+  /* Style defaults */
+    
+  /* Layouts are basically black on white */
+  layout_style->bg[GTK_STATE_NORMAL] = layout_style->white;
+  layout_style->fg[GTK_STATE_NORMAL] = layout_style->black;
+    
+  /* Title row is inverted */
+  title_style->bg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
+  title_style->fg[GTK_STATE_NORMAL] = layout_style->bg[GTK_STATE_NORMAL];
+
+  /* Active row is pastel green */
+  active_style->bg[GTK_STATE_NORMAL].red = 0xE000;
+  active_style->bg[GTK_STATE_NORMAL].green = 0xFFFF;
+  active_style->bg[GTK_STATE_NORMAL].blue = 0xE000;
+  active_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
+
+  /* Even rows are pastel red */
+  even_style->bg[GTK_STATE_NORMAL].red = 0xFFFF;
+  even_style->bg[GTK_STATE_NORMAL].green = 0xEC00;
+  even_style->bg[GTK_STATE_NORMAL].blue = 0xEC00;
+  even_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
+
+  /* Odd rows match the underlying layout */
+  odd_style->bg[GTK_STATE_NORMAL] = layout_style->bg[GTK_STATE_NORMAL];
+  odd_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
+
+  /* Search results have a yellow background */
+  search_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
+  search_style->bg[GTK_STATE_NORMAL].red = 0xFFFF;
+  search_style->bg[GTK_STATE_NORMAL].green = 0xFFFF;
+  search_style->bg[GTK_STATE_NORMAL].blue = 0x0000;
+
+  /* Drag targets are grey */
+  drag_style->bg[GTK_STATE_NORMAL].red = 0x6666;
+  drag_style->bg[GTK_STATE_NORMAL].green = 0x6666;
+  drag_style->bg[GTK_STATE_NORMAL].blue = 0x6666;
+  
+  /* Tools we leave at GTK+ defaults */
+}
+
 void save_settings(void) {
   char *dir, *path, *tmp;
   FILE *fp = 0;
+  size_t n, m, c;
 
   byte_xasprintf(&dir, "%s/.disorder", getenv("HOME"));
   byte_xasprintf(&path, "%s/disobedience", dir);
@@ -50,11 +165,27 @@ void save_settings(void) {
                tmp, strerror(errno));
     goto done;
   }
-  /* TODO */
+  if(fprintf(fp,
+             "# automatically generated!\n\n") < 0)
+    goto write_error;
+  for(n = 0; n < NSTYLES; ++n)
+    for(c = 0; c < NCOLORS; ++c)
+      for(m = 0; m < NSTATES; ++m) {
+        const GdkColor *color = (GdkColor *)((char *)styles[n].style + colors[c].offset) + m;
+        if(fprintf(fp, "color %8s %12s %s 0x%04x 0x%04x 0x%04x\n",
+                   styles[n].name, states[m], colors[c].name,
+                   color->red,
+                   color->green,
+                   color->blue) < 0)
+          goto write_error;
+      }
+  if(fprintf(fp, "browser %s\n", browser) < 0)
+    goto write_error;
   if(fclose(fp) < 0) {
+    fp = 0;
+  write_error:
     fpopup_msg(GTK_MESSAGE_ERROR, "error writing to %s: %s",
                tmp, strerror(errno));
-    fp = 0;
     goto done;
   }
   fp = 0;
@@ -75,6 +206,7 @@ void load_settings(void) {
   FILE *fp;
   char **vec;
   int nvec;
+  size_t n, m, c;
 
   byte_xasprintf(&path, "%s/.disorder/disobedience", getenv("HOME"));
   if(!(fp = fopen(path, "r"))) {
@@ -87,11 +219,39 @@ void load_settings(void) {
          || !nvec)
         continue;
       if(!strcmp(vec[0], "color")) {
-        if(nvec != 5) {
+        GdkColor *color;
+        if(nvec != 7) {
           error(0, "%s: malformed '%s' command", path, vec[0]);
           continue;
         }
-        /* TODO */
+        for(n = 0; n < NSTYLES && strcmp(styles[n].name, vec[1]); ++n)
+          ;
+        if(n >= NSTYLES) {
+          error(0, "%s: unknown style '%s'", path, vec[1]);
+          continue;
+        }
+        for(m = 0; m < NSTATES && strcmp(states[m], vec[2]); ++m)
+          ;
+        if(m >= NSTATES) {
+          error(0, "%s: unknown state '%s'", path, vec[2]);
+          continue;
+        }
+        for(c = 0; c < NCOLORS && strcmp(colors[c].name, vec[3]); ++c)
+          ;
+        if(c >= NCOLORS) {
+          error(0, "%s: unknown color '%s'", path, vec[3]);
+          continue;
+        }
+        color = (GdkColor *)((char *)styles[n].style + colors[c].offset) + m;
+        color->red = strtoul(vec[4], 0, 0);
+        color->green = strtoul(vec[5], 0, 0);
+        color->blue = strtoul(vec[6], 0, 0);
+      } else if(!strcmp(vec[0], "browser")) {
+        if(nvec != 2) {
+          error(0, "%s: malformed '%s' command", path, vec[0]);
+          continue;
+        }
+        browser = vec[1];
       } else
         /* mention errors but otherwise ignore them */
         error(0, "%s: unknown command '%s'", path, vec[0]);
@@ -122,81 +282,6 @@ void set_tool_colors(GtkWidget *w) {
     set_tool_colors(child);
 }
 
-/** @brief Default style for layouts */
-GtkStyle *layout_style;
-
-/** @brief Title-row style for layouts */
-GtkStyle *title_style;
-
-/** @brief Even-row style for layouts */
-GtkStyle *even_style;
-
-/** @brief Odd-row style for layouts */
-GtkStyle *odd_style;
-
-/** @brief Active-row style for layouts */
-GtkStyle *active_style;
-
-/** @brief Style for tools */
-GtkStyle *tool_style;
-
-/** @brief Style for search results */
-GtkStyle *search_style;
-
-/** @brief Style for drag targets */
-GtkStyle *drag_style;
-
-/** @brief Initialize styles */
-void init_styles(void) {
-  layout_style = gtk_style_new();
-  title_style = gtk_style_new();
-  even_style = gtk_style_new();
-  odd_style = gtk_style_new();
-  active_style = gtk_style_new();
-  search_style = gtk_style_new();
-  tool_style = gtk_style_new();
-  drag_style = gtk_style_new();
-
-  /* Style defaults */
-    
-  /* Layouts are basically black on white */
-  layout_style->bg[GTK_STATE_NORMAL] = layout_style->white;
-  layout_style->fg[GTK_STATE_NORMAL] = layout_style->black;
-    
-  /* Title row is inverted */
-  title_style->bg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
-  title_style->fg[GTK_STATE_NORMAL] = layout_style->bg[GTK_STATE_NORMAL];
-
-  /* Active row is pastel green */
-  active_style->bg[GTK_STATE_NORMAL].red = 0xE000;
-  active_style->bg[GTK_STATE_NORMAL].green = 0xFFFF;
-  active_style->bg[GTK_STATE_NORMAL].blue = 0xE000;
-  active_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
-
-  /* Even rows are pastel red */
-  even_style->bg[GTK_STATE_NORMAL].red = 0xFFFF;
-  even_style->bg[GTK_STATE_NORMAL].green = 0xEC00;
-  even_style->bg[GTK_STATE_NORMAL].blue = 0xEC00;
-  even_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
-
-  /* Odd rows match the underlying layout */
-  odd_style->bg[GTK_STATE_NORMAL] = layout_style->bg[GTK_STATE_NORMAL];
-  odd_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
-
-  /* Search results have a yellow background */
-  search_style->fg[GTK_STATE_NORMAL] = layout_style->fg[GTK_STATE_NORMAL];
-  search_style->bg[GTK_STATE_NORMAL].red = 0xFFFF;
-  search_style->bg[GTK_STATE_NORMAL].green = 0xFFFF;
-  search_style->bg[GTK_STATE_NORMAL].blue = 0x0000;
-
-  /* Drag targets are grey */
-  drag_style->bg[GTK_STATE_NORMAL].red = 0x6666;
-  drag_style->bg[GTK_STATE_NORMAL].green = 0x6666;
-  drag_style->bg[GTK_STATE_NORMAL].blue = 0x6666;
-  
-  /* Tools we leave at GTK+ defaults */
-}
-
 /*
 Local Variables:
 c-basic-offset:2