summary refs log tree commit diff
path: root/calmwm.c
diff options
context:
space:
mode:
authorokan <okan>2020-02-27 14:56:39 +0000
committerokan <okan>2020-02-27 14:56:39 +0000
commit96275a835d34b0e17da0c4d3bad294620f82d4d5 (patch)
tree700a125e15c14c00d85f3f14719c090184df7fa5 /calmwm.c
parent7a88b2bdb2789e549ed4caab37c814198e347696 (diff)
downloadcwm-96275a835d34b0e17da0c4d3bad294620f82d4d5.tar.gz
cwm-96275a835d34b0e17da0c4d3bad294620f82d4d5.tar.xz
cwm-96275a835d34b0e17da0c4d3bad294620f82d4d5.zip
Unrelated style fixes, consistency changes and sorting, appropriate
dosage/removal of wrappers, simplification of name queue, client cycle joins
other kb/mb bound functions.
Diffstat (limited to 'calmwm.c')
-rw-r--r--calmwm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/calmwm.c b/calmwm.c
index b1c23ed..3900dbc 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -44,6 +44,7 @@ struct screen_q		 Screenq = TAILQ_HEAD_INITIALIZER(Screenq);
 struct conf		 Conf;
 volatile sig_atomic_t	 cwm_status;
 
+__dead void	usage(void);
 static void	sighdlr(int);
 static int	x_errorhandler(Display *, XErrorEvent *);
 static int	x_init(const char *);
@@ -124,7 +125,7 @@ main(int argc, char **argv)
 		u_exec(fallback);
 	}
 
-	return(0);
+	return 0;
 }
 
 static int
@@ -142,7 +143,7 @@ x_init(const char *dpyname)
 
 	Conf.xrandr = XRRQueryExtension(X_Dpy, &Conf.xrandr_event_base, &i);
 
-	conf_atoms();
+	xu_atom_init();
 	conf_cursor(&Conf);
 
 	for (i = 0; i < ScreenCount(X_Dpy); i++)
@@ -180,7 +181,7 @@ static int
 x_wmerrorhandler(Display *dpy, XErrorEvent *e)
 {
 	errx(1, "root window unavailable - perhaps another wm is running?");
-	return(0);
+	return 0;
 }
 
 static int
@@ -196,7 +197,7 @@ x_errorhandler(Display *dpy, XErrorEvent *e)
 
 	warnx("%s(0x%x): %s", req, (unsigned int)e->resourceid, msg);
 #endif
-	return(0);
+	return 0;
 }
 
 static void