X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=b136ff34bf11404194f75c1c1b7853111fef8be2;hb=0fcdb76da25111d74fdbd6df0be3c9b4f45fc4bc;hp=900a317004c75445206752a15561ab83f3d21a10;hpb=ac70f13fefaf052701a448ab2fe0751f039d1c8f;p=chaz%2Ftint2 diff --git a/src/panel.c b/src/panel.c index 900a317..b136ff3 100644 --- a/src/panel.c +++ b/src/panel.c @@ -1,7 +1,7 @@ /************************************************************************** * * Copyright (C) 2008 PÃ¥l Staurland (staura@gmail.com) -* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) +* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -105,6 +105,8 @@ void cleanup_panel() if (!panel1) return; cleanup_taskbar(); + // taskbarname_font_desc freed here because cleanup_taskbarname() called on _NET_NUMBER_OF_DESKTOPS + if (taskbarname_font_desc) pango_font_description_free(taskbarname_font_desc); int i; Panel *p; @@ -169,9 +171,6 @@ void init_panel() p->area.resize = 1; p->area.size_mode = SIZE_BY_LAYOUT; p->area._resize = resize_panel; - 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 according to panel_items for (k=0 ; k < strlen(panel_items_order) ; k++) { @@ -183,8 +182,9 @@ void init_panel() if (panel_items_order[k] == 'B') init_battery_panel(p); #endif - if (panel_items_order[k] == 'S') { + if (panel_items_order[k] == 'S' && i==0) { // TODO : check systray is only on 1 panel + // at the moment only on panel1[0] allowed init_systray_panel(p); refresh_systray = 1; } @@ -199,7 +199,7 @@ void init_panel() p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att); long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask; - if (g_tooltip.enabled) + if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || (launcher_enabled && launcher_tooltip_enabled)) event_mask |= PointerMotionMask|LeaveWindowMask; if (panel_autohide) event_mask |= LeaveWindowMask|EnterWindowMask; @@ -236,6 +236,8 @@ void init_panel_size_and_position(Panel *panel) panel->area.width = (float)server.monitor[panel->monitor].width * panel->area.width / 100; if (panel->pourcenty) panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.height / 100; + if (panel->area.width + panel->marginx > server.monitor[panel->monitor].width) + panel->area.width = server.monitor[panel->monitor].width - panel->marginx; if (panel->area.bg->border.rounded > panel->area.height/2) { printf("panel_background_id rounded is too big... please fix your tint2rc\n"); g_array_append_val(backgrounds, *panel->area.bg); @@ -253,6 +255,8 @@ void init_panel_size_and_position(Panel *panel) panel->area.width = (float)server.monitor[panel->monitor].width * old_panel_height / 100; else panel->area.width = old_panel_height; + if (panel->area.height + panel->marginy > server.monitor[panel->monitor].height) + panel->area.height = server.monitor[panel->monitor].height - panel->marginy; if (panel->area.bg->border.rounded > panel->area.width/2) { printf("panel_background_id rounded is too big... please fix your tint2rc\n"); g_array_append_val(backgrounds, *panel->area.bg); @@ -398,8 +402,9 @@ void set_panel_items_order(Panel *p) if (panel_items_order[k] == 'B') p->area.list = g_slist_append(p->area.list, &p->battery); #endif - if (panel_items_order[k] == 'S') { + if (panel_items_order[k] == 'S' && p == panel1) { // TODO : check systray is only on 1 panel + // at the moment only on panel1[0] allowed p->area.list = g_slist_append(p->area.list, &systray); } if (panel_items_order[k] == 'C') @@ -530,12 +535,22 @@ void set_panel_background(Panel *p) set_redraw(a); } - // reset task 'state_pix' - int i; + // reset task/taskbar 'state_pix' + int i, k; Taskbar *tskbar; for (i=0 ; i < p->nb_desktop ; i++) { tskbar = &p->taskbar[i]; - for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + for (k=0; kstate_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]); + tskbar->state_pix[k] = 0; + if (tskbar->bar_name.state_pix[k]) XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]); + tskbar->bar_name.state_pix[k] = 0; + } + tskbar->area.pix = 0; + tskbar->bar_name.area.pix = 0; + l0 = tskbar->area.list; + if (taskbarname_enabled) l0 = l0->next; + for (; l0 ; l0 = l0->next) { set_task_redraw((Task *)l0->data); } } @@ -585,7 +600,9 @@ Task *click_task (Panel *panel, int x, int y) if ( (tskbar = click_taskbar(panel, x, y)) ) { if (panel_horizontal) { Task *tsk; - for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + l0 = tskbar->area.list; + if (taskbarname_enabled) l0 = l0->next; + for (; l0 ; l0 = l0->next) { tsk = l0->data; if (tsk->area.on_screen && x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) { return tsk; @@ -594,7 +611,9 @@ Task *click_task (Panel *panel, int x, int y) } else { Task *tsk; - for (l0 = tskbar->area.list; l0 ; l0 = l0->next) { + l0 = tskbar->area.list; + if (taskbarname_enabled) l0 = l0->next; + for (; l0 ; l0 = l0->next) { tsk = l0->data; if (tsk->area.on_screen && y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) { return tsk; @@ -680,16 +699,10 @@ Area* click_area(Panel *panel, int x, int y) GSList* it = result->list; while (it) { Area* a = it->data; - if (panel_horizontal) { - if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)) { - new_result = a; - break; - } - } else { - if (a->on_screen && y >= a->posy && y <= (a->posy + a->height)) { - new_result = a; - break; - } + if (a->on_screen && x >= a->posx && x <= (a->posx + a->width) + && y >= a->posy && y <= (a->posy + a->height)) { + new_result = a; + break; } it = it->next; }