X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=draw.c;h=6466f41734d81f4c2b4ab9cdd99011c2bde5f113;hb=a3e3f0b9edd395f4ba34eeba60d58560c4528d47;hp=5d19bfb26486f1c9688449f88103393fd9c2ff07;hpb=4250c26e9b406dd5963a6e9a9b4b33e64ff9c861;p=dwm.git

diff --git a/draw.c b/draw.c
index 5d19bfb..6466f41 100644
--- a/draw.c
+++ b/draw.c
@@ -9,26 +9,6 @@
 
 /* static */
 
-static void
-drawborder(void)
-{
-	XPoint points[5];
-
-	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-	XSetForeground(dpy, dc.gc, dc.border);
-	points[0].x = dc.x;
-	points[0].y = dc.y;
-	points[1].x = dc.w - 1;
-	points[1].y = 0;
-	points[2].x = 0;
-	points[2].y = dc.h - 1;
-	points[3].x = -(dc.w - 1);
-	points[3].y = 0;
-	points[4].x = 0;
-	points[4].y = -(dc.h - 1);
-	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-}
-
 static unsigned int
 textnw(const char *text, unsigned int len)
 {
@@ -48,11 +28,24 @@ drawtext(const char *text, Bool invert)
 	static char buf[256];
 	unsigned int len;
 	XGCValues gcv;
+	XPoint points[5];
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-	drawborder();
+	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+	XSetForeground(dpy, dc.gc, dc.border);
+	points[0].x = dc.x;
+	points[0].y = dc.y;
+	points[1].x = dc.w - 1;
+	points[1].y = 0;
+	points[2].x = 0;
+	points[2].y = dc.h - 1;
+	points[3].x = -(dc.w - 1);
+	points[3].y = 0;
+	points[4].x = 0;
+	points[4].y = -(dc.h - 1);
+	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 
 	if(!text)
 		return;
@@ -138,7 +131,7 @@ drawtitle(Client *c)
 	int i;
 	Bool istile = arrange == dotile;
 
-	if(c == sel) {
+	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->title);
 		XSetWindowBorder(dpy, c->win, dc.fg);