diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2009-12-08 16:52:18 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2009-12-08 16:52:18 +0000 |
| commit | ba4890abf2f766ac715135a2a4b42895a90a5a9b (patch) | |
| tree | 03f0c85988a6375f3c0c348d786661e4ec42751f /app/cwm/calmwm.c | |
| parent | 833470ed20347a2d534ed1a02c578ffa97d78553 (diff) | |
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@
Diffstat (limited to 'app/cwm/calmwm.c')
| -rw-r--r-- | app/cwm/calmwm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/cwm/calmwm.c b/app/cwm/calmwm.c index 419b960cb..9f4150833 100644 --- a/app/cwm/calmwm.c +++ b/app/cwm/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); |