X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=11dafe16d497ccd7e167be34327e0fc160215b9c;hb=0b77fdd627f62cb7eaaa1faeb2bcd4b2680b6280;hp=b12f58a4f1d46c1f9f36dd7508089333a0f55477;hpb=da65866b2388391052e3ce95818c1d5ebd2b26b5;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index b12f58a..11dafe1 100644 --- a/src/panel.c +++ b/src/panel.c @@ -40,11 +40,13 @@ int mouse_scroll_up; int mouse_scroll_down; int panel_mode; +int wm_menu; int panel_position; int panel_refresh; -Task *task_active = 0; -Task *task_drag = 0; +Task *task_active; +Task *task_drag; +Task *task_urgent; Panel *panel1 = 0; int nb_panel; @@ -55,17 +57,30 @@ void init_panel() { int i; Panel *p; + for (i=0 ; i < nb_panel ; i++) { p = &panel1[i]; p->area.parent = p; p->area.panel = p; - p->area.visible = 1; + p->area.on_screen = 1; + p->area.resize = 1; p->area._resize = resize_panel; p->g_taskbar.parent = p; p->g_taskbar.panel = p; p->g_task.area.panel = p; + // add childs + if (p->clock.area.on_screen) + p->area.list = g_slist_append(p->area.list, &p->clock); + if (p->battery.area.on_screen) + p->area.list = g_slist_append(p->area.list, &p->battery); + if (systray.area.on_screen && i == 0) { + // systray only on first panel + p->area.list = g_slist_append(p->area.list, &systray); + } + + // detect panel size if (p->pourcentx) p->area.width = (float)server.monitor[p->monitor].width * p->initial_width / 100; else @@ -75,7 +90,6 @@ void init_panel() else p->area.height = p->initial_height; - // full width mode if (!p->area.width) p->area.width = server.monitor[p->monitor].width; @@ -101,22 +115,17 @@ void init_panel() else { p->posy = server.monitor[p->monitor].y + server.monitor[p->monitor].height - p->area.height - p->marginy; } + //printf("posx %d, posy %d, width %d, height %d\n", p->posx, p->posy, p->area.width, p->area.height); // Catch some events XSetWindowAttributes att = { ParentRelative, 0L, 0, 0L, 0, 0, Always, 0L, 0L, False, ExposureMask|ButtonPressMask|ButtonReleaseMask, NoEventMask, False, 0, 0 }; - - // XCreateWindow(display, parent, x, y, w, h, border, depth, class, visual, mask, attrib) - // main_win doesn't include panel.area.paddingx, so we have WM capabilities on left and right. if (p->main_win) XDestroyWindow(server.dsp, p->main_win); - //win = XCreateWindow (server.dsp, server.root_win, p->posx+p->area.paddingxlr, p->posy, p->area.width-(2*p->area.paddingxlr), p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att); p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, CopyFromParent, CWEventMask, &att); set_panel_properties(p); set_panel_background(p); XMapWindow (server.dsp, p->main_win); - - init_clock(&p->clock, &p->area); } panel_refresh = 1; } @@ -126,6 +135,10 @@ void cleanup_panel() { if (!panel1) return; + task_active = 0; + task_drag = 0; + task_urgent = 0; + cleanup_systray(); cleanup_taskbar(); // font allocated once @@ -139,12 +152,6 @@ void cleanup_panel() for (i=0 ; i < nb_panel ; i++) { p = &panel1[i]; - // freed list of visible objects - if (p->list_visible) { - g_slist_free(p->list_visible); - p->list_visible = 0; - } - free_area(&p->area); free_area(&p->g_task.area); free_area(&p->g_taskbar); @@ -169,39 +176,40 @@ void resize_panel(void *obj) Panel *panel = (Panel*)obj; int taskbar_width, modulo_width, taskbar_on_screen; -//printf("resize_panel : : posx et width des barres de taches\n"); - - if (panel_mode == MULTI_DESKTOP) taskbar_on_screen = panel->nb_desktop; - else taskbar_on_screen = 1; - taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width); - if (time1_format) + if (panel->clock.area.on_screen && panel->clock.area.width) taskbar_width -= (panel->clock.area.width + panel->area.paddingx); - //taskbar_width -= (panel->trayer.area.width + panel->area.paddingx); - - taskbar_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) / taskbar_on_screen; - - if (taskbar_on_screen > 1) - modulo_width = (taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx)) % taskbar_on_screen; - else + if (panel->battery.area.on_screen && panel->battery.area.width) + taskbar_width -= (panel->battery.area.width + panel->area.paddingx); + // TODO : systray only on first panel. search better implementation ! + if (systray.area.on_screen && systray.area.width && panel == &panel1[0]) + taskbar_width -= (systray.area.width + panel->area.paddingx); + + if (panel_mode == MULTI_DESKTOP) { + taskbar_on_screen = panel->nb_desktop; + int width = taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx); + taskbar_width = width / taskbar_on_screen; + modulo_width = width % taskbar_on_screen; + } + else { + taskbar_on_screen = 1; modulo_width = 0; + } // change posx and width for all taskbar - int i, modulo=0, posx=0; + int i, posx; + posx = panel->area.pix.border.width + panel->area.paddingxlr; for (i=0 ; i < panel->nb_desktop ; i++) { - if ((i % taskbar_on_screen) == 0) { - posx = panel->area.pix.border.width + panel->area.paddingxlr; - modulo = modulo_width; - } - else posx += taskbar_width + panel->area.paddingx; - panel->taskbar[i].area.posx = posx; panel->taskbar[i].area.width = taskbar_width; panel->taskbar[i].area.resize = 1; - if (modulo) { + if (modulo_width) { panel->taskbar[i].area.width++; - modulo--; + modulo_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; } } @@ -214,23 +222,15 @@ void visible_object() for (i=0 ; i < nb_panel ; i++) { panel = &panel1[i]; - // clock before taskbar because resize(clock) can resize others object - if (time1_format) - panel->clock.area.visible = 1; - else - panel->clock.area.visible = 0; - - //panel->area.list = g_slist_append(panel->area.list, &panel->trayer); - Taskbar *taskbar; for (j=0 ; j < panel->nb_desktop ; j++) { taskbar = &panel->taskbar[j]; if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) { - // (SINGLE_DESKTOP or SINGLE_MONITOR) and not current desktop - taskbar->area.visible = 0; + // SINGLE_DESKTOP and not current desktop + taskbar->area.on_screen = 0; } else { - taskbar->area.visible = 1; + taskbar->area.on_screen = 1; } } }