X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/3e60c5d836c1f9f3b4415782de48476663943274..51224dcb79aef90ff53c0d6edbd7233ca9ccdb26:/dmenu.c?ds=sidebyside

diff --git a/dmenu.c b/dmenu.c
index 18f2a56..44b4254 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -79,7 +79,7 @@ static unsigned int mw, mh;
 static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
-static DC dc = {0};
+static DC dc;
 static Item *allitems = NULL;	/* first of all items */
 static Item *item = NULL;	/* first of pattern matching items */
 static Item *sel = NULL;
@@ -300,9 +300,6 @@ initfont(const char *fontstr) {
 		}
 	}
 	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
 		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
@@ -399,10 +396,7 @@ kpress(XKeyEvent * e) {
 	default:
 		if(num && !iscntrl((int) buf[0])) {
 			buf[num] = 0;
-			if(len > 0)
-				strncat(text, buf, sizeof text);
-			else
-				strncpy(text, buf, sizeof text);
+			strncpy(text + len, buf, sizeof text - len);
 			match(text);
 		}
 		break;