aboutsummaryrefslogtreecommitdiffstats
path: root/calmwm.c
diff options
context:
space:
mode:
authorokan2020-02-27 14:56:39 +0000
committerWynn Wolf Arbor2020-03-18 14:30:58 +0100
commitd8f3547b8f545b439d9df7b41cfe872ce6c8f42d (patch)
tree1be865226e709457b823835f42a3ed338801f74a /calmwm.c
parenta4006dcef17be430ad3cc2c2a63ea1de75a20d62 (diff)
downloadcwm-d8f3547b8f545b439d9df7b41cfe872ce6c8f42d.tar.gz
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.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/calmwm.c b/calmwm.c
index 447ee24..6634d1a 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: calmwm.c,v 1.111 2019/03/04 19:28:17 okan Exp $
+ * $OpenBSD: calmwm.c,v 1.112 2020/02/27 14:56:39 okan Exp $
*/
#include <sys/types.h>
@@ -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