// panel's initial config
Panel panel_config;
// panels (one panel per monitor)
-Panel *panel1 = NULL;
+Panel *panel1 = 0;
int nb_panel = 0;
Imlib_Image default_icon = NULL;
new_panel[i].main_win = old_win;
}
- fprintf(stderr, "tint2 : nb monitor %d, nb desktop %d\n", nb_panel, server.nb_desktop);
+ fprintf(stderr, "tint2 : nb monitor %d, nb monitor used %d, nb desktop %d\n", server.nb_monitor, nb_panel, server.nb_desktop);
for (i=0 ; i < nb_panel ; i++) {
p = &new_panel[i];
- p->monitor = i;
+ if (panel_config.monitor < 0)
+ p->monitor = i;
p->area.parent = p;
p->area.panel = p;
p->area.on_screen = 1;
}
}
- if (panel1) free(panel1);
- panel1 = 0;
+ if (panel1) {
+ free(panel1);
+ panel1 = 0;
+ nb_panel = 0;
+ }
if (panel_config.g_task.font_desc) {
pango_font_description_free(panel_config.g_task.font_desc);
XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
// Reserved space
+ unsigned int d1, screen_width, screen_height;
+ Window d2;
+ int d3;
+ XGetGeometry(server.dsp, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
+ Monitor monitor = server.monitor[p->monitor];
long struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
if (panel_horizontal) {
if (panel_position & TOP) {
- struts[2] = p->area.height + p->marginy;
+ struts[2] = p->area.height + p->marginy + monitor.y;
struts[8] = p->posx;
// p->area.width - 1 allowed full screen on monitor 2
struts[9] = p->posx + p->area.width - 1;
}
else {
- struts[3] = p->area.height + p->marginy;
+ struts[3] = p->area.height + p->marginy + screen_height - monitor.y - monitor.height;
struts[10] = p->posx;
// p->area.width - 1 allowed full screen on monitor 2
struts[11] = p->posx + p->area.width - 1;
}
else {
if (panel_position & LEFT) {
- struts[0] = p->area.width + p->marginx;
+ struts[0] = p->area.width + p->marginx + monitor.x;
struts[4] = p->posy;
// p->area.width - 1 allowed full screen on monitor 2
struts[5] = p->posy + p->area.height - 1;
}
else {
- struts[1] = p->area.width + p->marginx;
+ struts[1] = p->area.width + p->marginx + screen_width - monitor.x - monitor.width;
struts[6] = p->posy;
// p->area.width - 1 allowed full screen on monitor 2
struts[7] = p->posy + p->area.height - 1;
return 0;
}
+
+Taskbar *click_taskbar (Panel *panel, int x, int y)
+{
+ Taskbar *tskbar;
+ int i;
+
+ if (panel_horizontal) {
+ for (i=0; i < panel->nb_desktop ; i++) {
+ tskbar = &panel->taskbar[i];
+ if (tskbar->area.on_screen && x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+ return tskbar;
+ }
+ }
+ else {
+ for (i=0; i < panel->nb_desktop ; i++) {
+ tskbar = &panel->taskbar[i];
+ if (tskbar->area.on_screen && y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
+ return tskbar;
+ }
+ }
+ return NULL;
+}
+
+
+Task *click_task (Panel *panel, int x, int y)
+{
+ GSList *l0;
+ Taskbar *tskbar;
+
+ if ( (tskbar = click_taskbar(panel, x, y)) ) {
+ if (panel_horizontal) {
+ Task *tsk;
+ for (l0 = tskbar->area.list; 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;
+ }
+ }
+ }
+ else {
+ Task *tsk;
+ for (l0 = tskbar->area.list; 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;
+ }
+ }
+ }
+ }
+ return NULL;
+}
+
+
+int click_padding(Panel *panel, int x, int y)
+{
+ if (panel_horizontal) {
+ if (x < panel->area.paddingxlr || x > panel->area.width-panel->area.paddingxlr)
+ return 1;
+ }
+ else {
+ if (y < panel->area.paddingxlr || y > panel->area.height-panel->area.paddingxlr)
+ return 1;
+ }
+ return 0;
+}
+
+
+int click_clock(Panel *panel, int x, int y)
+{
+ Clock clk = panel->clock;
+ if (panel_horizontal) {
+ if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
+ return TRUE;
+ } else {
+ if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height))
+ return TRUE;
+ }
+ return FALSE;
+}
+
+
+Area* click_area(Panel *panel, int x, int y)
+{
+ Area* result = &panel->area;
+ Area* new_result = result;
+ do {
+ result = new_result;
+ 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;
+ }
+ }
+ it = it->next;
+ }
+ } while (new_result != result);
+ return result;
+}