X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=fce3ff98ea1cbb7fd1521049f4639ee6bb514308;hb=bdf5fa4daad88f6a65b6f4be3acae7b663906e86;hp=0815acd2b555b6569b196aae1d818547050e4afd;hpb=45704e9e1b7798307c0fb9a664b8e759a8524f38;p=chaz%2Ftint2 diff --git a/src/config.c b/src/config.c index 0815acd..fce3ff9 100644 --- a/src/config.c +++ b/src/config.c @@ -40,11 +40,18 @@ #include "taskbar.h" #include "systraybar.h" #include "clock.h" -#include "battery.h" #include "panel.h" #include "config.h" #include "window.h" +#ifdef ENABLE_BATTERY +#include "battery.h" +#endif + +// global path +char *config_path = 0; +char *thumbnail_path = 0; + // -------------------------------------------------- // backward compatibility static int save_file_config; @@ -54,8 +61,10 @@ 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 panel static Panel *panel_config = 0; @@ -75,8 +84,11 @@ void init_config() list_back = g_slist_append(0, calloc(1, sizeof(Area))); panel_config = calloc(1, sizeof(Panel)); - // window manager's menu default value == true - wm_menu = 1; + systray.sort = 1; + + // window manager's menu default value == false + wm_menu = 0; + max_tick_urgent = 7; } @@ -219,6 +231,12 @@ void get_action (char *event, int *action) *action = SHADE; else if (strcmp (event, "toggle_iconify") == 0) *action = TOGGLE_ICONIFY; + else if (strcmp (event, "maximize_restore") == 0) + *action = MAXIMIZE_RESTORE; + else if (strcmp (event, "desktop_left") == 0) + *action = DESKTOP_LEFT; + else if (strcmp (event, "desktop_right") == 0) + *action = DESKTOP_RIGHT; } @@ -291,9 +309,12 @@ void add_entry (char *key, char *value) else if (strcmp (key, "panel_position") == 0) { extract_values(value, &value1, &value2, &value3); if (strcmp (value1, "top") == 0) panel_position = TOP; - else panel_position = BOTTOM; + else { + if (strcmp (value1, "bottom") == 0) panel_position = BOTTOM; + else panel_position = CENTER; + } - if (!value2) panel_position = CENTER; + if (!value2) panel_position |= CENTER; else { if (strcmp (value2, "left") == 0) panel_position |= LEFT; else { @@ -301,6 +322,11 @@ void add_entry (char *key, char *value) else panel_position |= CENTER; } } + if (!value3) panel_horizontal = 1; + else { + if (strcmp (value3, "vertical") == 0) panel_horizontal = 0; + else panel_horizontal = 1; + } } else if (strcmp (key, "font_shadow") == 0) panel_config->g_task.font_shadow = atoi (value); @@ -312,49 +338,70 @@ void add_entry (char *key, char *value) } else if (strcmp (key, "wm_menu") == 0) wm_menu = atoi (value); + else if (strcmp (key, "urgent_nb_of_blink") == 0) + max_tick_urgent = (atoi (value) * 2) + 1; /* Battery */ else if (strcmp (key, "battery") == 0) { +#ifdef ENABLE_BATTERY if(atoi(value) == 1) panel_config->battery.area.on_screen = 1; +#else + if(atoi(value) == 1) + printf("tint2 is build without battery support\n"); +#endif } else if (strcmp (key, "battery_low_status") == 0) { +#ifdef ENABLE_BATTERY battery_low_status = atoi(value); if(battery_low_status < 0 || battery_low_status > 100) battery_low_status = 0; +#endif } else if (strcmp (key, "battery_low_cmd") == 0) { +#ifdef ENABLE_BATTERY if (battery_low_cmd) g_free(battery_low_cmd); if (strlen(value) > 0) battery_low_cmd = strdup (value); else battery_low_cmd = 0; +#endif } 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 } else if (strcmp (key, "battery_font_color") == 0) { +#ifdef ENABLE_BATTERY extract_values(value, &value1, &value2, &value3); get_color (value1, panel_config->battery.font.color); if (value2) panel_config->battery.font.alpha = (atoi (value2) / 100.0); else panel_config->battery.font.alpha = 0.5; +#endif } else if (strcmp (key, "battery_padding") == 0) { +#ifdef ENABLE_BATTERY extract_values(value, &value1, &value2, &value3); panel_config->battery.area.paddingxlr = panel_config->battery.area.paddingx = atoi (value1); if (value2) panel_config->battery.area.paddingy = atoi (value2); if (value3) panel_config->battery.area.paddingx = atoi (value3); +#endif } 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)); +#endif } /* Clock */ @@ -415,8 +462,8 @@ void add_entry (char *key, char *value) /* Taskbar */ else if (strcmp (key, "taskbar_mode") == 0) { - if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP; - else panel_mode = MULTI_DESKTOP; + if (strcmp (value, "multi_desktop") == 0) panel_mode = MULTI_DESKTOP; + else panel_mode = SINGLE_DESKTOP; } else if (strcmp (key, "taskbar_padding") == 0) { extract_values(value, &value1, &value2, &value3); @@ -430,6 +477,13 @@ void add_entry (char *key, char *value) 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); + 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; + } /* Task */ else if (strcmp (key, "task_text") == 0) @@ -438,8 +492,18 @@ void add_entry (char *key, char *value) panel_config->g_task.icon = atoi (value); else if (strcmp (key, "task_centered") == 0) panel_config->g_task.centered = atoi (value); - else if (strcmp (key, "task_width") == 0) + else if (strcmp (key, "task_width") == 0) { + // old parameter : just for backward compatibility panel_config->g_task.maximum_width = atoi (value); + panel_config->g_task.maximum_height = 30; + } + else if (strcmp (key, "task_maximum_size") == 0) { + extract_values(value, &value1, &value2, &value3); + panel_config->g_task.maximum_width = atoi (value1); + panel_config->g_task.maximum_height = 30; + if (value2) + panel_config->g_task.maximum_height = atoi (value2); + } else if (strcmp (key, "task_padding") == 0) { extract_values(value, &value1, &value2, &value3); panel_config->g_task.area.paddingxlr = panel_config->g_task.area.paddingx = atoi (value1); @@ -463,6 +527,18 @@ void add_entry (char *key, char *value) 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_hsb") == 0) { + extract_values(value, &value1, &value2, &value3); + panel_config->g_task.hue = atoi(value1); + panel_config->g_task.saturation = atoi(value2); + panel_config->g_task.brightness = atoi(value3); + } + else if (strcmp (key, "task_active_icon_hsb") == 0) { + extract_values(value, &value1, &value2, &value3); + panel_config->g_task.hue_active = atoi(value1); + panel_config->g_task.saturation_active = atoi(value2); + panel_config->g_task.brightness_active = atoi(value3); + } else if (strcmp (key, "task_background_id") == 0) { int id = atoi (value); Area *a = g_slist_nth_data(list_back, id); @@ -490,6 +566,12 @@ void add_entry (char *key, char *value) memcpy(&systray.area.pix.back, &a->pix.back, sizeof(Color)); memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border)); } + else if (strcmp(key, "systray_sort") == 0) { + if (strcmp(value, "desc") == 0) + systray.sort = -1; + else + systray.sort = 1; + } /* Mouse actions */ else if (strcmp (key, "mouse_middle") == 0) @@ -504,6 +586,7 @@ void add_entry (char *key, char *value) /* 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; } @@ -617,8 +700,10 @@ int parse_line (const char *line) void config_finish () { if (panel_config->monitor > (server.nb_monitor-1)) { - fprintf(stderr, "tint2 exit : monitor %d not found.\n", panel_config->monitor+1); - exit(0); + // server.nb_monitor minimum value is 1 (see get_monitors_and_desktops()) + // and panel_config->monitor is higher + fprintf(stderr, "warning : monitor not found. tint2 default to monitor 1.\n"); + panel_config->monitor = 0; } // alloc panels @@ -645,7 +730,9 @@ void config_finish () // clock and systray before taskbar because resize(clock) can resize others object ?? init_panel(); init_clock(); +#ifdef ENABLE_BATTERY init_battery(); +#endif init_systray(); init_taskbar(); visible_object(); @@ -670,6 +757,7 @@ deb: path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL); if (g_file_test (path1, G_FILE_TEST_EXISTS)) { i = config_read_file (path1); + config_path = strdup(path1); g_free(path1); return i; } @@ -684,14 +772,7 @@ deb: 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; - old_task_font = 0; - old_time1_font = 0; - old_time2_font = 0; config_read_file (path1); - save_config(); - if (old_task_font) g_free(old_task_font); - if (old_time1_font) g_free(old_time1_font); - if (old_time2_font) g_free(old_time2_font); g_free(path1); goto deb; } @@ -719,6 +800,7 @@ deb: g_free(path2); i = config_read_file (path1); + config_path = strdup(path1); g_free(path1); return i; } @@ -732,18 +814,37 @@ int config_read_file (const char *path) char line[80]; 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) parse_line (line); 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; + } return 1; } void save_config () { - fprintf(stderr, "tint2 : convert user's config file tintrc to tint2rc\n"); + fprintf(stderr, "tint2 : convert user's config file\n"); char *path, *dir; FILE *fp; @@ -786,14 +887,15 @@ void save_config () 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\n", fp); - else if (panel_position & RIGHT) fputs(" right\n", fp); - else fputs(" center\n", fp); - fprintf(fp, "panel_size = %d %d\n", (int)panel_config->initial_width, (int)panel_config->initial_height); - fprintf(fp, "panel_margin = %d %d\n", panel_config->marginx, panel_config->marginy); - fprintf(fp, "panel_padding = %d %d\n", panel_config->area.paddingx, panel_config->area.paddingy); + 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", (int)panel_config->initial_width, (int)panel_config->initial_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); @@ -809,7 +911,7 @@ void save_config () 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_width = %d\n", panel_config->g_task.maximum_width); + 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); @@ -836,7 +938,10 @@ void save_config () 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); @@ -848,6 +953,7 @@ void save_config () 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);