*fix* calculate right struts for multiple monitors. fixes issue 148 and issue 178

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index efbcd5c082e363fd554a0a3af17af99698745e7c..bc54938eda8d6ee71f0abab6e19b3957898e2a38 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -32,6 +32,7 @@
 #include <ctype.h>
 #include <glib/gstdio.h>
 #include <pango/pangocairo.h>
+#include <pango/pangoxft.h>
 #include <Imlib2.h>
 
 #include "common.h"
@@ -44,6 +45,7 @@
 #include "config.h"
 #include "window.h"
 #include "tooltip.h"
+#include "timer.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -51,14 +53,16 @@
 
 // global path
 char *config_path = 0;
-char *thumbnail_path = 0;
+char *snapshot_path = 0;
 
 // --------------------------------------------------
 // backward compatibility
 static int old_task_icon_size;
 static Area *area_task;
 static Area *area_task_active;
-
+// detect if it's an old config file
+// ==1
+static int old_config_file;
 
 // temporary list of background
 static GSList *list_back;
@@ -71,8 +75,11 @@ 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();
+#endif
        cleanup_clock();
        cleanup_tooltip();
 
@@ -84,10 +91,16 @@ void init_config()
        panel_config.g_task.alpha = 100;
        panel_config.g_task.alpha_active = 100;
        systray.sort = 3;
+       old_config_file = 1;
 
        // window manager's menu default value == false
        wm_menu = 0;
        max_tick_urgent = 7;
+
+       // flush pango cache if possible
+       //pango_xft_shutdown_display(server.dsp, server.screen);
+       //PangoFontMap *font_map = pango_xft_get_font_map(server.dsp, server.screen);
+       //pango_fc_font_map_shutdown(font_map);
 }
 
 
@@ -162,6 +175,10 @@ void get_action (char *event, int *action)
                *action = DESKTOP_LEFT;
        else if (strcmp (event, "desktop_right") == 0)
                *action = DESKTOP_RIGHT;
+       else if (strcmp (event, "next_task") == 0)
+               *action = NEXT_TASK;
+       else if (strcmp (event, "prev_task") == 0)
+               *action = PREV_TASK;
 }
 
 
@@ -371,6 +388,10 @@ void add_entry (char *key, char *value)
                memcpy(&panel_config.clock.area.pix.back, &a->pix.back, sizeof(Color));
                memcpy(&panel_config.clock.area.pix.border, &a->pix.border, sizeof(Border));
        }
+       else if (strcmp(key, "clock_tooltip") == 0) {
+               if (strlen(value) > 0)
+                       time_tooltip_format = strdup (value);
+       }
        else if (strcmp(key, "clock_lclick_command") == 0) {
                if (strlen(value) > 0)
                        clock_lclick_command = strdup(value);
@@ -472,10 +493,13 @@ void add_entry (char *key, char *value)
 
        /* Systray */
        else if (strcmp (key, "systray") == 0) {
-               if(atoi(value) == 1)
-                       systray_enabled = 1;
+               systray_enabled = atoi(value);
+               // systray is latest option added. files without 'systray' are old.
+               old_config_file = 0;
        }
        else if (strcmp (key, "systray_padding") == 0) {
+               if (old_config_file)
+                       systray_enabled = 1;
                extract_values(value, &value1, &value2, &value3);
                systray.area.paddingxlr = systray.area.paddingx = atoi (value1);
                if (value2) systray.area.paddingy = atoi (value2);
@@ -504,14 +528,18 @@ void add_entry (char *key, char *value)
        else if (strcmp (key, "tooltip_show_timeout") == 0) {
                double timeout = atof(value);
                int sec = (int)timeout;
-               int usec = (timeout-sec)*1e6;
-               g_tooltip.show_timeout.it_value = (struct timeval){.tv_sec=sec, .tv_usec=usec};
+               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};
        }
        else if (strcmp (key, "tooltip_hide_timeout") == 0) {
                double timeout = atof(value);
                int sec = (int)timeout;
-               int usec = (timeout-sec)*1e6;
-               g_tooltip.hide_timeout.it_value = (struct timeval){.tv_sec=sec, .tv_usec=usec};
+               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};
        }
        else if (strcmp (key, "tooltip_padding") == 0) {
                extract_values(value, &value1, &value2, &value3);