added some comments

[dwm.git] / client.c

diff --git a/client.c b/client.c
index beb7e35..b6caa93 100644 (file)
--- a/client.c
+++ b/client.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>


@@ -11,21 +10,66 @@
 
 /* static functions */
 
 
 /* static functions */
 

+static void
+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(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)
 {
 static void
 resizetitle(Client *c)
 {

-       int i;
-
-       c->bw = 0;
-       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->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->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
 }
 
 static int


@@ -39,60 +83,46 @@ 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->twin, c->tx + 2 * sw, c->ty);

 }
 
 void
 focus(Client *c)
 {
 }
 
 void
 focus(Client *c)
 {

-       Client *old = sel;
-       XEvent ev;
+       Client *old;

 
 

-       sel = c;
-       if(old && old != c)
-               drawtitle(old);
-       drawtitle(c);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       XSync(dpy, False);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-focusnext(Arg *arg)
-{
-       Client *c;
-   
-       if(!sel)
+       if(!issel)

                return;
                return;

-
-       if(!(c = getnext(sel->next, tsel)))
-               c = getnext(clients, tsel);
-       if(c) {
-               higher(c);
-               c->revert = sel;
-               focus(c);
-       }
-}
-
-void
-focusprev(Arg *arg)
-{
-       Client *c;
-

        if(!sel)
        if(!sel)

-               return;
-
-       if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-               higher(c);
-               focus(c);
+               sel = c;
+       else if(sel != c) {
+               if(maximized)
+                       togglemax(NULL);
+               old = sel;
+               sel = c;
+               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);
+       }
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

 }
 
 Client *
 getclient(Window w)
 {
        Client *c;
 }
 
 Client *
 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,8 +133,9 @@ Client *
 getctitle(Window w)
 {
        Client *c;
 getctitle(Window w)
 {
        Client *c;

+

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

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

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


@@ -115,6 +146,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 +157,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 +178,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,15 +191,8 @@ gravitate(Client *c, Bool invert)
                dx = -dx;
                dy = -dy;
        }
                dx = -dx;
                dy = -dy;
        }

-       *c->x += dx;
-       *c->y += dy;
-}
-
-void
-higher(Client *c)
-{
-       XRaiseWindow(dpy, c->win);
-       XRaiseWindow(dpy, c->title);
+       c->x += dx;
+       c->y += dy;

 }
 
 void
 }
 
 void


@@ -176,174 +200,120 @@ killclient(Arg *arg)
 {
        if(!sel)
                return;
 {
        if(!sel)
                return;

-       if(sel->proto & WM_PROTOCOL_DELWIN)
+       if(sel->proto & PROTODELWIN)

                sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
        else
                XKillClient(dpy, sel->win);
 }
 
                sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
        else
                XKillClient(dpy, sel->win);
 }
 

-void
-lower(Client *c)
-{
-       XLowerWindow(dpy, c->title);
-       XLowerWindow(dpy, c->win);
-}
-

 void
 manage(Window w, XWindowAttributes *wa)
 {
        Client *c;
 void
 manage(Window w, XWindowAttributes *wa)
 {
        Client *c;

-       XSetWindowAttributes twa;

        Window trans;
        Window trans;

+       XSetWindowAttributes twa;

 
        c = emallocz(sizeof(Client));
 
        c = emallocz(sizeof(Client));

+       c->tags = emallocz(ntags * sizeof(Bool));

        c->win = w;
        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;
-       c->border = 1;
-       c->proto = getproto(c->win);
+       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;
+
+       c->border = 0;

        setsize(c);
        setsize(c);

+
+       if(c->x + c->w + 2 > sw)
+               c->x = sw - c->w - 2;
+       if(c->x < 0)
+               c->x = 0;
+       if(c->y + c->h + 2 > sh)
+               c->y = sh - c->h - 2;
+       if(c->h != sh && c->y < bh)
+               c->y = bh;
+
+       c->proto = getproto(c->win);

        XSelectInput(dpy, c->win,
        XSelectInput(dpy, c->win,

-                       StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);

        XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;
        XGetTransientForHint(dpy, c->win, &trans);
        twa.override_redirect = 1;
        twa.background_pixmap = ParentRelative;

-       twa.event_mask = ExposureMask;
+       twa.event_mask = ExposureMask | EnterWindowMask;

 
 

-       c->title = XCreateWindow(dpy, root, c->bx, c->by, c->bw, c->bh,
+       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);
 

-       settags(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,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-
+       grabbuttons(c, False);
+       settags(c, getclient(trans));

        if(!c->isfloat)
                c->isfloat = trans
        if(!c->isfloat)
                c->isfloat = trans

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

 
 

-       setgeom(c);
-       settitle(c);
-
-       arrange(NULL);
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       c->snext = stack;
+       stack = clients = c;

 
 

-       /* mapping the window now prevents flicker */
-       if(c->tags[tsel]) {
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
+       settitle(c);
+       ban(c);
+       XMapWindow(dpy, c->win);
+       XMapWindow(dpy, c->twin);
+       if(isvisible(c))

                focus(c);
                focus(c);

-       }
-       else {
-               ban(c);
-               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);
-}
-
-void
-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
        arrange(NULL);
 }
 
 void

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

 {
 {

-       XConfigureEvent e;
+       int bottom = c->y + c->h;
+       int right = c->x + c->w;
+       XWindowChanges wc;

 
 

-       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 == BotRight)
+               c->x = right - c->w;
+       if(sticky == BotLeft || sticky == BotRight)
+               c->y = bottom - c->h;
+

        resizetitle(c);
        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;
-       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;
-       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
+       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);

        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;


@@ -380,9 +350,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;


@@ -405,48 +375,65 @@ settitle(Client *c)
        resizetitle(c);
 }
 
        resizetitle(c);
 }
 

+void
+togglemax(Arg *arg)
+{
+       int ox, oy, ow, oh;
+       Client *c;
+       XEvent ev;
+
+       if(!sel)
+               return;
+
+       if((maximized = !maximized)) {
+               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();
+               for(c = getnext(clients); c; c = getnext(c->next))
+                       if(c != sel)
+                               ban(c);
+               resize(sel, arrange == dofloat, TopLeft);
+
+               sel->x = ox;
+               sel->y = oy;
+               sel->w = ow;
+               sel->h = oh;
+       }
+       else
+               arrange(NULL);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+

 void
 unmanage(Client *c)
 {
 void
 unmanage(Client *c)
 {

-       Client **l;
+       Client *nc;

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

-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       XDestroyWindow(dpy, c->title);
+       detach(c);
+       detachstack(c);
+       if(sel == c) {
+               for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+               focus(nc);
+       }

 
 

-       for(l = &clients; *l && *l != c; l = &(*l)->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;
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       XDestroyWindow(dpy, c->twin);

 
 

+       free(c->tags);

        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        arrange(NULL);
        free(c);
 
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        arrange(NULL);

-       if(sel)
-               focus(sel);
-}
-
-void
-zoom(Arg *arg)
-{
-       Client *c;
-
-       if(!sel)
-               return;
-
-       if(sel == getnext(clients, tsel) && sel->next)  {
-               if((c = getnext(sel->next, tsel)))
-                       sel = c;
-       }
-
-       pop(sel);
-       focus(sel);

 }
 }