mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
Fix whitespace.
This commit is contained in:
okan
parent
1d31f9000c
commit
cd3bbb1c9c
12
calmwm.h
12
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
|
||||
|
||||
4
client.c
4
client.c
@ -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
|
||||
|
||||
52
conf.c
52
conf.c
@ -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} },
|
||||
|
||||
4
cwm.1
4
cwm.1
@ -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]
|
||||
|
||||
8
screen.c
8
screen.c
@ -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)) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user