X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=41d3f3fd39c2a95a2c377c49d02f52b53a2736fe;hb=b7aaf2ac709f85602ef6152980a639fd3a8577e7;hp=dee33d213877775db9514695f3e06ea05a3d694c;hpb=332a02bc23e76658b1b865749b0ca1b082ad439b;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index dee33d2..41d3f3f 100644
--- 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"
@@ -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;
 }
 
 
@@ -288,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) {
@@ -361,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);
 	}
@@ -382,6 +405,14 @@ 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_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);
@@ -516,16 +547,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);
@@ -692,7 +719,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;