diff options
| -rw-r--r-- | calmwm.c | 4 | ||||
| -rw-r--r-- | client.c | 18 | ||||
| -rw-r--r-- | conf.c | 4 | ||||
| -rw-r--r-- | xutil.c | 6 |
4 files changed, 18 insertions, 14 deletions
@@ -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.c,v 1.59 2011/09/08 12:35:33 okan Exp $ + * $OpenBSD: calmwm.c,v 1.60 2012/05/13 15:15:54 okan Exp $ */ #include <sys/param.h> @@ -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) { @@ -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.91 2011/09/13 08:41:57 okan Exp $ + * $OpenBSD: client.c,v 1.92 2012/05/13 15:15:54 okan Exp $ */ #include <sys/param.h> @@ -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); } @@ -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.98 2012/05/10 00:39:47 okan Exp $ + * $OpenBSD: conf.c,v 1.99 2012/05/13 15:15:54 okan Exp $ */ #include <sys/param.h> @@ -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: @@ -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: xutil.c,v 1.37 2011/07/25 15:10:24 okan Exp $ + * $OpenBSD: xutil.c,v 1.38 2012/05/13 15:15:54 okan Exp $ */ #include <sys/param.h> @@ -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 |