*fix* issue 175

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index bc54938eda8d6ee71f0abab6e19b3957898e2a38..5f74d4ed762a6abb0cf67a5c1730703529e03435 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -75,7 +75,6 @@ void init_config()
        list_back = g_slist_append(0, calloc(1, sizeof(Area)));
 
        // tint2 could reload config, so we cleanup objects
-       uninstall_all_timer();
        cleanup_systray();
 #ifdef ENABLE_BATTERY
        cleanup_battery();
@@ -294,6 +293,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) {
@@ -367,6 +376,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);
        }
@@ -392,6 +409,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);
@@ -521,25 +542,20 @@ 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);
+       }
 
        /* 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);
@@ -706,7 +722,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;