diff options
| -rw-r--r-- | config.def.h | 3 | ||||
| -rw-r--r-- | dwm.c | 15 | 
2 files changed, 3 insertions, 15 deletions
| diff --git a/config.def.h b/config.def.h index 4dfc11b..f0e44a7 100644 --- a/config.def.h +++ b/config.def.h @@ -13,9 +13,6 @@ static const unsigned int snap      = 32;       /* snap pixel */  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" }; @@ -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)))) | 
