man page fix

[dwm.git] / client.c

diff --git a/client.c b/client.c
index af0190f..d5bc30e 100644 (file)
--- a/client.c
+++ b/client.c
@@ -11,87 +11,105 @@
 /* static functions */
 
 static void
 /* static functions */
 
 static void

-grabbutton(Client *c, unsigned int button, unsigned int modifier)
-{
-       XGrabButton(dpy, button, modifier, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, button, modifier | LockMask, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, button, modifier | numlockmask, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, button, modifier | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                       GrabModeAsync, GrabModeSync, None, None);
+detachstack(Client *c) {
+       Client **tc;
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;

 }
 
 static void
 }
 
 static void

-resizetitle(Client *c)
-{
-       int i;
-
-       c->tw = 0;
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i])
-                       c->tw += textw(tags[i]);
-       c->tw += textw(c->name);
+grabbuttons(Client *c, Bool focused) {
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+       if(focused) {
+               XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+
+               XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+
+               XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+       }
+       else
+               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+}
+
+static void
+resizetitle(Client *c) {
+       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(isvisible(c))
        if(c->tw > c->w)
                c->tw = c->w + 2;
        c->tx = c->x + c->w - c->tw + 2;
        c->ty = c->y;
        if(isvisible(c))

-               XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+               XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);

        else
        else

-               XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
-
-}
-
-static void
-ungrabbutton(Client *c, unsigned int button, unsigned int modifier)
-{
-       XUngrabButton(dpy, button, modifier, c->win);
-       XUngrabButton(dpy, button, modifier | LockMask, c->win);
-       XUngrabButton(dpy, button, modifier | numlockmask, c->win);
-       XUngrabButton(dpy, button, modifier | numlockmask | LockMask, c->win);
+               XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);

 }
 
 static int
 }
 
 static int

-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {

        return 0;
 }
 
 /* extern functions */
 
 void
        return 0;
 }
 
 /* extern functions */
 
 void

-ban(Client *c)
-{
+ban(Client *c) {

        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

-       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+       XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);

 }
 
 void
 }
 
 void

-focus(Client *c)
-{
-       Client *old = sel;
+focus(Client *c) {
+       Client *old;

 
 

-       if(!issel)
+       if(!issel || (c && !isvisible(c)))

                return;
        if(!sel)
                sel = c;
        else if(sel != c) {
                return;
        if(!sel)
                sel = c;
        else if(sel != c) {

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

                sel = c;
                sel = c;

-               grabbutton(old, AnyButton, 0);
-               drawtitle(old);
+               if(old) {
+                       grabbuttons(old, False);
+                       drawtitle(old);
+               }
+       }
+       if(c) {
+               detachstack(c);
+               c->snext = stack;
+               stack = c;
+               grabbuttons(c, True);
+               drawtitle(c);
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

        }
        }

-       ungrabbutton(c, AnyButton, 0);
-       drawtitle(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

 }
 
 Client *
 }
 
 Client *

-getclient(Window w)
-{
+getclient(Window w) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)


@@ -101,19 +119,17 @@ getclient(Window w)
 }
 
 Client *
 }
 
 Client *

-getctitle(Window w)
-{
+getctitle(Window w) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(c->title == w)
+               if(c->twin == w)

                        return c;
        return NULL;
 }
 
 void
                        return c;
        return NULL;
 }
 
 void

