implemented Sanders remarks

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 269bf8c..7ccad39 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"


@@ -11,94 +10,101 @@
 /* static functions */
 
 static void
 /* static functions */
 
 static void

-resizetitle(Client *c)
-{
-       int i;
+detachstack(Client *c) {
+       Client **tc;
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}

 
 

-       c->tw = 0;
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i])
-                       c->tw += textw(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(isvisible(c))
-               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 void
+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 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)
-{
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+configure(Client *c) {
+       XEvent synev;
+
+       synev.type = ConfigureNotify;
+       synev.xconfigure.display = dpy;
+       synev.xconfigure.event = c->win;
+       synev.xconfigure.window = c->win;
+       synev.xconfigure.x = c->x;
+       synev.xconfigure.y = c->y;
+       synev.xconfigure.width = c->w;
+       synev.xconfigure.height = c->h;
+       synev.xconfigure.border_width = c->border;
+       synev.xconfigure.above = None;
+       XSendEvent(dpy, c->win, True, NoEventMask, &synev);

 }
 
 void
 }
 
 void

-focus(Client *c)
-{
-       Client *old = sel;
-
-       if (!issel)
+focus(Client *c) {
+       if(c && !isvisible(c))

                return;
                return;

-       if(sel && sel->ismax)
-               togglemax(NULL);
-       sel = c;
-       if(old && old != c)
-               drawtitle(old);
-       drawtitle(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-}
-
-void
-focusnext(Arg *arg)
-{
-       Client *c;
-   
-       if(!sel)
-               return;
-
-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
+       if(sel && sel != c) {
+               grabbuttons(sel, False);
+               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+       }

        if(c) {
        if(c) {

-               focus(c);
-               restack();
+               detachstack(c);
+               c->snext = stack;
+               stack = c;
+               grabbuttons(c, True);

        }
        }

-}
-
-void
-focusprev(Arg *arg)
-{
-       Client *c;
-
-       if(!sel)
+       sel = c;
+       drawstatus();
+       if(!activescreen)

                return;
                return;

-
-       if(!(c = getprev(sel->prev))) {
-               for(c = clients; c && c->next; c = c->next);
-               c = getprev(c);
-       }

        if(c) {
        if(c) {

-               focus(c);
-               restack();
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+               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)


@@ -107,75 +113,8 @@ getclient(Window w)
        return NULL;
 }
 
        return NULL;
 }
 

-Client *
-getctitle(Window w)
-{
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->title == w)
-                       return c;
-       return NULL;
-}
-

 void
 void

-gravitate(Client *c, Bool invert)
-{
-       int dx = 0, dy = 0;
-
-       switch(c->grav) {
-       default:
-               break;
-       case StaticGravity:
-       case NorthWestGravity:
-       case NorthGravity:
-       case NorthEastGravity:
-               dy = c->border;
-               break;
-       case EastGravity:
-       case CenterGravity:
-       case WestGravity:
-               dy = -(c->h / 2) + c->border;
-               break;
-       case SouthEastGravity:
-       case SouthGravity:
-       case SouthWestGravity:
-               dy = -(c->h);
-               break;
-       }
-
-       switch (c->grav) {
-       default:
-               break;
-       case StaticGravity:
-       case NorthWestGravity:
-       case WestGravity:
-       case SouthWestGravity:
-               dx = c->border;
-               break;
-       case NorthGravity:
-       case CenterGravity:
-       case SouthGravity:
-               dx = -(c->w / 2) + c->border;
-               break;
-       case NorthEastGravity:
-       case EastGravity:
-       case SouthEastGravity:
-               dx = -(c->w + c->border);
-               break;
-       }
-
-       if(invert) {
-               dx = -dx;
-               dy = -dy;
-       }
-       c->x += dx;
-       c->y += dy;
-}
-
-void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {

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


@@ -185,103 +124,58 @@ killclient(Arg *arg)
 }
 
 void
 }
 
 void

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

        Window trans;
        Window trans;

-       XSetWindowAttributes twa;

 
        c = emallocz(sizeof(Client));
        c->tags = emallocz(ntags * sizeof(Bool));
        c->win = w;
 
        c = emallocz(sizeof(Client));
        c->tags = emallocz(ntags * sizeof(Bool));
        c->win = w;

-       c->x = c->tx = wa->x;
-       c->y = c->ty = wa->y;
-       c->w = c->tw = wa->width;
+       c->x = wa->x;
+       c->y = wa->y;
+       c->w = wa->width;

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

-       c->th = bh;
-
-       c->border = 0;
-       setsize(c);
-
-       if(c->h != sh && c->y < bh)
-               c->y = c->ty = bh;
-
+       if(c->w == sw && c->h == sh) {
+               c->border = 0;
+               c->x = sx;
+               c->y = sy;
+       }
+       else {
+               c->border = BORDERPX;
+               if(c->x < wax)
+                       c->x = wax;
+               if(c->y < way)
+                       c->y = way;
+               if(c->x + c->w + 2 * c->border > wax + waw)
+                       c->x = wax + waw - c->w - 2 * c->border;
+               if(c->y + c->h + 2 * c->border > way + wah)
+                       c->y = way + wah - c->h - 2 * c->border;
+       }
+       updatesizehints(c);

        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);
        c->proto = getproto(c->win);
        XSelectInput(dpy, c->win,
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
        XGetTransientForHint(dpy, c->win, &trans);

-       twa.override_redirect = 1;
-       twa.background_pixmap = ParentRelative;
-       twa.event_mask = ExposureMask | EnterWindowMask;
-
-       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);
-
+       grabbuttons(c, False);
+       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+       updatetitle(c);
+       settags(c, getclient(trans));
+       if(!c->isfloat)
+               c->isfloat = trans || c->isfixed;

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

