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 9944a05..c20c517 100644 (file)
--- a/client.c
+++ b/client.c
@@ -16,16 +16,20 @@ resizetitle(Client *c)
 {
        int i;
 
 {
        int i;
 

-       c->bw = 0;
+       c->tw = 0;

        for(i = 0; i < TLast; i++)
                if(c->tags[i])
        for(i = 0; i < TLast; i++)
                if(c->tags[i])

-                       c->bw += textw(c->tags[i]);
-       c->bw += textw(c->name);
-       if(c->bw > *c->w)
-               c->bw = *c->w + 2;
-       c->bx = *c->x + *c->w - c->bw + 2;
-       c->by = *c->y;
-       XMoveResizeWindow(dpy, c->title, c->bx, c->by, c->bw, c->bh);
+                       c->tw += textw(c->tags[i]);
+       c->tw += textw(c->name);
+       if(c->tw > c->w)
+               c->tw = c->w + 2;
+       c->tx = c->x + c->w - c->tw + 2;
+       c->ty = c->y;
+       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


@@ -39,8 +43,8 @@ xerrordummy(Display *dsply, XErrorEvent *ee)
 void
 ban(Client *c)
 {
 void
 ban(Client *c)
 {

-       XMoveWindow(dpy, c->win, *c->x + 2 * sw, *c->y);
-       XMoveWindow(dpy, c->title, c->bx + 2 * sw, c->by);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);

 }
 
 void
 }
 
 void


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

+       if(sel->ismax)
+               togglemax(NULL);
+

        if(!(c = getnext(sel->next, tsel)))
                c = getnext(clients, tsel);
        if(c) {
                higher(c);
        if(!(c = getnext(sel->next, tsel)))
                c = getnext(clients, tsel);
        if(c) {
                higher(c);

-               c->revert = sel;

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


@@ -83,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);
        }


@@ -93,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;


@@ -103,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;


@@ -115,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:


@@ -124,18 +141,18 @@ gravitate(Client *c, Bool invert)
        case EastGravity:
        case CenterGravity:
        case WestGravity:
        case EastGravity:
        case CenterGravity:
        case WestGravity:

-               dy = -(*c->h / 2) + c->border;
+               dy = -(c->h / 2) + c->border;

                break;
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:
                break;
        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:


@@ -145,14 +162,12 @@ gravitate(Client *c, Bool invert)
        case NorthGravity:
        case CenterGravity:
        case SouthGravity:
        case NorthGravity:
        case CenterGravity:
        case SouthGravity:

-               dx = -(*c->w / 2) + c->border;
+               dx = -(c->w / 2) + c->border;

                break;
        case NorthEastGravity:
        case EastGravity:
        case SouthEastGravity:
                break;
        case NorthEastGravity:
        case EastGravity:
        case SouthEastGravity:

-               dx = -(*c->w + c->border);
-               break;
-       default:
+               dx = -(c->w + c->border);

                break;
        }
 
                break;
        }
 


@@ -160,8 +175,8 @@ gravitate(Client *c, Bool invert)
                dx = -dx;
                dy = -dy;
        }
                dx = -dx;
                dy = -dy;
        }

-       *c->x += dx;
-       *c->y += dy;
+       c->x += dx;
+       c->y += dy;

 }
 
 void
 }
 
 void


@@ -192,62 +207,56 @@ lower(Client *c)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

-       int diff;

        Client *c;
        Client *c;

-       XSetWindowAttributes twa;

        Window trans;
        Window trans;

+       XSetWindowAttributes twa;

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

-       c->bx = c->fx = c->tx = wa->x;
-       c->by = c->fy = c->ty = wa->y;
-       if(c->fy < bh)
-               c->by = c->fy = c->ty += bh;
-       c->bw = c->fw = c->tw = wa->width;
-       c->fh = c->th = wa->height;
-       c->bh = bh;
-
-       diff = sw - c->fw;
-       c->fx = random() % (diff ? diff : 1);
-       diff = sh - c->fh - bh;
-       c->fy = random() % (diff ? diff : 1);
+       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;
+
+       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;
        twa.event_mask = ExposureMask;
 
        XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask;
 

