X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=814bc5d2ff3fcba5f03d24d43a8f9da737edeee7;hb=367bf8f76227dea6e7e10e974967ae1d60cfe38e;hp=cbb9d664e4dc1a0c5977a0d87a8b47647e30bfa5;hpb=9becd8bd3b513a0bbfe778b2ef88f6d598fdf03a;p=chaz%2Ftint2 diff --git a/src/config.c b/src/config.c index cbb9d66..814bc5d 100644 --- a/src/config.c +++ b/src/config.c @@ -66,6 +66,7 @@ static int old_config_file; // temporary list of background static GSList *list_back; +static int back_count; @@ -73,6 +74,7 @@ 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(); @@ -89,6 +91,7 @@ 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; @@ -191,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; @@ -283,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)); @@ -293,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) { @@ -346,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)); @@ -391,6 +407,7 @@ 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)); @@ -425,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)); @@ -491,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)); @@ -518,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)); @@ -532,6 +554,15 @@ 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) @@ -551,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)); @@ -575,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) {