X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=da69deab726d73aa569db5600737982d5aa7f99c;hb=8354267448dab01626da0c4b3d2eedfa20e6858a;hp=6b79b2430f3ae040eb90326baec29d5f7fb5ffaf;hpb=9cb781048d0a1cf55f0044e2f9f65ac9a5a241e9;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 6b79b24..da69dea 100644
--- a/src/config.c
+++ b/src/config.c
@@ -43,6 +43,7 @@
 #include "panel.h"
 #include "config.h"
 #include "window.h"
+#include "tooltip.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -338,6 +339,8 @@ void add_entry (char *key, char *value)
 	}
 	else if (strcmp (key, "wm_menu") == 0)
 		wm_menu = atoi (value);
+	else if (strcmp (key, "panel_dock") == 0)
+		panel_dock = atoi (value);
 	else if (strcmp (key, "urgent_nb_of_blink") == 0)
 		max_tick_urgent = (atoi (value) * 2) + 1;
 
@@ -527,15 +530,15 @@ void add_entry (char *key, char *value)
 		if (value2) panel_config->g_task.font_active.alpha = (atoi (value2) / 100.0);
 		else panel_config->g_task.font_active.alpha = 0.1;
 	}
-	else if (strcmp (key, "task_icon_hsb") == 0) {
+	else if (strcmp (key, "task_icon_asb") == 0) {
 		extract_values(value, &value1, &value2, &value3);
-		panel_config->g_task.hue = atoi(value1);
+		panel_config->g_task.alpha = atoi(value1);
 		panel_config->g_task.saturation = atoi(value2);
 		panel_config->g_task.brightness = atoi(value3);
 	}
-	else if (strcmp (key, "task_active_icon_hsb") == 0) {
+	else if (strcmp (key, "task_active_icon_asb") == 0) {
 		extract_values(value, &value1, &value2, &value3);
-		panel_config->g_task.hue_active = atoi(value1);
+		panel_config->g_task.alpha_active = atoi(value1);
 		panel_config->g_task.saturation_active = atoi(value2);
 		panel_config->g_task.brightness_active = atoi(value3);
 	}
@@ -573,6 +576,43 @@ void add_entry (char *key, char *value)
 			systray.sort = 1;
 	}
 
+	/* 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 usec = (timeout-sec)*1e6;
+		g_tooltip.show_timeout.it_value = (struct timeval){.tv_sec=sec, .tv_usec=usec};
+	}
+	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};
+	}
+	else if (strcmp (key, "tooltip_padding") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		if (value1) g_tooltip.paddingx = atoi(value1);
+		if (value2) g_tooltip.paddingy = atoi(value2);
+	}
+	else if (strcmp (key, "tooltip_background_id") == 0) {
+		int id = atoi (value);
+		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));
+	}
+	else if (strcmp (key, "tooltip_font_color") == 0) {
+		extract_values(value, &value1, &value2, &value3);
+		get_color(value1, g_tooltip.font_color.color);
+		if (value2) g_tooltip.font_color.alpha = (atoi (value2) / 100.0);
+		else g_tooltip.font_color.alpha = 0.1;
+	}
+	else if (strcmp (key, "tooltip_font") == 0) {
+		if (g_tooltip.font_desc) pango_font_description_free(g_tooltip.font_desc);
+		g_tooltip.font_desc = pango_font_description_from_string(value);
+	}
+
 	/* Mouse actions */
 	else if (strcmp (key, "mouse_middle") == 0)
 		get_action (value, &mouse_middle);
@@ -735,6 +775,7 @@ void config_finish ()
 #endif
 	init_systray();
 	init_taskbar();
+	init_tooltip();
 	visible_object();
 
 	cleanup_config();