X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=90cb31e41cd124b935aae91f7d0908814eba8796;hb=3cf41266a0125935c58edb64941f2a27a0fab3c4;hp=da69deab726d73aa569db5600737982d5aa7f99c;hpb=8354267448dab01626da0c4b3d2eedfa20e6858a;p=chaz%2Ftint2 diff --git a/src/config.c b/src/config.c index da69dea..90cb31e 100644 --- a/src/config.c +++ b/src/config.c @@ -36,11 +36,11 @@ #include "common.h" #include "server.h" +#include "panel.h" #include "task.h" #include "taskbar.h" #include "systraybar.h" #include "clock.h" -#include "panel.h" #include "config.h" #include "window.h" #include "tooltip.h" @@ -67,25 +67,20 @@ static char *old_bat1_font; static char *old_bat2_font; #endif -// temporary panel -static Panel *panel_config = 0; - // temporary list of background static GSList *list_back; + void init_config() { - cleanup_panel(); - - // get monitor and desktop config - get_monitors_and_desktops(); - // append full transparency background list_back = g_slist_append(0, calloc(1, sizeof(Area))); - panel_config = calloc(1, sizeof(Panel)); - systray.sort = 1; + 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; @@ -95,9 +90,6 @@ void init_config() void cleanup_config() { - free(panel_config); - panel_config = 0; - // cleanup background list GSList *l0; for (l0 = list_back; l0 ; l0 = l0->next) { @@ -108,25 +100,6 @@ void cleanup_config() } -void copy_file(const char *pathSrc, const char *pathDest) -{ - FILE *fileSrc, *fileDest; - char line[100]; - int nb; - - fileSrc = fopen(pathSrc, "rb"); - if (fileSrc == NULL) return; - - fileDest = fopen(pathDest, "wb"); - if (fileDest == NULL) return; - - while ((nb = fread(line, 1, 100, fileSrc)) > 0) fwrite(line, 1, nb, fileDest); - - fclose (fileDest); - fclose (fileSrc); -} - - void extract_values (const char *value, char **value1, char **value2, char **value3) { char *b=0, *c=0; @@ -166,58 +139,6 @@ void extract_values (const char *value, char **value1, char **value2, char **val } -int hex_char_to_int (char c) -{ - int r; - - if (c >= '0' && c <= '9') r = c - '0'; - else if (c >= 'a' && c <= 'f') r = c - 'a' + 10; - else if (c >= 'A' && c <= 'F') r = c - 'A' + 10; - else r = 0; - - return r; -} - - -int hex_to_rgb (char *hex, int *r, int *g, int *b) -{ - int len; - - if (hex == NULL || hex[0] != '#') return (0); - - len = strlen (hex); - if (len == 3 + 1) { - *r = hex_char_to_int (hex[1]); - *g = hex_char_to_int (hex[2]); - *b = hex_char_to_int (hex[3]); - } - else if (len == 6 + 1) { - *r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]); - *g = hex_char_to_int (hex[3]) * 16 + hex_char_to_int (hex[4]); - *b = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]); - } - else if (len == 12 + 1) { - *r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]); - *g = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]); - *b = hex_char_to_int (hex[9]) * 16 + hex_char_to_int (hex[10]); - } - else return 0; - - return 1; -} - - -void get_color (char *hex, double *rgb) -{ - int r, g, b; - hex_to_rgb (hex, &r, &g, &b); - - rgb[0] = (r / 255.0); - rgb[1] = (g / 255.0); - rgb[2] = (b / 255.0); -} - - void get_action (char *event, int *action) { if (strcmp (event, "none") == 0) @@ -273,10 +194,10 @@ void add_entry (char *key, char *value) /* Panel */ else if (strcmp (key, "panel_monitor") == 0) { - if (strcmp (value, "all") == 0) panel_config->monitor = -1; + if (strcmp (value, "all") == 0) panel_config.monitor = -1; else { - panel_config->monitor = atoi (value); - if (panel_config->monitor > 0) panel_config->monitor -= 1; + panel_config.monitor = atoi (value); + if (panel_config.monitor > 0) panel_config.monitor -= 1; } } else if (strcmp (key, "panel_size") == 0) { @@ -285,27 +206,32 @@ void add_entry (char *key, char *value) char *b; if ((b = strchr (value1, '%'))) { b[0] = '\0'; - panel_config->pourcentx = 1; + panel_config.pourcentx = 1; + } + panel_config.area.width = atoi(value1); + if (panel_config.area.width == 0) { + // full width mode + panel_config.area.width = 100; + panel_config.pourcentx = 1; } - panel_config->initial_width = atof(value1); if (value2) { if ((b = strchr (value2, '%'))) { b[0] = '\0'; - panel_config->pourcenty = 1; + panel_config.pourcenty = 1; } - panel_config->initial_height = atof(value2); + panel_config.area.height = atoi(value2); } } else if (strcmp (key, "panel_margin") == 0) { extract_values(value, &value1, &value2, &value3); - panel_config->marginx = atoi (value1); - if (value2) panel_config->marginy = atoi (value2); + panel_config.marginx = atoi (value1); + if (value2) panel_config.marginy = atoi (value2); } else if (strcmp (key, "panel_padding") == 0) { extract_values(value, &value1, &value2, &value3); - panel_config->area.paddingxlr = panel_config->area.paddingx = atoi (value1); - if (value2) panel_config->area.paddingy = atoi (value2); - if (value3) panel_config->area.paddingx = atoi (value3); + panel_config.area.paddingxlr = panel_config.area.paddingx = atoi (value1); + if (value2) panel_config.area.paddingy = atoi (value2); + if (value3) panel_config.area.paddingx = atoi (value3); } else if (strcmp (key, "panel_position") == 0) { extract_values(value, &value1, &value2, &value3); @@ -330,12 +256,12 @@ void add_entry (char *key, char *value) } } else if (strcmp (key, "font_shadow") == 0) - panel_config->g_task.font_shadow = atoi (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)); + memcpy(&panel_config.area.pix.back, &a->pix.back, sizeof(Color)); + memcpy(&panel_config.area.pix.border, &a->pix.border, sizeof(Border)); } else if (strcmp (key, "wm_menu") == 0) wm_menu = atoi (value); @@ -348,7 +274,7 @@ void add_entry (char *key, char *value) else if (strcmp (key, "battery") == 0) { #ifdef ENABLE_BATTERY if(atoi(value) == 1) - panel_config->battery.area.on_screen = 1; + panel_config.battery.area.on_screen = 1; #else if(atoi(value) == 1) fprintf(stderr, "tint2 is build without battery support\n"); @@ -385,25 +311,25 @@ void add_entry (char *key, char *value) 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; + 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); + 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)); + 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 } @@ -412,11 +338,11 @@ void add_entry (char *key, char *value) if (time1_format) g_free(time1_format); if (strlen(value) > 0) { time1_format = strdup (value); - panel_config->clock.area.on_screen = 1; + panel_config.clock.area.on_screen = 1; } else { time1_format = 0; - panel_config->clock.area.on_screen = 0; + panel_config.clock.area.on_screen = 0; } } else if (strcmp (key, "time2_format") == 0) { @@ -436,21 +362,21 @@ void add_entry (char *key, char *value) } else if (strcmp (key, "clock_font_color") == 0) { extract_values(value, &value1, &value2, &value3); - get_color (value1, panel_config->clock.font.color); - if (value2) panel_config->clock.font.alpha = (atoi (value2) / 100.0); - else panel_config->clock.font.alpha = 0.5; + get_color (value1, panel_config.clock.font.color); + if (value2) panel_config.clock.font.alpha = (atoi (value2) / 100.0); + else panel_config.clock.font.alpha = 0.5; } else if (strcmp (key, "clock_padding") == 0) { extract_values(value, &value1, &value2, &value3); - panel_config->clock.area.paddingxlr = panel_config->clock.area.paddingx = atoi (value1); - if (value2) panel_config->clock.area.paddingy = atoi (value2); - if (value3) panel_config->clock.area.paddingx = atoi (value3); + panel_config.clock.area.paddingxlr = panel_config.clock.area.paddingx = atoi (value1); + if (value2) panel_config.clock.area.paddingy = atoi (value2); + if (value3) panel_config.clock.area.paddingx = atoi (value3); } 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)); + 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_lclick_command") == 0) { if (clock_lclick_command) g_free(clock_lclick_command); @@ -470,89 +396,89 @@ 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.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); } 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)); + 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; + 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) - panel_config->g_task.text = atoi (value); + panel_config.g_task.text = atoi (value); else if (strcmp (key, "task_icon") == 0) - panel_config->g_task.icon = atoi (value); + panel_config.g_task.icon = atoi (value); else if (strcmp (key, "task_centered") == 0) - panel_config->g_task.centered = atoi (value); + panel_config.g_task.centered = atoi (value); 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; + 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; + 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); + 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); - if (value2) panel_config->g_task.area.paddingy = atoi (value2); - if (value3) panel_config->g_task.area.paddingx = atoi (value3); + panel_config.g_task.area.paddingxlr = panel_config.g_task.area.paddingx = atoi (value1); + if (value2) panel_config.g_task.area.paddingy = atoi (value2); + 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); + 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; + 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; + 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) { 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); + 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) { extract_values(value, &value1, &value2, &value3); - panel_config->g_task.alpha_active = atoi(value1); - panel_config->g_task.saturation_active = atoi(value2); - panel_config->g_task.brightness_active = atoi(value3); + panel_config.g_task.alpha_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); - 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)); + 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); 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)); + 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)); } /* Systray */ @@ -570,10 +496,14 @@ void add_entry (char *key, char *value) memcpy(&systray.area.pix.border, &a->pix.border, sizeof(Border)); } else if (strcmp(key, "systray_sort") == 0) { - if (strcmp(value, "desc") == 0) + if (strcmp(value, "descending") == 0) systray.sort = -1; - else + else if (strcmp(value, "ascending") == 0) systray.sort = 1; + else if (strcmp(value, "left2right") == 0) + systray.sort = 2; + else if (strcmp(value, "right2left") == 0) + systray.sort = 3; } /* Tooltip */ @@ -654,10 +584,10 @@ void add_entry (char *key, char *value) else a->pix.border.alpha = 0.5; } else if (strcmp (key, "task_text_centered") == 0) - panel_config->g_task.centered = atoi (value); + 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); + 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); @@ -708,79 +638,26 @@ void add_entry (char *key, char *value) } -int parse_line (const char *line) -{ - char *a, *b, *key, *value; - - /* Skip useless lines */ - if ((line[0] == '#') || (line[0] == '\n')) return 0; - if (!(a = strchr (line, '='))) return 0; - - /* overwrite '=' with '\0' */ - a[0] = '\0'; - key = strdup (line); - a++; - - /* overwrite '\n' with '\0' if '\n' present */ - if ((b = strchr (a, '\n'))) b[0] = '\0'; - - value = strdup (a); - - g_strstrip(key); - g_strstrip(value); - - add_entry (key, value); - - free (key); - free (value); - return 1; -} - - void config_finish () { - if (panel_config->monitor > (server.nb_monitor-1)) { - // server.nb_monitor minimum value is 1 (see get_monitors_and_desktops()) + 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 monitor 1.\n"); - panel_config->monitor = 0; - } - - // alloc panels - int i; - if (panel_config->monitor >= 0) { - // one monitor - nb_panel = 1; - panel1 = calloc(nb_panel, sizeof(Panel)); - memcpy(panel1, panel_config, sizeof(Panel)); - panel1->monitor = panel_config->monitor; - } - else { - // all monitors - nb_panel = server.nb_monitor; - panel1 = calloc(nb_panel, sizeof(Panel)); - - for (i=0 ; i < nb_panel ; i++) { - memcpy(&panel1[i], panel_config, sizeof(Panel)); - panel1[i].monitor = i; - } + 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_panel(); + init_tooltip(); init_clock(); #ifdef ENABLE_BATTERY init_battery(); #endif init_systray(); - init_taskbar(); - init_tooltip(); - visible_object(); + init_panel(); cleanup_config(); - - task_refresh_tasklist(); } @@ -853,15 +730,20 @@ int config_read_file (const char *path) { FILE *fp; char line[80]; + 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) - parse_line (line); - + while (fgets(line, sizeof(line), fp) != NULL) { + if (parse_line(line, &key, &value)) { + add_entry (key, value); + free (key); + free (value); + } + } fclose (fp); if (save_file_config) @@ -891,7 +773,7 @@ void save_config () FILE *fp; if (old_task_icon_size) { - panel_config->g_task.area.paddingy = ((int)panel_config->initial_height - (2 * panel_config->area.paddingy) - old_task_icon_size) / 2; + 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); @@ -931,10 +813,10 @@ void save_config () 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); + 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); @@ -943,7 +825,7 @@ void save_config () 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); + fprintf(fp, "taskbar_padding = 0 0 %d\n", panel_config.g_taskbar.paddingx); fputs("taskbar_background_id = 0\n", fp); fputs("\n#---------------------------------------------\n", fp); @@ -952,12 +834,12 @@ 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_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_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)); + 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); @@ -976,7 +858,7 @@ void save_config () 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)); + 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); @@ -986,12 +868,12 @@ void save_config () 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 = %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)); + 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