make ewmh dialog windows float

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 01e8d1f..f753bfe 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -58,7 +58,8 @@
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetWMState,
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetWMState,

-       NetWMFullscreen, NetActiveWindow, NetLast };     /* EWMH atoms */
+       NetWMFullscreen, NetActiveWindow, NetWMWindowType,
+       NetWMWindowTypeDialog, 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 */


@@ -125,6 +126,7 @@ typedef struct {
 struct Monitor {
        char ltsymbol[16];
        float mfact;
 struct Monitor {
        char ltsymbol[16];
        float mfact;

+       int nmaster;

        int num;
        int by;               /* bar geometry */
        int mx, my, mw, mh;   /* screen size */
        int num;
        int by;               /* bar geometry */
        int mx, my, mw, mh;   /* screen size */


@@ -189,6 +191,7 @@ static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);

+static void incnmaster(const Arg *arg);

 static void initfont(const char *fontstr);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);
 static void initfont(const char *fontstr);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);


@@ -235,6 +238,7 @@ static void updatebars(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);

+static void updatewindowtype(Client *c);

 static void updatetitle(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);
 static void updatetitle(Client *c);
 static void updatewmhints(Client *c);
 static void view(const Arg *arg);


@@ -289,31 +293,31 @@ applyrules(Client *c) {
        unsigned int i;
        const Rule *r;
        Monitor *m;
        unsigned int i;
        const Rule *r;
        Monitor *m;

-       XClassHint ch = { 0 };
+       XClassHint ch = { NULL, NULL };

 
        /* rule matching */
        c->isfloating = c->tags = 0;
 
        /* rule matching */
        c->isfloating = c->tags = 0;

-       if(XGetClassHint(dpy, c->win, &ch)) {
-               class = ch.res_class ? ch.res_class : broken;
-               instance = ch.res_name ? ch.res_name : broken;
-               for(i = 0; i < LENGTH(rules); i++) {
-                       r = &rules[i];
-                       if((!r->title || strstr(c->name, r->title))
-                       && (!r->class || strstr(class, r->class))
-                       && (!r->instance || strstr(instance, r->instance)))
-                       {
-                               c->isfloating = r->isfloating;
-                               c->tags |= r->tags;
-                               for(m = mons; m && m->num != r->monitor; m = m->next);
-                               if(m)
-                                       c->mon = m;
-                       }
+       XGetClassHint(dpy, c->win, &ch);
+       class    = ch.res_class ? ch.res_class : broken;
+       instance = ch.res_name  ? ch.res_name  : broken;
+
+       for(i = 0; i < LENGTH(rules); i++) {
+               r = &rules[i];
+               if((!r->title || strstr(c->name, r->title))
+               && (!r->class || strstr(class, r->class))
+               && (!r->instance || strstr(instance, r->instance)))
+               {
+                       c->isfloating = r->isfloating;
+                       c->tags |= r->tags;
+                       for(m = mons; m && m->num != r->monitor; m = m->next);
+                       if(m)
+                               c->mon = m;

                }
                }

-               if(ch.res_class)
-                       XFree(ch.res_class);
-               if(ch.res_name)
-                       XFree(ch.res_name);

        }
        }

+       if(ch.res_class)
+               XFree(ch.res_class);
+       if(ch.res_name)
+               XFree(ch.res_name);

        c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
 }
 
        c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
 }
 


@@ -349,7 +353,7 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
                *h = bh;
        if(*w < bh)
                *w = bh;
                *h = bh;
        if(*w < bh)
                *w = bh;

