*add* strut_policy = none

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 9b8ff748f0fd96239e997125c4913ba2069ebe8e..b6a0fd6d582317fbb120f101b56c95113cf9e274 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -50,6 +50,7 @@ int panel_layer=BOTTOM_LAYER;  // default is bottom layer
 int panel_position;
 int panel_horizontal;
 int panel_refresh;
+int task_dragged=0;
 
 int panel_autohide = 0;
 int panel_autohide_show_timeout = 0;
@@ -67,6 +68,8 @@ Panel panel_config;
 Panel *panel1 = 0;
 int  nb_panel = 0;
 
+GArray* backgrounds = 0;
+
 Imlib_Image default_icon = NULL;
 
 
@@ -79,6 +82,12 @@ void init_panel()
        int i, old_nb_panel;
        Panel *new_panel, *p;
 
+       if (panel_config.monitor > (server.nb_monitor-1)) {
+               // server.nb_monitor minimum value is 1 (see get_monitors())
+               fprintf(stderr, "warning : monitor not found. tint2 default to all monitors.\n");
+               panel_config.monitor = 0;
+       }
+
        init_tooltip();
        init_systray();
        init_clock();
@@ -88,6 +97,7 @@ void init_panel()
 
        cleanup_taskbar();
        for (i=0 ; i < nb_panel ; i++) {
+               autohide_show(&panel1[i]);
                free_area(&panel1[i].area);
                if (panel1[i].temp_pmap) {
                        XFreePixmap(server.dsp, panel1[i].temp_pmap);
@@ -133,11 +143,10 @@ void init_panel()
                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_taskbar.area.parent = p;
+               p->g_taskbar.area.panel = p;
                p->g_task.area.panel = p;
                init_panel_size_and_position(p);
-
                // add childs
                if (clock_enabled) {
                        init_clock_panel(p);
@@ -158,12 +167,7 @@ void init_panel()
 
                if (i >= old_nb_panel) {
                        // new panel : catch some events
-                       long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask;
-                       if (g_tooltip.enabled)
-                               event_mask |= PointerMotionMask|LeaveWindowMask;
-                       if (panel_autohide)
-                               event_mask |= LeaveWindowMask|EnterWindowMask;
-                       XSetWindowAttributes att = { .event_mask=event_mask, .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
+                       XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
                        unsigned long mask = CWEventMask|CWColormap|CWBackPixel|CWBorderPixel;
                        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);
                }
@@ -172,6 +176,13 @@ void init_panel()
                        XMoveResizeWindow(server.dsp, p->main_win, p->posx, p->posy, p->area.width, p->area.height);
                }
 
+               long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask;
+               if (g_tooltip.enabled)
+                       event_mask |= PointerMotionMask|LeaveWindowMask;
+               if (panel_autohide)
+                       event_mask |= LeaveWindowMask|EnterWindowMask;
+               XChangeWindowAttributes(server.dsp, p->main_win, CWEventMask, &(XSetWindowAttributes){.event_mask=event_mask});
+
                if (!server.gc) {
                        XGCValues  gcv;
                        server.gc = XCreateGC(server.dsp, p->main_win, 0, &gcv);
@@ -205,8 +216,12 @@ 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.pix.border.rounded > panel->area.height/2)
-                       panel->area.pix.border.rounded = panel->area.height/2;
+               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);
+                       panel->area.bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
+                       panel->area.bg->border.rounded = panel->area.height/2;
+               }
        }
        else {
                int old_panel_height = panel->area.height;
@@ -218,8 +233,12 @@ 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.pix.border.rounded > panel->area.width/2)
-                       panel->area.pix.border.rounded = panel->area.width/2;
+               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);
+                       panel->area.bg = &g_array_index(backgrounds, Background, backgrounds->len-1);
+                       panel->area.bg->border.rounded = panel->area.width/2;
+               }
        }
 
        // panel position determined here
@@ -303,6 +322,11 @@ void cleanup_panel()
                pango_font_description_free(panel_config.g_task.font_desc);
                panel_config.g_task.font_desc = 0;
        }
+
+       if (backgrounds) {
+               g_array_free(backgrounds, 1);
+               backgrounds = 0;
+       }
 }
 
 
@@ -313,7 +337,7 @@ void resize_panel(void *obj)
        if (panel_horizontal) {
                int taskbar_width, modulo_width = 0;
 
-               taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
+               taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.bg->border.width);
                if (panel->clock.area.on_screen && panel->clock.area.width)
                        taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
        #ifdef ENABLE_BATTERY
@@ -332,7 +356,7 @@ void resize_panel(void *obj)
 
                // change posx and width for all taskbar
                int i, posx;
