*fix* use another timer implementation, coz *BSD does not support timerfd :(

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index d8675c3eb44c3a7154f641716d3e82b21ce61c4a..caebe6476638bd3bf3ef9d132eb1b2f01518581b 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -45,6 +45,7 @@
 #include "config.h"
 #include "window.h"
 #include "tooltip.h"
+#include "timer.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -52,7 +53,7 @@
 
 // global path
 char *config_path = 0;
-char *thumbnail_path = 0;
+char *snapshot_path = 0;
 
 // --------------------------------------------------
 // backward compatibility
@@ -173,6 +174,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;
 }
 
 
@@ -382,6 +387,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);
@@ -516,16 +525,12 @@ void add_entry (char *key, char *value)
        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 usec = (timeout-sec)*1e6;
-               g_tooltip.show_timeout.it_value = (struct timeval){.tv_sec=sec, .tv_usec=usec};
+               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 usec = (timeout-sec)*1e6;
-               g_tooltip.hide_timeout.it_value = (struct timeval){.tv_sec=sec, .tv_usec=usec};
+               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);