-       if(resizehints || c->isfloating) {
+       if(resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {

                /* see last two sentences in ICCCM 4.1.2.3 */
                baseismin = c->basew == c->minw && c->baseh == c->minh;
                if(!baseismin) { /* temporarily remove base dimensions */
                /* see last two sentences in ICCCM 4.1.2.3 */
                baseismin = c->basew == c->minw && c->baseh == c->minh;
                if(!baseismin) { /* temporarily remove base dimensions */


@@ -389,7 +393,6 @@ 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);

-       focus(NULL);

        if(m)
                arrangemon(m);
        else for(m = mons; m; m = m->next)
        if(m)
                arrangemon(m);
        else for(m = mons; m; m = m->next)


@@ -433,9 +436,9 @@ buttonpress(XEvent *e) {
        }
        if(ev->window == selmon->barwin) {
                i = x = 0;
        }
        if(ev->window == selmon->barwin) {
                i = x = 0;

-               do {
+               do

                        x += TEXTW(tags[i]);
                        x += TEXTW(tags[i]);

-               } while(ev->x >= x && ++i < LENGTH(tags));
+               while(ev->x >= x && ++i < LENGTH(tags));

                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;
                if(i < LENGTH(tags)) {
                        click = ClkTagBar;
                        arg.ui = 1 << i;


@@ -598,6 +601,7 @@ configurenotify(XEvent *e) {
                        updatebars();
                        for(m = mons; m; m = m->next)
                                XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
                        updatebars();
                        for(m = mons; m; m = m->next)
                                XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);

+                       focus(NULL);

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


@@ -615,18 +619,26 @@ configurerequest(XEvent *e) {
                        c->bw = ev->border_width;
                else if(c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
                        m = c->mon;
                        c->bw = ev->border_width;
                else if(c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
                        m = c->mon;

-                       if(ev->value_mask & CWX)
+                       if(ev->value_mask & CWX) {
+                               c->oldx = c->x;

                                c->x = m->mx + ev->x;
                                c->x = m->mx + ev->x;

-                       if(ev->value_mask & CWY)
+                       }
+                       if(ev->value_mask & CWY) {
+                               c->oldy = c->y;

                                c->y = m->my + ev->y;
                                c->y = m->my + ev->y;

-                       if(ev->value_mask & CWWidth)
+                       }
+                       if(ev->value_mask & CWWidth) {
+                               c->oldw = c->w;

                                c->w = ev->width;
                                c->w = ev->width;

-                       if(ev->value_mask & CWHeight)
+                       }
+                       if(ev->value_mask & CWHeight) {
+                               c->oldh = c->h;

                                c->h = ev->height;
                                c->h = ev->height;

+                       }

                        if((c->x + c->w) > m->mx + m->mw && c->isfloating)
                        if((c->x + c->w) > m->mx + m->mw && c->isfloating)

-                               c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */
+                               c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */

                        if((c->y + c->h) > m->my + m->mh && c->isfloating)
                        if((c->y + c->h) > m->my + m->mh && c->isfloating)

-                               c->y = m->my + (m->mh / 2 - c->h / 2); /* center in y direction */
+                               c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */

                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                        if(ISVISIBLE(c))
                        if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                        if(ISVISIBLE(c))


@@ -656,6 +668,7 @@ createmon(void) {
                die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
        m->tagset[0] = m->tagset[1] = 1;
        m->mfact = mfact;
                die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
        m->tagset[0] = m->tagset[1] = 1;
        m->mfact = mfact;

+       m->nmaster = nmaster;

        m->showbar = showbar;
        m->topbar = topbar;
        m->lt[0] = &layouts[0];
        m->showbar = showbar;
        m->topbar = topbar;
        m->lt[0] = &layouts[0];


@@ -712,12 +725,10 @@ dirtomon(int dir) {
                if(!(m = selmon->next))
                        m = mons;
        }
                if(!(m = selmon->next))
                        m = mons;
        }

-       else {
-               if(selmon == mons)
-                       for(m = mons; m->next; m = m->next);
-               else
-                       for(m = mons; m->next != selmon; m = m->next);
-       }
+       else if(selmon == mons)
+               for(m = mons; m->next; m = m->next);
+       else
+               for(m = mons; m->next != selmon; m = m->next);

        return m;
 }
 
        return m;
 }
 


@@ -1009,21 +1020,25 @@ grabkeys(void) {
                KeyCode code;
 
                XUngrabKey(dpy, AnyKey, AnyModifier, root);
                KeyCode code;
 
                XUngrabKey(dpy, AnyKey, AnyModifier, root);

-               for(i = 0; i < LENGTH(keys); i++) {
+               for(i = 0; i < LENGTH(keys); i++)

                        if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
                                for(j = 0; j < LENGTH(modifiers); j++)
                                        XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
                                                 True, GrabModeAsync, GrabModeAsync);
                        if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
                                for(j = 0; j < LENGTH(modifiers); j++)
                                        XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
                                                 True, GrabModeAsync, GrabModeAsync);

-               }

        }
 }
 
        }
 }
 

+void
+incnmaster(const Arg *arg) {
+       selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+       arrange(selmon);
+}
+

 void
 initfont(const char *fontstr) {
        char *def, **missing;
        int n;
 
 void
 initfont(const char *fontstr) {
        char *def, **missing;
        int n;
 

-       missing = NULL;

        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(missing) {
                while(n--)


@@ -1119,7 +1134,7 @@ manage(Window w, XWindowAttributes *wa) {
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;
        if(c->w == c->mon->mw && c->h == c->mon->mh) {
        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;
+               c->isfloating = True; // regression with flash, XXXX

                c->x = c->mon->mx;
                c->y = c->mon->my;
                c->bw = 0;
                c->x = c->mon->mx;
                c->y = c->mon->my;
                c->bw = 0;


@@ -1139,6 +1154,7 @@ manage(Window w, XWindowAttributes *wa) {
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */

+       updatewindowtype(c);

        updatesizehints(c);
        updatewmhints(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        updatesizehints(c);
        updatewmhints(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);


@@ -1150,9 +1166,13 @@ manage(Window w, XWindowAttributes *wa) {
        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */

-       XMapWindow(dpy, c->win);

        setclientstate(c, NormalState);
        setclientstate(c, NormalState);

+       if (c->mon == selmon)
+               unfocus(selmon->sel, False);
+       c->mon->sel = c;

        arrange(c->mon);
        arrange(c->mon);

+       XMapWindow(dpy, c->win);
+       focus(NULL);

 }
 
 void
 }
 
 void


@@ -1291,6 +1311,8 @@ propertynotify(XEvent *e) {
                        if(c == c->mon->sel)
                                drawbar(c->mon);
                }
                        if(c == c->mon->sel)
                                drawbar(c->mon);
                }

+               if(ev->atom == netatom[NetWMWindowType])
+                       updatewindowtype(c);

        }
 }
 
        }
 }
 


@@ -1303,6 +1325,7 @@ ptrtomon(int x, int y) {
                        return m;
        return selmon;
 }
                        return m;
        return selmon;
 }

+

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


@@ -1407,10 +1430,9 @@ run(void) {
        XEvent ev;
        /* main event loop */
        XSync(dpy, False);
        XEvent ev;
        /* main event loop */
        XSync(dpy, False);

-       while(running && !XNextEvent(dpy, &ev)) {
+       while(running && !XNextEvent(dpy, &ev))

                if(handler[ev.type])
                        handler[ev.type](&ev); /* call handler */
                if(handler[ev.type])
                        handler[ev.type](&ev); /* call handler */

-       }

 }
 
 void
 }
 
 void


@@ -1545,6 +1567,8 @@ setup(void) {
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
        netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", 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);

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


@@ -1589,7 +1613,7 @@ showhide(Client *c) {
        }
        else { /* hide clients bottom up */
                showhide(c->snext);
        }
        else { /* hide clients bottom up */
                showhide(c->snext);

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

        }
 }
 
        }
 }
 


