cleanup and issue 99

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index d861ba5672d02cd13a27722f7eb76f706dacc5df..0b625f6c25534a3dd15a5689fc9b6fff1407ce23 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -75,6 +75,8 @@ void init_config()
    list_back = g_slist_append(0, calloc(1, sizeof(Area)));
 
        panel_config = calloc(1, sizeof(Panel));
+       // window manager's menu default value == true
+       wm_menu = 1;
 }
 
 
@@ -308,6 +310,8 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->area.pix.back, &a->pix.back, sizeof(Color));
       memcpy(&panel_config->area.pix.border, &a->pix.border, sizeof(Border));
    }
+   else if (strcmp (key, "wm_menu") == 0)
+      wm_menu = atoi (value);
 
    /* Battery */
    else if (strcmp (key, "battery") == 0) {
@@ -398,12 +402,21 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->clock.area.pix.back, &a->pix.back, sizeof(Color));
       memcpy(&panel_config->clock.area.pix.border, &a->pix.border, sizeof(Border));
    }
+       else if (strcmp(key, "clock_lclick_command") == 0) {
+               if (clock_lclick_command) g_free(clock_lclick_command);
+               if (strlen(value) > 0) clock_lclick_command = strdup(value);
+               else clock_lclick_command = 0;
+       }
+       else if (strcmp(key, "clock_rclick_command") == 0) {
+               if (clock_rclick_command) g_free(clock_rclick_command);
+               if (strlen(value) > 0) clock_rclick_command = strdup(value);
+               else clock_rclick_command = 0;
+       }
 
    /* Taskbar */
    else if (strcmp (key, "taskbar_mode") == 0) {
       if (strcmp (value, "multi_desktop") == 0) panel_mode = MULTI_DESKTOP;
-      else if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
-      else panel_mode = SINGLE_MONITOR;
+      else panel_mode = SINGLE_DESKTOP;
    }
    else if (strcmp (key, "taskbar_padding") == 0) {
       extract_values(value, &value1, &value2, &value3);
@@ -491,9 +504,9 @@ void add_entry (char *key, char *value)
 
    /* Read tint-0.6 config for backward compatibility */
    else if (strcmp (key, "panel_mode") == 0) {
-      if (strcmp (value, "multi_desktop") == 0) panel_mode = MULTI_DESKTOP;
-      else if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
-      else panel_mode = SINGLE_MONITOR;
+               save_file_config = 1;
+      if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
+      else panel_mode = MULTI_DESKTOP;
    }
    else if (strcmp (key, "panel_rounded") == 0) {
       Area *a = calloc(1, sizeof(Area));
@@ -672,14 +685,7 @@ deb:
        path1 = g_build_filename (g_get_user_config_dir(), "tint", "tintrc", NULL);
        if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
                save_file_config = 1;
-               old_task_font = 0;
-               old_time1_font = 0;
-               old_time2_font = 0;
                config_read_file (path1);
-               save_config();
-               if (old_task_font) g_free(old_task_font);
-               if (old_time1_font) g_free(old_time1_font);
-               if (old_time2_font) g_free(old_time2_font);
                g_free(path1);
                goto deb;
        }
@@ -720,18 +726,37 @@ int config_read_file (const char *path)
    char line[80];
 
    if ((fp = fopen(path, "r")) == NULL) return 0;
+       old_task_font = 0;
+       old_time1_font = 0;
+       old_time2_font = 0;
 
    while (fgets(line, sizeof(line), fp) != NULL)
       parse_line (line);
 
    fclose (fp);
+
+       if (save_file_config)
+               save_config();
+
+       if (old_task_font) {
+               g_free(old_task_font);
+               old_task_font = 0;
+       }
+       if (old_time1_font) {
+               g_free(old_time1_font);
+               old_time1_font = 0;
+       }
+       if (old_time2_font) {
+               g_free(old_time2_font);
+               old_time2_font = 0;
+       }
    return 1;
 }
 
 
 void save_config ()
 {
-   fprintf(stderr, "tint2 : convert user's config file tintrc to tint2rc\n");
+   fprintf(stderr, "tint2 : convert user's config file\n");
 
    char *path, *dir;
    FILE *fp;
@@ -777,9 +802,9 @@ void save_config ()
    if (panel_position & LEFT) fputs(" left\n", fp);
    else if (panel_position & RIGHT) fputs(" right\n", fp);
    else fputs(" center\n", fp);
-   fprintf(fp, "panel_size = %d %d\n", (int)panel_config->initial_width, (int)panel_config->initial_height);
+       fprintf(fp, "panel_size = %d %d\n", (int)panel_config->initial_width, (int)panel_config->initial_height);
    fprintf(fp, "panel_margin = %d %d\n", panel_config->marginx, panel_config->marginy);
-   fprintf(fp, "panel_padding = %d %d\n", panel_config->area.paddingx, panel_config->area.paddingy);
+   fprintf(fp, "panel_padding = %d %d %d\n", panel_config->area.paddingxlr, panel_config->area.paddingy, panel_config->area.paddingx);
    fprintf(fp, "font_shadow = %d\n", panel_config->g_task.font_shadow);
    fputs("panel_background_id = 1\n", fp);