-       c->title = XCreateWindow(dpy, root, c->bx, c->by, c->bw, c->bh,
+       c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,

                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
        settags(c);
 
                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
        settags(c);
 

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

        c->next = clients;
        clients = c;
 
        c->next = clients;
        clients = c;
 

-       XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       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);
 
        if(!c->isfloat)
                        GrabModeAsync, GrabModeSync, None, None);
 
        if(!c->isfloat)

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

 
 

-       setgeom(c);
-       settitle(c);

 
 

+       settitle(c);

        arrange(NULL);
 
        /* mapping the window now prevents flicker */
        arrange(NULL);
 
        /* mapping the window now prevents flicker */


@@ -257,77 +266,73 @@ 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);

-               XSync(dpy, False);
-       }
-}

 
 

-void
-maximize(Arg *arg)
-{
-       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, TopLeft);
+       }

 }
 
 void
 pop(Client *c)
 {
        Client **l;
 }
 
 void
 pop(Client *c)
 {
        Client **l;

+

        for(l = &clients; *l && *l != c; l = &(*l)->next);
        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;
 

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

        clients = c;
        arrange(NULL);
 }
 
 void
        clients = c;
        arrange(NULL);
 }
 
 void

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

 {
 {

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

        XConfigureEvent e;
        XConfigureEvent e;

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

 
 

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

                if(c->incw)
                if(c->incw)

-                       *c->w -= (*c->w - c->basew) % c->incw;
+                       c->w -= (c->w - c->basew) % c->incw;

                if(c->inch)
                if(c->inch)

-                       *c->h -= (*c->h - c->baseh) % 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)
-               *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;
-       if(sticky == TopRight || sticky == BottomRight)
-               *c->x = right - *c->w;
-       if(sticky == BottomLeft || sticky == BottomRight)
-               *c->y = bottom - *c->h;
+       if(c->x > sw) /* might happen on restart */
+               c->x = sw - c->w;
+       if(c->y > sh)
+               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);
        resizetitle(c);
        XSetWindowBorderWidth(dpy, c->win, 1);

-       XMoveResizeWindow(dpy, c->win, *c->x, *c->y, *c->w, *c->h);
+       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;

-       e.x = *c->x;
-       e.y = *c->y;
-       e.width = *c->w;
-       e.height = *c->h;
+       e.x = c->x;
+       e.y = c->y;
+       e.width = c->w;
+       e.height = c->h;

        e.border_width = c->border;
        e.above = None;
        e.override_redirect = False;
        e.border_width = c->border;
        e.above = None;
        e.override_redirect = False;


@@ -335,28 +340,12 @@ resize(Client *c, Bool inc, Corner sticky)
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

-void
-setgeom(Client *c)
-{
-       if((arrange == dotile) && !c->isfloat) {
-               c->x = &c->tx;
-               c->y = &c->ty;
-               c->w = &c->tw;
-               c->h = &c->th;
-       }
-       else {
-               c->x = &c->fx;
-               c->y = &c->fy;
-               c->w = &c->fw;
-               c->h = &c->fh;
-       }
-}
-

 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;


@@ -393,9 +382,9 @@ 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;


@@ -418,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)
 {


@@ -430,13 +451,18 @@ 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);
 
        XSync(dpy, False);
        free(c);
 
        XSync(dpy, False);


@@ -450,7 +476,7 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
 void
 zoom(Arg *arg)
 {

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

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


@@ -460,6 +486,19 @@ zoom(Arg *arg)
                        sel = c;
        }
 
                        sel = c;
        }
 

-       pop(sel);
+       /* pop */
+       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;
+
+       sel->prev = NULL;
+       if(clients)
+               clients->prev = sel;
+       sel->next = clients;
+       clients = sel;
+       arrange(NULL);

        focus(sel);
 }
        focus(sel);
 }