X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=0c339a2c0872d56a2988c840b598e04e0ce28a70;hb=1bc1f62c7a0ed3edf41faf0cec49cfad2db794b0;hp=37cdf4810e5edef8489cb5037410a4dd79af86fc;hpb=c9ca43ac665ec0473a0671e15f55837befa21078;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 37cdf48..0c339a2 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -178,6 +178,7 @@ Atom			aprot;
 Atom			adelete;
 Atom			takefocus;
 Atom			a_wmname;
+Atom			a_netwmname;
 Atom			a_utf8_string;
 Atom			a_string;
 Atom			a_swm_iconic;
@@ -3281,7 +3282,7 @@ uniconify(struct swm_region *r, union arg *args)
 		if (win->iconic == 0)
 			continue;
 
-		name = get_win_name(display, win->id, a_wmname, a_string,
+		name = get_win_name(display, win->id, a_netwmname, a_utf8_string,
 		    &len);
 		if (name == NULL)
 			continue;
@@ -3437,7 +3438,7 @@ search_resp_uniconify(char *resp, unsigned long len)
 	TAILQ_FOREACH(win, &search_r->ws->winlist, entry) {
 		if (win->iconic == 0)
 			continue;
-		name = get_win_name(display, win->id, a_wmname, a_string, &len);
+		name = get_win_name(display, win->id, a_netwmname, a_utf8_string, &len);
 		if (name == NULL)
 			continue;
 		if (asprintf(&s, "%s.%lu", name, win->id) == -1) {
@@ -5399,7 +5400,7 @@ conf_load(char *filename, int keymapping)
 		if (wordlen == 0) {
 			warnx("%s: line %zd: no option found",
 			    filename, lineno);
-			return (1);
+			goto out;
 		}
 		optind = -1;
 		for (i = 0; i < LENGTH(configopt); i++) {
@@ -5413,12 +5414,12 @@ conf_load(char *filename, int keymapping)
 		if (optind == -1) {
 			warnx("%s: line %zd: unknown option %.*s",
 			    filename, lineno, wordlen, cp);
-			return (1);
+			goto out;
 		}
 		if (keymapping && strcmp(opt->optname, "bind")) {
 			warnx("%s: line %zd: invalid option %.*s",
 			    filename, lineno, wordlen, cp);
-			return (1);
+			goto out;
 		}
 		cp += wordlen;
 		cp += strspn(cp, " \t\n"); /* eat whitespace */
@@ -5431,7 +5432,7 @@ conf_load(char *filename, int keymapping)
 				if (wordlen == 0) {
 					warnx("%s: line %zd: syntax error",
 					    filename, lineno);
-					return (1);
+					goto out;
 				}
 				asprintf(&optsub, "%.*s", wordlen, cp);
 			}
@@ -5458,6 +5459,12 @@ conf_load(char *filename, int keymapping)
 	DNPRINTF(SWM_D_CONF, "conf_load end\n");
 
 	return (0);
+
+out:
+	free(line);
+	fclose(config);
+
+	return (1);
 }
 
 void
@@ -6743,6 +6750,7 @@ main(int argc, char *argv[])
 	adelete = XInternAtom(display, "WM_DELETE_WINDOW", False);
 	takefocus = XInternAtom(display, "WM_TAKE_FOCUS", False);
 	a_wmname = XInternAtom(display, "WM_NAME", False);
+	a_netwmname = XInternAtom(display, "_NET_WM_NAME", False);
 	a_utf8_string = XInternAtom(display, "UTF8_STRING", False);
 	a_string = XInternAtom(display, "STRING", False);
 	a_swm_iconic = XInternAtom(display, "_SWM_ICONIC", False);