reversed Andreas Amann's fullscreen fix with the approach proposed by Gary Langshaw:

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index f753bfe..685eb4a 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -43,7 +43,8 @@
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))

-#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define INTERSECT(x,y,w,h,m)    (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
+                               * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))

 #define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))
 #define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))


@@ -59,7 +60,7 @@ enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetWMState,
        NetWMFullscreen, NetActiveWindow, NetWMWindowType,
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetWMState,
        NetWMFullscreen, NetActiveWindow, NetWMWindowType,

-       NetWMWindowTypeDialog, NetLast };     /* EWMH atoms */
+       NetWMWindowTypeDialog, NetClientList, NetLast };     /* EWMH atoms */

 enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast };             /* clicks */


@@ -199,12 +200,13 @@ static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void monocle(Monitor *m);

+static void motionnotify(XEvent *e);

 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void pop(Client *);
 static void propertynotify(XEvent *e);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void pop(Client *);
 static void propertynotify(XEvent *e);

-static Monitor *ptrtomon(int x, int y);

 static void quit(const Arg *arg);
 static void quit(const Arg *arg);

+static Monitor *recttomon(int x, int y, int w, int h);

 static void resize(Client *c, int x, int y, int w, int h, Bool interact);
 static void resizeclient(Client *c, int x, int y, int w, int h);
 static void resizemouse(const Arg *arg);
 static void resize(Client *c, int x, int y, int w, int h, Bool interact);
 static void resizeclient(Client *c, int x, int y, int w, int h);
 static void resizemouse(const Arg *arg);


@@ -215,6 +217,7 @@ static Bool sendevent(Client *c, Atom proto);
 static void sendmon(Client *c, Monitor *m);
 static void setclientstate(Client *c, long state);
 static void setfocus(Client *c);
 static void sendmon(Client *c, Monitor *m);
 static void setclientstate(Client *c, long state);
 static void setfocus(Client *c);

+static void setfullscreen(Client *c, Bool fullscreen);

 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);


@@ -235,6 +238,7 @@ static void unmapnotify(XEvent *e);
 static Bool updategeom(void);
 static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static Bool updategeom(void);
 static void updatebarpos(Monitor *m);
 static void updatebars(void);

+static void updateclientlist(void);

 static void updatenumlockmask(void);
 static void updatesizehints(Client *c);
 static void updatestatus(void);
 static void updatenumlockmask(void);
 static void updatesizehints(Client *c);
 static void updatestatus(void);


@@ -269,6 +273,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,

+       [MotionNotify] = motionnotify,

        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };


@@ -340,14 +345,14 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
                        *y = 0;
        }
        else {
                        *y = 0;
        }
        else {

-               if(*x > m->mx + m->mw)
-                       *x = m->mx + m->mw - WIDTH(c);
-               if(*y > m->my + m->mh)
-                       *y = m->my + m->mh - HEIGHT(c);
-               if(*x + *w + 2 * c->bw < m->mx)
-                       *x = m->mx;
-               if(*y + *h + 2 * c->bw < m->my)
-                       *y = m->my;
+               if(*x >= m->wx + m->ww)
+                       *x = m->wx + m->ww - WIDTH(c);
+               if(*y >= m->wy + m->wh)
+                       *y = m->wy + m->wh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw <= m->wx)
+                       *x = m->wx;
+               if(*y + *h + 2 * c->bw <= m->wy)
+                       *y = m->wy;

        }
        if(*h < bh)
                *h = bh;
        }
        if(*h < bh)
                *h = bh;


@@ -393,9 +398,10 @@ arrange(Monitor *m) {
                showhide(m->stack);
        else for(m = mons; m; m = m->next)
                showhide(m->stack);
                showhide(m->stack);
        else for(m = mons; m; m = m->next)
                showhide(m->stack);

-       if(m)
+       if(m) {

                arrangemon(m);
                arrangemon(m);

-       else for(m = mons; m; m = m->next)
+               restack(m);
+       } else for(m = mons; m; m = m->next)

                arrangemon(m);
 }
 
                arrangemon(m);
 }
 


