X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=797b96a2c11f8bcca73e7f99037660b001dce01a;hb=616c9da1e11226d2b98478ee644d12339489813a;hp=21604e4a94c2365c32cce976680565423ec72349;hpb=ac96fe8050ff0f5c4d0cb4b794eeee875e1d4bfd;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index 21604e4..797b96a 100644 --- a/src/panel.c +++ b/src/panel.c @@ -58,6 +58,7 @@ int panel_autohide_show_timeout; int panel_autohide_hide_timeout; int panel_autohide_height; int panel_strut_policy; +char *panel_items_order; int max_tick_urgent; @@ -79,6 +80,7 @@ void default_panel() 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; @@ -115,6 +117,7 @@ void cleanup_panel() 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); @@ -123,7 +126,7 @@ void cleanup_panel() void init_panel() { - int i, j; + int i, k; Panel *p; if (panel_config.monitor > (server.nb_monitor-1)) { @@ -139,6 +142,7 @@ void init_panel() #ifdef ENABLE_BATTERY init_battery(); #endif + init_taskbar(); // number of panels (one monitor or 'all' monitors) if (panel_config.monitor >= 0) @@ -164,38 +168,30 @@ void init_panel() p->area.on_screen = 1; p->area.resize = 1; p->area.size_mode = SIZE_BY_LAYOUT; - p->area._resize = resize_panel; + p->area._resize = resize_by_layout; p->g_taskbar.area.parent = p; 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 }; @@ -225,8 +221,6 @@ void init_panel() add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p); } - panel_refresh = 1; - init_taskbar(); visible_object(); task_refresh_tasklist(); active_task(); @@ -307,96 +301,6 @@ void init_panel_size_and_position(Panel *panel) } -int resize_panel(void *obj) -{ - Panel *panel = (Panel*)obj; - int size, nb_by_content=0, nb_by_layout=0; - Area *a = (Area*)obj; - int paddingx = a->paddingx;; - - if (panel_horizontal) { - // detect free size for SIZE_BY_LAYOUT's Area - size = a->width - (2 * a->paddingxlr) - (2 * a->bg->border.width); - GSList *l; - for (l = ((Area*)obj)->list ; l ; l = l->next) { - a = (Area*)l->data; - if (a->on_screen && a->width && a->size_mode == SIZE_BY_CONTENT) { - size -= a->width; - nb_by_content++; - } - if (a->on_screen && a->size_mode == SIZE_BY_LAYOUT) - nb_by_layout++; - } - if (nb_by_content+nb_by_layout) - size -= ((nb_by_content+nb_by_layout-1) * paddingx); - //printf("resize_panel : size_panel %d, size_layout %d\n", panel->area.width, size); - - int width=0, modulo=0; - if (nb_by_layout) { - width = size / nb_by_layout; - modulo = size % nb_by_layout; - } - //printf(" content %d, layout %d, width %d, modulo %d\n", nb_by_content, nb_by_layout, width, modulo); - - // change posx and width for all taskbar - int i, posx; - posx = panel->area.bg->border.width + panel->area.paddingxlr; - if (panel->launcher.area.on_screen && panel->launcher.area.width) - posx += (panel->launcher.area.width + panel->area.paddingx); - for (i=0 ; i < panel->nb_desktop ; i++) { - panel->taskbar[i].area.posx = posx; - panel->taskbar[i].area.width = width; - panel->taskbar[i].area.resize = 1; - if (modulo) { - panel->taskbar[i].area.width++; - modulo--; - } - //printf(" width %d\n", panel->taskbar[i].area.width); - //printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width); - if (panel_mode == MULTI_DESKTOP) - posx += panel->taskbar[i].area.width + panel->area.paddingx; - } - } - else { - // detect free size for SIZE_BY_LAYOUT's Area - size = a->height - (2 * a->paddingxlr) - (2 * a->bg->border.width); - GSList *l; - for (l = ((Area*)obj)->list ; l ; l = l->next) { - a = (Area*)l->data; - if (a->on_screen && a->height && a->size_mode == SIZE_BY_CONTENT) { - size -= a->height; - nb_by_content++; - } - if (a->on_screen && a->size_mode == SIZE_BY_LAYOUT) - nb_by_layout++; - } - if (nb_by_content+nb_by_layout) - size -= ((nb_by_content+nb_by_layout-1) * paddingx); - - int width=0, modulo=0; - if (nb_by_layout) { - width = size / nb_by_layout; - modulo = size % nb_by_layout; - } - - // change posy and height for all taskbar - int i, posy; - for (i=0 ; i < panel->nb_desktop ; i++) { - panel->taskbar[i].area.posy = posy; - panel->taskbar[i].area.height = width; - panel->taskbar[i].area.resize = 1; - if (modulo) { - panel->taskbar[i].area.height++; - modulo--; - } - if (panel_mode == MULTI_DESKTOP) - posy += panel->taskbar[i].area.height + panel->area.paddingx; - } - } - return 1; -} - - void visible_object() { Panel *panel; @@ -475,6 +379,37 @@ void update_strut(Panel* p) } +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");