diff options
| author | okan <okan> | 2009-01-16 15:24:14 +0000 |
|---|---|---|
| committer | okan <okan> | 2009-01-16 15:24:14 +0000 |
| commit | ec8e6052ba902d2b6afced31008aad015d38f062 (patch) | |
| tree | 68c77d7e466ced3867647a355e86bb4dc28a0a67 /calmwm.c | |
| parent | 5c757cc7f420f58112d3e2af7a6f124994bcbe23 (diff) | |
| download | cwm-ec8e6052ba902d2b6afced31008aad015d38f062.tar.gz cwm-ec8e6052ba902d2b6afced31008aad015d38f062.tar.xz cwm-ec8e6052ba902d2b6afced31008aad015d38f062.zip | |
remove pwin, bringing us to one client, one window. we no longer have
to push attributes around, so things get a lot simplier, while fixing a few issues in the meantime; original suggestion by Edd Barrett many many moons ago. annoying window placement and race, found in c2k8 by todd, fix by oga! lots of feedback from todd and oga - thanks! "commit that bad boy" oga@
Diffstat (limited to 'calmwm.c')
| -rw-r--r-- | calmwm.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/calmwm.c b/calmwm.c index 7ba6e04..c332e55 100644 --- a/calmwm.c +++ b/calmwm.c @@ -35,16 +35,10 @@ u_int Nscreens; struct client_ctx_q Clientq; -int Doshape, Shape_ev; int HasXinerama, HasRandr, Randr_ev; int Starting; struct conf Conf; -/* From TWM */ -#define gray_width 2 -#define gray_height 2 -static char gray_bits[] = {0x02, 0x01}; - static void _sigchld_cb(int); static void dpy_init(const char *); @@ -116,8 +110,6 @@ dpy_init(const char *dpyname) XSetErrorHandler(x_errorhandler); - Doshape = XShapeQueryExtension(X_Dpy, &Shape_ev, &i); - HasRandr = XRRQueryExtension(X_Dpy, &Randr_ev, &i); TAILQ_INIT(&Screenq); @@ -181,7 +173,7 @@ x_setupscreen(struct screen_ctx *sc, u_int which) XAllocNamedColor(X_Dpy, DefaultColormap(X_Dpy, which), "red", &sc->redcolor, &tmp); XAllocNamedColor(X_Dpy, DefaultColormap(X_Dpy, which), - "#00ccc8", &sc->cyancolor, &tmp); + "#666666", &sc->graycolor, &tmp); XAllocNamedColor(X_Dpy, DefaultColormap(X_Dpy, which), "white", &sc->whitecolor, &tmp); XAllocNamedColor(X_Dpy, DefaultColormap(X_Dpy, which), @@ -191,19 +183,7 @@ x_setupscreen(struct screen_ctx *sc, u_int which) sc->whitepixl = WhitePixel(X_Dpy, sc->which); sc->bluepixl = sc->fccolor.pixel; sc->redpixl = sc->redcolor.pixel; - sc->cyanpixl = sc->cyancolor.pixel; - - sc->gray = XCreatePixmapFromBitmapData(X_Dpy, sc->rootwin, - gray_bits, gray_width, gray_height, - sc->blackpixl, sc->whitepixl, DefaultDepth(X_Dpy, sc->which)); - - sc->blue = XCreatePixmapFromBitmapData(X_Dpy, sc->rootwin, - gray_bits, gray_width, gray_height, - sc->bluepixl, sc->whitepixl, DefaultDepth(X_Dpy, sc->which)); - - sc->red = XCreatePixmapFromBitmapData(X_Dpy, sc->rootwin, - gray_bits, gray_width, gray_height, - sc->redpixl, sc->whitepixl, DefaultDepth(X_Dpy, sc->which)); + sc->graypixl = sc->graycolor.pixel; gv.foreground = sc->blackpixl^sc->whitepixl; gv.background = sc->whitepixl; |