*add* drag'n'drop task reordering

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index c5597cb36e8d0d9b4ef0ddcc8bef5fdb1e538bdb..b271b23601c625277bee5db9328de63ba8ecae54 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;
@@ -96,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);
@@ -165,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);
                }
@@ -179,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);
@@ -551,6 +555,12 @@ void set_panel_background(Panel *p)
        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, 0, 0, p->area.width, p->area.height);
        }
@@ -560,7 +570,11 @@ void set_panel_background(Panel *p)
                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) ;
+               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);
        }
 
@@ -576,11 +590,6 @@ void set_panel_background(Panel *p)
        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, p->hidden_pixmap, server.gc, xoff, yoff, p->hidden_width, p->hidden_height, 0, 0);
        }
 
@@ -591,6 +600,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);
+               }
+       }
 }
 
 
@@ -730,7 +748,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);
@@ -743,6 +761,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;
 }
 
@@ -755,7 +774,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)