cleanup code

[chaz/tint2] / src / config.c

diff --git a/src/config.c b/src/config.c
index f4236542e112263189ae6f37b3fb2c15b8b4c23c..757eff6e73b915ee34ddb89e840ea5402a43082c 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -311,6 +311,7 @@ void add_entry (char *key, char *value)
       if (time1_format) g_free(time1_format);
       if (strlen(value) > 0) time1_format = strdup (value);
       else time1_format = 0;
+      panel_config->clock.area.visible = 1;
    }
    else if (strcmp (key, "time2_format") == 0) {
       if (time2_format) g_free(time2_format);
@@ -410,12 +411,19 @@ void add_entry (char *key, char *value)
       memcpy(&panel_config->g_task.area.pix_active.border, &a->pix.border, sizeof(Border));
    }
 
-   /* Trayer */
-   else if (strcmp (key, "trayer_background_id") == 0) {
+   /* Systray */
+   else if (strcmp (key, "systray_padding") == 0) {
+      extract_values(value, &value1, &value2, &value3);
+      panel_config->systray.area.paddingxlr = panel_config->systray.area.paddingx = atoi (value1);
+      if (value2) panel_config->systray.area.paddingy = atoi (value2);
+      if (value3) panel_config->systray.area.paddingx = atoi (value3);
+      panel_config->systray.area.visible = 1;
+   }
+   else if (strcmp (key, "systray_background_id") == 0) {
       int id = atoi (value);
       Area *a = g_slist_nth_data(list_back, id);
-      memcpy(&panel_config->trayer.area.pix.back, &a->pix.back, sizeof(Color));
-      memcpy(&panel_config->trayer.area.pix.border, &a->pix.border, sizeof(Border));
+      memcpy(&panel_config->systray.area.pix.back, &a->pix.back, sizeof(Color));
+      memcpy(&panel_config->systray.area.pix.border, &a->pix.border, sizeof(Border));
    }
 
    /* Mouse actions */
@@ -569,17 +577,23 @@ void config_finish ()
                }
        }
 
+       // 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_clock();
+   // force the resize
+       for (i=0 ; i < nb_panel ; i++) {
+          panel1[i].area.resize = 1;
+          if (panel1[i].clock.area.visible)
+                  resize_clock(&panel1[i].clock);
+       }
+
+       init_systray();
    init_taskbar();
    visible_object();
 
        cleanup_config();
 
-   // force the resize (using visible_object() order)
-       for (i=0 ; i < nb_panel ; i++) {
-               //init_systray(&panel1[i].trayer, &panel1[i].area);
-               set_resize(&panel1[i]);
-       }
        task_refresh_tasklist();
 }