diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2012-12-17 18:35:27 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2012-12-17 18:35:27 +0000 |
| commit | e59673393bad213eb7acb223a04e85179717630a (patch) | |
| tree | 9067a9222eacbaa1ad20c93825d8fb768679a294 /app/cwm | |
| parent | d2b08f3c9fddc97190e15eb6ba04acc245e55cab (diff) | |
cmap -> colormap in client_ctx
Diffstat (limited to 'app/cwm')
| -rw-r--r-- | app/cwm/calmwm.h | 4 | ||||
| -rw-r--r-- | app/cwm/client.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index e029dfd79..05e56a307 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/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.170 2012/12/17 18:34:06 okan Exp $ + * $OpenBSD: calmwm.h,v 1.171 2012/12/17 18:35:26 okan Exp $ */ #ifndef _CALMWM_H_ @@ -132,7 +132,7 @@ struct client_ctx { struct screen_ctx *sc; Window win; XSizeHints *size; - Colormap cmap; + Colormap colormap; u_int bwidth; /* border width */ struct geom geom, savegeom; struct { diff --git a/app/cwm/client.c b/app/cwm/client.c index 5ff06fa66..1dd246d28 100644 --- a/app/cwm/client.c +++ b/app/cwm/client.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: client.c,v 1.106 2012/12/17 17:48:57 okan Exp $ + * $OpenBSD: client.c,v 1.107 2012/12/17 18:35:26 okan Exp $ */ #include <sys/param.h> @@ -92,7 +92,7 @@ client_new(Window win, struct screen_ctx *sc, int mapped) cc->geom.y = wattr.y; cc->geom.w = wattr.width; cc->geom.h = wattr.height; - cc->cmap = wattr.colormap; + cc->colormap = wattr.colormap; if (wattr.map_state != IsViewable) { client_placecalc(cc); @@ -202,7 +202,7 @@ client_setactive(struct client_ctx *cc, int fg) sc = cc->sc; if (fg) { - XInstallColormap(X_Dpy, cc->cmap); + XInstallColormap(X_Dpy, cc->colormap); XSetInputFocus(X_Dpy, cc->win, RevertToPointerRoot, CurrentTime); conf_grab_mouse(cc); |