*add* systray icons can also be adjusted, like task icons

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index efbcd5c082e363fd554a0a3af17af99698745e7c..d5f7ef1a8776e58ae670c7b4a08f32ec03b92e3e 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;
@@ -72,7 +76,9 @@ void init_config()
 
        // tint2 could reload config, so we cleanup objects
        cleanup_systray();
+#ifdef ENABLE_BATTERY
        cleanup_battery();
+#endif
        cleanup_clock();
        cleanup_tooltip();
 
@@ -83,11 +89,18 @@ void init_config()
        memset(&panel_config, 0, sizeof(Panel));
        panel_config.g_task.alpha = 100;
        panel_config.g_task.alpha_active = 100;
+       systray.alpha = 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;
 }
 
 
@@ -277,6 +294,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) {
@@ -350,6 +377,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);
        }
@@ -371,6 +406,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);
@@ -472,10 +515,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);
@@ -497,21 +543,26 @@ 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);
+       }
+       else if (strcmp(key, "systray_icon_asb") == 0) {
+               extract_values(value, &value1, &value2, &value3);
+               systray.alpha = atoi(value1);
+               systray.saturation = atoi(value2);
+               systray.brightness = atoi(value3);
+       }
 
        /* 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};
+               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);
@@ -678,7 +729,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;