commit 565050ac51687bbd4f388c6aeb2298db94430efb from: Anselm R Garbe date: Thu Jul 9 10:29:01 2009 UTC removed monsyms, useless commit - 5e408d8ff65c8609898ad792cdeeac443f28be7a commit + 565050ac51687bbd4f388c6aeb2298db94430efb blob - 4dfc11b0058b7420497ebcf59deee6cf205f3073 blob + f0e44a755d91a197d07bba3ab813eed5883d7954 --- config.def.h +++ config.def.h @@ -13,9 +13,6 @@ static const unsigned int snap = 32; /* sna static const Bool showbar = True; /* False means no bar */ static const Bool topbar = True; /* False means bottom bar */ -/* monitor(s) symbols */ -static const char *monsyms[] = { "<1>", "<2>", "<3>", "<4>" }; - /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; blob - fa5fdea3a8787f0289a0c7ae67c5b5500f7cf36e blob + 07d0d36f4c744a032029a4dde17f368bfefb1bf9 --- dwm.c +++ dwm.c @@ -123,7 +123,7 @@ typedef struct { struct Monitor { int screen_number; float mfact; - int by, btx; /* bar geometry */ + int by; /* bar geometry */ int mx, my, mw, mh; /* screen size */ int wx, wy, ww, wh; /* window area */ unsigned int seltags; @@ -409,9 +409,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)); @@ -652,12 +651,6 @@ drawbar(Monitor *m) { 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; @@ -1690,8 +1683,6 @@ updategeom(void) { if(XineramaIsActive(dpy)) info = XineramaQueryScreens(dpy, &n); #endif /* XINERAMA */ - if(n > LENGTH(monsyms)) - n = LENGTH(monsyms); /* allocate monitor(s) for the new geometry setup */ for(i = 0; i < n; i++) { if(!(m = (Monitor *)malloc(sizeof(Monitor))))