X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=814bc5d2ff3fcba5f03d24d43a8f9da737edeee7;hb=ad50533aef71e9697fe78bb636e64079f198f985;hp=5a627040b6e761e84ea169bcc47edab5761fb89a;hpb=386f2fec6d8d7c3ebe1e2192f4632ed0b12f0df1;p=chaz%2Ftint2 diff --git a/src/config.c b/src/config.c index 5a62704..814bc5d 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" @@ -52,17 +53,20 @@ // 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; +static int back_count; @@ -70,10 +74,13 @@ void init_config() { // 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(); +#ifdef ENABLE_BATTERY cleanup_battery(); +#endif cleanup_clock(); cleanup_tooltip(); @@ -84,7 +91,9 @@ 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; @@ -168,6 +177,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; } @@ -181,6 +194,7 @@ void add_entry (char *key, char *value) 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; @@ -273,6 +287,7 @@ void add_entry (char *key, char *value) 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)); @@ -283,6 +298,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) { @@ -336,6 +361,7 @@ void add_entry (char *key, char *value) 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)); @@ -356,6 +382,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); } @@ -373,10 +407,19 @@ void add_entry (char *key, char *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); @@ -399,12 +442,14 @@ void add_entry (char *key, char *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)); @@ -465,12 +510,14 @@ void add_entry (char *key, char *value) } 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)); @@ -478,10 +525,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); @@ -489,6 +539,7 @@ void add_entry (char *key, char *value) } 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)); @@ -503,21 +554,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); @@ -526,6 +582,7 @@ void add_entry (char *key, char *value) } 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)); @@ -550,6 +607,22 @@ void add_entry (char *key, char *value) 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) { @@ -684,7 +757,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;