Faris
/
dwm
mirror of git://git.suckless.org/dwm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

interactive resizals allow display dimensions again

This commit is contained in:
Anselm R Garbe 2009-07-02 18:30:01 +01:00
parent ca376970db
commit 52bd69c2a4
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dwm.c
View File

@ -148,7 +148,7 @@ typedef struct {
/* function declarations */ /* function declarations */
static void applyrules(Client *c); static void applyrules(Client *c);
static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h); static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
static void arrange(void); static void arrange(void);
static void attach(Client *c); static void attach(Client *c);
static void attachstack(Client *c); static void attachstack(Client *c);
@ -194,7 +194,7 @@ static Client *nexttiled(Client *c);
static Monitor *pointertomon(int x, int y); static Monitor *pointertomon(int x, int y);
static void propertynotify(XEvent *e); static void propertynotify(XEvent *e);
static void quit(const Arg *arg); static void quit(const Arg *arg);
static void resize(Client *c, int x, int y, int w, int h); static void resize(Client *c, int x, int y, int w, int h, Bool interact);
static void resizemouse(const Arg *arg); static void resizemouse(const Arg *arg);
static void restack(Monitor *m); static void restack(Monitor *m);
static void run(void); static void run(void);
@ -298,7 +298,7 @@ applyrules(Client *c) {
} }
Bool Bool
applysizehints(Client *c, int *x, int *y, int *w, int *h) { applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
Bool baseismin; Bool baseismin;
Monitor *m = c->mon; Monitor *m = c->mon;
@ -306,14 +306,26 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h) {
*w = MAX(1, *w); *w = MAX(1, *w);
*h = MAX(1, *h); *h = MAX(1, *h);
if(*x > m->mx + m->mw) if(interact) {
*x = m->mx + m->mw - WIDTH(c); if(*x > sw)
if(*y > m->my + m->mh) *x = sw - WIDTH(c);
*y = m->my + m->mh - HEIGHT(c); if(*y > sh)
if(*x + *w + 2 * c->bw < m->mx) *y = sh - HEIGHT(c);
*x = m->mx; if(*x + *w + 2 * c->bw < 0)
if(*y + *h + 2 * c->bw < m->my) *x = 0;
*y = m->my; if(*y + *h + 2 * c->bw < 0)
*y = 0;
}
else {
if(*x > m->mx + m->mw)
*x = m->mx + m->mw - WIDTH(c);
if(*y > m->my + m->mh)
*y = m->my + m->mh - HEIGHT(c);
if(*x + *w + 2 * c->bw < m->mx)
*x = m->mx;
if(*y + *h + 2 * c->bw < m->my)
*y = m->my;
}
if(*h < bh) if(*h < bh)
*h = bh; *h = bh;
if(*w < bh) if(*w < bh)
@ -1120,7 +1132,7 @@ monocle(Monitor *m) {
Client *c; Client *c;
for(c = nexttiled(m->clients); c; c = nexttiled(c->next)) for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw); resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
} }
void void
@ -1166,7 +1178,7 @@ movemouse(const Arg *arg) {
togglefloating(NULL); togglefloating(NULL);
} }
if(!lt[selmon->sellt]->arrange || c->isfloating) if(!lt[selmon->sellt]->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h); resize(c, nx, ny, c->w, c->h, True);
break; break;
} }
} }
@ -1235,10 +1247,10 @@ quit(const Arg *arg) {
} }
void void
resize(Client *c, int x, int y, int w, int h) { resize(Client *c, int x, int y, int w, int h, Bool interact) {
XWindowChanges wc; XWindowChanges wc;
if(applysizehints(c, &x, &y, &w, &h)) { if(applysizehints(c, &x, &y, &w, &h, interact)) {
c->x = wc.x = x; c->x = wc.x = x;
c->y = wc.y = y; c->y = wc.y = y;
c->w = wc.width = w; c->w = wc.width = w;
@ -1286,7 +1298,7 @@ resizemouse(const Arg *arg) {
togglefloating(NULL); togglefloating(NULL);
} }
if(!lt[selmon->sellt]->arrange || c->isfloating) if(!lt[selmon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh); resize(c, c->x, c->y, nw, nh, True);
break; break;
} }
} }
@ -1484,7 +1496,7 @@ showhide(Client *c) {
if(ISVISIBLE(c)) { /* show clients top down */ if(ISVISIBLE(c)) { /* show clients top down */
XMoveWindow(dpy, c->win, c->x, c->y); XMoveWindow(dpy, c->win, c->x, c->y);
if(!lt[c->mon->sellt]->arrange || c->isfloating) if(!lt[c->mon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h); resize(c, c->x, c->y, c->w, c->h, False);
showhide(c->snext); showhide(c->snext);
} }
else { /* hide clients bottom up */ else { /* hide clients bottom up */
@ -1554,7 +1566,7 @@ tile(Monitor *m) {
/* master */ /* master */
c = nexttiled(m->clients); c = nexttiled(m->clients);
mw = m->mfact * m->ww; mw = m->mfact * m->ww;
resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw); resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);
if(--n == 0) if(--n == 0)
return; return;
@ -1569,7 +1581,7 @@ tile(Monitor *m) {
for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n) resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw)); ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);
if(h != m->wh) if(h != m->wh)
y = c->y + HEIGHT(c); y = c->y + HEIGHT(c);
} }
@ -1589,7 +1601,8 @@ togglefloating(const Arg *arg) {
return; return;
selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
if(selmon->sel->isfloating) if(selmon->sel->isfloating)
resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h); resize(selmon->sel, selmon->sel->x, selmon->sel->y,
selmon->sel->w, selmon->sel->h, False);
arrange(); arrange();
} }