-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {

        int dx = 0, dy = 0;
 
        switch(c->grav) {
        int dx = 0, dy = 0;
 
        switch(c->grav) {


@@ -167,8 +183,7 @@ gravitate(Client *c, Bool invert)
 }
 
 void
 }
 
 void

-killclient(Arg *arg)
-{
+killclient(Arg *arg) {

        if(!sel)
                return;
        if(sel->proto & PROTODELWIN)
        if(!sel)
                return;
        if(sel->proto & PROTODELWIN)


@@ -178,10 +193,8 @@ killclient(Arg *arg)
 }
 
 void
 }
 
 void

-manage(Window w, XWindowAttributes *wa)
-{
-       unsigned int i;
-       Client *c, *tc;
+manage(Window w, XWindowAttributes *wa) {
+       Client *c;

        Window trans;
        XSetWindowAttributes twa;
 
        Window trans;
        XSetWindowAttributes twa;
 


@@ -195,7 +208,7 @@ manage(Window w, XWindowAttributes *wa)
        c->th = bh;
 
        c->border = 0;
        c->th = bh;
 
        c->border = 0;

-       setsize(c);
+       updatesize(c);

 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;
 
        if(c->x + c->w + 2 > sw)
                c->x = sw - c->w - 2;


@@ -214,42 +227,35 @@ manage(Window w, XWindowAttributes *wa)
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask | EnterWindowMask;
 
        twa.background_pixmap = ParentRelative;
        twa.event_mask = ExposureMask | EnterWindowMask;
 

-       c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+       c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,

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

-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
-
-       grabbutton(c, Button1, MODKEY);
-       grabbutton(c, Button2, MODKEY);
-       grabbutton(c, Button3, MODKEY);
-
-       if((tc = getclient(trans))) /* inherit tags */
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = tc->tags[i];
-       else
-               settags(c);
+       grabbuttons(c, False);
+       settags(c, getclient(trans));

        if(!c->isfloat)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                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);
-       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->win);

-       XMapWindow(dpy, c->title);
+       XMapWindow(dpy, c->twin);

        if(isvisible(c))
                focus(c);
        if(isvisible(c))
                focus(c);

+       arrange(NULL);

 }
 
 void
 }
 
 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;
        int bottom = c->y + c->h;
        int right = c->x + c->w;
        XWindowChanges wc;


@@ -273,6 +279,16 @@ resize(Client *c, Bool sizehints, Corner sticky)
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;
 
        if(sticky == BotLeft || sticky == BotRight)
                c->y = bottom - c->h;
 

+       /* offscreen appearance fixes */
+       if(c->x + c->w < 0)
+               c->x = 0;
+       if(c->y + c->h < bh)
+               c->y = bh;
+       if(c->x > sw)
+               c->x = sw - c->w;
+       if(c->y > sh)
+               c->y = sh - c->h;
+

        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;
        resizetitle(c);
        wc.x = c->x;
        wc.y = c->y;


@@ -282,13 +298,12 @@ resize(Client *c, Bool sizehints, Corner sticky)
                wc.border_width = 0;
        else
                wc.border_width = 1;
                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
        XSync(dpy, False);
 }
 
 void

-setsize(Client *c)
-{
+updatesize(Client *c) {

        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 


@@ -326,8 +341,7 @@ setsize(Client *c)
 }
 
 void
 }
 
 void

-settitle(Client *c)
-{
+updatetitle(Client *c) {

        char **list = NULL;
        int n;
        XTextProperty name;
        char **list = NULL;
        int n;
        XTextProperty name;


@@ -354,61 +368,28 @@ settitle(Client *c)
 }
 
 void
 }
 
 void

-togglemax(Arg *arg)
-{
-       int ox, oy, ow, oh;
-       XEvent ev;
+unmanage(Client *c) {
+       Client *nc;

 
 

-       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->h = sh - 2 - bh;
-
-               restack();
-               resize(sel, arrange == dofloat, 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)
-{
+       /* The server grab construct avoids race conditions. */

        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 

+       detach(c);
+       detachstack(c);
+       if(sel == c) {
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);
+       }
+

        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

-       XDestroyWindow(dpy, c->title);
-
-       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)
-               sel = getnext(clients);
+       XDestroyWindow(dpy, c->twin);
+

        free(c->tags);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        free(c->tags);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       if(sel)
-               focus(sel);

        arrange(NULL);
 }
        arrange(NULL);
 }