From 0f89dda7154b6cffb15f7fbf2b2e08ade2f70aac Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 21 Aug 2015 16:52:37 +0000 Subject: Fix whitespace. --- calmwm.h | 14 +++++++------- client.c | 6 +++--- conf.c | 54 +++++++++++++++++++++++++++--------------------------- cwm.1 | 8 ++++---- screen.c | 10 +++++----- 5 files changed, 46 insertions(+), 46 deletions(-) diff --git a/calmwm.h b/calmwm.h index 6b1ba88..7550b0f 100644 --- a/calmwm.h +++ b/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.298 2015/08/21 16:30:02 okan Exp $ + * $OpenBSD: calmwm.h,v 1.299 2015/08/21 16:52:37 okan Exp $ */ #ifndef _CALMWM_H_ @@ -43,12 +43,12 @@ #define CONFFILE ".cwmrc" #define WMNAME "CWM" -#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) -#define MOUSEMASK (BUTTONMASK|PointerMotionMask) -#define MENUMASK (MOUSEMASK|ButtonMotionMask|ExposureMask) -#define MENUGRABMASK (MOUSEMASK|ButtonMotionMask|StructureNotifyMask) -#define KEYMASK (KeyPressMask|ExposureMask) -#define IGNOREMODMASK (LockMask|Mod2Mask) +#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) +#define MOUSEMASK (BUTTONMASK | PointerMotionMask) +#define MENUMASK (MOUSEMASK | ButtonMotionMask | ExposureMask) +#define MENUGRABMASK (MOUSEMASK | ButtonMotionMask | StructureNotifyMask) +#define KEYMASK (KeyPressMask | ExposureMask) +#define IGNOREMODMASK (LockMask | Mod2Mask) /* kb movement */ #define CWM_MOVE 0x0001 diff --git a/client.c b/client.c index dc63899..fd6d75c 100644 --- a/client.c +++ b/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.201 2015/08/21 16:30:02 okan Exp $ + * $OpenBSD: client.c,v 1.202 2015/08/21 16:52:37 okan Exp $ */ #include @@ -669,7 +669,7 @@ client_cycle(struct screen_ctx *sc, int flags) client_next(newcc); /* Only cycle visible and non-ignored windows. */ - if ((newcc->flags & (CLIENT_HIDDEN|CLIENT_IGNORE)) + if ((newcc->flags & (CLIENT_HIDDEN | CLIENT_IGNORE)) || ((flags & CWM_INGROUP) && (newcc->group != oldcc->group))) again = 1; @@ -729,7 +729,7 @@ client_placecalc(struct client_ctx *cc) struct screen_ctx *sc = cc->sc; int xslack, yslack; - if (cc->hint.flags & (USPosition|PPosition)) { + if (cc->hint.flags & (USPosition | PPosition)) { /* * Ignore XINERAMA screens, just make sure it's somewhere * in the virtual desktop. else it stops people putting xterms diff --git a/conf.c b/conf.c index f10120a..e683d2c 100644 --- a/conf.c +++ b/conf.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: conf.c,v 1.194 2015/08/21 16:30:02 okan Exp $ + * $OpenBSD: conf.c,v 1.195 2015/08/21 16:52:37 okan Exp $ */ #include @@ -390,9 +390,9 @@ static const struct { { "cyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_CYCLE} }, { "rcyclegroup", kbfunc_client_cyclegroup, 0, {.i = CWM_RCYCLE} }, { "cycleingroup", kbfunc_client_cycle, CWM_WIN, - {.i = CWM_CYCLE|CWM_INGROUP} }, + {.i = (CWM_CYCLE | CWM_INGROUP)} }, { "rcycleingroup", kbfunc_client_cycle, CWM_WIN, - {.i = CWM_RCYCLE|CWM_INGROUP} }, + {.i = (CWM_RCYCLE | CWM_INGROUP)} }, { "grouptoggle", kbfunc_client_grouptoggle, CWM_WIN, {.i = 0}}, { "sticky", kbfunc_client_toggle_sticky, CWM_WIN, {0} }, { "fullscreen", kbfunc_client_toggle_fullscreen, CWM_WIN, {0} }, @@ -408,53 +408,53 @@ static const struct { { "terminal", kbfunc_term, 0, {0} }, { "lock", kbfunc_lock, 0, {0} }, { "moveup", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_UP|CWM_MOVE)} }, + {.i = (CWM_UP | CWM_MOVE)} }, { "movedown", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_DOWN|CWM_MOVE)} }, + {.i = (CWM_DOWN | CWM_MOVE)} }, { "moveright", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_RIGHT|CWM_MOVE)} }, + {.i = (CWM_RIGHT | CWM_MOVE)} }, { "moveleft", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_LEFT|CWM_MOVE)} }, + {.i = (CWM_LEFT | CWM_MOVE)} }, { "bigmoveup", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_UP|CWM_MOVE|CWM_BIGMOVE)} }, + {.i = (CWM_UP | CWM_MOVE | CWM_BIGMOVE)} }, { "bigmovedown", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_DOWN|CWM_MOVE|CWM_BIGMOVE)} }, + {.i = (CWM_DOWN | CWM_MOVE | CWM_BIGMOVE)} }, { "bigmoveright", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_RIGHT|CWM_MOVE|CWM_BIGMOVE)} }, + {.i = (CWM_RIGHT | CWM_MOVE | CWM_BIGMOVE)} }, { "bigmoveleft", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_LEFT|CWM_MOVE|CWM_BIGMOVE)} }, + {.i = (CWM_LEFT | CWM_MOVE | CWM_BIGMOVE)} }, { "resizeup", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_UP|CWM_RESIZE)} }, + {.i = (CWM_UP | CWM_RESIZE)} }, { "resizedown", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_DOWN|CWM_RESIZE)} }, + {.i = (CWM_DOWN | CWM_RESIZE)} }, { "resizeright", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_RIGHT|CWM_RESIZE)} }, + {.i = (CWM_RIGHT | CWM_RESIZE)} }, { "resizeleft", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_LEFT|CWM_RESIZE)} }, + {.i = (CWM_LEFT | CWM_RESIZE)} }, { "bigresizeup", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_UP|CWM_RESIZE|CWM_BIGMOVE)} }, + {.i = (CWM_UP | CWM_RESIZE | CWM_BIGMOVE)} }, { "bigresizedown", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_DOWN|CWM_RESIZE|CWM_BIGMOVE)} }, + {.i = (CWM_DOWN | CWM_RESIZE | CWM_BIGMOVE)} }, { "bigresizeright", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_RIGHT|CWM_RESIZE|CWM_BIGMOVE)} }, + {.i = (CWM_RIGHT | CWM_RESIZE | CWM_BIGMOVE)} }, { "bigresizeleft", kbfunc_client_moveresize, CWM_WIN, - {.i = (CWM_LEFT|CWM_RESIZE|CWM_BIGMOVE)} }, + {.i = (CWM_LEFT | CWM_RESIZE | CWM_BIGMOVE)} }, { "ptrmoveup", kbfunc_client_moveresize, 0, - {.i = (CWM_UP|CWM_PTRMOVE)} }, + {.i = (CWM_UP | CWM_PTRMOVE)} }, { "ptrmovedown", kbfunc_client_moveresize, 0, - {.i = (CWM_DOWN|CWM_PTRMOVE)} }, + {.i = (CWM_DOWN | CWM_PTRMOVE)} }, { "ptrmoveleft", kbfunc_client_moveresize, 0, - {.i = (CWM_LEFT|CWM_PTRMOVE)} }, + {.i = (CWM_LEFT | CWM_PTRMOVE)} }, { "ptrmoveright", kbfunc_client_moveresize, 0, - {.i = (CWM_RIGHT|CWM_PTRMOVE)} }, + {.i = (CWM_RIGHT | CWM_PTRMOVE)} }, { "bigptrmoveup", kbfunc_client_moveresize, 0, - {.i = (CWM_UP|CWM_PTRMOVE|CWM_BIGMOVE)} }, + {.i = (CWM_UP | CWM_PTRMOVE | CWM_BIGMOVE)} }, { "bigptrmovedown", kbfunc_client_moveresize, 0, - {.i = (CWM_DOWN|CWM_PTRMOVE|CWM_BIGMOVE)} }, + {.i = (CWM_DOWN | CWM_PTRMOVE | CWM_BIGMOVE)} }, { "bigptrmoveleft", kbfunc_client_moveresize, 0, - {.i = (CWM_LEFT|CWM_PTRMOVE|CWM_BIGMOVE)} }, + {.i = (CWM_LEFT | CWM_PTRMOVE | CWM_BIGMOVE)} }, { "bigptrmoveright", kbfunc_client_moveresize, 0, - {.i = (CWM_RIGHT|CWM_PTRMOVE|CWM_BIGMOVE)} }, + {.i = (CWM_RIGHT | CWM_PTRMOVE | CWM_BIGMOVE)} }, { "htile", kbfunc_tile, CWM_WIN, {.i = CWM_TILE_HORIZ} }, { "vtile", kbfunc_tile, CWM_WIN, {.i = CWM_TILE_VERT} }, { "window_lower", kbfunc_client_lower, CWM_WIN, {0} }, diff --git a/cwm.1 b/cwm.1 index 5dd9881..4fbcfc7 100644 --- a/cwm.1 +++ b/cwm.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cwm.1,v 1.52 2015/05/31 23:07:36 okan Exp $ +.\" $OpenBSD: cwm.1,v 1.53 2015/08/21 16:52:37 okan Exp $ .\" .\" Copyright (c) 2004,2005 Marius Aamodt Eriksen .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: May 31 2015 $ +.Dd $Mdocdate: August 21 2015 $ .Dt CWM 1 .Os .Sh NAME @@ -117,9 +117,9 @@ Toggle maximization of current window. Toggle vertical maximization of current window. .It Ic CMS-= Toggle horizontal maximization of current window. -.It Ic C-[Up|Down|Left|Right] +.It Ic C-[Up | Down | Left | Right] Move pointer by a small amount. -.It Ic CS-[Up|Down|Left|Right] +.It Ic CS-[Up | Down | Left | Right] Move pointer by a large amount; see .Xr cwmrc 5 . .It Ic M-[hjkl] diff --git a/screen.c b/screen.c index 03cf679..4adc63f 100644 --- a/screen.c +++ b/screen.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: screen.c,v 1.76 2015/06/30 14:01:43 okan Exp $ + * $OpenBSD: screen.c,v 1.77 2015/08/21 16:52:37 okan Exp $ */ #include @@ -67,12 +67,12 @@ screen_init(int which) xu_ewmh_net_virtual_roots(sc); rootattr.cursor = Conf.cursor[CF_NORMAL]; - rootattr.event_mask = SubstructureRedirectMask|SubstructureNotifyMask| - PropertyChangeMask|EnterWindowMask|LeaveWindowMask| - ColormapChangeMask|BUTTONMASK; + rootattr.event_mask = SubstructureRedirectMask | + SubstructureNotifyMask | PropertyChangeMask | EnterWindowMask | + LeaveWindowMask | ColormapChangeMask | BUTTONMASK; XChangeWindowAttributes(X_Dpy, sc->rootwin, - CWEventMask|CWCursor, &rootattr); + (CWEventMask | CWCursor), &rootattr); /* Deal with existing clients. */ if (XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins)) { -- cgit v1.2.3-2-gb3c3