X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=8cc95715ad7b13689de518aa966492e4e7f9a32c;hp=b4c34118c259dc9cb391b22a9dbe2f6e99ccfa1d;hb=271b0614b4ecf0670ca9f9f89edb983055920ece;hpb=3e5cca9ec9b04e5d0fbf9eb059c37fa3e689b46d

diff --git a/dwm.c b/dwm.c
index b4c3411..8cc9571 100644
--- a/dwm.c
+++ b/dwm.c
@@ -55,7 +55,8 @@
 #define WIDTH(X)                ((X)->w + 2 * (X)->bw)
 #define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
 #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
-#define TEXTW(X)                (drw_font_getexts_width(drw->font, X, strlen(X)) + drw->font->h)
+#define TEXTW_NOPAD(X)          drw_font_getexts_width(drw->font, X, strlen(X))
+#define TEXTW(X)                (TEXTW_NOPAD(X) + drw->font->h)
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@@ -804,11 +805,9 @@ drawbar(Monitor *m) {
 	}
 	x = 0;
 	for(i = 0; i < LENGTH(tags); i++) {
-		w = TEXTW(tags[i]);
+		w = TEXTW_NOPAD(tags[i]);
 		drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
-		drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
-		drw_rect(drw, x, 0, w, bh, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-		           occ & 1 << i, urg & 1 << i);
+		drw_text_nopad(drw, x, 0, w, bh, tags[i], urg & 1 << i);
 		x += w;
 	}
 	xx = x;
@@ -1746,7 +1745,7 @@ kbspawn(const Arg *arg) {
 void
 spawn(const Arg *arg) {
 	int tag = 0, i;
-	if(arg->v == termcmd || arg->v == runcmd) {
+	if(arg->v == termcmd || arg->v == belltermcmd || arg->v == runcmd) {
 		for(i = 0; i < 32; ++i) {
 			if(selmon->tagset[selmon->seltags] & (1 << i)) {
 				tag = i;