-               posx = panel->area.pix.border.width + panel->area.paddingxlr;
+               posx = panel->area.bg->border.width + panel->area.paddingxlr;
                for (i=0 ; i < panel->nb_desktop ; i++) {
                        panel->taskbar[i].area.posx = posx;
                        panel->taskbar[i].area.width = taskbar_width;
@@ -350,7 +374,7 @@ void resize_panel(void *obj)
                int taskbar_height, modulo_height = 0;
                int i, posy;
 
-               taskbar_height = panel->area.height - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
+               taskbar_height = panel->area.height - (2 * panel->area.paddingxlr) - (2 * panel->area.bg->border.width);
                if (panel->clock.area.on_screen && panel->clock.area.height)
                        taskbar_height -= (panel->clock.area.height + panel->area.paddingx);
        #ifdef ENABLE_BATTERY
@@ -361,7 +385,7 @@ void resize_panel(void *obj)
                if (systray.area.on_screen && systray.area.height && panel == &panel1[0])
                        taskbar_height -= (systray.area.height + panel->area.paddingx);
 
-               posy = panel->area.height - panel->area.pix.border.width - panel->area.paddingxlr - taskbar_height;
+               posy = panel->area.height - panel->area.bg->border.width - panel->area.paddingxlr - taskbar_height;
                if (panel_mode == MULTI_DESKTOP) {
                        int height = taskbar_height - ((panel->nb_desktop-1) * panel->area.paddingx);
                        taskbar_height = height / panel->nb_desktop;
@@ -409,6 +433,12 @@ void visible_object()
 
 void update_strut(Panel* p)
 {
+       if (panel_strut_policy == STRUT_NONE) {
+               XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT);
+               XDeleteProperty(server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL);
+               return;
+       }
+
        // Reserved space
        unsigned int d1, screen_width, screen_height;
        Window d2;
@@ -528,40 +558,45 @@ void set_panel_properties(Panel *p)
 
 void set_panel_background(Panel *p)
 {
-       if (p->area.pix.pmap) XFreePixmap (server.dsp, p->area.pix.pmap);
-       p->area.pix.pmap = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
+       if (p->area.pix) XFreePixmap (server.dsp, p->area.pix);
+       p->area.pix = XCreatePixmap (server.dsp, server.root_win, p->area.width, p->area.height, server.depth);
+
+       int xoff=0, yoff=0;
+       if (panel_horizontal && panel_position & BOTTOM)
+               yoff = p->area.height-p->hidden_height;
+       else if (!panel_horizontal && panel_position & RIGHT)
+               xoff = p->area.width-p->hidden_width;
 
        if (real_transparency) {
-               clear_pixmap(p->area.pix.pmap, 0, 0, p->area.width, p->area.height);
+               clear_pixmap(p->area.pix, 0, 0, p->area.width, p->area.height);
        }
        else {
                get_root_pixmap();
-               // copy background (server.root_pmap) in panel.area.pix.pmap
+               // copy background (server.root_pmap) in panel.area.pix
                Window dummy;
                int  x, y;
                XTranslateCoordinates(server.dsp, p->main_win, server.root_win, 0, 0, &x, &y, &dummy);
-               XSetTSOrigin(server.dsp, server.gc, -x, -y) ;
-               XFillRectangle(server.dsp, p->area.pix.pmap, server.gc, 0, 0, p->area.width, p->area.height);
+               if (panel_autohide && p->is_hidden) {
+                       x -= xoff;
+                       y -= yoff;
+               }
+               XSetTSOrigin(server.dsp, server.gc, -x, -y);
+               XFillRectangle(server.dsp, p->area.pix, server.gc, 0, 0, p->area.width, p->area.height);
        }
 
        // draw background panel
        cairo_surface_t *cs;
        cairo_t *c;
-       cs = cairo_xlib_surface_create (server.dsp, p->area.pix.pmap, server.visual, p->area.width, p->area.height);
+       cs = cairo_xlib_surface_create (server.dsp, p->area.pix, server.visual, p->area.width, p->area.height);
        c = cairo_create (cs);
-       draw_background(&p->area, c, 0);
+       draw_background(&p->area, c);
        cairo_destroy (c);
        cairo_surface_destroy (cs);
 
        if (panel_autohide) {
                if (p->hidden_pixmap) XFreePixmap(server.dsp, p->hidden_pixmap);
                p->hidden_pixmap = XCreatePixmap(server.dsp, server.root_win, p->hidden_width, p->hidden_height, server.depth);
-               int xoff=0, yoff=0;
-               if (panel_horizontal && panel_position & BOTTOM)
-                       yoff = p->area.height-p->hidden_height;
-               else if (!panel_horizontal && panel_position & RIGHT)
-                       xoff = p->area.width-p->hidden_width;
-               XCopyArea(server.dsp, p->area.pix.pmap, p->hidden_pixmap, server.gc, xoff, yoff, p->hidden_width, p->hidden_height, 0, 0);
+               XCopyArea(server.dsp, p->area.pix, p->hidden_pixmap, server.gc, xoff, yoff, p->hidden_width, p->hidden_height, 0, 0);
        }
 
        // redraw panel's object
@@ -571,6 +606,15 @@ void set_panel_background(Panel *p)
                a = l0->data;
                set_redraw(a);
        }
+       // reset task 'state_pix'
+       int i;
+       Taskbar *tskbar;
+       for (i=0 ; i < p->nb_desktop ; i++) {
+               tskbar = &p->taskbar[i];
+               for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+                       set_task_redraw((Task *)l0->data);
+               }
+       }
 }
 
 
@@ -710,7 +754,7 @@ void autohide_show(void* p)
        if (panel_strut_policy == STRUT_FOLLOW_SIZE)
                update_strut(p);
 
-       XMapSubwindows(server.dsp, panel->main_win);
+       XMapSubwindows(server.dsp, panel->main_win);  // systray windows
        if (panel_horizontal) {
                if (panel_position & TOP)
                        XResizeWindow(server.dsp, panel->main_win, panel->area.width, panel->area.height);
@@ -723,6 +767,7 @@ void autohide_show(void* p)
                else
                        XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height);
        }
+       refresh_systray = 1;   // ugly hack, because we actually only need to call XSetBackgroundPixmap
        panel_refresh = 1;
 }
 
@@ -735,7 +780,7 @@ void autohide_hide(void* p)
        if (panel_strut_policy == STRUT_FOLLOW_SIZE)
                update_strut(p);
 
-       XUnmapSubwindows(server.dsp, panel->main_win);
+       XUnmapSubwindows(server.dsp, panel->main_win);  // systray windows
        int diff = (panel_horizontal ? panel->area.height : panel->area.width) - panel_autohide_height;
        if (panel_horizontal) {
                if (panel_position & TOP)