@@ -404,7 +410,6 @@ arrangemon(Monitor *m) {
        strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
        if(m->lt[m->sellt]->arrange)
                m->lt[m->sellt]->arrange(m);
        strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
        if(m->lt[m->sellt]->arrange)
                m->lt[m->sellt]->arrange(m);

-       restack(m);

 }
 
 void
 }
 
 void


@@ -495,6 +500,7 @@ cleanup(void) {
                cleanupmon(mons);
        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
                cleanupmon(mons);
        XSync(dpy, False);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

+       XDeleteProperty(dpy, root, netatom[NetActiveWindow]);

 }
 
 void
 }
 
 void


@@ -531,31 +537,10 @@ clientmessage(XEvent *e) {
 
        if(!c)
                return;
 
        if(!c)
                return;

-       if(cme->message_type == netatom[NetWMState] && cme->data.l[1] == netatom[NetWMFullscreen]) {
-               if(cme->data.l[0] && !c->isfullscreen) {
-                       XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
-                                       PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
-                       c->isfullscreen = True;
-                       c->oldstate = c->isfloating;
-                       c->oldbw = c->bw;
-                       c->bw = 0;
-                       c->isfloating = True;
-                       resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
-                       XRaiseWindow(dpy, c->win);
-               }
-               else {
-                       XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
-                                       PropModeReplace, (unsigned char*)0, 0);
-                       c->isfullscreen = False;
-                       c->isfloating = c->oldstate;
-                       c->bw = c->oldbw;
-                       c->x = c->oldx;
-                       c->y = c->oldy;
-                       c->w = c->oldw;
-                       c->h = c->oldh;
-                       resizeclient(c, c->x, c->y, c->w, c->h);
-                       arrange(c->mon);
-               }
+       if(cme->message_type == netatom[NetWMState]) {
+               if(cme->data.l[1] == netatom[NetWMFullscreen] || cme->data.l[2] == netatom[NetWMFullscreen])
+                       setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
+                                     || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));

        }
        else if(cme->message_type == netatom[NetActiveWindow]) {
                if(!ISVISIBLE(c)) {
        }
        else if(cme->message_type == netatom[NetActiveWindow]) {
                if(!ISVISIBLE(c)) {


@@ -590,8 +575,9 @@ configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
        Bool dirty;
 
        XConfigureEvent *ev = &e->xconfigure;
        Bool dirty;
 

+       // TODO: updategeom handling sucks, needs to be simplified

        if(ev->window == root) {
        if(ev->window == root) {

-               dirty = (sw != ev->width);
+               dirty = (sw != ev->width || sh != ev->height);

                sw = ev->width;
                sh = ev->height;
                if(updategeom() || dirty) {
                sw = ev->width;
                sh = ev->height;
                if(updategeom() || dirty) {


@@ -875,8 +861,10 @@ focus(Client *c) {
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                setfocus(c);
        }
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                setfocus(c);
        }

-       else
+       else {

                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

+               XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+       }

        selmon->sel = c;
        drawbars();
 }
        selmon->sel = c;
        drawbars();
 }


@@ -897,7 +885,8 @@ focusmon(const Arg *arg) {
                return;
        if((m = dirtomon(arg->i)) == selmon)
                return;
                return;
        if((m = dirtomon(arg->i)) == selmon)
                return;

-       unfocus(selmon->sel, True);
+       unfocus(selmon->sel, False); /* s/True/False/ fixes input focus issues
+                                       in gedit and anjuta */

        selmon = m;
        focus(NULL);
 }
        selmon = m;
        focus(NULL);
 }


@@ -928,6 +917,21 @@ focusstack(const Arg *arg) {
        }
 }
 
        }
 }
 

