cleanup code

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 756a6339ffa771e48d1e0a3dad3ab5f0227f3f15..04ec056173607730db02dafcf57b9b5becf27500 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -59,14 +59,14 @@ char *snapshot_path;
 // --------------------------------------------------
 // backward compatibility
 // detect if it's an old config file (==1)
-static int old_config_file;
+static int new_config_file;
 
 
 void default_config()
 {
        config_path = 0;
        snapshot_path = 0;
-       old_config_file = 1;
+       new_config_file = 0;
 }
 
 void cleanup_config()
@@ -235,6 +235,31 @@ void add_entry (char *key, char *value)
                        panel_config.area.height = atoi(value2);
                }
        }
+       else if (strcmp (key, "panel_items") == 0) {
+               new_config_file = 1;
+               panel_items_order = strdup(value);
+               int j;
+               for (j=0 ; j < strlen(panel_items_order) ; j++) {
+                       if (panel_items_order[j] == 'L')
+                               launcher_enabled = 1;
+                       if (panel_items_order[j] == 'T')
+                               taskbar_enabled = 1;
+                       if (panel_items_order[j] == 'B') {
+#ifdef ENABLE_BATTERY
+                               battery_enabled = 1;
+#else
+                               fprintf(stderr, "tint2 is build without battery support\n");
+#endif
+                       }
+                       if (panel_items_order[j] == 'S') {
+                               // systray disabled in snapshot mode
+                               if (snapshot_path == 0)
+                                       systray_enabled = 1;
+                       }
+                       if (panel_items_order[j] == 'C')                        
+                               clock_enabled = 1;
+               }
+       }
        else if (strcmp (key, "panel_margin") == 0) {
                extract_values(value, &value1, &value2, &value3);
                panel_config.marginx = atoi (value1);
@@ -291,15 +316,6 @@ void add_entry (char *key, char *value)
        }
 
        /* Battery */
-       else if (strcmp (key, "battery") == 0) {
-#ifdef ENABLE_BATTERY
-               if(atoi(value) == 1)
-                       battery_enabled = 1;
-#else
-               if(atoi(value) == 1)
-                       fprintf(stderr, "tint2 is build without battery support\n");
-#endif
-       }
        else if (strcmp (key, "battery_low_status") == 0) {
 #ifdef ENABLE_BATTERY
                battery_low_status = atoi(value);
@@ -356,6 +372,13 @@ void add_entry (char *key, char *value)
 
        /* Clock */
        else if (strcmp (key, "time1_format") == 0) {
+               if (new_config_file == 0) {
+                       clock_enabled = 1;
+                       if (panel_items_order)
+                               panel_items_order = strcat(panel_items_order, "C");
+                       else 
+                               panel_items_order = strdup("C");
+               }
                if (strlen(value) > 0) {
                        time1_format = strdup (value);
                        clock_enabled = 1;
@@ -428,13 +451,14 @@ void add_entry (char *key, char *value)
                int id = atoi (value);
                id = (id < backgrounds->len && id >= 0) ? id : 0;
                panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id);
+               if (panel_config.g_taskbar.bg_active == 0)
+                       panel_config.g_taskbar.bg_active = panel_config.g_taskbar.bg;
                panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
        }
        else if (strcmp (key, "taskbar_active_background_id") == 0) {
                int id = atoi (value);
                id = (id < backgrounds->len && id >= 0) ? id : 0;
                panel_config.g_taskbar.bg_active = &g_array_index(backgrounds, Background, id);
-               panel_config.g_taskbar.use_active = 1;
        }
 
        /* Task */
@@ -498,16 +522,7 @@ void add_entry (char *key, char *value)
        }
 
        /* Systray */
-       // systray disabled in snapshot mode
-       else if (strcmp (key, "systray") == 0 && snapshot_path == 0) {
-               systray_enabled = atoi(value);
-               old_config_file = 0;
-       }
-       else if (strcmp (key, "systray_padding") == 0 && snapshot_path == 0) {
-               if (old_config_file) {
-                       // if tint2rc is an old config file, systray_padding enabled the systray bar.
-                       systray_enabled = 1;
-               }
+       else if (strcmp (key, "systray_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
                systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
                if (value2) systray.area.paddingy = atoi (value2);
@@ -539,9 +554,6 @@ void add_entry (char *key, char *value)
        }
 
        /* Launcher */
-       else if (strcmp (key, "launcher") == 0) {
-               launcher_enabled = atoi(value);
-       }
        else if (strcmp (key, "launcher_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
                panel_config.launcher.area.paddingxlr = panel_config.launcher.area.paddingx = atoi (value1);
@@ -556,13 +568,13 @@ void add_entry (char *key, char *value)
        else if (strcmp(key, "launcher_icon_size") == 0) {
                launcher_max_icon_size = atoi(value);
        }
-       else if (strcmp(key, "launcher_item_icon") == 0) {
-               char *path = strdup(value);
-               panel_config.launcher.list_icon_paths = g_slist_append(panel_config.launcher.list_icon_paths, path);
+       else if (strcmp(key, "launcher_item_app") == 0) {
+               char *app = strdup(value);
+               panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
        }
-       else if (strcmp(key, "launcher_item_cmd") == 0) {
-               char *cmd = strdup(value);
-               panel_config.launcher.list_cmds = g_slist_append(panel_config.launcher.list_cmds, cmd);
+       else if (strcmp(key, "launcher_icon_theme") == 0) {
+               char *app = strdup(value);
+               panel_config.launcher.icon_theme_names = g_slist_append(panel_config.launcher.icon_theme_names, app);
        }
 
        /* Tooltip */
@@ -629,6 +641,29 @@ void add_entry (char *key, char *value)
                }
        }
 
+       // old config option
+       else if (strcmp(key, "systray") == 0) {
+               if (new_config_file == 0) {
+                       systray_enabled = atoi(value);
+                       if (systray_enabled) {
+                               if (panel_items_order)
+                                       panel_items_order = strcat(panel_items_order, "S");
+                               else 
+                                       panel_items_order = strdup("S");
+                       }
+               }
+       }
+       else if (strcmp(key, "battery") == 0) {
+               if (new_config_file == 0) {
+                       battery_enabled = atoi(value);
+                       if (battery_enabled) {
+                               if (panel_items_order)
+                                       panel_items_order = strcat(panel_items_order, "B");
+                               else 
+                                       panel_items_order = strdup("B");
+                       }
+               }
+       }
        else
                fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);
 
@@ -701,6 +736,17 @@ int config_read_file (const char *path)
                }
        }
        fclose (fp);
+       
+       // append Taskbar item
+       if (new_config_file == 0) {
+               taskbar_enabled = 1;
+               if (panel_items_order) {
+                       char *tmp = strdup("T");
+                       panel_items_order = strcat(tmp, panel_items_order);
+               }
+               else 
+                       panel_items_order = strdup("T");
+       }
 
        return 1;
 }