commit c619363d1580d5913b00d8b7d0415da5917b8060
parent 012710a3cee6a15e4b8284edb57d39332ddd60b4
Author: Anselm R Garbe <garbeam@gmail.com>
Date: Mon, 11 Feb 2008 20:43:41 +0000
applied dwm-4.8-snaptileds.diff
Diffstat:
| M | dwm.c | | | 23 | +++++++++++------------ |
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/dwm.c b/dwm.c
@@ -368,23 +368,16 @@ buttonpress(XEvent *e) {
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- if((m->layout->arrange == floating) || c->isfloating)
- restack();
- else
- togglefloating(NULL);
+ restack();
movemouse(c);
}
else if(ev->button == Button2) {
if((floating != m->layout->arrange) && c->isfloating)
togglefloating(NULL);
- else
- zoom(NULL);
+ zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- if((floating == m->layout->arrange) || c->isfloating)
- restack();
- else
- togglefloating(NULL);
+ restack();
resizemouse(c);
}
}
@@ -1195,7 +1188,10 @@ movemouse(Client *c) {
ny = m->way;
else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
ny = m->way + m->wah - c->h - 2 * c->border;
- resize(c, nx, ny, c->w, c->h, False);
+ if((monitors[selmonitor].layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ togglefloating(NULL);
+ if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+ resize(c, nx, ny, c->w, c->h, False);
memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
break;
}
@@ -1358,7 +1354,10 @@ resizemouse(Client *c) {
nw = 1;
if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
nh = 1;
- resize(c, c->x, c->y, nw, nh, True);
+ if((monitors[selmonitor].layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ togglefloating(NULL);
+ if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+ resize(c, c->x, c->y, nw, nh, True);
break;
}
}
