diff options
| author | Anselm R Garbe <garbeam@gmail.com> | 2008-08-25 09:37:39 +0100 |
|---|---|---|
| committer | Anselm R Garbe <garbeam@gmail.com> | 2008-08-25 09:37:39 +0100 |
| commit | 6411aa921baabd11bfa55eb708bb804dfc6b1375 (patch) | |
| tree | f70601c96dee7d949a952c89f44d01250ecbc72b | |
| parent | db5db8806f4bbb26bb1259f7ea42d7a826517bbb (diff) | |
| download | dwm-6411aa921baabd11bfa55eb708bb804dfc6b1375.tar.gz | |
reverted some resize() changes, reverted setlocale removal
| -rw-r--r-- | dwm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/dwm.c b/dwm.c index ae2952b..4ea16e0 100644 --- a/dwm.c +++ b/dwm.c @@ -24,6 +24,7 @@ * To understand everything else, start reading main(). */ #include <errno.h> +#include <locale.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1046,7 +1047,6 @@ quit(const Arg *arg) { void resize(Client *c, int x, int y, int w, int h, Bool sizehints) { - float a; XWindowChanges wc; if(sizehints) { @@ -1064,11 +1064,10 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { /* adjust for aspect limits */ if(c->mina > 0 && c->maxa > 0) { - a = (float) w/h; - if(a > c->maxa) + if(c->maxa < (float)(w / h)) w = h * c->maxa; - else if(a < c->mina) - h = w / c->mina; + else if(c->mina < (float)(h / w)) + h = w * c->mina; } if(baseismin) { /* increment calculation requires this */ @@ -1712,7 +1711,7 @@ main(int argc, char *argv[]) { else if(argc != 1) die("usage: dwm [-v]\n"); - if(!XSupportsLocale()) + if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) fprintf(stderr, "warning: no locale support\n"); if(!(dpy = XOpenDisplay(0))) |