Hi!
I wrote a patch which removes the last argument from resize(). This is
handled now directly in applysizehints(). What do you think about it?
regards
Gottox
--
http://www.gnuffy.chaotika.org - Real Community Distro
diff -r b4e7c220422d dwm.c
--- a/dwm.c Sat Feb 21 19:20:11 2009 +
+++ b/dwm.c Mon Mar 02 20:55:27 2009 +0100
@@ -129,6 +129,7 @@
/* function declarations */
static void applyrules(Client *c);
+static void applysizehints(Client *c, int *w, int *h);
static void arrange(void);
static void attach(Client *c);
static void attachstack(Client *c);
@@ -169,7 +170,7 @@
static Client *nexttiled(Client *c);
static void propertynotify(XEvent *e);
static void quit(const Arg *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resize(Client *c, int x, int y, int w, int h);
static void resizemouse(const Arg *arg);
static void restack(void);
static void run(void);
@@ -271,6 +272,58 @@
}
void
+applysizehints(Client *c, int *w, int *h) {
+ Bool baseismin;
+
+ if(!resizehints !c-isfloating)
+ return;
+
+ /* see last two sentences in ICCCM 4.1.2.3 */
+ baseismin = c-basew == c-minw c-baseh == c-minh;
+
+ /* set minimum possible */
+ *w = MAX(1, *w);
+ *h = MAX(1, *h);
+
+ if(!baseismin) { /* temporarily remove base dimensions */
+ *w -= c-basew;
+ *h -= c-baseh;
+ }
+
+ /* adjust for aspect limits */
+ if(c-mina 0 c-maxa 0) {
+ if(c-maxa (float)*w / *h)
+ *w = *h * c-maxa;
+ else if(c-mina (float)*h / *w)
+ *h = *w * c-mina;
+ }
+
+ if(baseismin) { /* increment calculation requires this */
+ *w -= c-basew;
+ *h -= c-baseh;
+ }
+
+ /* adjust for increment value */
+ if(c-incw)
+ *w -= *w % c-incw;
+ if(c-inch)
+ *h -= *h % c-inch;
+
+ /* restore base dimensions */
+ *w += c-basew;
+ *h += c-baseh;
+
+ *w = MAX(*w, c-minw);
+ *h = MAX(*h, c-minh);
+
+ if(c-maxw)
+ *w = MIN(*w, c-maxw);
+
+ if(c-maxh)
+ *h = MIN(*h, c-maxh);
+}
+
+void
arrange(void) {
unsigned int nt;
Client *c;
@@ -931,7 +984,7 @@
Client *c;
for(c = nexttiled(clients); c; c = nexttiled(c-next)) {
- resize(c, wx, wy, ww - 2 * c-bw, wh - 2 * c-bw, resizehints);
+ resize(c, wx, wy, ww - 2 * c-bw, wh - 2 * c-bw);
}
}
@@ -979,7 +1032,7 @@
togglefloating(NULL);
}
if(!lt[sellt]-arrange || c-isfloating)
- resize(c, nx, ny, c-w, c-h, False);
+ resize(c, nx, ny, c-w, c-h);
break;
}
}
@@ -1035,54 +1088,10 @@
}
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) {
XWindowChanges wc;
- if(sizehints) {
- /* see last two sentences in ICCCM 4.1.2.3 */
- Bool baseismin = c-basew == c-minw c-baseh == c-minh;
-
- /* set minimum possible */
- w = MAX(1, w);
- h = MAX(1, h);
-
- if(!baseismin) { /* temporarily remove base dimensions */
- w -= c-basew;
- h -= c-baseh;
- }
-
- /* adjust for aspect limits */
- if(c-mina 0 c-maxa 0) {
- if(c-maxa (float)w / h)
- w = h * c-maxa;
- else if(c-mina (float)h / w)
- h = w * c-mina;
- }
-
- if(baseismin) { /* increment calculation requires this */
- w -= c-basew;
- h -= c-baseh;
- }
-
- /* adjust for increment value */
- if(c-incw)
- w -= w % c-incw;
- if(c-inch)
- h -= h % c-inch;
-
- /* restore base dimensions */
- w += c-basew;
- h += c-baseh;
-
- w = MAX(w, c-minw);
- h = MAX(h, c-minh);
-
- if(c-maxw)
- w = MIN(w, c-maxw);
-
- if(c-maxh)
- h = MIN(h, c-maxh);
- }
+ applysizehints(c, w, h);
if(w = 0 || h = 0)
return;
if(x sx + sw)
@@ -1147,7 +1156,7 @@
togglefloating(NULL);
}
if(!lt[sellt]-arrange || c-isfloating)
- resize(c, c-x, c-y, nw, nh, True);
+ resize(c, c-x, c-y, nw, nh);
