replace conf_{gap,color,font} with conf_screen since really we are

configuring the screen *after* parsing, just as we do a conf_client on
client manage.

3 files changed, 11 insertions, 23 deletions

diff --git a/calmwm.h b/calmwm.h
index bc46871..712dc4b 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -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.h,v 1.196 2013/05/10 16:32:47 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.197 2013/05/11 21:46:27 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -439,14 +439,12 @@ void			 conf_bindname(struct conf *, char *, char *);
 void			 conf_clear(struct conf *);
 void			 conf_client(struct client_ctx *);
 void			 conf_cmd_add(struct conf *, char *, char *);
-void			 conf_color(struct conf *, struct screen_ctx *);
-void			 conf_font(struct conf *, struct screen_ctx *);
-void			 conf_gap(struct conf *, struct screen_ctx *);
 void			 conf_grab(struct conf *, struct keybinding *);
 void			 conf_grab_mouse(struct client_ctx *);
 void			 conf_init(struct conf *);
 void			 conf_ignore(struct conf *, char *);
 void			 conf_mousebind(struct conf *, char *, char *);
+void			 conf_screen(struct screen_ctx *);
 void			 conf_ungrab(struct conf *, struct keybinding *);
 
 void			 font_draw(struct screen_ctx *, const char *, int,
diff --git a/conf.c b/conf.c
index c2c3bbb..0113167 100644
--- a/conf.c
+++ b/conf.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: conf.c,v 1.125 2013/05/10 16:32:48 okan Exp $
+ * $OpenBSD: conf.c,v 1.126 2013/05/11 21:46:27 okan Exp $
  */
 
 #include <sys/param.h>
@@ -84,18 +84,6 @@ conf_ignore(struct conf *c, char *val)
 	TAILQ_INSERT_TAIL(&c->ignoreq, wm, entry);
 }
 
-void
-conf_gap(struct conf *c, struct screen_ctx *sc)
-{
-	sc->gap = c->gap;
-}
-
-void
-conf_font(struct conf *c, struct screen_ctx *sc)
-{
-	font_init(sc, c->font, (const char **)c->menucolor);
-}
-
 static char *menu_color_binds[CWM_COLOR_MENU_MAX] = {
 	"black",	/* CWM_COLOR_MENU_FG */
 	"white",	/* CWM_COLOR_MENU_BG */
@@ -111,12 +99,16 @@ static char *color_binds[CWM_COLOR_BORDER_MAX] = {
 };
 
 void
-conf_color(struct conf *c, struct screen_ctx *sc)
+conf_screen(struct screen_ctx *sc)
 {
 	int	 i;
 
+	sc->gap = Conf.gap;
+
+	font_init(sc, Conf.font, (const char **)Conf.menucolor);
+
 	for (i = 0; i < CWM_COLOR_BORDER_MAX; i++)
-		sc->color[i] = xu_getcolor(sc, c->color[i]);
+		sc->color[i] = xu_getcolor(sc, Conf.color[i]);
 }
 
 static struct {
diff --git a/screen.c b/screen.c
index ec371fe..51ab021 100644
--- a/screen.c
+++ b/screen.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: screen.c,v 1.48 2013/04/30 21:12:20 okan Exp $
+ * $OpenBSD: screen.c,v 1.49 2013/05/11 21:46:27 okan Exp $
  */
 
 #include <sys/param.h>
@@ -49,9 +49,7 @@ screen_init(int which)
 	xu_ewmh_net_supported(sc);
 	xu_ewmh_net_supported_wm_check(sc);
 
-	conf_gap(&Conf, sc);
-	conf_color(&Conf, sc);
-	conf_font(&Conf, sc);
+	conf_screen(sc);
 
 	screen_update_geometry(sc);