preparing 0.6 which will be available in the evening after sanders patch approx.

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 1e3216e..c20c517 100644 (file)
--- a/client.c
+++ b/client.c
@@ -25,7 +25,11 @@ resizetitle(Client *c)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
        c->ty = c->y;
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
        c->ty = c->y;

-       XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+       if(c->tags[tsel])
+               XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+       else
+               XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
+

 }
 
 static int
 }
 
 static int


@@ -49,13 +53,12 @@ focus(Client *c)
        Client *old = sel;
        XEvent ev;
 
        Client *old = sel;
        XEvent ev;
 

-       XFlush(dpy);

        sel = c;
        if(old && old != c)
                drawtitle(old);
        drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        sel = c;
        if(old && old != c)
                drawtitle(old);
        drawtitle(c);
        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

-       XFlush(dpy);
+       XSync(dpy, False);

        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 


@@ -67,11 +70,13 @@ focusnext(Arg *arg)
        if(!sel)
                return;
 
        if(!sel)
                return;
 

-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
+       if(sel->ismax)
+               togglemax(NULL);
+
+       if(!(c = getnext(sel->next, tsel)))
+               c = getnext(clients, tsel);

        if(c) {
                higher(c);
        if(c) {
                higher(c);

-               c->revert = sel;

                focus(c);
        }
 }
                focus(c);
        }
 }


@@ -84,7 +89,14 @@ focusprev(Arg *arg)
        if(!sel)
                return;
 
        if(!sel)
                return;
 

-       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+       if(sel->ismax)
+               togglemax(NULL);
+
+       if(!(c = getprev(sel->prev))) {
+               for(c = clients; c && c->next; c = c->next);
+               c = getprev(c);
+       }
+       if(c) {

                higher(c);
                focus(c);
        }
                higher(c);
                focus(c);
        }


@@ -94,6 +106,7 @@ Client *
 getclient(Window w)
 {
        Client *c;
 getclient(Window w)
 {
        Client *c;

+

        for(c = clients; c; c = c->next)
                if(c->win == w)
                        return c;
        for(c = clients; c; c = c->next)
                if(c->win == w)
                        return c;


@@ -104,6 +117,7 @@ Client *
 getctitle(Window w)
 {
        Client *c;
 getctitle(Window w)
 {
        Client *c;

+

        for(c = clients; c; c = c->next)
                if(c->title == w)
                        return c;
        for(c = clients; c; c = c->next)
                if(c->title == w)
                        return c;


@@ -116,6 +130,8 @@ gravitate(Client *c, Bool invert)
        int dx = 0, dy = 0;
 
        switch(c->grav) {
        int dx = 0, dy = 0;
 
        switch(c->grav) {

+       default:
+               break;

        case StaticGravity:
        case NorthWestGravity:
        case NorthGravity:
        case StaticGravity:
        case NorthWestGravity:
        case NorthGravity:


@@ -130,13 +146,13 @@ gravitate(Client *c, Bool invert)
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:

-               dy = -c->h;
-               break;
-       default:
+               dy = -(c->h);

                break;
        }
 
        switch (c->grav) {
                break;
        }
 
        switch (c->grav) {

+       default:
+               break;

        case StaticGravity:
        case NorthWestGravity:
        case WestGravity:
        case StaticGravity:
        case NorthWestGravity:
        case WestGravity:


@@ -153,8 +169,6 @@ gravitate(Client *c, Bool invert)
        case SouthEastGravity:
                dx = -(c->w + c->border);
                break;
        case SouthEastGravity:
                dx = -(c->w + c->border);
                break;

-       default:
-               break;

        }
 
        if(invert) {
        }
 
        if(invert) {


@@ -178,7 +192,7 @@ killclient(Arg *arg)
        if(!sel)
                return;
        if(sel->proto & WM_PROTOCOL_DELWIN)
        if(!sel)
                return;
        if(sel->proto & WM_PROTOCOL_DELWIN)

-               sendevent(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);

        else
                XKillClient(dpy, sel->win);
 }
        else
                XKillClient(dpy, sel->win);
 }


@@ -193,24 +207,26 @@ lower(Client *c)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

-       Client *c, **l;
-       XSetWindowAttributes twa;
+       Client *c;

        Window trans;
        Window trans;

+       XSetWindowAttributes twa;

 
        c = emallocz(sizeof(Client));
        c->win = w;
 
        c = emallocz(sizeof(Client));
        c->win = w;

-       c->tx = c->x = wa->x;
-       c->ty = c->y = wa->y;
-       if(c->y < bh)
-               c->ty = c->y += bh;
-       c->tw = c->w = wa->width;
+       c->x = c->tx = wa->x;
+       c->y = c->ty = wa->y;
+       c->w = c->tw = wa->width;

        c->h = wa->height;
        c->th = bh;
        c->h = wa->height;
        c->th = bh;

+
+       if(c->y < bh)
+               c->y = c->ty = bh;
+

        c->border = 1;
        c->proto = getproto(c->win);
        setsize(c);
        XSelectInput(dpy, c->win,
        c->border = 1;
        c->proto = getproto(c->win);
        setsize(c);
        XSelectInput(dpy, c->win,

-                       StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);

        XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;


@@ -221,25 +237,28 @@ manage(Window w, XWindowAttributes *wa)
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 

-       settitle(c);

        settags(c);
 
        settags(c);
 

-       for(l = &clients; *l; l = &(*l)->next);
-       c->next = *l; /* *l == nil */
-       *l = c;
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;

 
 

-       XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,

                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);

-       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,

                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);

-       XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,

                        GrabModeAsync, GrabModeSync, None, None);
 
                        GrabModeAsync, GrabModeSync, None, None);
 

-       if(!c->dofloat)
-               c->dofloat = trans
-                       || ((c->maxw == c->minw) && (c->maxh == c->minh));
+       if(!c->isfloat)
+               c->isfloat = trans || (c->maxw && c->minw &&
+                               (c->maxw == c->minw) && (c->maxh == c->minh));
+

 
 

+       settitle(c);

        arrange(NULL);
        arrange(NULL);

+

        /* mapping the window now prevents flicker */
        if(c->tags[tsel]) {
                XMapRaised(dpy, c->win);
        /* mapping the window now prevents flicker */
        if(c->tags[tsel]) {
                XMapRaised(dpy, c->win);


@@ -247,51 +266,66 @@ manage(Window w, XWindowAttributes *wa)
                focus(c);
        }
        else {
                focus(c);
        }
        else {

-               ban(c);

                XMapRaised(dpy, c->win);
                XMapRaised(dpy, c->title);
                XMapRaised(dpy, c->win);
                XMapRaised(dpy, c->title);

+

        }
 }
 
 void
        }
 }
 
 void

