X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=70aee79463e69f5fa3e9ce508b4c40f896ade0dd;hb=6392bc78077595ba35d63693a54ab66bb00e9077;hp=2b1ba3b560467f1c4253af6468c7d11fc87e0983;hpb=ef26984e3981a0ca7f50bf18da5ec8be9105ef29;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 2b1ba3b..70aee79 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
  * Copyright (c) 2009 Darrin Chandler <dwchandler@stilyagin.com>
+ * Copyright (c) 2009 Pierre-Yves Ritschard <pyr@spootnik.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -135,7 +136,7 @@ u_int32_t		swm_debug = 0
 #define SWM_PROPLEN		(16)
 #define SWM_FUNCNAME_LEN	(32)
 #define SWM_KEYS_LEN		(255)
-#define SWM_QUIRK_LEN		(32)
+#define SWM_QUIRK_LEN		(64)
 #define X(r)			(r)->g.x
 #define Y(r)			(r)->g.y
 #define WIDTH(r)		(r)->g.w
@@ -799,12 +800,12 @@ bar_update(void)
 		status = XGetClassHint(display, cur_focus->id, xch);
 		if (status == BadWindow || status == BadAlloc)
 			goto out;
-		if (title_name_enabled)
-			strlcat(s, xch->res_name, sizeof s);
-		if (title_name_enabled && title_class_enabled)
-			strlcat(s, " ", sizeof s);
 		if (title_class_enabled)
 			strlcat(s, xch->res_class, sizeof s);
+		if (title_name_enabled && title_class_enabled)
+			strlcat(s, ":", sizeof s);
+		if (title_name_enabled)
+			strlcat(s, xch->res_name, sizeof s);
 	}
 out:
 	if (xch)
@@ -812,7 +813,7 @@ out:
 	for (i = 0; i < ScreenCount(display); i++) {
 		x = 1;
 		TAILQ_FOREACH(r, &screens[i].rl, entry) {
-			snprintf(loc, sizeof loc, "%d:%d    %s%s    %s",
+			snprintf(loc, sizeof loc, "%d:%d    %s %s    %s",
 			    x++, r->ws->idx + 1, s, bar_ext, bar_vertext);
 			bar_print(r, loc);
 		}