regarding to http://plan9.bell-labs.com/sources/contrib/rsc/man.ps the BUGS section...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index e05fdd7..e11abfd 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,179 +1,302 @@
-/*
- * (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.
  */
  * 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>

+#include <X11/Xutil.h>
+
+/* 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);

 
 

-#include "util.h"
-#include "wm.h"
+               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);

 
 

-#define CLIENT_MASK            (StructureNotifyMask | PropertyChangeMask | EnterWindowMask)
+               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
+xerrordummy(Display *dsply, XErrorEvent *ee) {
+       return 0;
+}
+
+/* extern functions */

 
 void
 
 void

-update_name(Client *c)
-{
-       XTextProperty name;
-       int n;
-       char **list = NULL;
+configure(Client *c) {
+       XEvent synev;

 
 

-       name.nitems = 0;
-       c->name[0] = 0;
-       XGetTextProperty(dpy, c->win, &name, net_atom[NetWMName]);
-       if(!name.nitems)
-               XGetWMName(dpy, c->win, &name);
-       if(!name.nitems)
+       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
+focus(Client *c) {
+       if(c && !isvisible(c))

                return;
                return;

-       if(name.encoding == XA_STRING)
-               strncpy(c->name, (char *)name.value, sizeof(c->name));
-       else {
-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-                               && n > 0 && *list)
-               {
-                       strncpy(c->name, *list, sizeof(c->name));
-                       XFreeStringList(list);
-               }
+       if(sel && sel != c) {
+               grabbuttons(sel, False);
+               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+       }
+       if(c) {
+               detachstack(c);
+               c->snext = stack;
+               stack = c;
+               grabbuttons(c, True);
+       }
+       sel = c;
+       drawstatus();
+       if(!selscreen)
+               return;
+       if(c) {
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

        }
        }

-       XFree(name.value);
-       if(c == stack)
-               draw_bar();

        else
        else

-               draw_client(c);
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+Client *
+getclient(Window w) {
+       Client *c;
+
+       for(c = clients; c; c = c->next)
+               if(c->win == w)
+                       return c;
+       return NULL;

 }
 
 void
 }
 
 void

-focus(Client *c)
-{
-       Client **l;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
-       c->snext = stack;
-       stack = c;
-       XRaiseWindow(dpy, c->win);
-       XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       XFlush(dpy);
+killclient(Arg *arg) {
+       if(!sel)
+               return;
+       if(sel->proto & PROTODELWIN)
+               sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
+       else
+               XKillClient(dpy, sel->win);

 }
 
 void
 }
 
 void

-manage(Window w, XWindowAttributes *wa)
-{
-       Client *c, **l;
-       XSetWindowAttributes twa;
-       long msize;
+manage(Window w, XWindowAttributes *wa) {
+       Client *c;
+       Window trans;

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

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

        c->win = w;
        c->win = w;

-       c->r[RFloat].x = wa->x;
-       c->r[RFloat].y = wa->y;
-       c->r[RFloat].width = wa->width;
-       c->r[RFloat].height = wa->height;
-       c->border = wa->border_width;
-       XSetWindowBorderWidth(dpy, c->win, 0);
-       XSelectInput(dpy, c->win, CLIENT_MASK);
-       XGetTransientForHint(dpy, c->win, &c->trans);
-       if(!XGetWMNormalHints(dpy, c->win, &c->size, &msize) || !c->size.flags)
-               c->size.flags = PSize;
-       c->fixedsize =
-               (c->size.flags & PMinSize && c->size.flags & PMaxSize
-                && c->size.min_width == c->size.max_width
-                && c->size.min_height == c->size.max_height);
-       update_name(c);
-       twa.override_redirect = 1;
-       twa.background_pixmap = ParentRelative;
-       twa.event_mask = ExposureMask;
-
-       c->title = XCreateWindow(dpy, root, c->r[RFloat].x, c->r[RFloat].y,
-                       c->r[RFloat].width, barrect.height, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent,
-                       DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
-
-       for(l=&clients; *l; l=&(*l)->next);
-       c->next = *l; /* *l == nil */
-       *l = c;
+       c->x = wa->x;
+       c->y = wa->y;
+       c->w = wa->width;
+       c->h = wa->height;
+       if(c->w == sw && c->h == sh) {
+               c->border = 0;
+               c->x = sx;
+               c->y = sy;
+       }
+       else {
+               c->border = BORDERPX;
+               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;
+               if(c->x < wax)
+                       c->x = wax;
+               if(c->y < way)
+                       c->y = way;
+       }
+       updatesizehints(c);
+       c->proto = getproto(c->win);
+       XSelectInput(dpy, c->win,
+               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       XGetTransientForHint(dpy, c->win, &trans);
+       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;

        c->snext = stack;
        c->snext = stack;

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

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

-       XGrabButton(dpy, AnyButton, Mod1Mask, c->win, False, ButtonPressMask,
-                       GrabModeAsync, GrabModeSync, None, None);
-       focus(c);
+       if(isvisible(c))
+               focus(c);
+       arrange();

 }
 
 void
 }
 
 void

-resize(Client *c)
-{
-       XConfigureEvent e;
-
-       XMoveResizeWindow(dpy, c->win, c->r[RFloat].x, c->r[RFloat].y,
-                       c->r[RFloat].width, c->r[RFloat].height);
-       e.type = ConfigureNotify;
-       e.event = c->win;
-       e.window = c->win;
-       e.x = c->r[RFloat].x;
-       e.y = c->r[RFloat].y;
-       e.width = c->r[RFloat].width;
-       e.height = c->r[RFloat].height;
-       e.border_width = c->border;
-       e.above = None;
-       e.override_redirect = False;
-       XSelectInput(dpy, c->win, CLIENT_MASK & ~StructureNotifyMask);
-       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
-       XSelectInput(dpy, c->win, CLIENT_MASK);
-       XFlush(dpy);
-}
+resize(Client *c, Bool sizehints) {
+       XWindowChanges wc;

 
 

-static int
-dummy_error_handler(Display *dpy, XErrorEvent *error)
-{
-       return 0;
+       if(c->w <= 0 || c->h <= 0)
+               return;
+       if(sizehints) {
+               if(c->incw)
+                       c->w -= (c->w - c->basew) % c->incw;
+               if(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->w == sw && c->h == sh)
+               c->border = 0;
+       else
+               c->border = BORDERPX;
+       /* offscreen appearance fixes */
+       if(c->x > sw)
+               c->x = sw - c->w - 2 * c->border;
+       if(c->y > sh)
+               c->y = sh - c->h - 2 * c->border;
+       if(c->x + c->w + 2 * c->border < sx)
+               c->x = sx;
+       if(c->y + c->h + 2 * c->border < sy)
+               c->y = sy;
+       wc.x = c->x;
+       wc.y = c->y;
+       wc.width = c->w;
+       wc.height = c->h;
+       wc.border_width = c->border;
+       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+       configure(c);
+       XSync(dpy, False);

 }
 
 void
 }
 
 void

-unmanage(Client *c)
-{
-       Client **l;
-
-       XGrabServer(dpy);
-       XSetErrorHandler(dummy_error_handler);
-
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       XUnmapWindow(dpy, c->win);
-       XDestroyWindow(dpy, c->title);
-
-       for(l=&clients; *l && *l != c; l=&(*l)->next);
-       eassert(*l == c);
-       *l = c->next;
-       for(l=&stack; *l && *l != c; l=&(*l)->snext);
-       eassert(*l == c);
-       *l = c->snext;
-       free(c);
+updatesizehints(Client *c) {
+       long msize;
+       XSizeHints size;

 
 

-       XFlush(dpy);
-       XSetErrorHandler(error_handler);
-       XUngrabServer(dpy);
-       discard_events(EnterWindowMask);
-       if(stack)
-               focus(stack);
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+               size.flags = PSize;
+       c->flags = size.flags;
+       if(c->flags & PBaseSize) {
+               c->basew = size.base_width;
+               c->baseh = size.base_height;
+       }
+       else
+               c->basew = c->baseh = 0;
+       if(c->flags & PResizeInc) {
+               c->incw = size.width_inc;
+               c->inch = size.height_inc;
+       }
+       else
+               c->incw = c->inch = 0;
+       if(c->flags & PMaxSize) {
+               c->maxw = size.max_width;
+               c->maxh = size.max_height;
+       }
+       else
+               c->maxw = c->maxh = 0;
+       if(c->flags & PMinSize) {
+               c->minw = size.min_width;
+               c->minh = size.min_height;
+       }
+       else
+               c->minw = c->minh = 0;
+       c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
+                               c->maxw == c->minw && c->maxh == c->minh);

 }
 
 }
 

+void
+updatetitle(Client *c) {
+       char **list = NULL;
+       int n;
+       XTextProperty name;

 
 

-Client *
-getclient(Window w)
-{
-       Client *c;
-       for(c = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
+       name.nitems = 0;
+       c->name[0] = 0;
+       XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);
+       if(!name.nitems)
+               XGetWMName(dpy, c->win, &name);
+       if(!name.nitems)
+               return;
+       if(name.encoding == XA_STRING)
+               strncpy(c->name, (char *)name.value, sizeof c->name);
+       else {
+               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
+                               && n > 0 && *list)
+               {
+                       strncpy(c->name, *list, sizeof c->name);
+                       XFreeStringList(list);
+               }
+       }
+       XFree(name.value);

 }
 
 void
 }
 
 void

-draw_client(Client *c)
-{
-       
-
+unmanage(Client *c) {
+       Client *nc;

 
 

+       /* The server grab construct avoids race conditions. */
+       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);
+       free(c->tags);
+       free(c);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);
+       XUngrabServer(dpy);
+       arrange();

 }
 }