From ea96e92ac8ab68439f7cafa294e3905818324960 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Wed, 15 Apr 2009 14:01:45 +0000
Subject: [PATCH] properly teardown X connection upon quit; static a few while
 here, requested by oga@

ok oga@ sometime ago
---
 calmwm.c | 16 ++++++++++++++++
 calmwm.h |  2 --
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/calmwm.c b/calmwm.c
index 843db62..36aa533 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -40,6 +40,9 @@ struct conf			 Conf;
 
 static void	_sigchld_cb(int);
 static void	dpy_init(const char *);
+static void	x_setup(void);
+static void	x_setupscreen(struct screen_ctx *, u_int);
+static void	x_teardown(void);
 
 int
 main(int argc, char **argv)
@@ -97,6 +100,8 @@ main(int argc, char **argv)
 
 	xev_loop();
 
+	x_teardown();
+
 	return (0);
 }
 
@@ -143,6 +148,17 @@ x_setup(void)
 	Cursor_question = XCreateFontCursor(X_Dpy, XC_question_arrow);
 }
 
+void
+x_teardown(void)
+{
+	struct screen_ctx	*sc;
+
+	TAILQ_FOREACH(sc, &Screenq, entry)
+		XFreeGC(X_Dpy, sc->gc);
+
+	XCloseDisplay(X_Dpy);
+}
+
 void
 x_setupscreen(struct screen_ctx *sc, u_int which)
 {
diff --git a/calmwm.h b/calmwm.h
index e84318f..88da71a 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -310,8 +310,6 @@ int			 input_keycodetrans(KeyCode, u_int, enum ctltype *,
 			     char *);
 
 int			 x_errorhandler(Display *, XErrorEvent *);
-void			 x_setup(void);
-void			 x_setupscreen(struct screen_ctx *, u_int);
 __dead void		 usage(void);
 
 struct client_ctx	*client_find(Window);