*add* remove of tooltip = En/Disabled. it's renamed to task_tooltip to enable/disable...

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index 37a30eff74d31dc2228d5e45356eaf44996d8568..ae6fe31ecd3947c1fe145653732fa77f139cd9a6 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"
@@ -374,10 +375,13 @@ void add_entry (char *key, char *value)
        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");
+                       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 = strdup("C");
+                               panel_items_order = g_strdup("C");
                }
                if (strlen(value) > 0) {
                        time1_format = strdup (value);
@@ -450,14 +454,48 @@ 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_padding") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               panel_config.g_taskbar.area_name.paddingxlr = panel_config.g_taskbar.area_name.paddingx = atoi (value1);
+       }
+       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_NORMAL] = &g_array_index(backgrounds, Background, id);
+               if (panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] == 0)
+                       panel_config.g_taskbar.background_name[TASKBAR_ACTIVE] = panel_config.g_taskbar.background_name[TASKBAR_NORMAL];
+       }
+       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) {
+               extract_values(value, &value1, &value2, &value3);
+               get_color (value1, taskbarname_active_font.color);
+               if (value2) taskbarname_active_font.alpha = (atoi (value2) / 100.0);
+               else taskbarname_active_font.alpha = 0.5;
        }
 
        /* Task */
@@ -519,9 +557,22 @@ void add_entry (char *key, char *value)
                panel_config.g_task.config_background_mask |= (1<<status);
                if (status == TASK_NORMAL) panel_config.g_task.area.bg = panel_config.g_task.background[TASK_NORMAL];
        }
+       // "tooltip" is deprecated but here for backwards compatibility
+       else if (strcmp (key, "task_tooltip") == 0 || strcmp(key, "tooltip") == 0)
+               panel_config.g_task.tooltip_enabled = atoi(value);
 
        /* Systray */
        else if (strcmp (key, "systray_padding") == 0) {
+               if (new_config_file == 0 && systray_enabled == 0) {
+                       systray_enabled = 1;
+                       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");
+               }
                extract_values(value, &value1, &value2, &value3);
                systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
                if (value2) systray.area.paddingy = atoi (value2);
@@ -572,13 +623,12 @@ 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 */
-       else if (strcmp (key, "tooltip") == 0)
-               g_tooltip.enabled = atoi(value);
        else if (strcmp (key, "tooltip_show_timeout") == 0) {
                int timeout_msec = 1000*atof(value);
                g_tooltip.show_timeout_msec = timeout_msec;
@@ -645,10 +695,13 @@ void add_entry (char *key, char *value)
                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");
+                               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");
                        }
                }
        }
@@ -656,10 +709,13 @@ void add_entry (char *key, char *value)
                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");
+                               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");
                        }
                }
        }
@@ -740,11 +796,12 @@ int config_read_file (const char *path)
        if (new_config_file == 0) {
                taskbar_enabled = 1;
                if (panel_items_order) {
-                       char *tmp = strdup("T");
-                       panel_items_order = strcat(tmp, 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 = strdup("T");
+                       panel_items_order = g_strdup("T");
        }
 
        return 1;