diff options
author | okan <okan> | 2009-12-08 16:52:17 +0000 |
---|---|---|
committer | okan <okan> | 2009-12-08 16:52:17 +0000 |
commit | ee7df6a95f80bebc9ec2d8571c1ff8ff2f53cfd0 (patch) | |
tree | 72d45dd2b4f7a08e9fa71bd138354cd9741f33b5 /conf.c | |
parent | aa88d5848e0b3ee3ea7c64c7582eddd963dcecb2 (diff) | |
download | cwm-ee7df6a95f80bebc9ec2d8571c1ff8ff2f53cfd0.tar.gz cwm-ee7df6a95f80bebc9ec2d8571c1ff8ff2f53cfd0.tar.xz cwm-ee7df6a95f80bebc9ec2d8571c1ff8ff2f53cfd0.zip |
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 'conf.c')
-rw-r--r-- | conf.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/conf.c b/conf.c index b7bf52b..7e34ced 100644 --- a/conf.c +++ b/conf.c @@ -51,23 +51,16 @@ conf_cmd_add(struct conf *c, char *image, char *label, int flags) } void -conf_font(struct conf *c) +conf_font(struct conf *c, struct screen_ctx *sc) { - struct screen_ctx *sc; - - sc = screen_current(); - - c->DefaultFont = font_make(sc, c->DefaultFontName); - c->FontHeight = font_ascent() + font_descent() + 1; + sc->font = font_make(sc, c->DefaultFontName); + sc->fontheight = font_ascent(sc) + font_descent(sc) + 1; } void -conf_color(struct conf *c) +conf_color(struct conf *c, struct screen_ctx *sc) { - struct screen_ctx *sc; - int i; - - sc = screen_current(); + int i; for (i = 0; i < CWM_COLOR_MAX; i++) { xu_freecolor(sc, sc->color[i].pixel); @@ -78,6 +71,7 @@ conf_color(struct conf *c) void conf_reload(struct conf *c) { + struct screen_ctx *sc; struct client_ctx *cc; if (parse_config(c->conf_path, c) == -1) { @@ -85,10 +79,12 @@ conf_reload(struct conf *c) return; } - conf_color(c); TAILQ_FOREACH(cc, &Clientq, entry) client_draw_border(cc); - conf_font(c); + TAILQ_FOREACH(sc, &Screenq, entry) { + conf_color(c, sc); + conf_font(c, sc); + } } static struct { |