This commit is contained in:
Cadey Ratio 2020-05-31 09:07:07 -04:00
parent 8f0a7726be
commit a3eed39efb
1 changed files with 30 additions and 2 deletions

32
dwm.c
View File

@ -107,6 +107,7 @@ typedef struct Client Client;
struct Client { struct Client {
char name[256]; char name[256];
float mina, maxa; float mina, maxa;
float cfact;
int x, y, w, h; int x, y, w, h;
int oldx, oldy, oldw, oldh; int oldx, oldy, oldw, oldh;
int basew, baseh, incw, inch, maxw, maxh, minw, minh; int basew, baseh, incw, inch, maxw, maxh, minw, minh;
@ -235,6 +236,7 @@ static void setclientstate(Client *c, long state);
static void setfocus(Client *c); static void setfocus(Client *c);
static void setfullscreen(Client *c, int fullscreen); static void setfullscreen(Client *c, int fullscreen);
static void setlayout(const Arg *arg); static void setlayout(const Arg *arg);
static void setcfact(const Arg *arg);
static void setmfact(const Arg *arg); static void setmfact(const Arg *arg);
static void setup(void); static void setup(void);
static void seturgent(Client *c, int urg); static void seturgent(Client *c, int urg);
@ -1201,6 +1203,7 @@ manage(Window w, XWindowAttributes *wa)
c->w = c->oldw = wa->width; c->w = c->oldw = wa->width;
c->h = c->oldh = wa->height; c->h = c->oldh = wa->height;
c->oldbw = wa->border_width; c->oldbw = wa->border_width;
c->cfact = 1.0;
updatetitle(c); updatetitle(c);
if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) { if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
@ -1795,6 +1798,23 @@ setlayout(const Arg *arg)
drawbar(selmon); drawbar(selmon);
} }
void setcfact(const Arg *arg) {
float f;
Client *c;
c = selmon->sel;
if(!arg || !c || !selmon->lt[selmon->sellt]->arrange)
return;
f = arg->f + c->cfact;
if(arg->f == 0.0)
f = 1.0;
else if(f < 0.25 || f > 4.0)
return;
c->cfact = f;
arrange(selmon);
}
/* arg > 1.0 will set mfact absolutely */ /* arg > 1.0 will set mfact absolutely */
void void
setmfact(const Arg *arg) setmfact(const Arg *arg)
@ -1994,9 +2014,15 @@ void
tile(Monitor *m) tile(Monitor *m)
{ {
unsigned int i, n, h, mw, my, ty; unsigned int i, n, h, mw, my, ty;
float mfacts = 0, sfacts = 0;
Client *c; Client *c;
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
if (n < m->nmaster)
mfacts += c->cfact;
else
sfacts += c->cfact;
}
if (n == 0) if (n == 0)
return; return;
@ -2006,13 +2032,15 @@ tile(Monitor *m)
mw = m->ww; mw = m->ww;
for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) { if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i); h = (m->wh - my) * (c->cfact / mfacts);
resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
my += HEIGHT(c); my += HEIGHT(c);
mfacts -= c->cfact;
} else { } else {
h = (m->wh - ty) / (n - i); h = (m->wh - ty) / (n - i);
resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
ty += HEIGHT(c); ty += HEIGHT(c);
sfacts -= c->cfact;
} }
} }