X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=d93d2c3d4166115c237fe9fadb8ec2d0bf5771f2;hb=1b1f2a1a069edcf3db99ae07020eeedae3023f76;hp=02d0265d74fd9117f9c966f5d11b97e2c1a9b9fd;hpb=fbf80ddaba618c12fc0cf2cd62bc9f4ec8b766c6;p=chaz%2Ftint2 diff --git a/src/config.c b/src/config.c index 02d0265..d93d2c3 100644 --- a/src/config.c +++ b/src/config.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include "common.h" @@ -51,21 +52,16 @@ // global path char *config_path = 0; -char *thumbnail_path = 0; +char *snapshot_path = 0; // -------------------------------------------------- // 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 +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; @@ -77,14 +73,32 @@ void init_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(); +#ifdef ENABLE_BATTERY + cleanup_battery(); +#endif + cleanup_clock(); + cleanup_tooltip(); + + // panel's default value + if (panel_config.g_task.font_desc) { + pango_font_description_free(panel_config.g_task.font_desc); + } memset(&panel_config, 0, sizeof(Panel)); panel_config.g_task.alpha = 100; panel_config.g_task.alpha_active = 100; systray.sort = 3; + old_config_file = 1; // window manager's menu default value == false wm_menu = 0; max_tick_urgent = 7; + + // flush pango cache if possible + //pango_xft_shutdown_display(server.dsp, server.screen); + //PangoFontMap *font_map = pango_xft_get_font_map(server.dsp, server.screen); + //pango_fc_font_map_shutdown(font_map); } @@ -159,6 +173,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; } @@ -199,6 +217,11 @@ void add_entry (char *key, char *value) 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; + } } else if (strcmp (key, "panel_size") == 0) { extract_values(value, &value1, &value2, &value3); @@ -289,22 +312,17 @@ void add_entry (char *key, char *value) } 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; + if (strlen(value) > 0) + battery_low_cmd = strdup (value); #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 } @@ -335,29 +353,19 @@ void add_entry (char *key, char *value) /* Clock */ else if (strcmp (key, "time1_format") == 0) { - if (time1_format) g_free(time1_format); if (strlen(value) > 0) { time1_format = strdup (value); - panel_config.clock.area.on_screen = 1; - } - else { - time1_format = 0; - panel_config.clock.area.on_screen = 0; + clock_enabled = 1; } } else if (strcmp (key, "time2_format") == 0) { - if (time2_format) g_free(time2_format); - if (strlen(value) > 0) time2_format = strdup (value); - else time2_format = 0; + if (strlen(value) > 0) + 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, "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) { @@ -378,15 +386,17 @@ void add_entry (char *key, char *value) 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_lclick_command") == 0) { - if (clock_lclick_command) g_free(clock_lclick_command); - if (strlen(value) > 0) clock_lclick_command = strdup(value); - else clock_lclick_command = 0; + if (strlen(value) > 0) + clock_lclick_command = strdup(value); } else if (strcmp(key, "clock_rclick_command") == 0) { - if (clock_rclick_command) g_free(clock_rclick_command); - if (strlen(value) > 0) clock_rclick_command = strdup(value); - else clock_rclick_command = 0; + if (strlen(value) > 0) + clock_rclick_command = strdup(value); } /* Taskbar */ @@ -440,8 +450,6 @@ 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) { @@ -482,12 +490,18 @@ void add_entry (char *key, char *value) } /* Systray */ + else if (strcmp (key, "systray") == 0) { + 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); if (value3) systray.area.paddingx = atoi (value3); - systray.area.on_screen = 1; } else if (strcmp (key, "systray_background_id") == 0) { int id = atoi (value); @@ -512,14 +526,18 @@ void add_entry (char *key, char *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 nsec = (timeout-sec)*1e9; + if (nsec < 0) // can happen because of double is not precise such that (sec > timeout)==TRUE + nsec = 0; + g_tooltip.show_timeout = (struct timespec){.tv_sec=sec, .tv_nsec=nsec}; } 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 nsec = (timeout-sec)*1e9; + if (nsec < 0) // can happen because of double is not precise such that (sec > timeout)==TRUE + nsec = 0; + g_tooltip.hide_timeout = (struct timespec){.tv_sec=sec, .tv_nsec=nsec}; } else if (strcmp (key, "tooltip_padding") == 0) { extract_values(value, &value1, &value2, &value3); @@ -539,7 +557,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); } @@ -556,7 +573,6 @@ 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; } @@ -638,39 +654,13 @@ void add_entry (char *key, char *value) } -void config_finish () -{ - if (panel_config.monitor > (server.nb_monitor-1)) { - // server.nb_monitor minimum value is 1 (see get_monitors()) - // and panel_config->monitor is higher - fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n"); - panel_config.monitor = 0; - } - - // TODO: user can configure layout => ordered objects in panel.area.list - // clock and systray before taskbar because resize(clock) can resize others object ?? - init_tooltip(); - init_clock(); -#ifdef ENABLE_BATTERY - init_battery(); -#endif - init_systray(); - init_panel(); - - cleanup_config(); -} - - int config_read () { const gchar * const * system_dirs; 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)) { @@ -679,24 +669,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++) { @@ -733,9 +708,6 @@ int config_read_file (const char *path) 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)) { @@ -746,170 +718,11 @@ 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; - } - 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; } + return 1; +} - 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); -}