feat(config.h): global custom WMNAME usage

1 files changed, 11 insertions, 11 deletions

diff --git a/dwm.c b/dwm.c
index a037ebc..f618932 100644
--- a/dwm.c
+++ b/dwm.c
@@ -2091,7 +2091,7 @@ setup(void)
 	XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
 		PropModeReplace, (unsigned char *) &wmcheckwin, 1);
 	XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
-		PropModeReplace, (unsigned char *) wmname, 3);
+		PropModeReplace, (unsigned char *) WMNAME, 3);
 	XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
 		PropModeReplace, (unsigned char *) &wmcheckwin, 1);
 	/* EWMH support per view */
@@ -2194,7 +2194,7 @@ spawn(const Arg *arg)
 			close(ConnectionNumber(dpy));
 		setsid();
 		execvp(((char **)arg->v)[0], (char **)arg->v);
-		die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]);
+		die(WMNAME ": execvp '%s' failed:", ((char **)arg->v)[0]);
 	}
 }
 
@@ -2419,7 +2419,7 @@ updatebars(void)
 		.background_pixmap = ParentRelative,
 		.event_mask = ButtonPressMask|ExposureMask
 	};
-	XClassHint ch = {(char *)wmname, (char *)wmname};
+	XClassHint ch = {WMNAME, WMNAME};
 	for (m = mons; m; m = m->next) {
 		if (m->barwin)
 			continue;
@@ -2605,7 +2605,7 @@ void
 updatestatus(void)
 {
 	if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
-		strcpy(stext, "dwm-"VERSION);
+		strcpy(stext, WMNAME "-"VERSION);
 	else
 		copyvalidchars(stext, rawstext);
 	drawbar(selmon);
@@ -2698,7 +2698,7 @@ updatesystray(void)
 			XSync(dpy, False);
 		}
 		else {
-			fprintf(stderr, "dwm: unable to obtain system tray.\n");
+			fprintf(stderr, WMNAME ": unable to obtain system tray.\n");
 			free(systray);
 			systray = NULL;
 			return;
@@ -2942,7 +2942,7 @@ xerror(Display *dpy, XErrorEvent *ee)
 	|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
 	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
 		return 0;
-	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
+	fprintf(stderr, WMNAME ": fatal error: request code=%d, error code=%d\n",
 		ee->request_code, ee->error_code);
 	return xerrorxlib(dpy, ee); /* may call exit */
 }
@@ -2958,7 +2958,7 @@ xerrordummy(Display *dpy, XErrorEvent *ee)
 int
 xerrorstart(Display *dpy, XErrorEvent *ee)
 {
-	die("dwm: another window manager is already running");
+	die(WMNAME ": another window manager is already running");
 	return -1;
 }
 
@@ -3017,7 +3017,7 @@ resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
 	char *type;
 	XrmValue ret;
 
-	snprintf(fullname, sizeof(fullname), "%s.%s", wmname, name);
+	snprintf(fullname, sizeof(fullname), "%s.%s", WMNAME, name);
 	fullname[sizeof(fullname) - 1] = '\0';
 
 	XrmGetResource(db, fullname, "*", &type, &ret);
@@ -3060,15 +3060,15 @@ int
 main(int argc, char *argv[])
 {
 	if (argc == 2 && !strcmp("-v", argv[1]))
-		die("dwm-"VERSION);
+		die(WMNAME "-"VERSION);
 	else if (argc != 1)
 		die("usage: dwm [-v]");
 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		fputs("warning: no locale support\n", stderr);
 	if (!(dpy = XOpenDisplay(NULL)))
-		die("dwm: cannot open display");
+		die(WMNAME ": cannot open display");
 	if (!(xcon = XGetXCBConnection(dpy)))
-		die("dwm: cannot get xcb connection\n");
+		die(WMNAME ": cannot get xcb connection\n");
 	checkotherwm();
 	XrmInitialize();
 	load_xresources();