@@ -1617,6 +1641,7 @@ void
 tag(const Arg *arg) {
        if(selmon->sel && arg->ui & TAGMASK) {
                selmon->sel->tags = arg->ui & TAGMASK;
 tag(const Arg *arg) {
        if(selmon->sel && arg->ui & TAGMASK) {
                selmon->sel->tags = arg->ui & TAGMASK;

+               focus(NULL);

                arrange(selmon);
        }
 }
                arrange(selmon);
        }
 }


@@ -1641,32 +1666,28 @@ textnw(const char *text, unsigned int len) {
 
 void
 tile(Monitor *m) {
 
 void
 tile(Monitor *m) {

-       int x, y, h, w, mw;
-       unsigned int i, n;
+       unsigned int i, n, h, mw, my, ty;

        Client *c;
 
        for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
        if(n == 0)
                return;
        Client *c;
 
        for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
        if(n == 0)
                return;

-       /* master */
-       c = nexttiled(m->clients);
-       mw = m->mfact * m->ww;
-       resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);
-       if(--n == 0)
-               return;
-       /* tile stack */
-       x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
-       y = m->wy;
-       w = (m->wx + mw > c->x + c->w) ? m->wx + m->ww - x : m->ww - mw;
-       h = m->wh / n;
-       if(h < bh)
-               h = m->wh;
-       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-               resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
-                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);
-               if(h != m->wh)
-                       y = c->y + HEIGHT(c);
-       }
+
+       if(n > m->nmaster)
+               mw = m->nmaster ? m->ww * m->mfact : 0;
+       else
+               mw = m->ww;
+       for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+               if(i < m->nmaster) {
+                       h = (m->wh - my) / (MIN(n, m->nmaster) - i);
+                       resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False);
+                       my += HEIGHT(c);
+               }
+               else {
+                       h = (m->wh - ty) / (n - i);
+                       resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False);
+                       ty += HEIGHT(c);
+               }

 }
 
 void
 }
 
 void


@@ -1697,6 +1718,7 @@ toggletag(const Arg *arg) {
        newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
        if(newtags) {
                selmon->sel->tags = newtags;
        newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
        if(newtags) {
                selmon->sel->tags = newtags;

+               focus(NULL);

                arrange(selmon);
        }
 }
                arrange(selmon);
        }
 }


@@ -1707,6 +1729,7 @@ toggleview(const Arg *arg) {
 
        if(newtagset) {
                selmon->tagset[selmon->seltags] = newtagset;
 
        if(newtagset) {
                selmon->tagset[selmon->seltags] = newtagset;

+               focus(NULL);

                arrange(selmon);
        }
 }
                arrange(selmon);
        }
 }


@@ -1750,8 +1773,12 @@ unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 

-       if((c = wintoclient(ev->window)))
-               unmanage(c, False);
+       if((c = wintoclient(ev->window))) {
+               if(ev->send_event)
+                       setclientstate(c, WithdrawnState);
+               else
+                       unmanage(c, False);
+       }

 }
 
 void
 }
 
 void


@@ -1946,6 +1973,25 @@ updatestatus(void) {
        drawbar(selmon);
 }
 
        drawbar(selmon);
 }
 

+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);
+
+               if(wtype == netatom[NetWMWindowTypeDialog])
+                       c->isfloating = True;
+       }
+}
+

 void
 updatewmhints(Client *c) {
        XWMHints *wmh;
 void
 updatewmhints(Client *c) {
        XWMHints *wmh;


@@ -1972,6 +2018,7 @@ view(const Arg *arg) {
        selmon->seltags ^= 1; /* toggle sel tagset */
        if(arg->ui & TAGMASK)
                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
        selmon->seltags ^= 1; /* toggle sel tagset */
        if(arg->ui & TAGMASK)
                selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;

+       focus(NULL);

        arrange(selmon);
 }
 
        arrange(selmon);
 }