*fix* issue 185

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 52ae61b6096e43131edd28a0c90772f4fd8bd4e5..3064a201f0057024e4b5839511def7dc3b6e8a40 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -58,7 +58,7 @@ int  max_tick_urgent;
 // 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;
@@ -113,11 +113,12 @@ void init_panel()
                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;
@@ -263,8 +264,11 @@ void cleanup_panel()
                }
        }
 
-       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);
@@ -423,16 +427,21 @@ void set_panel_properties(Panel *p)
        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;
@@ -440,13 +449,13 @@ void set_panel_properties(Panel *p)
        }
        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;
@@ -463,6 +472,13 @@ void set_panel_properties(Panel *p)
        size_hints.min_width = size_hints.max_width = p->area.width;
        size_hints.min_height = size_hints.max_height = p->area.height;
        XSetWMNormalHints(server.dsp, p->main_win, &size_hints);
+
+       // Set WM_CLASS
+       XClassHint* classhint = XAllocClassHint();
+       classhint->res_name = "tint2";
+       classhint->res_class = "Tint2";
+       XSetClassHint(server.dsp, p->main_win, classhint);
+       XFree(classhint);
 }