removed a bunch of lines through making function signatures more consistent with...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 9c0428a..956b13f 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,11 +11,17 @@
 /* static functions */
 
 static void
-grabbuttons(Client *c, Bool focus)
-{
+detachstack(Client *c) {
+       Client **tc;
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}
+
+static void
+grabbuttons(Client *c, Bool focused) {
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
-       if(focus) {
+       if(focused) {
                XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
@@ -46,12 +52,10 @@ grabbuttons(Client *c, Bool focus)
        else
                XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
-
 }
 
 static void
-resizetitle(Client *c)
-{
+resizetitle(Client *c) {
        c->tw = textw(c->name);
        if(c->tw > c->w)
                c->tw = c->w + 2;
@@ -61,48 +65,53 @@ resizetitle(Client *c)
                XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
        else
                XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
-
 }
 
 static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {
        return 0;
 }
 
 /* extern functions */
 
 void
-ban(Client *c)
-{
+ban(Client *c) {
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
 }
 
 void
-focus(Client *c)
-{
-       Client *old = sel;
+focus(Client *c) {
+       Client *old;
 
        if(!issel)
                return;
        if(!sel)
                sel = c;
        else if(sel != c) {
-               if(sel->ismax)
+               if(maximized)
                        togglemax(NULL);
+               old = sel;
                sel = c;
-               grabbuttons(old, False);
-               drawtitle(old);
+               if(old) {
+                       grabbuttons(old, False);
+                       drawtitle(old);
+               }
        }
-       grabbuttons(c, True);
-       drawtitle(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       if(c) {
+               detachstack(c);
+               c->snext = stack;
+               stack = c;
+               grabbuttons(c, True);
+               drawtitle(c);
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       }
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
 Client *
-getclient(Window w)
-{
+getclient(Window w) {
        Client *c;
 
        for(c = clients; c; c = c->next)
@@ -112,8 +121,7 @@ getclient(Window w)
 }
 
 Client *
-getctitle(Window w)
-{
+getctitle(Window w) {
        Client *c;
 
        for(c = clients; c; c = c->next)
@@ -123,8 +131,7 @@ getctitle(Window w)
 }
 
 void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
        int dx = 0, dy = 0;
 
        switch(c->grav) {
@@ -178,8 +185,7 @@ gravitate(Client *c, Bool invert)
 }
 
 void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {
        if(!sel)
                return;
        if(sel->proto & PROTODELWIN)
@@ -189,10 +195,8 @@ killclient(Arg *arg)
 }
 
 void
-manage(Window w, XWindowAttributes *wa)
-{
-       unsigned int i;
-       Client *c, *tc;
+manage(Window w, XWindowAttributes *wa) {
+       Client *c;
        Window trans;
        XSetWindowAttributes twa;
 
@@ -206,7 +210,7 @@ manage(Window w, XWindowAttributes *wa)
        c->th = bh;
 
        c->border = 0;
-       setsize(c);
+       updatesize(c);
 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;
@@ -230,35 +234,30 @@ manage(Window w, XWindowAttributes *wa)
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
-
        grabbuttons(c, False);
-
-       if((tc = getclient(trans))) /* inherit tags */
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = tc->tags[i];
-       else
-               settags(c);
+       settags(c, getclient(trans));
        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
-       settitle(c);
-       if(isvisible(c))
-               sel = c;
-       arrange(NULL);
+
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       c->snext = stack;
+       stack = clients = c;
+
+       updatetitle(c);
+       ban(c);
        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->twin);
        if(isvisible(c))
                focus(c);
+       arrange(NULL);
 }
 
 void
-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {
        int bottom = c->y + c->h;
        int right = c->x + c->w;
        XWindowChanges wc;
@@ -291,13 +290,12 @@ resize(Client *c, Bool sizehints, Corner sticky)
                wc.border_width = 0;
        else
                wc.border_width = 1;
-       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
        XSync(dpy, False);
 }
 
 void
-setsize(Client *c)
-{
+updatesize(Client *c) {
        long msize;
        XSizeHints size;
 
@@ -335,8 +333,7 @@ setsize(Client *c)
 }
 
 void
-settitle(Client *c)
-{
+updatetitle(Client *c) {
        char **list = NULL;
        int n;
        XTextProperty name;
@@ -363,15 +360,15 @@ settitle(Client *c)
 }
 
 void
-togglemax(Arg *arg)
-{
+togglemax(Arg *arg) {
        int ox, oy, ow, oh;
+       Client *c;
        XEvent ev;
 
        if(!sel)
                return;
 
-       if((sel->ismax = !sel->ismax)) {
+       if((maximized = !maximized)) {
                ox = sel->x;
                oy = sel->y;
                ow = sel->w;
@@ -382,6 +379,9 @@ togglemax(Arg *arg)
                sel->h = sh - 2 - bh;
 
                restack();
+               for(c = getnext(clients); c; c = getnext(c->next))
+                       if(c != sel)
+                               ban(c);
                resize(sel, arrange == dofloat, TopLeft);
 
                sel->x = ox;
@@ -390,42 +390,32 @@ togglemax(Arg *arg)
                sel->h = oh;
        }
        else
-               resize(sel, False, TopLeft);
+               arrange(NULL);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-unmanage(Client *c)
-{
-       Client *tc;
-       Window trans;
+unmanage(Client *c) {
+       Client *nc;
+
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
-       XGetTransientForHint(dpy, c->win, &trans);
+       detach(c);
+       detachstack(c);
+       if(sel == c) {
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);
+       }
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->twin);
 
-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
-               clients = c->next;
-       if(sel == c) {
-               if(trans && (tc = getclient(trans)) && isvisible(tc))
-                       sel = tc;
-               else
-                       sel = getnext(clients);
-       }
        free(c->tags);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
-       if(sel)
-               focus(sel);
        arrange(NULL);
 }