start fixing screen_ctx usage, for it is utterly broken. bring font

into screen_ctx and start passing screen_ctx around to in order get rid
of Curscreen; fixup per-screen config colors the same way.

diff mostly from oga@, with a bit harsher reaction to the state of screen_ctx.

"please commit" oga@

1 files changed, 3 insertions, 3 deletions

diff --git a/calmwm.c b/calmwm.c
index 419b960..9f41508 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.
  *
- * $Id: calmwm.c,v 1.45 2009/12/07 23:19:51 oga Exp $
+ * $Id: calmwm.c,v 1.46 2009/12/08 16:52:17 okan Exp $
  */
 
 #include "headers.h"
@@ -156,10 +156,10 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
 	sc->xmax = DisplayWidth(X_Dpy, sc->which);
 	sc->ymax = DisplayHeight(X_Dpy, sc->which);
 
-	conf_color(&Conf);
+	conf_color(&Conf, sc);
 
 	font_init(sc);
-	conf_font(&Conf);
+	conf_font(&Conf, sc);
 
 	TAILQ_INIT(&sc->mruq);