#include "config.h"
#include "window.h"
+// --------------------------------------------------
+// backward compatibility
+static int old_config_file = 0;
+static int old_task_icon;
+static int old_panel_background;
+static int old_task_background;
+static char *old_task_font = 0;
-void cleanup_taskbar()
+// temporary panel
+static Panel *panel_config = 0;
+
+// temporary list of background
+static GSList *list_back;
+
+
+void init_config()
{
- GSList *l0;
- Task *tsk;
-
- int i, nb;
- nb = panel.nb_desktop * panel.nb_monitor;
- for (i=0 ; i < nb ; i++) {
- l0 = panel.taskbar[i].area.list;
- while (l0) {
- tsk = l0->data;
- l0 = l0->next;
- // careful : remove_task change l0->next
- remove_task (tsk);
- }
+ cleanup_panel();
- free_area (&panel.taskbar[i].area);
- }
+ // get monitor and desktop config
+ get_monitors_and_desktops();
- free(panel.taskbar);
- panel.taskbar = 0;
+ // append full transparency background
+ list_back = g_slist_append(0, calloc(1, sizeof(Area)));
- free_area(&panel.area);
+ panel_config = calloc(1, sizeof(Panel));
}
-void cleanup ()
+void cleanup_config()
{
- if (panel.old_task_font) free(panel.old_task_font);
- if (g_task.font_desc) pango_font_description_free(g_task.font_desc);
- if (panel.clock.time1_font_desc) pango_font_description_free(panel.clock.time1_font_desc);
- if (panel.clock.time2_font_desc) pango_font_description_free(panel.clock.time2_font_desc);
- if (panel.taskbar) cleanup_taskbar();
- if (panel.clock.time1_format) g_free(panel.clock.time1_format);
- if (panel.clock.time2_format) g_free(panel.clock.time2_format);
- if (server.monitor) free(server.monitor);
- XCloseDisplay(server.dsp);
+ if (old_task_font) free(old_task_font);
+ if (panel_config) free(panel_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;
}
}
-void extract_values (const char *value, char **value1, char **value2)
+void extract_values (const char *value, char **value1, char **value2, char **value3)
{
- char *b;
+ char *b=0, *c=0;
if (*value1) free (*value1);
if (*value2) free (*value2);
+ if (*value3) free (*value3);
if ((b = strchr (value, ' '))) {
b[0] = '\0';
b++;
- *value2 = strdup (b);
- g_strstrip(*value2);
- }
- else *value2 = 0;
-
- *value1 = strdup (value);
- g_strstrip(*value1);
+ }
+ else {
+ *value2 = 0;
+ *value3 = 0;
+ }
+ *value1 = strdup (value);
+ g_strstrip(*value1);
+
+ if (b) {
+ if ((c = strchr (b, ' '))) {
+ c[0] = '\0';
+ c++;
+ }
+ else {
+ c = 0;
+ *value3 = 0;
+ }
+ *value2 = strdup (b);
+ g_strstrip(*value2);
+ }
+
+ if (c) {
+ *value3 = strdup (c);
+ g_strstrip(*value3);
+ }
}
void add_entry (char *key, char *value)
{
- char *value1=0, *value2=0;
+ char *value1=0, *value2=0, *value3=0;
/* Background and border */
if (strcmp (key, "rounded") == 0) {
}
else if (strcmp (key, "background_color") == 0) {
Area *a = g_slist_last(list_back)->data;
- extract_values(value, &value1, &value2);
+ 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, "border_color") == 0) {
Area *a = g_slist_last(list_back)->data;
- extract_values(value, &value1, &value2);
+ 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;
/* Panel */
else if (strcmp (key, "panel_monitor") == 0) {
- panel.monitor = atoi (value);
- if (panel.monitor > 0) panel.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;
+ }
}
else if (strcmp (key, "panel_size") == 0) {
- extract_values(value, &value1, &value2);
- panel.area.width = atoi (value1);
- if (value2) panel.area.height = atoi (value2);
+ extract_values(value, &value1, &value2, &value3);
+
+ char *b;
+ if ((b = strchr (value1, '%'))) {
+ b[0] = '\0';
+ 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->initial_height = atof(value2);
+ }
}
else if (strcmp (key, "panel_margin") == 0) {
- extract_values(value, &value1, &value2);
- panel.marginx = atoi (value1);
- if (value2) panel.marginy = atoi (value2);
+ extract_values(value, &value1, &value2, &value3);
+ panel_config->marginx = atoi (value1);
+ if (value2) panel_config->marginy = atoi (value2);
}
else if (strcmp (key, "panel_padding") == 0) {
- extract_values(value, &value1, &value2);
- panel.area.paddingx = atoi (value1);
- if (value2) panel.area.paddingy = atoi (value2);
+ 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);
}
else if (strcmp (key, "panel_position") == 0) {
- extract_values(value, &value1, &value2);
- if (strcmp (value1, "top") == 0) panel.position = TOP;
- else panel.position = BOTTOM;
+ extract_values(value, &value1, &value2, &value3);
+ if (strcmp (value1, "top") == 0) panel_position = TOP;
+ else panel_position = BOTTOM;
- if (!value2) panel.position = CENTER;
+ if (!value2) panel_position = CENTER;
else {
- if (strcmp (value2, "left") == 0) panel.position |= LEFT;
+ if (strcmp (value2, "left") == 0) panel_position |= LEFT;
else {
- if (strcmp (value2, "right") == 0) panel.position |= RIGHT;
- else panel.position |= CENTER;
+ if (strcmp (value2, "right") == 0) panel_position |= RIGHT;
+ else panel_position |= CENTER;
}
}
}
else if (strcmp (key, "font_shadow") == 0)
- 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.area.pix.back, &a->pix.back, sizeof(Color));
- memcpy(&panel.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));
}
/* Clock */
else if (strcmp (key, "time1_format") == 0) {
- if (panel.clock.time1_format) g_free(panel.clock.time1_format);
- if (strlen(value) > 0) panel.clock.time1_format = strdup (value);
- else panel.clock.time1_format = 0;
+ if (time1_format) g_free(time1_format);
+ if (strlen(value) > 0) time1_format = strdup (value);
+ else time1_format = 0;
}
else if (strcmp (key, "time2_format") == 0) {
- if (panel.clock.time2_format) g_free(panel.clock.time2_format);
- if (strlen(value) > 0) panel.clock.time2_format = strdup (value);
- else panel.clock.time2_format = 0;
+ if (time2_format) g_free(time2_format);
+ if (strlen(value) > 0) time2_format = strdup (value);
+ else time2_format = 0;
}
else if (strcmp (key, "time1_font") == 0) {
- if (panel.clock.time1_font_desc) pango_font_description_free(panel.clock.time1_font_desc);
- panel.clock.time1_font_desc = pango_font_description_from_string (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 (panel.clock.time2_font_desc) pango_font_description_free(panel.clock.time2_font_desc);
- panel.clock.time2_font_desc = pango_font_description_from_string (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) {
- extract_values(value, &value1, &value2);
- get_color (value1, panel.clock.font.color);
- if (value2) panel.clock.font.alpha = (atoi (value2) / 100.0);
- else panel.clock.font.alpha = 0.1;
+ 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;
}
else if (strcmp (key, "clock_padding") == 0) {
- extract_values(value, &value1, &value2);
- panel.clock.area.paddingx = atoi (value1);
- if (value2) panel.clock.area.paddingy = atoi (value2);
+ 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);
}
else if (strcmp (key, "clock_background_id") == 0) {
int id = atoi (value);
Area *a = g_slist_nth_data(list_back, id);
- memcpy(&panel.clock.area.pix.back, &a->pix.back, sizeof(Color));
- memcpy(&panel.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));
}
/* Taskbar */
else if (strcmp (key, "taskbar_mode") == 0) {
- if (strcmp (value, "multi_desktop") == 0) panel.mode = MULTI_DESKTOP;
- else if (strcmp (value, "multi_monitor") == 0) panel.mode = MULTI_MONITOR;
- else panel.mode = SINGLE_DESKTOP;
+ if (strcmp (value, "multi_desktop") == 0) panel_mode = MULTI_DESKTOP;
+ else if (strcmp (value, "single_desktop") == 0) panel_mode = SINGLE_DESKTOP;
+ else panel_mode = SINGLE_MONITOR;
}
else if (strcmp (key, "taskbar_padding") == 0) {
- extract_values(value, &value1, &value2);
- g_taskbar.paddingx = atoi (value1);
- if (value2) g_taskbar.paddingy = atoi (value2);
+ 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);
}
else if (strcmp (key, "taskbar_background_id") == 0) {
int id = atoi (value);
Area *a = g_slist_nth_data(list_back, id);
- memcpy(&g_taskbar.pix.back, &a->pix.back, sizeof(Color));
- memcpy(&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));
}
/* Task */
else if (strcmp (key, "task_text") == 0)
- g_task.text = atoi (value);
+ panel_config->g_task.text = atoi (value);
else if (strcmp (key, "task_icon") == 0)
- g_task.icon = atoi (value);
+ panel_config->g_task.icon = atoi (value);
else if (strcmp (key, "task_centered") == 0)
- g_task.centered = atoi (value);
+ panel_config->g_task.centered = atoi (value);
else if (strcmp (key, "task_width") == 0)
- g_task.maximum_width = atoi (value);
+ panel_config->g_task.maximum_width = atoi (value);
else if (strcmp (key, "task_padding") == 0) {
- extract_values(value, &value1, &value2);
- g_task.area.paddingx = atoi (value1);
- if (value2) {
- g_task.area.paddingy = atoi (value2);
- }
+ 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);
}
else if (strcmp (key, "task_font") == 0) {
- if (g_task.font_desc) pango_font_description_free(g_task.font_desc);
- 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);
- get_color (value1, g_task.font.color);
- if (value2) g_task.font.alpha = (atoi (value2) / 100.0);
- else g_task.font.alpha = 0.1;
+ 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);
- get_color (value1, g_task.font_active.color);
- if (value2) g_task.font_active.alpha = (atoi (value2) / 100.0);
- else g_task.font_active.alpha = 0.1;
+ 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_background_id") == 0) {
int id = atoi (value);
Area *a = g_slist_nth_data(list_back, id);
- memcpy(&g_task.area.pix.back, &a->pix.back, sizeof(Color));
- memcpy(&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(&g_task.area.pix_active.back, &a->pix.back, sizeof(Color));
- memcpy(&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));
}
/* Mouse actions */
else if (strcmp (key, "mouse_middle") == 0)
- get_action (value, &panel.mouse_middle);
+ get_action (value, &mouse_middle);
else if (strcmp (key, "mouse_right") == 0)
- get_action (value, &panel.mouse_right);
+ get_action (value, &mouse_right);
else if (strcmp (key, "mouse_scroll_up") == 0)
- get_action (value, &panel.mouse_scroll_up);
+ get_action (value, &mouse_scroll_up);
else if (strcmp (key, "mouse_scroll_down") == 0)
- get_action (value, &panel.mouse_scroll_down);
+ get_action (value, &mouse_scroll_down);
/* Read old config for backward compatibility */
else if (strcmp (key, "font") == 0) {
- panel.old_config_file = 1;
- if (g_task.font_desc) pango_font_description_free(g_task.font_desc);
- g_task.font_desc = pango_font_description_from_string (value);
- if (panel.old_task_font) free(panel.old_task_font);
- panel.old_task_font = strdup (value);
+ old_config_file = 1;
+ 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 (old_task_font) free(old_task_font);
+ old_task_font = strdup (value);
}
else if (strcmp (key, "font_color") == 0)
- get_color (value, g_task.font.color);
+ get_color (value, panel_config->g_task.font.color);
else if (strcmp (key, "font_alpha") == 0)
- g_task.font.alpha = (atoi (value) / 100.0);
+ panel_config->g_task.font.alpha = (atoi (value) / 100.0);
else if (strcmp (key, "font_active_color") == 0)
- get_color (value, g_task.font_active.color);
+ get_color (value, panel_config->g_task.font_active.color);
else if (strcmp (key, "font_active_alpha") == 0)
- g_task.font_active.alpha = (atoi (value) / 100.0);
+ panel_config->g_task.font_active.alpha = (atoi (value) / 100.0);
else if (strcmp (key, "panel_show_all_desktop") == 0) {
- if (atoi (value) == 0) panel.mode = SINGLE_DESKTOP;
- else panel.mode = MULTI_DESKTOP;
+ if (atoi (value) == 0) panel_mode = SINGLE_DESKTOP;
+ else panel_mode = MULTI_DESKTOP;
}
else if (strcmp (key, "panel_width") == 0)
- panel.area.width = atoi (value);
+ panel_config->area.width = atoi (value);
else if (strcmp (key, "panel_height") == 0)
- panel.area.height = atoi (value);
+ panel_config->area.height = atoi (value);
else if (strcmp (key, "panel_background") == 0)
- panel.old_panel_background = atoi (value);
+ old_panel_background = atoi (value);
else if (strcmp (key, "panel_background_alpha") == 0)
- panel.area.pix.back.alpha = (atoi (value) / 100.0);
+ panel_config->area.pix.back.alpha = (atoi (value) / 100.0);
else if (strcmp (key, "panel_border_alpha") == 0)
- panel.area.pix.border.alpha = (atoi (value) / 100.0);
+ panel_config->area.pix.border.alpha = (atoi (value) / 100.0);
else if (strcmp (key, "task_icon") == 0)
- panel.old_task_icon = atoi (value);
+ old_task_icon = atoi (value);
else if (strcmp (key, "task_background") == 0)
- panel.old_task_background = atoi (value);
+ old_task_background = atoi (value);
else if (strcmp (key, "task_background_alpha") == 0)
- g_task.area.pix.back.alpha = (atoi (value) / 100.0);
+ panel_config->g_task.area.pix.back.alpha = (atoi (value) / 100.0);
else if (strcmp (key, "task_active_background_alpha") == 0)
- g_task.area.pix_active.back.alpha = (atoi (value) / 100.0);
+ panel_config->g_task.area.pix_active.back.alpha = (atoi (value) / 100.0);
else if (strcmp (key, "task_border_alpha") == 0)
- g_task.area.pix.border.alpha = (atoi (value) / 100.0);
+ panel_config->g_task.area.pix.border.alpha = (atoi (value) / 100.0);
else if (strcmp (key, "task_active_border_alpha") == 0)
- g_task.area.pix_active.border.alpha = (atoi (value) / 100.0);
+ panel_config->g_task.area.pix_active.border.alpha = (atoi (value) / 100.0);
// disabled parameters
else if (strcmp (key, "task_active_border_width") == 0) ;
else if (strcmp (key, "task_active_rounded") == 0) ;
if (value1) free (value1);
if (value2) free (value2);
+ if (value3) free (value3);
}
}
-void config_taskbar()
-{
- int i, j;
-
- if (g_task.area.pix.border.rounded > g_task.area.height/2) {
- g_task.area.pix.border.rounded = g_task.area.height/2;
- g_task.area.pix_active.border.rounded = g_task.area.pix.border.rounded;
- }
-
- for (i=0 ; i < 15 ; i++) {
- server.nb_desktop = server_get_number_of_desktop ();
- if (server.nb_desktop > 0) break;
- sleep(1);
- }
- if (server.nb_desktop == 0) {
- server.nb_desktop = 1;
- fprintf(stderr, "tint2 warning : cannot found number of desktop.\n");
- }
-
- if (panel.taskbar) cleanup_taskbar();
-
- panel.nb_desktop = server.nb_desktop;
- if (panel.mode == MULTI_MONITOR) panel.nb_monitor = server.nb_monitor;
- else panel.nb_monitor = 1;
- panel.taskbar = calloc(panel.nb_desktop * panel.nb_monitor, sizeof(Taskbar));
- g_slist_free(panel.area.list);
- panel.area.list = 0;
-
- Taskbar *tskbar;
- for (i=0 ; i < panel.nb_desktop ; i++) {
- for (j=0 ; j < panel.nb_monitor ; j++) {
- tskbar = &panel.taskbar[index(i,j)];
- memcpy(&tskbar->area, &g_taskbar, sizeof(Area));
- tskbar->desktop = i;
- tskbar->monitor = j;
-
- // TODO: redefinir panel.area.list en fonction des objets visibles
- panel.area.list = g_slist_append(panel.area.list, tskbar);
- }
- }
- if (panel.clock.time1_format)
- panel.area.list = g_slist_append(panel.area.list, &panel.clock);
-
- //printf("taskbar (desktop x monitor) : (%d x %d)\n", panel.nb_desktop, panel.nb_monitor);
- resize_taskbar();
- task_refresh_tasklist ();
- panel.refresh = 1;
-}
-
-
void config_finish ()
{
- int height_ink, height;
+ if (old_config_file) save_config();
- if (panel.old_config_file) save_config();
-
- // get monitor's configuration
- get_monitors();
-
- if (panel.monitor > (server.nb_monitor-1)) {
- panel.sleep_mode = 1;
- printf("tint2 sleep and wait monitor %d.\n", panel.monitor+1);
+ if (panel_config->monitor > (server.nb_monitor-1)) {
+ fprintf(stderr, "tint2 exit : monitor %d not found.\n", panel_config->monitor+1);
+ exit(0);
}
else {
- panel.sleep_mode = 0;
- //printf("tint2 wake up on monitor %d\n", panel.monitor+1);
- if (!server.monitor[panel.monitor].width || !server.monitor[panel.monitor].height)
+ if (!server.monitor[panel_config->monitor].width || !server.monitor[panel_config->monitor].height)
fprintf(stderr, "tint2 error : invalid monitor size.\n");
}
- if (!panel.area.width) panel.area.width = server.monitor[panel.monitor].width - 1;
-
- // taskbar
- g_taskbar.posy = panel.area.pix.border.width + panel.area.paddingy;
- g_taskbar.height = panel.area.height - (2 * g_taskbar.posy);
- g_taskbar.redraw = 1;
-
- // task
- g_task.area.posy = g_taskbar.posy + g_taskbar.pix.border.width + g_taskbar.paddingy;
- g_task.area.height = panel.area.height - (2 * g_task.area.posy);
- g_task.area.use_active = 1;
- g_task.area.redraw = 1;
-
- if (!g_task.maximum_width)
- g_task.maximum_width = server.monitor[panel.monitor].width;
-
- if (panel.area.pix.border.rounded > panel.area.height/2)
- panel.area.pix.border.rounded = panel.area.height/2;
-
- // clock
- init_clock(&panel.clock, panel.area.height);
-
- // compute vertical position : text and icon
- get_text_size(g_task.font_desc, &height_ink, &height, panel.area.height, "TAjpg", 5);
- g_task.text_posy = (g_task.area.height - height) / 2.0;
-
- // add task_icon_size
- g_task.text_posx = g_task.area.paddingx + g_task.area.pix.border.width;
- if (g_task.icon) {
- g_task.icon_size1 = g_task.area.height - (2 * g_task.area.paddingy);
- g_task.text_posx += g_task.icon_size1;
- g_task.icon_posy = (g_task.area.height - g_task.icon_size1) / 2;
- }
-
- config_taskbar();
+ // alloc panels
+ int i;
+ if (panel_config->monitor >= 0) {
+ nb_panel = 1;
+ panel1 = calloc(nb_panel, sizeof(Panel));
+ memcpy(panel1, panel_config, sizeof(Panel));
+ }
+ else {
+ // multi monitor
+ 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;
+ }
+ }
+
+ init_panel();
+ init_taskbar();
visible_object();
- // cleanup background list
- GSList *l0;
- for (l0 = list_back; l0 ; l0 = l0->next) {
- free(l0->data);
- }
- g_slist_free(list_back);
- list_back = NULL;
+ task_refresh_tasklist();
+ panel_refresh = 1;
+// XFlush (server.dsp);
+
+ cleanup_config();
}
void save_config ()
{
+/*
fprintf(stderr, "tint2 warning : convert user's config file\n");
panel.area.paddingx = panel.area.paddingy = panel.marginx;
panel.marginx = panel.marginy = 0;
- if (panel.old_task_icon == 0) g_task.icon_size1 = 0;
- if (panel.old_panel_background == 0) panel.area.pix.back.alpha = 0;
- if (panel.old_task_background == 0) {
+ if (old_task_icon == 0) g_task.icon_size1 = 0;
+ if (old_panel_background == 0) panel.area.pix.back.alpha = 0;
+ if (old_task_background == 0) {
g_task.area.pix.back.alpha = 0;
g_task.area.pix_active.back.alpha = 0;
}
fputs("#---------------------------------------------\n", fp);
fputs("# PANEL\n", fp);
fputs("#---------------------------------------------\n", fp);
- if (panel.mode == SINGLE_DESKTOP) fputs("panel_mode = single_desktop\n", fp);
+ if (panel_mode == SINGLE_DESKTOP) fputs("panel_mode = single_desktop\n", fp);
else fputs("panel_mode = multi_desktop\n", fp);
fputs("panel_monitor = 1\n", fp);
- if (panel.position & BOTTOM) fputs("panel_position = bottom", 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);
+ 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", panel.area.width, panel.area.height);
fprintf(fp, "panel_margin = %d %d\n", panel.marginx, panel.marginy);
fprintf(fp, "task_width = %d\n", g_task.maximum_width);
fprintf(fp, "task_padding = %d\n", g_task.area.paddingx);
fprintf(fp, "task_icon = %d\n", g_task.icon);
- fprintf(fp, "task_font = %s\n", panel.old_task_font);
+ fprintf(fp, "task_font = %s\n", old_task_font);
fprintf(fp, "task_font_color = #%02x%02x%02x %d\n", (int)(g_task.font.color[0]*255), (int)(g_task.font.color[1]*255), (int)(g_task.font.color[2]*255), (int)(g_task.font.alpha*100));
fprintf(fp, "task_active_font_color = #%02x%02x%02x %d\n", (int)(g_task.font_active.color[0]*255), (int)(g_task.font_active.color[1]*255), (int)(g_task.font_active.color[2]*255), (int)(g_task.font_active.alpha*100));
fputs("\n#---------------------------------------------\n", fp);
fputs("# MOUSE ACTION ON TASK\n", fp);
fputs("#---------------------------------------------\n", fp);
- if (panel.mouse_middle == NONE) fputs("mouse_middle = none\n", fp);
- else if (panel.mouse_middle == CLOSE) fputs("mouse_middle = close\n", fp);
- else if (panel.mouse_middle == TOGGLE) fputs("mouse_middle = toggle\n", fp);
- else if (panel.mouse_middle == ICONIFY) fputs("mouse_middle = iconify\n", fp);
- else if (panel.mouse_middle == SHADE) fputs("mouse_middle = shade\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 (panel.mouse_right == NONE) fputs("mouse_right = none\n", fp);
- else if (panel.mouse_right == CLOSE) fputs("mouse_right = close\n", fp);
- else if (panel.mouse_right == TOGGLE) fputs("mouse_right = toggle\n", fp);
- else if (panel.mouse_right == ICONIFY) fputs("mouse_right = iconify\n", fp);
- else if (panel.mouse_right == SHADE) fputs("mouse_right = shade\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 (panel.mouse_scroll_up == NONE) fputs("mouse_scroll_up = none\n", fp);
- else if (panel.mouse_scroll_up == CLOSE) fputs("mouse_scroll_up = close\n", fp);
- else if (panel.mouse_scroll_up == TOGGLE) fputs("mouse_scroll_up = toggle\n", fp);
- else if (panel.mouse_scroll_up == ICONIFY) fputs("mouse_scroll_up = iconify\n", fp);
- else if (panel.mouse_scroll_up == SHADE) fputs("mouse_scroll_up = shade\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 (panel.mouse_scroll_down == NONE) fputs("mouse_scroll_down = none\n", fp);
- else if (panel.mouse_scroll_down == CLOSE) fputs("mouse_scroll_down = close\n", fp);
- else if (panel.mouse_scroll_down == TOGGLE) fputs("mouse_scroll_down = toggle\n", fp);
- else if (panel.mouse_scroll_down == ICONIFY) fputs("mouse_scroll_down = iconify\n", fp);
- else if (panel.mouse_scroll_down == SHADE) fputs("mouse_scroll_down = shade\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);
-
- panel.old_config_file = 0;
+*/
+ old_config_file = 0;
}
projects / chaz / tint2 / blobdiff