diff options
| author | okan <okan> | 2012-05-13 15:15:54 +0000 |
|---|---|---|
| committer | okan <okan> | 2012-05-13 15:15:54 +0000 |
| commit | fb4936d0f7ea06554a2b11aaa2272f7ca1dd4a98 (patch) | |
| tree | 11efe2189ad525f07a7a21eba71a29c3536dc22f | |
| parent | 63b59e44c14fd8d7cce4abba064fa71a9fb6ac65 (diff) | |
| download | cwm-fb4936d0f7ea06554a2b11aaa2272f7ca1dd4a98.tar.gz cwm-fb4936d0f7ea06554a2b11aaa2272f7ca1dd4a98.tar.xz cwm-fb4936d0f7ea06554a2b11aaa2272f7ca1dd4a98.zip | |
knf, some from a diff from Tiago Cunha.
| -rw-r--r-- | calmwm.c | 2 | ||||
| -rw-r--r-- | client.c | 16 | ||||
| -rw-r--r-- | conf.c | 2 | ||||
| -rw-r--r-- | xutil.c | 4 |
4 files changed, 14 insertions, 10 deletions
diff --git a/calmwm.c b/calmwm.c index 611ae37..9d91084 100644 --- a/calmwm.c +++ b/calmwm.c @@ -159,6 +159,7 @@ x_setupscreen(struct screen_ctx *sc, u_int which) XSetWindowAttributes rootattr; int fake; u_int nwins, i; + sc->which = which; sc->rootwin = RootWindow(X_Dpy, sc->which); @@ -221,6 +222,7 @@ x_wmerrorhandler(Display *dpy, XErrorEvent *e) return (0); } + static int x_errorhandler(Display *dpy, XErrorEvent *e) { diff --git a/client.c b/client.c index 711aeba..6b28e38 100644 --- a/client.c +++ b/client.c @@ -394,7 +394,7 @@ client_horizmaximize(struct client_ctx *cc) cc->geom.height -= cc->bwidth * 2; cc->flags &= ~CLIENT_HMAXIMIZED; goto resize; - } + } cc->savegeom.x = cc->geom.x; cc->savegeom.width = cc->geom.width; @@ -613,7 +613,8 @@ client_cycle(struct screen_ctx *sc, int flags) return; if (oldcc == NULL) - oldcc = (flags & CWM_RCYCLE ? TAILQ_LAST(&sc->mruq, cycle_entry_q) : + oldcc = (flags & CWM_RCYCLE ? + TAILQ_LAST(&sc->mruq, cycle_entry_q) : TAILQ_FIRST(&sc->mruq)); newcc = oldcc; @@ -792,6 +793,7 @@ client_getsizehints(struct client_ctx *cc) cc->size->max_aspect.y; } } + void client_applysizehints(struct client_ctx *cc) { @@ -911,13 +913,13 @@ client_snapcalc(int n, int dn, int nmax, int bwidth, int snapdist) /* possible to snap in both directions */ if (s0 != 0 && s1 != 0) if (abs(s0) < abs(s1)) - return s0; + return (s0); else - return s1; + return (s1); else if (s0 != 0) - return s0; + return (s0); else if (s1 != 0) - return s1; + return (s1); else - return 0; + return (0); } diff --git a/conf.c b/conf.c index 380214f..8812c4f 100644 --- a/conf.c +++ b/conf.c @@ -642,7 +642,7 @@ conf_grab_mouse(struct client_ctx *cc) TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) { if (mb->context != MOUSEBIND_CTX_WIN) - continue; + continue; switch(mb->button) { case 1: diff --git a/xutil.c b/xutil.c index 84ef1d8..67cc856 100644 --- a/xutil.c +++ b/xutil.c @@ -292,10 +292,10 @@ xu_getcolor(struct screen_ctx *sc, char *name) if (!XAllocNamedColor(X_Dpy, DefaultColormap(X_Dpy, sc->which), name, &color, &tmp)) { warnx("XAllocNamedColor error: '%s'", name); - return 0; + return (0); } - return color.pixel; + return (color.pixel); } void |