extended rule to apply monitors if set up accordingly

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 17d5218..4d1493b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -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;
@@ -145,6 +145,7 @@ typedef struct {
        const char *title;
        unsigned int tags;
        Bool isfloating;
+       int monitor;
 } Rule;
 
 /* function declarations */
@@ -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;
@@ -276,6 +277,7 @@ void
 applyrules(Client *c) {
        unsigned int i;
        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;
@@ -1682,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;
@@ -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;