#include "config.h"
#include "window.h"
#include "tooltip.h"
+#include "timer.h"
#ifdef ENABLE_BATTERY
#include "battery.h"
// temporary list of background
static GSList *list_back;
+static int back_count;
{
// append full transparency background
list_back = g_slist_append(0, calloc(1, sizeof(Area)));
+ back_count = 1;
// tint2 could reload config, so we cleanup objects
cleanup_systray();
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;
*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;
}
Area *a = calloc(1, sizeof(Area));
a->pix.border.rounded = atoi (value);
list_back = g_slist_append(list_back, a);
+ back_count++;
}
else if (strcmp (key, "border_width") == 0) {
Area *a = g_slist_last(list_back)->data;
panel_config.g_task.font_shadow = atoi (value);
else if (strcmp (key, "panel_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
memcpy(&panel_config.area.pix.back, &a->pix.back, sizeof(Color));
memcpy(&panel_config.area.pix.border, &a->pix.border, sizeof(Border));
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) {
else if (strcmp (key, "battery_background_id") == 0) {
#ifdef ENABLE_BATTERY
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
memcpy(&panel_config.battery.area.pix.back, &a->pix.back, sizeof(Color));
memcpy(&panel_config.battery.area.pix.border, &a->pix.border, sizeof(Border));
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);
}
}
else if (strcmp (key, "clock_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
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);
}
else if (strcmp (key, "taskbar_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
memcpy(&panel_config.g_taskbar.pix.back, &a->pix.back, sizeof(Color));
memcpy(&panel_config.g_taskbar.pix.border, &a->pix.border, sizeof(Border));
}
else if (strcmp (key, "taskbar_active_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
memcpy(&panel_config.g_taskbar.pix_active.back, &a->pix.back, sizeof(Color));
memcpy(&panel_config.g_taskbar.pix_active.border, &a->pix.border, sizeof(Border));
}
else if (strcmp (key, "task_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
memcpy(&panel_config.g_task.area.pix.back, &a->pix.back, sizeof(Color));
memcpy(&panel_config.g_task.area.pix.border, &a->pix.border, sizeof(Border));
}
else if (strcmp (key, "task_active_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
memcpy(&panel_config.g_task.area.pix_active.back, &a->pix.back, sizeof(Color));
memcpy(&panel_config.g_task.area.pix_active.border, &a->pix.border, sizeof(Border));
}
else if (strcmp (key, "systray_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
Area *a = g_slist_nth_data(list_back, id);
memcpy(&systray.area.pix.back, &a->pix.back, sizeof(Color));
memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border));
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);
}
else if (strcmp (key, "tooltip_background_id") == 0) {
int id = atoi (value);
+ id = (id < back_count && id >= 0) ? id : 0;
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, "mouse_scroll_down") == 0)
get_action (value, &mouse_scroll_down);
+ /* autohide options */
+ else if (strcmp(key, "autohide") == 0)
+ panel_autohide = atoi(value);
+ else if (strcmp(key, "autohide_show_timeout") == 0)
+ panel_autohide_show_timeout = 1000*atof(value);
+ else if (strcmp(key, "autohide_hide_timeout") == 0)
+ panel_autohide_hide_timeout = 1000*atof(value);
+ else if (strcmp(key, "strut_policy") == 0) {
+ if (strcmp(value, "follow_size") == 0)
+ panel_strut_policy = STRUT_FOLLOW_SIZE;
+ else
+ panel_strut_policy = STRUT_MINIMUM;
+ }
+ else if (strcmp(key, "autohide_height") == 0)
+ panel_autohide_height = atoi(value);
+
/* Read tint-0.6 config for backward compatibility */
else if (strcmp (key, "panel_mode") == 0) {
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;