-maximize(Arg *arg)
+pop(Client *c)

 {
 {

-       if(!sel)
-               return;
-       sel->x = sx;
-       sel->y = sy + bh;
-       sel->w = sw - 2 * sel->border;
-       sel->h = sh - 2 * sel->border - bh;
-       higher(sel);
-       resize(sel, False);
+       Client **l;
+
+       for(l = &clients; *l && *l != c; l = &(*l)->next);
+       if(c->prev)
+               c->prev->next = c->next;
+       if(c->next)
+               c->next->prev = c->prev;
+       *l = c->next;
+
+       c->prev = NULL;
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+       arrange(NULL);

 }
 
 void
 }
 
 void

-resize(Client *c, Bool inc)
+resize(Client *c, Bool sizehints, Corner sticky)

 {
 {

+       int bottom = c->y + c->h;
+       int right = c->x + c->w;

        XConfigureEvent e;
 
        XConfigureEvent e;
 

-       if(inc) {
+       if(sizehints) {

                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;
                if(c->inch)
                        c->h -= (c->h - c->baseh) % c->inch;
                if(c->incw)
                        c->w -= (c->w - c->basew) % c->incw;
                if(c->inch)
                        c->h -= (c->h - c->baseh) % c->inch;

+               if(c->minw && c->w < c->minw)
+                       c->w = c->minw;
+               if(c->minh && c->h < c->minh)
+                       c->h = c->minh;
+               if(c->maxw && c->w > c->maxw)
+                       c->w = c->maxw;
+               if(c->maxh && c->h > c->maxh)
+                       c->h = c->maxh;

        }
        if(c->x > sw) /* might happen on restart */
                c->x = sw - c->w;
        if(c->y > sh)
        }
        if(c->x > sw) /* might happen on restart */
                c->x = sw - c->w;
        if(c->y > sh)

-               c->ty = c->y = sh - c->h;
-       if(c->minw && c->w < c->minw)
-               c->w = c->minw;
-       if(c->minh && c->h < c->minh)
-               c->h = c->minh;
-       if(c->maxw && c->w > c->maxw)
-               c->w = c->maxw;
-       if(c->maxh && c->h > c->maxh)
-               c->h = c->maxh;
+               c->y = sh - c->h;
+       if(sticky == TopRight || sticky == BotRight)
+               c->x = right - c->w;
+       if(sticky == BotLeft || sticky == BotRight)
+               c->y = bottom - c->h;
+

        resizetitle(c);
        XSetWindowBorderWidth(dpy, c->win, 1);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
        resizetitle(c);
        XSetWindowBorderWidth(dpy, c->win, 1);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);

+

        e.type = ConfigureNotify;
        e.event = c->win;
        e.window = c->win;
        e.type = ConfigureNotify;
        e.event = c->win;
        e.window = c->win;


@@ -303,14 +337,15 @@ resize(Client *c, Bool inc)
        e.above = None;
        e.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
        e.above = None;
        e.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);

