cleaned up code

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 166e979..889daa5 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;
-       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
@@ -93,6 +97,7 @@ Client *
 getclient(Window w)
 {
        Client *c;
+
        for(c = clients; c; c = c->next)
                if(c->win == w)
                        return c;
@@ -103,6 +108,7 @@ Client *
 getctitle(Window w)
 {
        Client *c;
+
        for(c = clients; c; c = c->next)
                if(c->title == w)
                        return c;
@@ -129,7 +135,7 @@ gravitate(Client *c, Bool invert)
        case SouthEastGravity:
        case SouthGravity:
        case SouthWestGravity:
-               dy = -c->h;
+               dy = -(c->h);
                break;
        default:
                break;
@@ -192,19 +198,22 @@ lower(Client *c)
 void
 manage(Window w, XWindowAttributes *wa)
 {
+       int diff;
        Client *c;
-       XSetWindowAttributes twa;
        Window trans;
+       XSetWindowAttributes twa;
 
        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;
+
+       if(c->y < bh)
+               c->y = c->ty = bh;
+
        c->border = 1;
        c->proto = getproto(c->win);
        setsize(c);
@@ -220,7 +229,6 @@ manage(Window w, XWindowAttributes *wa)
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-       settitle(c);
        settags(c);
 
        c->next = clients;
@@ -228,18 +236,21 @@ manage(Window w, XWindowAttributes *wa)
 
        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);
-       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
                        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)
-               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));
+
 
+       settitle(c);
        arrange(NULL);
+
        /* mapping the window now prevents flicker */
        if(c->tags[tsel]) {
                XMapRaised(dpy, c->win);
@@ -247,10 +258,8 @@ manage(Window w, XWindowAttributes *wa)
                focus(c);
        }
        else {
-               ban(c);
                XMapRaised(dpy, c->win);
                XMapRaised(dpy, c->title);
-               XSync(dpy, False);
        }
 }
 
@@ -264,12 +273,27 @@ maximize(Arg *arg)
        sel->w = sw - 2 * sel->border;
        sel->h = sh - 2 * sel->border - bh;
        higher(sel);
-       resize(sel, False);
+       resize(sel, False, TopLeft);
 }
 
 void
-resize(Client *c, Bool inc)
+pop(Client *c)
 {
+       Client **l;
+
+       for(l = &clients; *l && *l != c; l = &(*l)->next);
+       *l = c->next;
+
+       c->next = clients; /* pop */
+       clients = c;
+       arrange(NULL);
+}
+
+void
+resize(Client *c, Bool inc, Corner sticky)
+{
+       int bottom = c->y + c->h;
+       int right = c->x + c->w;
        XConfigureEvent e;
 
        if(inc) {
@@ -281,7 +305,7 @@ resize(Client *c, Bool inc)
        if(c->x > sw) /* might happen on restart */
                c->x = sw - c->w;
        if(c->y > sh)
-               c->ty = c->y = sh - c->h;
+               c->y = sh - c->h;
        if(c->minw && c->w < c->minw)
                c->w = c->minw;
        if(c->minh && c->h < c->minh)
@@ -290,9 +314,15 @@ resize(Client *c, Bool inc)
                c->w = c->maxw;
        if(c->maxh && c->h > c->maxh)
                c->h = c->maxh;
+       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);
+
        e.type = ConfigureNotify;
        e.event = c->win;
        e.window = c->win;
@@ -310,8 +340,9 @@ resize(Client *c, Bool inc)
 void
 setsize(Client *c)
 {
-       XSizeHints size;
        long msize;
+       XSizeHints size;
+
        if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
                size.flags = PSize;
        c->flags = size.flags;
@@ -348,9 +379,9 @@ setsize(Client *c)
 void
 settitle(Client *c)
 {
-       XTextProperty name;
-       int n;
        char **list = NULL;
+       int n;
+       XTextProperty name;
 
        name.nitems = 0;
        c->name[0] = 0;
@@ -405,7 +436,7 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
-       Client **l, *c;
+       Client *c;
 
        if(!sel)
                return;
@@ -415,11 +446,6 @@ zoom(Arg *arg)
                        sel = c;
        }
 
-       for(l = &clients; *l && *l != sel; l = &(*l)->next);
-       *l = sel->next;
-
-       sel->next = clients; /* pop */
-       clients = sel;
-       arrange(NULL);
+       pop(sel);
        focus(sel);
 }