+Atom
+getatomprop(Client *c, Atom prop) {
+       int di;
+       unsigned long dl;
+       unsigned char *p = NULL;
+       Atom da, atom = None;
+
+       if(XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
+                             &da, &di, &dl, &dl, &p) == Success && p) {
+               atom = *(Atom *)p;
+               XFree(p);
+       }
+       return atom;
+}
+

 unsigned long
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
 unsigned long
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);


@@ -1133,23 +1137,17 @@ manage(Window w, XWindowAttributes *wa) {
        c->w = c->oldw = wa->width;
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;
        c->w = c->oldw = wa->width;
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;

-       if(c->w == c->mon->mw && c->h == c->mon->mh) {
-               c->isfloating = True; // regression with flash, XXXX
-               c->x = c->mon->mx;
-               c->y = c->mon->my;
-               c->bw = 0;
-       }
-       else {
-               if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
-                       c->x = c->mon->mx + c->mon->mw - WIDTH(c);
-               if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
-                       c->y = c->mon->my + c->mon->mh - HEIGHT(c);
-               c->x = MAX(c->x, c->mon->mx);
-               /* only fix client y-offset, if the client center might cover the bar */
-               c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
-                          && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
-               c->bw = borderpx;
-       }
+
+       if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+               c->x = c->mon->mx + c->mon->mw - WIDTH(c);
+       if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+               c->y = c->mon->my + c->mon->mh - HEIGHT(c);
+       c->x = MAX(c->x, c->mon->mx);
+       /* only fix client y-offset, if the client center might cover the bar */
+       c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
+                  && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
+       c->bw = borderpx;
+

        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);


@@ -1165,6 +1163,8 @@ manage(Window w, XWindowAttributes *wa) {
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);
                XRaiseWindow(dpy, c->win);
        attach(c);
        attachstack(c);

+       XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
+                       (unsigned char *) &(c->win), 1);

        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
        setclientstate(c, NormalState);
        if (c->mon == selmon)
        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
        setclientstate(c, NormalState);
        if (c->mon == selmon)


@@ -1211,6 +1211,22 @@ monocle(Monitor *m) {
                resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
 }
 
                resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
 }
 

