extended rule to apply monitors if set up accordingly

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index c0a15cc..4d1493b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -66,7 +66,7 @@ typedef union {
        int i;
        unsigned int ui;
        float f;
-       void *v;
+       const void *v;
 } Arg;
 
 typedef struct {
@@ -121,9 +121,9 @@ typedef struct {
 } Layout;
 
 struct Monitor {
-       int screen_number;
        float mfact;
-       int by, btx;          /* bar geometry */
+       int num;
+       int by;               /* bar geometry */
        int mx, my, mw, mh;   /* screen size */
        int wx, wy, ww, wh;   /* window area  */
        unsigned int seltags;
@@ -136,7 +136,7 @@ struct Monitor {
        Client *stack;
        Monitor *next;
        Window barwin;
-       Layout *lt[2];
+       const Layout *lt[2];
 };
 
 typedef struct {
@@ -145,6 +145,7 @@ typedef struct {
        const char *title;
        unsigned int tags;
        Bool isfloating;
+       int monitor;
 } Rule;
 
 /* function declarations */
@@ -177,7 +178,7 @@ static void focusin(XEvent *e);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
 static unsigned long getcolor(const char *colstr);
-static Bool getrootpointer(int *x, int *y);
+static Bool getrootptr(int *x, int *y);
 static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
@@ -192,7 +193,7 @@ static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
-static Monitor *pointertomon(int x, int y);
+static Monitor *ptrtomon(int x, int y);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void resize(Client *c, int x, int y, int w, int h, Bool interact);
@@ -236,9 +237,9 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 
 /* variables */
-static char stext[256];
+static char stext[256], ntext[8];
 static int screen;
-static int sw, sh;           /* X display screen geometry x, y, width, height */
+static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
@@ -275,7 +276,8 @@ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1
 void
 applyrules(Client *c) {
        unsigned int i;
-       Rule *r;
+       const Rule *r;
+       Monitor *m;
        XClassHint ch = { 0 };
 
        /* rule matching */
@@ -289,6 +291,9 @@ applyrules(Client *c) {
                        {
                                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)
@@ -409,9 +414,8 @@ buttonpress(XEvent *e) {
                selmon = m;
                focus(NULL);
        }
-       if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
-               i = 0;
-               x = selmon->btx;
+       if(ev->window == selmon->barwin) {
+               i = x = 0;
                do
                        x += TEXTW(tags[i]);
                while(ev->x >= x && ++i < LENGTH(tags));
@@ -642,22 +646,18 @@ dirtomon(int dir) {
 void
 drawbar(Monitor *m) {
        int x;
-       unsigned int i, occ = 0, urg = 0;
+       unsigned int i, n = 0, occ = 0, urg = 0;
        unsigned long *col;
        Client *c;
 
        for(c = m->clients; c; c = c->next) {
+               if(ISVISIBLE(c))
+                       n++;
                occ |= c->tags;
                if(c->isurgent)
                        urg |= c->tags;
        }
        dc.x = 0;
-       if(mons->next) { /* more than a single monitor */
-               dc.w = TEXTW(monsyms[m->screen_number]);
-               drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False);
-               dc.x += dc.w;
-       }
-       m->btx = dc.x;
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
                col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
@@ -669,10 +669,12 @@ drawbar(Monitor *m) {
        if(blw > 0) {
                dc.w = blw;
                drawtext(m->lt[m->sellt]->symbol, dc.norm, False);
-               x = dc.x + dc.w;
+               dc.x += dc.w;
        }
-       else
-               x = dc.x;
+       snprintf(ntext, sizeof ntext, "%u", n);
+       dc.w = TEXTW(ntext);
+       drawtext(ntext, dc.norm, False);
+       x = (dc.x += dc.w);
        if(m == selmon) { /* status is only drawn on selected monitor */
                dc.w = TEXTW(stext);
                dc.x = m->ww - dc.w;
@@ -862,7 +864,7 @@ getcolor(const char *colstr) {
 }
 
 Bool
-getrootpointer(int *x, int *y) {
+getrootptr(int *x, int *y) {
        int di;
        unsigned int dui;
        Window dummy;
@@ -1147,7 +1149,7 @@ movemouse(const Arg *arg) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
-       if(!getrootpointer(&x, &y))
+       if(!getrootptr(&x, &y))
                return;
        do {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
@@ -1181,7 +1183,7 @@ movemouse(const Arg *arg) {
        }
        while(ev.type != ButtonRelease);
        XUngrabPointer(dpy, CurrentTime);
-       if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+       if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
                sendmon(c, m);
                selmon = m;
                focus(NULL);
@@ -1195,7 +1197,7 @@ nexttiled(Client *c) {
 }
 
 Monitor *
-pointertomon(int x, int y) {
+ptrtomon(int x, int y) {
        Monitor *m;
 
        for(m = mons; m; m = m->next)
@@ -1302,7 +1304,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));
-       if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+       if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
                sendmon(c, m);
                selmon = m;
                focus(NULL);
@@ -1339,10 +1341,9 @@ run(void) {
 
        /* 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 */
-       }
 }
 
 void
@@ -1683,7 +1684,7 @@ void
 updategeom(void) {
        int i, n = 1;
        Client *c;
-       Monitor *newmons = NULL, *m, *tm;
+       Monitor *newmons = NULL, *m = NULL, *tm;
 
 #ifdef XINERAMA
        XineramaScreenInfo *info = NULL;
@@ -1693,7 +1694,8 @@ updategeom(void) {
 #endif /* XINERAMA */
        /* allocate monitor(s) for the new geometry setup */
        for(i = 0; i < n; i++) {
-               m = (Monitor *)malloc(sizeof(Monitor));
+               if(!(m = (Monitor *)malloc(sizeof(Monitor))))
+                       die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
                m->next = newmons;
                newmons = m;
        }
@@ -1701,7 +1703,7 @@ updategeom(void) {
 #ifdef XINERAMA
        if(XineramaIsActive(dpy)) {
                for(i = 0, m = newmons; m; m = m->next, i++) {
-                       m->screen_number = info[i].screen_number;
+                       m->num = info[i].screen_number;
                        m->mx = m->wx = info[i].x_org;
                        m->my = m->wy = info[i].y_org;
                        m->mw = m->ww = info[i].width;
@@ -1713,7 +1715,7 @@ updategeom(void) {
 #endif /* XINERAMA */
        /* default monitor setup */
        {
-               m->screen_number = 0;
+               m->num = 0;
                m->mx = m->wx = 0;
                m->my = m->wy = 0;
                m->mw = m->ww = sw;
@@ -1726,8 +1728,8 @@ updategeom(void) {
                m->sellt = 0;
                m->tagset[0] = m->tagset[1] = 1;
                m->mfact = mfact;
-               m->showbar = SHOWBAR;
-               m->topbar = TOPBAR;
+               m->showbar = showbar;
+               m->topbar = topbar;
                m->lt[0] = &layouts[0];
                m->lt[1] = &layouts[1 % LENGTH(layouts)];
                updatebarpos(m);
@@ -1869,8 +1871,8 @@ wintomon(Window w) {
        Client *c;
        Monitor *m;
 
-       if(w == root && getrootpointer(&x, &y))
-               return pointertomon(x, y);
+       if(w == root && getrootptr(&x, &y))
+               return ptrtomon(x, y);
        for(m = mons; m; m = m->next)
                if(w == m->barwin)
                        return m;