-       XFlush(dpy);
+       XSync(dpy, False);

 }
 
 void
 setsize(Client *c)
 {
 }
 
 void
 setsize(Client *c)
 {

-       XSizeHints size;

        long msize;
        long msize;

+       XSizeHints size;
+

        if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
                size.flags = PSize;
        c->flags = size.flags;
        if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
                size.flags = PSize;
        c->flags = size.flags;


@@ -347,13 +382,13 @@ setsize(Client *c)
 void
 settitle(Client *c)
 {
 void
 settitle(Client *c)
 {

-       XTextProperty name;
-       int n;

        char **list = NULL;
        char **list = NULL;

+       int n;
+       XTextProperty name;

 
        name.nitems = 0;
        c->name[0] = 0;
 
        name.nitems = 0;
        c->name[0] = 0;

-       XGetTextProperty(dpy, c->win, &name, net_atom[NetWMName]);
+       XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);

        if(!name.nitems)
                XGetWMName(dpy, c->win, &name);
        if(!name.nitems)
        if(!name.nitems)
                XGetWMName(dpy, c->win, &name);
        if(!name.nitems)


@@ -372,6 +407,38 @@ settitle(Client *c)
        resizetitle(c);
 }
 
        resizetitle(c);
 }
 

+void
+togglemax(Arg *arg)
+{
+       int ox, oy, ow, oh;
+       XEvent ev;
+
+       if(!sel)
+               return;
+
+       if((sel->ismax = !sel->ismax)) {
+               ox = sel->x;
+               oy = sel->y;
+               ow = sel->w;
+               oh = sel->h;
+               sel->x = sx;
+               sel->y = sy + bh;
+               sel->w = sw - 2 * sel->border;
+               sel->h = sh - 2 * sel->border - bh;
+
+               higher(sel);
+               resize(sel, False, TopLeft);
+
+               sel->x = ox;
+               sel->y = oy;
+               sel->w = ow;
+               sel->h = oh;
+       }
+       else
+               resize(sel, False, TopLeft);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+

 void
 unmanage(Client *c)
 {
 void
 unmanage(Client *c)
 {


@@ -384,16 +451,21 @@ unmanage(Client *c)
        XDestroyWindow(dpy, c->title);
 
        for(l = &clients; *l && *l != c; l = &(*l)->next);
        XDestroyWindow(dpy, c->title);
 
        for(l = &clients; *l && *l != c; l = &(*l)->next);

+       if(c->prev)
+               c->prev->next = c->next;
+       if(c->next)
+               c->next->prev = c->prev;

        *l = c->next;
        *l = c->next;

-       for(l = &clients; *l; l = &(*l)->next)
-               if((*l)->revert == c)
-                       (*l)->revert = NULL;
-       if(sel == c)
-               sel = sel->revert ? sel->revert : clients;
-
+       if(sel == c) {
+               sel = getnext(c->next, tsel);
+               if(!sel)
+                       sel = getprev(c->prev);
+               if(!sel)
+                       sel = clients;
+       }

        free(c);
 
        free(c);
 

-       XFlush(dpy);
+       XSync(dpy, False);

        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        arrange(NULL);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        arrange(NULL);


@@ -404,20 +476,28 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
 void
 zoom(Arg *arg)
 {

-       Client **l, *c;
+       Client *c, **l;

 
        if(!sel)
                return;
 
 
        if(!sel)
                return;
 

-       if(sel == getnext(clients) && sel->next)  {
-               if((c = getnext(sel->next)))
+       if(sel == getnext(clients, tsel) && sel->next)  {
+               if((c = getnext(sel->next, tsel)))

                        sel = c;
        }
 
                        sel = c;
        }
 

+       /* pop */

        for(l = &clients; *l && *l != sel; l = &(*l)->next);
        for(l = &clients; *l && *l != sel; l = &(*l)->next);

+       if(sel->prev)
+               sel->prev->next = sel->next;
+       if(sel->next)
+               sel->next->prev = sel->prev;

        *l = sel->next;
 
        *l = sel->next;
 

-       sel->next = clients; /* pop */
+       sel->prev = NULL;
+       if(clients)
+               clients->prev = sel;
+       sel->next = clients;

        clients = sel;
        arrange(NULL);
        focus(sel);
        clients = sel;
        arrange(NULL);
        focus(sel);