*fix* memleak

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index bc54938eda8d6ee71f0abab6e19b3957898e2a38..69ceda0bac8116977cb97eae666b6bfb010e52b6 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -66,6 +66,7 @@ static int old_config_file;
 
 // temporary list of background
 static GSList *list_back;
+static int back_count;
 
 
 
@@ -73,9 +74,9 @@ void init_config()
 {
        // append full transparency background
        list_back = g_slist_append(0, calloc(1, sizeof(Area)));
+       back_count = 1;
 
        // tint2 could reload config, so we cleanup objects
-       uninstall_all_timer();
        cleanup_systray();
 #ifdef ENABLE_BATTERY
        cleanup_battery();
@@ -90,6 +91,7 @@ void init_config()
        memset(&panel_config, 0, sizeof(Panel));
        panel_config.g_task.alpha = 100;
        panel_config.g_task.alpha_active = 100;
+       systray.alpha = 100;
        systray.sort = 3;
        old_config_file = 1;
 
@@ -192,6 +194,7 @@ void add_entry (char *key, char *value)
                Area *a = calloc(1, sizeof(Area));
                a->pix.border.rounded = atoi (value);
                list_back = g_slist_append(list_back, a);
+               back_count++;
        }
        else if (strcmp (key, "border_width") == 0) {
                Area *a = g_slist_last(list_back)->data;
@@ -284,6 +287,7 @@ void add_entry (char *key, char *value)
                panel_config.g_task.font_shadow = atoi (value);
        else if (strcmp (key, "panel_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&panel_config.area.pix.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.area.pix.border, &a->pix.border, sizeof(Border));
@@ -294,6 +298,16 @@ void add_entry (char *key, char *value)
                panel_dock = atoi (value);
        else if (strcmp (key, "urgent_nb_of_blink") == 0)
                max_tick_urgent = (atoi (value) * 2) + 1;
+       else if (strcmp (key, "real_transparency") == 0)
+               real_transparency = atoi(value);
+       else if (strcmp (key, "panel_layer") == 0) {
+               if (strcmp(value, "bottom") == 0)
+                       panel_layer = BOTTOM_LAYER;
+               else if (strcmp(value, "normal") == 0)
+                       panel_layer = NORMAL_LAYER;
+               else if (strcmp(value, "top") == 0)
+                       panel_layer = TOP_LAYER;
+       }
 
        /* Battery */
        else if (strcmp (key, "battery") == 0) {
@@ -347,6 +361,7 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "battery_background_id") == 0) {
 #ifdef ENABLE_BATTERY
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&panel_config.battery.area.pix.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.battery.area.pix.border, &a->pix.border, sizeof(Border));
@@ -367,6 +382,14 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "time1_font") == 0) {
                time1_font_desc = pango_font_description_from_string (value);
        }
+       else if (strcmp(key, "time1_timezone") == 0) {
+               if (strlen(value) > 0)
+                       time1_timezone = strdup(value);
+       }
+       else if (strcmp(key, "time2_timezone") == 0) {
+               if (strlen(value) > 0)
+                       time2_timezone = strdup(value);
+       }
        else if (strcmp (key, "time2_font") == 0) {
                time2_font_desc = pango_font_description_from_string (value);
        }
@@ -384,6 +407,7 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "clock_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&panel_config.clock.area.pix.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.clock.area.pix.border, &a->pix.border, sizeof(Border));
@@ -392,6 +416,10 @@ void add_entry (char *key, char *value)
                if (strlen(value) > 0)
                        time_tooltip_format = strdup (value);
        }
+       else if (strcmp(key, "clock_tooltip_timezone") == 0) {
+               if (strlen(value) > 0)
+                       time_tooltip_timezone = strdup(value);
+       }
        else if (strcmp(key, "clock_lclick_command") == 0) {
                if (strlen(value) > 0)
                        clock_lclick_command = strdup(value);
@@ -414,12 +442,14 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "taskbar_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&panel_config.g_taskbar.pix.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.g_taskbar.pix.border, &a->pix.border, sizeof(Border));
        }
        else if (strcmp (key, "taskbar_active_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&panel_config.g_taskbar.pix_active.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.g_taskbar.pix_active.border, &a->pix.border, sizeof(Border));
@@ -480,12 +510,14 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "task_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&panel_config.g_task.area.pix.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.g_task.area.pix.border, &a->pix.border, sizeof(Border));
        }
        else if (strcmp (key, "task_active_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&panel_config.g_task.area.pix_active.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.g_task.area.pix_active.border, &a->pix.border, sizeof(Border));
@@ -507,6 +539,7 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "systray_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&systray.area.pix.back, &a->pix.back, sizeof(Color));
                memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border));
@@ -521,25 +554,26 @@ void add_entry (char *key, char *value)
                else  if (strcmp(value, "right2left") == 0)
                        systray.sort = 3;
        }
+       else if (strcmp(key, "systray_icon_size") == 0) {
+               systray_max_icon_size = atoi(value);
+       }
+       else if (strcmp(key, "systray_icon_asb") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               systray.alpha = atoi(value1);
+               systray.saturation = atoi(value2);
+               systray.brightness = atoi(value3);
+       }
 
        /* Tooltip */
        else if (strcmp (key, "tooltip") == 0)
                g_tooltip.enabled = atoi(value);
        else if (strcmp (key, "tooltip_show_timeout") == 0) {
-               double timeout = atof(value);
-               int sec = (int)timeout;
-               int nsec = (timeout-sec)*1e9;
-               if (nsec < 0)  // can happen because of double is not precise such that (sec > timeout)==TRUE
-                       nsec = 0;
-               g_tooltip.show_timeout = (struct timespec){.tv_sec=sec, .tv_nsec=nsec};
+               int timeout_msec = 1000*atof(value);
+               g_tooltip.show_timeout_msec = timeout_msec;
        }
        else if (strcmp (key, "tooltip_hide_timeout") == 0) {
-               double timeout = atof(value);
-               int sec = (int)timeout;
-               int nsec = (timeout-sec)*1e9;
-               if (nsec < 0)  // can happen because of double is not precise such that (sec > timeout)==TRUE
-                       nsec = 0;
-               g_tooltip.hide_timeout = (struct timespec){.tv_sec=sec, .tv_nsec=nsec};
+               int timeout_msec = 1000*atof(value);
+               g_tooltip.hide_timeout_msec = timeout_msec;
        }
        else if (strcmp (key, "tooltip_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);
@@ -548,6 +582,7 @@ void add_entry (char *key, char *value)
        }
        else if (strcmp (key, "tooltip_background_id") == 0) {
                int id = atoi (value);
+               id = id < back_count ? id : 0;
                Area *a = g_slist_nth_data(list_back, id);
                memcpy(&g_tooltip.background_color, &a->pix.back, sizeof(Color));
                memcpy(&g_tooltip.border, &a->pix.border, sizeof(Border));
@@ -706,7 +741,7 @@ int config_read ()
 int config_read_file (const char *path)
 {
        FILE *fp;
-       char line[80];
+       char line[512];
        char *key, *value;
 
        if ((fp = fopen(path, "r")) == NULL) return 0;