X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Fconfig.c;h=04ec056173607730db02dafcf57b9b5becf27500;hp=fae676e92e299171e1fc23245a611d6f63e53e52;hb=63bbffa4af17926ba2d52728883988eae402b07a;hpb=83f23be9b6b5c2f1ae39d7d045353036b07f872d diff --git a/src/config.c b/src/config.c index fae676e..04ec056 100644 --- a/src/config.c +++ b/src/config.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include "common.h" @@ -40,70 +41,38 @@ #include "task.h" #include "taskbar.h" #include "systraybar.h" +#include "launcher.h" #include "clock.h" #include "config.h" #include "window.h" #include "tooltip.h" +#include "timer.h" #ifdef ENABLE_BATTERY #include "battery.h" #endif // global path -char *config_path = 0; -char *thumbnail_path = 0; +char *config_path; +char *snapshot_path; // -------------------------------------------------- // backward compatibility -static int save_file_config; -static int old_task_icon_size; -static char *old_task_font; -static char *old_time1_font; -static char *old_time2_font; -static Area *area_task, *area_task_active; - -#ifdef ENABLE_BATTERY -static char *old_bat1_font; -static char *old_bat2_font; -#endif - -// temporary list of background -static GSList *list_back; +// detect if it's an old config file (==1) +static int new_config_file; - -void init_config() +void default_config() { - // append full transparency background - list_back = g_slist_append(0, calloc(1, sizeof(Area))); - - // tint2 could reload config, so we cleanup objects - cleanup_systray(); - cleanup_battery(); - cleanup_clock(); - cleanup_tooltip(); - - // panel's default value - memset(&panel_config, 0, sizeof(Panel)); - panel_config.g_task.alpha = 100; - panel_config.g_task.alpha_active = 100; - systray.sort = 3; - - // window manager's menu default value == false - wm_menu = 0; - max_tick_urgent = 7; + config_path = 0; + snapshot_path = 0; + new_config_file = 0; } - void cleanup_config() { - // cleanup background list - GSList *l0; - for (l0 = list_back; l0 ; l0 = l0->next) { - free(l0->data); - } - g_slist_free(list_back); - list_back = NULL; + if (config_path) g_free(config_path); + if (snapshot_path) g_free(snapshot_path); } @@ -166,9 +135,51 @@ 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; } +int get_task_status(char* status) +{ + if (strcmp(status, "active") == 0) + return TASK_ACTIVE; + if (strcmp(status, "iconified") == 0) + return TASK_ICONIFIED; + if (strcmp(status, "urgent") == 0) + return TASK_URGENT; + return TASK_NORMAL; +} + + +int config_get_monitor(char* monitor) +{ + if (strcmp(monitor, "all") != 0) { + char* endptr; + int ret_int = strtol(monitor, &endptr, 10); + if (*endptr == 0) + return ret_int-1; + else { + // monitor specified by name, not by index + int i, j; + for (i=0; i alloc a new background - Area *a = calloc(1, sizeof(Area)); - a->pix.border.rounded = atoi (value); - list_back = g_slist_append(list_back, a); + Background bg; + bg.border.rounded = atoi(value); + g_array_append_val(backgrounds, bg); } else if (strcmp (key, "border_width") == 0) { - Area *a = g_slist_last(list_back)->data; - a->pix.border.width = atoi (value); + g_array_index(backgrounds, Background, backgrounds->len-1).border.width = atoi(value); } else if (strcmp (key, "background_color") == 0) { - Area *a = g_slist_last(list_back)->data; + Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1); extract_values(value, &value1, &value2, &value3); - get_color (value1, a->pix.back.color); - if (value2) a->pix.back.alpha = (atoi (value2) / 100.0); - else a->pix.back.alpha = 0.5; + get_color (value1, bg->back.color); + if (value2) bg->back.alpha = (atoi (value2) / 100.0); + else bg->back.alpha = 0.5; } else if (strcmp (key, "border_color") == 0) { - Area *a = g_slist_last(list_back)->data; + Background* bg = &g_array_index(backgrounds, Background, backgrounds->len-1); extract_values(value, &value1, &value2, &value3); - get_color (value1, a->pix.border.color); - if (value2) a->pix.border.alpha = (atoi (value2) / 100.0); - else a->pix.border.alpha = 0.5; + get_color (value1, bg->border.color); + if (value2) bg->border.alpha = (atoi (value2) / 100.0); + else bg->border.alpha = 0.5; } /* Panel */ else if (strcmp (key, "panel_monitor") == 0) { - if (strcmp (value, "all") == 0) panel_config.monitor = -1; - else { - panel_config.monitor = atoi (value); - if (panel_config.monitor > 0) panel_config.monitor -= 1; - } - if (panel_config.monitor > (server.nb_monitor-1)) { - // server.nb_monitor minimum value is 1 (see get_monitors()) - fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n"); - panel_config.monitor = 0; - } + panel_config.monitor = config_get_monitor(value); } else if (strcmp (key, "panel_size") == 0) { extract_values(value, &value1, &value2, &value3); @@ -234,6 +235,31 @@ void add_entry (char *key, char *value) panel_config.area.height = atoi(value2); } } + else if (strcmp (key, "panel_items") == 0) { + new_config_file = 1; + panel_items_order = strdup(value); + int j; + for (j=0 ; j < strlen(panel_items_order) ; j++) { + if (panel_items_order[j] == 'L') + launcher_enabled = 1; + if (panel_items_order[j] == 'T') + taskbar_enabled = 1; + if (panel_items_order[j] == 'B') { +#ifdef ENABLE_BATTERY + battery_enabled = 1; +#else + fprintf(stderr, "tint2 is build without battery support\n"); +#endif + } + if (panel_items_order[j] == 'S') { + // systray disabled in snapshot mode + if (snapshot_path == 0) + systray_enabled = 1; + } + if (panel_items_order[j] == 'C') + clock_enabled = 1; + } + } else if (strcmp (key, "panel_margin") == 0) { extract_values(value, &value1, &value2, &value3); panel_config.marginx = atoi (value1); @@ -271,27 +297,25 @@ 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); - 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)); + id = (id < backgrounds->len && id >= 0) ? id : 0; + panel_config.area.bg = &g_array_index(backgrounds, Background, id); } 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; + max_tick_urgent = atoi (value); + else if (strcmp (key, "panel_layer") == 0) { + if (strcmp(value, "bottom") == 0) + panel_layer = BOTTOM_LAYER; + else if (strcmp(value, "top") == 0) + panel_layer = TOP_LAYER; + else + panel_layer = NORMAL_LAYER; + } /* Battery */ - else if (strcmp (key, "battery") == 0) { -#ifdef ENABLE_BATTERY - if(atoi(value) == 1) - battery_enabled = 1; -#else - if(atoi(value) == 1) - fprintf(stderr, "tint2 is build without battery support\n"); -#endif - } else if (strcmp (key, "battery_low_status") == 0) { #ifdef ENABLE_BATTERY battery_low_status = atoi(value); @@ -307,15 +331,11 @@ void add_entry (char *key, char *value) } else if (strcmp (key, "bat1_font") == 0) { #ifdef ENABLE_BATTERY - if (save_file_config) old_bat1_font = strdup (value); - if (bat1_font_desc) pango_font_description_free(bat1_font_desc); bat1_font_desc = pango_font_description_from_string (value); #endif } else if (strcmp (key, "bat2_font") == 0) { #ifdef ENABLE_BATTERY - if (save_file_config) old_bat2_font = strdup (value); - if (bat2_font_desc) pango_font_description_free(bat2_font_desc); bat2_font_desc = pango_font_description_from_string (value); #endif } @@ -338,14 +358,27 @@ void add_entry (char *key, char *value) else if (strcmp (key, "battery_background_id") == 0) { #ifdef ENABLE_BATTERY int id = atoi (value); - 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)); + id = (id < backgrounds->len && id >= 0) ? id : 0; + panel_config.battery.area.bg = &g_array_index(backgrounds, Background, id); +#endif + } + else if (strcmp (key, "battery_hide") == 0) { +#ifdef ENABLE_BATTERY + percentage_hide = atoi (value); + if (percentage_hide == 0) + percentage_hide = 101; #endif } /* Clock */ else if (strcmp (key, "time1_format") == 0) { + if (new_config_file == 0) { + clock_enabled = 1; + if (panel_items_order) + panel_items_order = strcat(panel_items_order, "C"); + else + panel_items_order = strdup("C"); + } if (strlen(value) > 0) { time1_format = strdup (value); clock_enabled = 1; @@ -356,13 +389,17 @@ void add_entry (char *key, char *value) time2_format = strdup (value); } else if (strcmp (key, "time1_font") == 0) { - if (save_file_config) old_time1_font = strdup (value); - if (time1_font_desc) pango_font_description_free(time1_font_desc); 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) { - if (save_file_config) old_time2_font = strdup (value); - if (time2_font_desc) pango_font_description_free(time2_font_desc); time2_font_desc = pango_font_description_from_string (value); } else if (strcmp (key, "clock_font_color") == 0) { @@ -379,9 +416,16 @@ void add_entry (char *key, char *value) } else if (strcmp (key, "clock_background_id") == 0) { int id = atoi (value); - 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)); + id = (id < backgrounds->len && id >= 0) ? id : 0; + panel_config.clock.area.bg = &g_array_index(backgrounds, Background, id); + } + 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) @@ -399,22 +443,22 @@ void add_entry (char *key, char *value) } else if (strcmp (key, "taskbar_padding") == 0) { extract_values(value, &value1, &value2, &value3); - panel_config.g_taskbar.paddingxlr = panel_config.g_taskbar.paddingx = atoi (value1); - if (value2) panel_config.g_taskbar.paddingy = atoi (value2); - if (value3) panel_config.g_taskbar.paddingx = atoi (value3); + panel_config.g_taskbar.area.paddingxlr = panel_config.g_taskbar.area.paddingx = atoi (value1); + if (value2) panel_config.g_taskbar.area.paddingy = atoi (value2); + if (value3) panel_config.g_taskbar.area.paddingx = atoi (value3); } else if (strcmp (key, "taskbar_background_id") == 0) { int id = atoi (value); - 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)); + id = (id < backgrounds->len && id >= 0) ? id : 0; + panel_config.g_taskbar.bg = &g_array_index(backgrounds, Background, id); + if (panel_config.g_taskbar.bg_active == 0) + panel_config.g_taskbar.bg_active = panel_config.g_taskbar.bg; + panel_config.g_taskbar.area.bg = panel_config.g_taskbar.bg; } else if (strcmp (key, "taskbar_active_background_id") == 0) { int id = atoi (value); - 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)); - panel_config.g_taskbar.use_active = 1; + id = (id < backgrounds->len && id >= 0) ? id : 0; + panel_config.g_taskbar.bg_active = &g_array_index(backgrounds, Background, id); } /* Task */ @@ -443,52 +487,41 @@ void add_entry (char *key, char *value) if (value3) panel_config.g_task.area.paddingx = atoi (value3); } else if (strcmp (key, "task_font") == 0) { - if (save_file_config) old_task_font = strdup (value); - if (panel_config.g_task.font_desc) pango_font_description_free(panel_config.g_task.font_desc); panel_config.g_task.font_desc = pango_font_description_from_string (value); } - else if (strcmp (key, "task_font_color") == 0) { - extract_values(value, &value1, &value2, &value3); - get_color (value1, panel_config.g_task.font.color); - if (value2) panel_config.g_task.font.alpha = (atoi (value2) / 100.0); - else panel_config.g_task.font.alpha = 0.1; - } - else if (strcmp (key, "task_active_font_color") == 0) { - extract_values(value, &value1, &value2, &value3); - get_color (value1, panel_config.g_task.font_active.color); - 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_asb") == 0) { + else if (g_regex_match_simple("task.*_font_color", key, 0, 0)) { + gchar** split = g_regex_split_simple("_", key, 0, 0); + int status = get_task_status(split[1]); + g_strfreev(split); extract_values(value, &value1, &value2, &value3); - 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_asb") == 0) { + float alpha = 1; + if (value2) alpha = (atoi (value2) / 100.0); + get_color (value1, panel_config.g_task.font[status].color); + panel_config.g_task.font[status].alpha = alpha; + panel_config.g_task.config_font_mask |= (1<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); - 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)); + id = (id < backgrounds->len && id >= 0) ? id : 0; + panel_config.g_task.background[status] = &g_array_index(backgrounds, Background, id); + panel_config.g_task.config_background_mask |= (1<pix.back, sizeof(Color)); - memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border)); + id = (id < backgrounds->len && id >= 0) ? id : 0; + systray.area.bg = &g_array_index(backgrounds, Background, id); } else if (strcmp(key, "systray_sort") == 0) { if (strcmp(value, "descending") == 0) @@ -511,21 +543,50 @@ 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); + } + + /* Launcher */ + else if (strcmp (key, "launcher_padding") == 0) { + extract_values(value, &value1, &value2, &value3); + panel_config.launcher.area.paddingxlr = panel_config.launcher.area.paddingx = atoi (value1); + if (value2) panel_config.launcher.area.paddingy = atoi (value2); + if (value3) panel_config.launcher.area.paddingx = atoi (value3); + } + else if (strcmp (key, "launcher_background_id") == 0) { + int id = atoi (value); + id = (id < backgrounds->len && id >= 0) ? id : 0; + panel_config.launcher.area.bg = &g_array_index(backgrounds, Background, id); + } + else if (strcmp(key, "launcher_icon_size") == 0) { + launcher_max_icon_size = atoi(value); + } + else if (strcmp(key, "launcher_item_app") == 0) { + char *app = strdup(value); + panel_config.launcher.list_apps = g_slist_append(panel_config.launcher.list_apps, app); + } + else if (strcmp(key, "launcher_icon_theme") == 0) { + char *app = strdup(value); + panel_config.launcher.icon_theme_names = g_slist_append(panel_config.launcher.icon_theme_names, app); + } /* 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); @@ -534,9 +595,8 @@ void add_entry (char *key, char *value) } 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)); + id = (id < backgrounds->len && id >= 0) ? id : 0; + g_tooltip.bg = &g_array_index(backgrounds, Background, id); } else if (strcmp (key, "tooltip_font_color") == 0) { extract_values(value, &value1, &value2, &value3); @@ -545,7 +605,6 @@ void add_entry (char *key, char *value) 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); } @@ -559,84 +618,54 @@ void add_entry (char *key, char *value) else if (strcmp (key, "mouse_scroll_down") == 0) get_action (value, &mouse_scroll_down); - - /* Read tint-0.6 config for backward compatibility */ - else if (strcmp (key, "panel_mode") == 0) { - save_file_config = 1; - if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP; - else panel_mode = MULTI_DESKTOP; - } - else if (strcmp (key, "panel_rounded") == 0) { - Area *a = calloc(1, sizeof(Area)); - a->pix.border.rounded = atoi (value); - list_back = g_slist_append(list_back, a); - } - else if (strcmp (key, "panel_border_width") == 0) { - Area *a = g_slist_last(list_back)->data; - a->pix.border.width = atoi (value); - } - else if (strcmp (key, "panel_background_color") == 0) { - Area *a = g_slist_last(list_back)->data; - extract_values(value, &value1, &value2, &value3); - get_color (value1, a->pix.back.color); - if (value2) a->pix.back.alpha = (atoi (value2) / 100.0); - else a->pix.back.alpha = 0.5; - } - else if (strcmp (key, "panel_border_color") == 0) { - Area *a = g_slist_last(list_back)->data; - extract_values(value, &value1, &value2, &value3); - get_color (value1, a->pix.border.color); - if (value2) a->pix.border.alpha = (atoi (value2) / 100.0); - else a->pix.border.alpha = 0.5; - } - else if (strcmp (key, "task_text_centered") == 0) - panel_config.g_task.centered = atoi (value); - else if (strcmp (key, "task_margin") == 0) { - panel_config.g_taskbar.paddingxlr = 0; - panel_config.g_taskbar.paddingx = atoi (value); - } - else if (strcmp (key, "task_icon_size") == 0) - old_task_icon_size = atoi (value); - else if (strcmp (key, "task_rounded") == 0) { - area_task = calloc(1, sizeof(Area)); - area_task->pix.border.rounded = atoi (value); - list_back = g_slist_append(list_back, area_task); - - area_task_active = calloc(1, sizeof(Area)); - area_task_active->pix.border.rounded = atoi (value); - list_back = g_slist_append(list_back, area_task_active); - } - else if (strcmp (key, "task_background_color") == 0) { - extract_values(value, &value1, &value2, &value3); - get_color (value1, area_task->pix.back.color); - if (value2) area_task->pix.back.alpha = (atoi (value2) / 100.0); - else area_task->pix.back.alpha = 0.5; - } - else if (strcmp (key, "task_active_background_color") == 0) { - extract_values(value, &value1, &value2, &value3); - get_color (value1, area_task_active->pix.back.color); - if (value2) area_task_active->pix.back.alpha = (atoi (value2) / 100.0); - else area_task_active->pix.back.alpha = 0.5; - } - else if (strcmp (key, "task_border_width") == 0) { - area_task->pix.border.width = atoi (value); - area_task_active->pix.border.width = atoi (value); + /* 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 if (strcmp(value, "none") == 0) + panel_strut_policy = STRUT_NONE; + else + panel_strut_policy = STRUT_MINIMUM; + } + else if (strcmp(key, "autohide_height") == 0) { + panel_autohide_height = atoi(value); + if (panel_autohide_height == 0) { + // autohide need height > 0 + panel_autohide_height = 1; + } } - else if (strcmp (key, "task_border_color") == 0) { - extract_values(value, &value1, &value2, &value3); - get_color (value1, area_task->pix.border.color); - if (value2) area_task->pix.border.alpha = (atoi (value2) / 100.0); - else area_task->pix.border.alpha = 0.5; + + // old config option + else if (strcmp(key, "systray") == 0) { + if (new_config_file == 0) { + systray_enabled = atoi(value); + if (systray_enabled) { + if (panel_items_order) + panel_items_order = strcat(panel_items_order, "S"); + else + panel_items_order = strdup("S"); + } + } } - else if (strcmp (key, "task_active_border_color") == 0) { - extract_values(value, &value1, &value2, &value3); - get_color (value1, area_task_active->pix.border.color); - if (value2) area_task_active->pix.border.alpha = (atoi (value2) / 100.0); - else area_task_active->pix.border.alpha = 0.5; + else if (strcmp(key, "battery") == 0) { + if (new_config_file == 0) { + battery_enabled = atoi(value); + if (battery_enabled) { + if (panel_items_order) + panel_items_order = strcat(panel_items_order, "B"); + else + panel_items_order = strdup("B"); + } + } } - else - fprintf(stderr, "tint2 : invalid option \"%s\", correct your config file\n", key); + fprintf(stderr, "tint2 : invalid option \"%s\",\n upgrade tint2 or correct your config file\n", key); if (value1) free (value1); if (value2) free (value2); @@ -650,10 +679,7 @@ int config_read () char *path1; gint i; - save_file_config = 0; - // follow XDG specification -deb: // check tint2rc in user directory path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL); if (g_file_test (path1, G_FILE_TEST_EXISTS)) { @@ -662,24 +688,9 @@ deb: g_free(path1); return i; } - g_free(path1); - if (save_file_config) { - fprintf(stderr, "tint2 exit : enable to write $HOME/.config/tint2/tint2rc\n"); - exit(0); - } - - // check old tintrc config file - path1 = g_build_filename (g_get_user_config_dir(), "tint", "tintrc", NULL); - if (g_file_test (path1, G_FILE_TEST_EXISTS)) { - save_file_config = 1; - config_read_file (path1); - g_free(path1); - goto deb; - } // copy tint2rc from system directory to user directory - g_free(path1); char *path2 = 0; system_dirs = g_get_system_config_dirs(); for (i = 0; system_dirs[i]; i++) { @@ -712,13 +723,10 @@ deb: 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; - old_task_font = 0; - old_time1_font = 0; - old_time2_font = 0; while (fgets(line, sizeof(line), fp) != NULL) { if (parse_line(line, &key, &value)) { @@ -728,171 +736,20 @@ int config_read_file (const char *path) } } fclose (fp); - - if (save_file_config) - save_config(); - - if (old_task_font) { - g_free(old_task_font); - old_task_font = 0; - } - if (old_time1_font) { - g_free(old_time1_font); - old_time1_font = 0; - } - if (old_time2_font) { - g_free(old_time2_font); - old_time2_font = 0; + + // append Taskbar item + if (new_config_file == 0) { + taskbar_enabled = 1; + if (panel_items_order) { + char *tmp = strdup("T"); + panel_items_order = strcat(tmp, panel_items_order); + } + else + panel_items_order = strdup("T"); } + return 1; } -void save_config () -{ - fprintf(stderr, "tint2 : convert user's config file\n"); - - char *path, *dir; - FILE *fp; - - if (old_task_icon_size) { - panel_config.g_task.area.paddingy = ((int)panel_config.area.height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2; - } - - dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL); - if (!g_file_test (dir, G_FILE_TEST_IS_DIR)) g_mkdir(dir, 0777); - g_free(dir); - - path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL); - fp = fopen(path, "w"); - g_free(path); - if (fp == NULL) return; - - fputs("#---------------------------------------------\n", fp); - fputs("# TINT2 CONFIG FILE\n", fp); - fputs("#---------------------------------------------\n\n", fp); - fputs("#---------------------------------------------\n", fp); - fputs("# BACKGROUND AND BORDER\n", fp); - fputs("#---------------------------------------------\n", fp); - GSList *l0; - Area *a; - l0 = list_back->next; - while (l0) { - a = l0->data; - fprintf(fp, "rounded = %d\n", a->pix.border.rounded); - fprintf(fp, "border_width = %d\n", a->pix.border.width); - fprintf(fp, "background_color = #%02x%02x%02x %d\n", (int)(a->pix.back.color[0]*255), (int)(a->pix.back.color[1]*255), (int)(a->pix.back.color[2]*255), (int)(a->pix.back.alpha*100)); - fprintf(fp, "border_color = #%02x%02x%02x %d\n\n", (int)(a->pix.border.color[0]*255), (int)(a->pix.border.color[1]*255), (int)(a->pix.border.color[2]*255), (int)(a->pix.border.alpha*100)); - - l0 = l0->next; - } - - fputs("#---------------------------------------------\n", fp); - fputs("# PANEL\n", fp); - fputs("#---------------------------------------------\n", fp); - fputs("panel_monitor = all\n", fp); - if (panel_position & BOTTOM) fputs("panel_position = bottom", fp); - else fputs("panel_position = top", fp); - if (panel_position & LEFT) fputs(" left horizontal\n", fp); - else if (panel_position & RIGHT) fputs(" right horizontal\n", fp); - else fputs(" center horizontal\n", fp); - fprintf(fp, "panel_size = %d %d\n", panel_config.area.width, panel_config.area.height); - fprintf(fp, "panel_margin = %d %d\n", panel_config.marginx, panel_config.marginy); - fprintf(fp, "panel_padding = %d %d %d\n", panel_config.area.paddingxlr, panel_config.area.paddingy, panel_config.area.paddingx); - fprintf(fp, "font_shadow = %d\n", panel_config.g_task.font_shadow); - fputs("panel_background_id = 1\n", fp); - fputs("wm_menu = 0\n", fp); - - fputs("\n#---------------------------------------------\n", fp); - fputs("# TASKBAR\n", fp); - fputs("#---------------------------------------------\n", fp); - if (panel_mode == MULTI_DESKTOP) fputs("taskbar_mode = multi_desktop\n", fp); - else fputs("taskbar_mode = single_desktop\n", fp); - fprintf(fp, "taskbar_padding = 0 0 %d\n", panel_config.g_taskbar.paddingx); - fputs("taskbar_background_id = 0\n", fp); - - fputs("\n#---------------------------------------------\n", fp); - fputs("# TASK\n", fp); - fputs("#---------------------------------------------\n", fp); - if (old_task_icon_size) fputs("task_icon = 1\n", fp); - else fputs("task_icon = 0\n", fp); - fputs("task_text = 1\n", fp); - fprintf(fp, "task_maximum_size = %d %d\n", panel_config.g_task.maximum_width, panel_config.g_task.maximum_height); - fprintf(fp, "task_centered = %d\n", panel_config.g_task.centered); - fprintf(fp, "task_padding = %d %d\n", panel_config.g_task.area.paddingx, panel_config.g_task.area.paddingy); - fprintf(fp, "task_font = %s\n", old_task_font); - fprintf(fp, "task_font_color = #%02x%02x%02x %d\n", (int)(panel_config.g_task.font.color[0]*255), (int)(panel_config.g_task.font.color[1]*255), (int)(panel_config.g_task.font.color[2]*255), (int)(panel_config.g_task.font.alpha*100)); - fprintf(fp, "task_active_font_color = #%02x%02x%02x %d\n", (int)(panel_config.g_task.font_active.color[0]*255), (int)(panel_config.g_task.font_active.color[1]*255), (int)(panel_config.g_task.font_active.color[2]*255), (int)(panel_config.g_task.font_active.alpha*100)); - fputs("task_background_id = 2\n", fp); - fputs("task_active_background_id = 3\n", fp); - - fputs("\n#---------------------------------------------\n", fp); - fputs("# SYSTRAYBAR\n", fp); - fputs("#---------------------------------------------\n", fp); - fputs("systray_padding = 4 3 4\n", fp); - fputs("systray_background_id = 0\n", fp); - - fputs("\n#---------------------------------------------\n", fp); - fputs("# CLOCK\n", fp); - fputs("#---------------------------------------------\n", fp); - if (time1_format) fprintf(fp, "time1_format = %s\n", time1_format); - else fputs("#time1_format = %H:%M\n", fp); - fprintf(fp, "time1_font = %s\n", old_time1_font); - if (time2_format) fprintf(fp, "time2_format = %s\n", time2_format); - else fputs("#time2_format = %A %d %B\n", fp); - fprintf(fp, "time2_font = %s\n", old_time2_font); - fprintf(fp, "clock_font_color = #%02x%02x%02x %d\n", (int)(panel_config.clock.font.color[0]*255), (int)(panel_config.clock.font.color[1]*255), (int)(panel_config.clock.font.color[2]*255), (int)(panel_config.clock.font.alpha*100)); - fputs("clock_padding = 2 2\n", fp); - fputs("clock_background_id = 0\n", fp); - fputs("#clock_lclick_command = xclock\n", fp); - fputs("clock_rclick_command = orage\n", fp); - -#ifdef ENABLE_BATTERY - fputs("\n#---------------------------------------------\n", fp); - fputs("# BATTERY\n", fp); - fputs("#---------------------------------------------\n", fp); - fprintf(fp, "battery = %d\n", panel_config.battery.area.on_screen); - fprintf(fp, "battery_low_status = %d\n", battery_low_status); - fprintf(fp, "battery_low_cmd = %s\n", battery_low_cmd); - fprintf(fp, "bat1_font = %s\n", old_bat1_font); - fprintf(fp, "bat2_font = %s\n", old_bat2_font); - fprintf(fp, "battery_font_color = #%02x%02x%02x %d\n", (int)(panel_config.battery.font.color[0]*255), (int)(panel_config.battery.font.color[1]*255), (int)(panel_config.battery.font.color[2]*255), (int)(panel_config.battery.font.alpha*100)); - fputs("battery_padding = 2 2\n", fp); - fputs("battery_background_id = 0\n", fp); -#endif - - fputs("\n#---------------------------------------------\n", fp); - fputs("# MOUSE ACTION ON TASK\n", fp); - fputs("#---------------------------------------------\n", fp); - if (mouse_middle == NONE) fputs("mouse_middle = none\n", fp); - else if (mouse_middle == CLOSE) fputs("mouse_middle = close\n", fp); - else if (mouse_middle == TOGGLE) fputs("mouse_middle = toggle\n", fp); - else if (mouse_middle == ICONIFY) fputs("mouse_middle = iconify\n", fp); - else if (mouse_middle == SHADE) fputs("mouse_middle = shade\n", fp); - else fputs("mouse_middle = toggle_iconify\n", fp); - - if (mouse_right == NONE) fputs("mouse_right = none\n", fp); - else if (mouse_right == CLOSE) fputs("mouse_right = close\n", fp); - else if (mouse_right == TOGGLE) fputs("mouse_right = toggle\n", fp); - else if (mouse_right == ICONIFY) fputs("mouse_right = iconify\n", fp); - else if (mouse_right == SHADE) fputs("mouse_right = shade\n", fp); - else fputs("mouse_right = toggle_iconify\n", fp); - - if (mouse_scroll_up == NONE) fputs("mouse_scroll_up = none\n", fp); - else if (mouse_scroll_up == CLOSE) fputs("mouse_scroll_up = close\n", fp); - else if (mouse_scroll_up == TOGGLE) fputs("mouse_scroll_up = toggle\n", fp); - else if (mouse_scroll_up == ICONIFY) fputs("mouse_scroll_up = iconify\n", fp); - else if (mouse_scroll_up == SHADE) fputs("mouse_scroll_up = shade\n", fp); - else fputs("mouse_scroll_up = toggle_iconify\n", fp); - - if (mouse_scroll_down == NONE) fputs("mouse_scroll_down = none\n", fp); - else if (mouse_scroll_down == CLOSE) fputs("mouse_scroll_down = close\n", fp); - else if (mouse_scroll_down == TOGGLE) fputs("mouse_scroll_down = toggle\n", fp); - else if (mouse_scroll_down == ICONIFY) fputs("mouse_scroll_down = iconify\n", fp); - else if (mouse_scroll_down == SHADE) fputs("mouse_scroll_down = shade\n", fp); - else fputs("mouse_scroll_down = toggle_iconify\n", fp); - - fputs("\n\n", fp); - fclose (fp); -}