desktop name: first step

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index de8a90d34e70406d80eed0daa4d038c952349dd6..b0b06d70a262d23cc4444310270a3f09de3a244e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -3,7 +3,7 @@
 * Tint2 : read/write config file
 *
 * Copyright (C) 2007 Pål Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -40,6 +40,7 @@
 #include "panel.h"
 #include "task.h"
 #include "taskbar.h"
+#include "taskbarname.h"
 #include "systraybar.h"
 #include "launcher.h"
 #include "clock.h"
@@ -59,14 +60,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()
@@ -236,13 +237,14 @@ void add_entry (char *key, char *value)
                }
        }
        else if (strcmp (key, "panel_items") == 0) {
-               if (panel_items_order) g_free(panel_items_order);
+               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')
+                       if (panel_items_order[j] == 'T')
+                               taskbar_enabled = 1;
                        if (panel_items_order[j] == 'B') {
 #ifdef ENABLE_BATTERY
                                battery_enabled = 1;
@@ -371,6 +373,16 @@ 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) {
+                               char* tmp = g_strconcat(panel_items_order, "C", NULL);
+                               g_free( panel_items_order );
+                               panel_items_order = tmp;
+                       }
+                       else 
+                               panel_items_order = g_strdup("C");
+               }
                if (strlen(value) > 0) {
                        time1_format = strdup (value);
                        clock_enabled = 1;
@@ -442,14 +454,38 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "taskbar_background_id") == 0) {
                int id = atoi (value);
                id = (id < backgrounds->len && id >= 0) ? id : 0;
-               panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id);
-               panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg;
+               panel_config.g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, id);
+               if (panel_config.g_taskbar.background[TASKBAR_ACTIVE] == 0)
+                       panel_config.g_taskbar.background[TASKBAR_ACTIVE] = panel_config.g_taskbar.background[TASKBAR_NORMAL];
        }
        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;
+               panel_config.g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
+       }
+       else if (strcmp (key, "taskbar_name") == 0) {
+               taskbarname_enabled = atoi (value);
+       }
+       else if (strcmp (key, "taskbar_name_background_id") == 0) {
+               int id = atoi (value);
+               id = (id < backgrounds->len && id >= 0) ? id : 0;
+               panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
+       }
+       else if (strcmp (key, "taskbar_name_active_background_id") == 0) {
+               int id = atoi (value);
+               id = (id < backgrounds->len && id >= 0) ? id : 0;
+               panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, id);
+       }
+       else if (strcmp (key, "taskbar_name_font") == 0) {
+               taskbarname_font_desc = pango_font_description_from_string (value);
+       }
+       else if (strcmp (key, "taskbar_name_font_color") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               get_color (value1, taskbarname_font.color);
+               if (value2) taskbarname_font.alpha = (atoi (value2) / 100.0);
+               else taskbarname_font.alpha = 0.5;
+       }
+       else if (strcmp (key, "taskbar_name_active_font_color") == 0) {
        }
 
        /* Task */
@@ -564,8 +600,9 @@ void add_entry (char *key, char *value)
                panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app);
        }
        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);
+               // if XSETTINGS manager running, tint2 use it.
+               if (!icon_theme_name)
+                       icon_theme_name = strdup(value);
        }
 
        /* Tooltip */
@@ -632,6 +669,35 @@ 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) {
+                                       char* tmp = g_strconcat(panel_items_order, "S", NULL);
+                                       g_free( panel_items_order );
+                                       panel_items_order = tmp;
+                               }
+                               else
+                                       panel_items_order = g_strdup("S");
+                       }
+               }
+       }
+       else if (strcmp(key, "battery") == 0) {
+               if (new_config_file == 0) {
+                       battery_enabled = atoi(value);
+                       if (battery_enabled) {
+                               if (panel_items_order) {
+                                       char* tmp = g_strconcat(panel_items_order, "B", NULL);
+                                       g_free( panel_items_order );
+                                       panel_items_order = tmp;
+                               }
+                               else
+                                       panel_items_order = g_strdup("B");
+                       }
+               }
+       }
        else
                fprintf(stderr, "tint2 : invalid option \"%s\",\n  upgrade tint2 or correct your config file\n", key);
 
@@ -704,6 +770,18 @@ 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 = g_strconcat( "T", panel_items_order, NULL );
+                       g_free(panel_items_order);
+                       panel_items_order = tmp;
+               }
+               else 
+                       panel_items_order = g_strdup("T");
+       }
 
        return 1;
 }