+void
+motionnotify(XEvent *e) {
+       static Monitor *mon = NULL;
+       Monitor *m;
+       XMotionEvent *ev = &e->xmotion;
+
+       if(ev->window != root)
+               return;
+       if((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
+               unfocus(selmon->sel, True);
+               selmon = m;
+               focus(NULL);
+       }
+       mon = m;
+}
+

 void
 movemouse(const Arg *arg) {
        int x, y, ocx, ocy, nx, ny;
 void
 movemouse(const Arg *arg) {
        int x, y, ocx, ocy, nx, ny;


@@ -1220,6 +1236,8 @@ movemouse(const Arg *arg) {
 
        if(!(c = selmon->sel))
                return;
 
        if(!(c = selmon->sel))
                return;

+       if(c->isfullscreen) /* no support moving fullscreen windows by mouse */
+               return;

        restack(selmon);
        ocx = c->x;
        ocy = c->y;
        restack(selmon);
        ocx = c->x;
        ocy = c->y;


@@ -1259,7 +1277,7 @@ movemouse(const Arg *arg) {
                }
        } while(ev.type != ButtonRelease);
        XUngrabPointer(dpy, CurrentTime);
                }
        } while(ev.type != ButtonRelease);
        XUngrabPointer(dpy, CurrentTime);

-       if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+       if((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {

                sendmon(c, m);
                selmon = m;
                focus(NULL);
                sendmon(c, m);
                selmon = m;
                focus(NULL);


@@ -1316,21 +1334,24 @@ propertynotify(XEvent *e) {
        }
 }
 
        }
 }
 

-Monitor *
-ptrtomon(int x, int y) {
-       Monitor *m;
-
-       for(m = mons; m; m = m->next)
-               if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
-                       return m;
-       return selmon;
-}
-

 void
 quit(const Arg *arg) {
        running = False;
 }
 
 void
 quit(const Arg *arg) {
        running = False;
 }
 

+Monitor *
+recttomon(int x, int y, int w, int h) {
+       Monitor *m, *r = selmon;
+       int a, area = 0;
+
+       for(m = mons; m; m = m->next)
+               if((a = INTERSECT(x, y, w, h, m)) > area) {
+                       area = a;
+                       r = m;
+               }
+       return r;
+}
+

 void
 resize(Client *c, int x, int y, int w, int h, Bool interact) {
        if(applysizehints(c, &x, &y, &w, &h, interact))
 void
 resize(Client *c, int x, int y, int w, int h, Bool interact) {
        if(applysizehints(c, &x, &y, &w, &h, interact))


@@ -1361,6 +1382,8 @@ resizemouse(const Arg *arg) {
 
        if(!(c = selmon->sel))
                return;
 
        if(!(c = selmon->sel))
                return;

+       if(c->isfullscreen) /* no support resizing fullscreen windows by mouse */
+               return;

        restack(selmon);
        ocx = c->x;
        ocy = c->y;
        restack(selmon);
        ocx = c->x;
        ocy = c->y;


@@ -1394,7 +1417,7 @@ resizemouse(const Arg *arg) {
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        XUngrabPointer(dpy, CurrentTime);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        XUngrabPointer(dpy, CurrentTime);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

-       if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+       if((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {

                sendmon(c, m);
                selmon = m;
                focus(NULL);
                sendmon(c, m);
                selmon = m;
                focus(NULL);


@@ -1510,11 +1533,43 @@ sendevent(Client *c, Atom proto) {
 
 void
 setfocus(Client *c) {
 
 void
 setfocus(Client *c) {

-       if(!c->neverfocus)
+       if(!c->neverfocus) {

                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

+               XChangeProperty(dpy, root, netatom[NetActiveWindow],
+                               XA_WINDOW, 32, PropModeReplace,
+                               (unsigned char *) &(c->win), 1);
+       }

        sendevent(c, wmatom[WMTakeFocus]);
 }
 
        sendevent(c, wmatom[WMTakeFocus]);
 }
 

+void
+setfullscreen(Client *c, Bool fullscreen) {
+       if(fullscreen) {
+               XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                               PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+               c->isfullscreen = True;
+               c->oldstate = c->isfloating;
+               c->oldbw = c->bw;
+               c->bw = 0;
+               c->isfloating = True;
+               resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+               XRaiseWindow(dpy, c->win);
+       }
+       else {
+               XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                               PropModeReplace, (unsigned char*)0, 0);
+               c->isfullscreen = False;
+               c->isfloating = c->oldstate;
+               c->bw = c->oldbw;
+               c->x = c->oldx;
+               c->y = c->oldy;
+               c->w = c->oldw;
+               c->h = c->oldh;
+               resizeclient(c, c->x, c->y, c->w, c->h);
+               arrange(c->mon);
+       }
+}
+

 void
 setlayout(const Arg *arg) {
        if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
 void
 setlayout(const Arg *arg) {
        if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])


@@ -1569,6 +1624,7 @@ setup(void) {
        netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
        netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
        netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
        netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
        netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
        netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);

+       netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);

        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);


@@ -1591,11 +1647,11 @@ setup(void) {
        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);
        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);

+       XDeleteProperty(dpy, root, netatom[NetClientList]);

        /* select for events */
        wa.cursor = cursor[CurNormal];
        /* select for events */
        wa.cursor = cursor[CurNormal];

-       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
-                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask
-                       |PropertyChangeMask;
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask|PointerMotionMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;

        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
        grabkeys();
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
        grabkeys();


@@ -1702,6 +1758,8 @@ void
 togglefloating(const Arg *arg) {
        if(!selmon->sel)
                return;
 togglefloating(const Arg *arg) {
        if(!selmon->sel)
                return;

+       if(selmon->sel->isfullscreen) /* no support for fullscreen windows */
+               return;

        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)
                resize(selmon->sel, selmon->sel->x, selmon->sel->y,
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)
                resize(selmon->sel, selmon->sel->x, selmon->sel->y,


@@ -1740,8 +1798,10 @@ unfocus(Client *c, Bool setfocus) {
                return;
        grabbuttons(c, False);
        XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
                return;
        grabbuttons(c, False);
        XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);

-       if(setfocus)
+       if(setfocus) {

                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

+               XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+       }

 }
 
 void
 }
 
 void


@@ -1765,6 +1825,7 @@ unmanage(Client *c, Bool destroyed) {
        }
        free(c);
        focus(NULL);
        }
        free(c);
        focus(NULL);

+       updateclientlist();

        arrange(m);
 }
 
        arrange(m);
 }
 


@@ -1790,6 +1851,8 @@ updatebars(void) {
                .event_mask = ButtonPressMask|ExposureMask
        };
        for(m = mons; m; m = m->next) {
                .event_mask = ButtonPressMask|ExposureMask
        };
        for(m = mons; m; m = m->next) {

+               if (m->barwin)
+                       continue;

                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
                                          CopyFromParent, DefaultVisual(dpy, screen),
                                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
                                          CopyFromParent, DefaultVisual(dpy, screen),
                                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);


@@ -1811,6 +1874,19 @@ updatebarpos(Monitor *m) {
                m->by = -bh;
 }
 
                m->by = -bh;
 }
 

+void
+updateclientlist() {
+       Client *c;
+       Monitor *m;
+
+       XDeleteProperty(dpy, root, netatom[NetClientList]);
+       for(m = mons; m; m = m->next)
+               for(c = m->clients; c; c = c->next)
+                       XChangeProperty(dpy, root, netatom[NetClientList],
+                                       XA_WINDOW, 32, PropModeAppend,
+                                       (unsigned char *) &(c->win), 1);
+}
+

 Bool
 updategeom(void) {
        Bool dirty = False;
 Bool
 updategeom(void) {
        Bool dirty = False;


@@ -1974,22 +2050,14 @@ updatestatus(void) {
 }
 
 void
 }
 
 void

-updatewindowtype(Client *c)
-{
-       Atom wtype, real;
-       int format;
-       unsigned long n, extra;
-       unsigned char *p = NULL;
-
-       if(XGetWindowProperty(dpy, c->win, netatom[NetWMWindowType], 0L,
-                             sizeof(Atom), False, XA_ATOM, &real, &format,
-                             &n, &extra, (unsigned char **)&p) == Success && p) {
-               wtype = *(Atom *)p;
-               XFree(p);
+updatewindowtype(Client *c) {
+       Atom state = getatomprop(c, netatom[NetWMState]);
+       Atom wtype = getatomprop(c, netatom[NetWMWindowType]);

 
 

-               if(wtype == netatom[NetWMWindowTypeDialog])
-                       c->isfloating = True;
-       }
+       if(state == netatom[NetWMFullscreen])
+               setfullscreen(c, True);
+       if(wtype == netatom[NetWMWindowTypeDialog])
+               c->isfloating = True;

 }
 
 void
 }
 
 void


@@ -2041,7 +2109,7 @@ wintomon(Window w) {
        Monitor *m;
 
        if(w == root && getrootptr(&x, &y))
        Monitor *m;
 
        if(w == root && getrootptr(&x, &y))

-               return ptrtomon(x, y);
+               return recttomon(x, y, 1, 1);

        for(m = mons; m; m = m->next)
                if(w == m->barwin)
                        return m;
        for(m = mons; m; m = m->next)
                if(w == m->barwin)
                        return m;


@@ -2099,7 +2167,7 @@ zoom(const Arg *arg) {
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               die("dwm-"VERSION", © 2006-2011 dwm engineers, see LICENSE for details\n");
+               die("dwm-"VERSION", © 2006-2012 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
                die("usage: dwm [-v]\n");
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
        else if(argc != 1)
                die("usage: dwm [-v]\n");
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())