int panel_autohide_hide_timeout;
int panel_autohide_height;
int panel_strut_policy;
+char *panel_items_order;
int max_tick_urgent;
task_dragged = 0;
panel_horizontal = 1;
panel_position = CENTER;
+ panel_items_order = 0;
panel_autohide = 0;
panel_autohide_show_timeout = 0;
panel_autohide_hide_timeout = 0;
if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
}
+ if (panel_items_order) g_free(panel_items_order);
if (panel1) free(panel1);
if (backgrounds)
g_array_free(backgrounds, 1);
void init_panel()
{
- int i, j;
+ int i, k;
Panel *p;
if (panel_config.monitor > (server.nb_monitor-1)) {
#ifdef ENABLE_BATTERY
init_battery();
#endif
+ init_taskbar();
// number of panels (one monitor or 'all' monitors)
if (panel_config.monitor >= 0)
p->g_taskbar.area.panel = p;
p->g_task.area.panel = p;
init_panel_size_and_position(p);
- // add childs
- // TODO : should respect the order of 'panel_items' config parameter
- if (launcher_enabled) {
- init_launcher_panel(p);
- p->area.list = g_slist_append(p->area.list, &p->launcher);
- }
- p->nb_desktop = server.nb_desktop;
- p->taskbar = calloc(p->nb_desktop, sizeof(Taskbar));
- for (j=0 ; j < p->nb_desktop ; j++) {
- p->area.list = g_slist_append(p->area.list, &p->taskbar[j]);
- }
+ // add childs according to panel_items
+ for (k=0 ; k < strlen(panel_items_order) ; k++) {
+ if (panel_items_order[k] == 'L')
+ init_launcher_panel(p);
+ if (panel_items_order[k] == 'T')
+ init_taskbar_panel(p);
#ifdef ENABLE_BATTERY
- if (battery_enabled) {
- init_battery_panel(p);
- p->area.list = g_slist_append(p->area.list, &p->battery);
- }
+ if (panel_items_order[k] == 'B')
+ init_battery_panel(p);
#endif
- // systray only on first panel
- if (systray.area.on_screen && i == 0) {
- init_systray_panel(p);
- p->area.list = g_slist_append(p->area.list, &systray);
- refresh_systray = 1;
- }
- if (clock_enabled) {
- init_clock_panel(p);
- p->area.list = g_slist_append(p->area.list, &p->clock);
+ if (panel_items_order[k] == 'S') {
+ // TODO : check systray is only on 1 panel
+ init_systray_panel(p);
+ refresh_systray = 1;
+ }
+ if (panel_items_order[k] == 'C')
+ init_clock_panel(p);
}
+ set_panel_items_order(p);
// catch some events
XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p);
}
- panel_refresh = 1;
- init_taskbar();
visible_object();
task_refresh_tasklist();
active_task();
posy += panel->taskbar[i].area.height + panel->area.paddingx;
}
}
- return 1;
+ return 0;
}
}
+void set_panel_items_order(Panel *p)
+{
+ int k, j;
+
+ if (p->area.list) {
+ g_slist_free(p->area.list);
+ p->area.list = 0;
+ }
+
+ for (k=0 ; k < strlen(panel_items_order) ; k++) {
+ if (panel_items_order[k] == 'L')
+ p->area.list = g_slist_append(p->area.list, &p->launcher);
+ if (panel_items_order[k] == 'T') {
+ for (j=0 ; j < p->nb_desktop ; j++)
+ p->area.list = g_slist_append(p->area.list, &p->taskbar[j]);
+ }
+#ifdef ENABLE_BATTERY
+ if (panel_items_order[k] == 'B')
+ p->area.list = g_slist_append(p->area.list, &p->battery);
+#endif
+ if (panel_items_order[k] == 'S') {
+ // TODO : check systray is only on 1 panel
+ p->area.list = g_slist_append(p->area.list, &systray);
+ }
+ if (panel_items_order[k] == 'C')
+ p->area.list = g_slist_append(p->area.list, &p->clock);
+ }
+ init_rendering(&p->area, 0);
+}
+
+
void set_panel_properties(Panel *p)
{
XStoreName (server.dsp, p->main_win, "tint2");