-       clients = c;
-
-       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);
-
-       settags(c);
-       if(!c->isfloat)
-               c->isfloat = trans
-                       || (c->maxw && c->minw &&
-                               c->maxw == c->minw && c->maxh == c->minh);
-       settitle(c);
-
-       if(trans && (tc = getclient(trans))) {
-               c->x = (tc->x + tc->w / 2) - (c->w / 2);
-               c->y = (tc->y + tc->h / 2) - (c->h / 2);
-       }
-       else {
-               c->x = (sw / 2) - (c->w / 2);
-               c->y = ((sh - bh) / 2) - (c->h / 2) + bh;
-       }
-
-       if(isvisible(c))
-               sel = c;
-       arrange(NULL);
+       c->snext = stack;
+       stack = clients = c;
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

        XMapWindow(dpy, c->win);
        XMapWindow(dpy, c->win);

-       XMapWindow(dpy, c->title);

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

+       arrange();

 }
 
 void
 }
 
 void

-resize(Client *c, Bool sizehints, Corner sticky)
-{
-       int bottom = c->y + c->h;
-       int right = c->x + c->w;
-       /*XConfigureEvent e;*/
+resize(Client *c, Bool sizehints) {

        XWindowChanges wc;
 
        if(sizehints) {
        XWindowChanges wc;
 
        if(sizehints) {


@@ -298,31 +192,31 @@ resize(Client *c, Bool sizehints, Corner sticky)
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }
                if(c->maxh && c->h > c->maxh)
                        c->h = c->maxh;
        }

-       if(c->x > right) /* might happen on restart */
-               c->x = right - c->w;
-       if(c->y > bottom)
-               c->y = bottom - c->h;
-       if(sticky == TopRight || sticky == BotRight)
-               c->x = right - c->w;
-       if(sticky == BotLeft || sticky == BotRight)
-               c->y = bottom - c->h;
-
-       resizetitle(c);
+       if(c->w == sw && c->h == sh)
+               c->border = 0;
+       else
+               c->border = BORDERPX;
+       /* offscreen appearance fixes */
+       if(c->x + c->w + 2 * c->border < sx)
+               c->x = sx;
+       if(c->y + c->h + 2 * c->border < sy)
+               c->y = sy;
+       if(c->x > sw)
+               c->x = sw - c->w - 2 * c->border;
+       if(c->y > sh)
+               c->y = sh - c->h - 2 * c->border;

        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;
        wc.height = c->h;
        wc.x = c->x;
        wc.y = c->y;
        wc.width = c->w;
        wc.height = c->h;

-       if(c->w == sw && c->h == sh)
-               wc.border_width = 0;
-       else
-               wc.border_width = 1;
-       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       wc.border_width = c->border;
+       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+       configure(c);

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

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

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


@@ -353,15 +247,12 @@ setsize(Client *c)
        }
        else
                c->minw = c->minh = 0;
        }
        else
                c->minw = c->minh = 0;

-       if(c->flags & PWinGravity)
-               c->grav = size.win_gravity;
-       else
-               c->grav = NorthWestGravity;
+       c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
+                               c->maxw == c->minw && c->maxh == c->minh);

 }
 
 void
 }
 
 void

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

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


@@ -374,102 +265,36 @@ settitle(Client *c)
        if(!name.nitems)
                return;
        if(name.encoding == XA_STRING)
        if(!name.nitems)
                return;
        if(name.encoding == XA_STRING)

-               strncpy(c->name, (char *)name.value, sizeof(c->name));
+               strncpy(c->name, (char *)name.value, sizeof c->name);

        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                                && n > 0 && *list)
                {
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                                && n > 0 && *list)
                {

-                       strncpy(c->name, *list, sizeof(c->name));
+                       strncpy(c->name, *list, sizeof c->name);

                        XFreeStringList(list);
                }
        }
        XFree(name.value);
                        XFreeStringList(list);
                }
        }
        XFree(name.value);

-       resizetitle(c);

 }
 
 void
 }
 
 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->h = sh - 2 - bh;
-
-               restack();
-               resize(sel, arrange == dofloat, TopLeft);
+unmanage(Client *c) {
+       Client *nc;

 
 

-               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);

        free(c->tags);
        free(c);
        free(c->tags);
        free(c);

-

        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

-       if(sel)
-               focus(sel);
-       arrange(NULL);
-}
-
-void
-zoom(Arg *arg)
-{
-       Client *c;
-
-       if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
-               return;
-
-       if(sel == getnext(clients))  {
-               if((c = getnext(sel->next)))
-                       sel = c;
-               else
-                       return;
-       }
-
-       /* pop */
-       sel->prev->next = sel->next;
-       if(sel->next)
-               sel->next->prev = sel->prev;
-       sel->prev = NULL;
-       clients->prev = sel;
-       sel->next = clients;
-       clients = sel;
-       focus(sel);
-       arrange(NULL);
+       arrange();

 }
 }