em/dwm
1
0
Fork 0
Code Releases Activity

reverted some resize() changes, reverted setlocale removal

Browse Source
This commit is contained in:
Anselm R Garbe
2008-08-25 09:37:39 +01:00
parent db5db8806f
commit 6411aa921b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dwm.c
View File

@@ -24,6 +24,7 @@
* To understand everything else, start reading main(). * To understand everything else, start reading main().
*/ */
#include <errno.h> #include <errno.h>
#include <locale.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -1046,7 +1047,6 @@ quit(const Arg *arg) {
void void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) { resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
float a;
XWindowChanges wc; XWindowChanges wc;
if(sizehints) { if(sizehints) {
@@ -1064,11 +1064,10 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
/* adjust for aspect limits */ /* adjust for aspect limits */
if(c->mina > 0 && c->maxa > 0) { if(c->mina > 0 && c->maxa > 0) {
a = (float) w/h; if(c->maxa < (float)(w / h))
if(a > c->maxa)
w = h * c->maxa; w = h * c->maxa;
else if(a < c->mina) else if(c->mina < (float)(h / w))
h = w / c->mina; h = w * c->mina;
} }
if(baseismin) { /* increment calculation requires this */ if(baseismin) { /* increment calculation requires this */
@@ -1712,7 +1711,7 @@ main(int argc, char *argv[]) {
else if(argc != 1) else if(argc != 1)
die("usage: dwm [-v]\n"); die("usage: dwm [-v]\n");
if(!XSupportsLocale()) if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fprintf(stderr, "warning: no locale support\n"); fprintf(stderr, "warning: no locale support\n");
if(!(dpy = XOpenDisplay(0))) if(!(dpy = XOpenDisplay(0)))