elal
/
ewm
mirror of https://github.com/E-Almqvist/ewm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed ugly ban(), extended resize() that it only resets the size if necessary, added border_width commit to manage()

Browse Source
pull/1/head
Anselm R. Garbe 18 years ago
parent 8a5f002c41
commit 6e22ccf7b1
5 changed files with 100 additions and 93 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 73
      client.c
  2. 4
      dwm.h
  3. 42
      event.c
  4. 3
      main.c
  5. 63
      view.c

73
client.c
Unescape View File

@ -158,6 +158,7 @@ void
manage(Window w, XWindowAttributes *wa) { manage(Window w, XWindowAttributes *wa) {
Client *c, *t; Client *c, *t;
Window trans; Window trans;
XWindowChanges wc;
c = emallocz(sizeof(Client)); c = emallocz(sizeof(Client));
c->tags = emallocz(ntags * sizeof(Bool)); c->tags = emallocz(ntags * sizeof(Bool));
@ -187,7 +188,10 @@ manage(Window w, XWindowAttributes *wa) {
StructureNotifyMask | PropertyChangeMask | EnterWindowMask); StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
XGetTransientForHint(dpy, c->win, &trans); XGetTransientForHint(dpy, c->win, &trans);
grabbuttons(c, False); grabbuttons(c, False);
wc.border_width = c->border;
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
updatetitle(c); updatetitle(c);
t = getclient(trans); t = getclient(trans);
settags(c, t); settags(c, t);
@ -198,7 +202,8 @@ manage(Window w, XWindowAttributes *wa) {
c->next = clients; c->next = clients;
c->snext = stack; c->snext = stack;
stack = clients = c; stack = clients = c;
ban(c); c->isbanned = True;
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
XMapWindow(dpy, c->win); XMapWindow(dpy, c->win);
setclientstate(c, NormalState); setclientstate(c, NormalState);
if(isvisible(c)) if(isvisible(c))
@ -207,25 +212,25 @@ manage(Window w, XWindowAttributes *wa) {
} }
void void
resize(Client *c, Bool sizehints) { resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
float actual, dx, dy, max, min; float actual, dx, dy, max, min;
XWindowChanges wc; XWindowChanges wc;
if(c->w <= 0 || c->h <= 0) if(w <= 0 || h <= 0)
return; return;
if(sizehints) { if(sizehints) {
if(c->minw && c->w < c->minw) if(c->minw && w < c->minw)
c->w = c->minw; w = c->minw;
if(c->minh && c->h < c->minh) if(c->minh && h < c->minh)
c->h = c->minh; h = c->minh;
if(c->maxw && c->w > c->maxw) if(c->maxw && w > c->maxw)
c->w = c->maxw; w = c->maxw;
if(c->maxh && c->h > c->maxh) if(c->maxh && h > c->maxh)
c->h = c->maxh; h = c->maxh;
/* inspired by algorithm from fluxbox */ /* inspired by algorithm from fluxbox */
if(c->minay > 0 && c->maxay && (c->h - c->baseh) > 0) { if(c->minay > 0 && c->maxay && (h - c->baseh) > 0) {
dx = (float)(c->w - c->basew); dx = (float)(w - c->basew);
dy = (float)(c->h - c->baseh); dy = (float)(h - c->baseh);
min = (float)(c->minax) / (float)(c->minay); min = (float)(c->minax) / (float)(c->minay);
max = (float)(c->maxax) / (float)(c->maxay); max = (float)(c->maxax) / (float)(c->maxay);
actual = dx / dy; actual = dx / dy;
@ -233,44 +238,46 @@ resize(Client *c, Bool sizehints) {
if(actual < min) { if(actual < min) {
dy = (dx * min + dy) / (min * min + 1); dy = (dx * min + dy) / (min * min + 1);
dx = dy * min; dx = dy * min;
c->w = (int)dx + c->basew; w = (int)dx + c->basew;
c->h = (int)dy + c->baseh; h = (int)dy + c->baseh;
} }
else if(actual > max) { else if(actual > max) {
dy = (dx * min + dy) / (max * max + 1); dy = (dx * min + dy) / (max * max + 1);
dx = dy * min; dx = dy * min;
c->w = (int)dx + c->basew; w = (int)dx + c->basew;
c->h = (int)dy + c->baseh; h = (int)dy + c->baseh;
} }
} }
} }
if(c->incw) if(c->incw)
c->w -= (c->w - c->basew) % c->incw; w -= (w - c->basew) % c->incw;
if(c->inch) if(c->inch)
c->h -= (c->h - c->baseh) % c->inch; h -= (h - c->baseh) % c->inch;
} }
if(c->w == sw && c->h == sh) if(w == sw && h == sh)
c->border = 0; c->border = 0;
else else
c->border = BORDERPX; c->border = BORDERPX;
/* offscreen appearance fixes */ /* offscreen appearance fixes */
if(c->x > sw) if(x > sw)
c->x = sw - c->w - 2 * c->border; x = sw - w - 2 * c->border;
if(c->y > sh) if(y > sh)
c->y = sh - c->h - 2 * c->border; y = sh - h - 2 * c->border;
if(c->x + c->w + 2 * c->border < sx) if(x + w + 2 * c->border < sx)
c->x = sx; x = sx;
if(c->y + c->h + 2 * c->border < sy) if(y + h + 2 * c->border < sy)
c->y = sy; y = sy;
wc.x = c->x; if(c->x != x || c->y != y || c->w != w || c->h != h) {
wc.y = c->y; c->x = wc.x = x;
wc.width = c->w; c->y = wc.y = y;
wc.height = c->h; c->w = wc.width = w;
c->h = wc.height = h;
wc.border_width = c->border; wc.border_width = c->border;
XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
configure(c); configure(c);
XSync(dpy, False); XSync(dpy, False);
} }
}
void void
updatesizehints(Client *c) { updatesizehints(Client *c) {

4
dwm.h
Unescape View File

@ -99,14 +99,14 @@ extern Display *dpy;
extern Window root, barwin; extern Window root, barwin;
/* client.c */ /* client.c */
extern void ban(Client *c); /* ban c */
extern void configure(Client *c); /* send synthetic configure event */ extern void configure(Client *c); /* send synthetic configure event */
extern void focus(Client *c); /* focus c, c may be NULL */ extern void focus(Client *c); /* focus c, c may be NULL */
extern Client *getclient(Window w); /* return client of w */ extern Client *getclient(Window w); /* return client of w */
extern Bool isprotodel(Client *c); /* returns True if c->win supports wmatom[WMDelete] */ extern Bool isprotodel(Client *c); /* returns True if c->win supports wmatom[WMDelete] */
extern void killclient(Arg *arg); /* kill c nicely */ extern void killclient(Arg *arg); /* kill c nicely */
extern void manage(Window w, XWindowAttributes *wa); /* manage new client */ extern void manage(Window w, XWindowAttributes *wa); /* manage new client */
extern void resize(Client *c, Bool sizehints); /* resize c*/ extern void resize(Client *c, int x, int y,
int w, int h, Bool sizehints); /* resize c*/
extern void updatesizehints(Client *c); /* update the size hint variables of c */ extern void updatesizehints(Client *c); /* update the size hint variables of c */
extern void updatetitle(Client *c); /* update the name of c */ extern void updatetitle(Client *c); /* update the name of c */
extern void unmanage(Client *c); /* destroy c */ extern void unmanage(Client *c); /* destroy c */

42
event.c
Unescape View File

@ -22,13 +22,13 @@ KEYS
static void static void
movemouse(Client *c) { movemouse(Client *c) {
int x1, y1, ocx, ocy, di; int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui; unsigned int dui;
Window dummy; Window dummy;
XEvent ev; XEvent ev;
ocx = c->x; ocx = nx = c->x;
ocy = c->y; ocy = ny = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess) None, cursor[CurMove], CurrentTime) != GrabSuccess)
return; return;
@ -38,7 +38,6 @@ movemouse(Client *c) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
switch (ev.type) { switch (ev.type) {
case ButtonRelease: case ButtonRelease:
resize(c, True);
XUngrabPointer(dpy, CurrentTime); XUngrabPointer(dpy, CurrentTime);
return; return;
case ConfigureRequest: case ConfigureRequest:
@ -48,17 +47,17 @@ movemouse(Client *c) {
break; break;
case MotionNotify: case MotionNotify:
XSync(dpy, False); XSync(dpy, False);
c->x = ocx + (ev.xmotion.x - x1); nx = ocx + (ev.xmotion.x - x1);
c->y = ocy + (ev.xmotion.y - y1); ny = ocy + (ev.xmotion.y - y1);
if(abs(wax + c->x) < SNAP) if(abs(wax + nx) < SNAP)
c->x = wax; nx = wax;
else if(abs((wax + waw) - (c->x + c->w + 2 * c->border)) < SNAP) else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
c->x = wax + waw - c->w - 2 * c->border; nx = wax + waw - c->w - 2 * c->border;
if(abs(way - c->y) < SNAP) if(abs(way - ny) < SNAP)
c->y = way; ny = way;
else if(abs((way + wah) - (c->y + c->h + 2 * c->border)) < SNAP) else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
c->y = way + wah - c->h - 2 * c->border; ny = way + wah - c->h - 2 * c->border;
resize(c, False); resize(c, nx, ny, c->w, c->h, False);
break; break;
} }
} }
@ -81,7 +80,6 @@ resizemouse(Client *c) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev); XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
switch(ev.type) { switch(ev.type) {
case ButtonRelease: case ButtonRelease:
resize(c, True);
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
c->w + c->border - 1, c->h + c->border - 1); c->w + c->border - 1, c->h + c->border - 1);
XUngrabPointer(dpy, CurrentTime); XUngrabPointer(dpy, CurrentTime);
@ -94,11 +92,11 @@ resizemouse(Client *c) {
break; break;
case MotionNotify: case MotionNotify:
XSync(dpy, False); XSync(dpy, False);
nw = ev.xmotion.x - ocx - 2 * c->border + 1; if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
c->w = nw > 0 ? nw : 1; nw = 1;
nh = ev.xmotion.y - ocy - 2 * c->border + 1; if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
c->h = nh > 0 ? nh : 1; nh = 1;
resize(c, True); resize(c, c->x, c->y, nw, nh, True);
break; break;
} }
} }
@ -187,7 +185,7 @@ configurerequest(XEvent *e) {
if((ev->value_mask & (CWX | CWY)) if((ev->value_mask & (CWX | CWY))
&& !(ev->value_mask & (CWWidth | CWHeight))) && !(ev->value_mask & (CWWidth | CWHeight)))
configure(c); configure(c);
resize(c, False); resize(c, c->x, c->y, c->w, c->h, False);
if(!isvisible(c)) if(!isvisible(c))
ban(c); ban(c);
} }

3
main.c
Unescape View File

@ -41,7 +41,8 @@ static void
cleanup(void) { cleanup(void) {
close(STDIN_FILENO); close(STDIN_FILENO);
while(stack) { while(stack) {
resize(stack, True); if(stack->isbanned)
XMoveWindow(dpy, stack->win, stack->x, stack->y);
unmanage(stack); unmanage(stack);
} }
if(dc.font.set) if(dc.font.set)

63
view.c
Unescape View File

@ -20,18 +20,14 @@ togglemax(Client *c) {
return; return;
if((c->ismax = !c->ismax)) { if((c->ismax = !c->ismax)) {
c->rx = c->x; c->x = wax; c->rx = c->x;
c->ry = c->y; c->y = way; c->ry = c->y;
c->rw = c->w; c->w = waw - 2 * BORDERPX; c->rw = c->w;
c->rh = c->h; c->h = wah - 2 * BORDERPX; c->rh = c->h;
resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
} }
else { else
c->x = c->rx; resize(c, c->rx, c->ry, c->rw, c->rh, True);
c->y = c->ry;
c->w = c->rw;
c->h = c->rh;
}
resize(c, True);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
} }
@ -56,11 +52,14 @@ dofloat(void) {
for(c = clients; c; c = c->next) { for(c = clients; c; c = c->next) {
if(isvisible(c)) { if(isvisible(c)) {
if(c->isbanned)
XMoveWindow(dpy, c->win, c->x, c->y);
c->isbanned = False; c->isbanned = False;
resize(c, True);
} }
else else {
ban(c); c->isbanned = True;
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
}
} }
if(!sel || !isvisible(sel)) { if(!sel || !isvisible(sel)) {
for(c = stack; c && !isvisible(c); c = c->snext); for(c = stack; c && !isvisible(c); c = c->snext);
@ -71,7 +70,7 @@ dofloat(void) {
void void
dotile(void) { dotile(void) {
unsigned int i, n, mw, mh, tw, th; unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
Client *c; Client *c;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
@ -84,34 +83,36 @@ dotile(void) {
for(i = 0, c = clients; c; c = c->next) for(i = 0, c = clients; c; c = c->next)
if(isvisible(c)) { if(isvisible(c)) {
if(c->isbanned)
XMoveWindow(dpy, c->win, c->x, c->y);
c->isbanned = False; c->isbanned = False;
if(c->isfloat) { if(c->isfloat)
resize(c, True);
continue; continue;
}
c->ismax = False; c->ismax = False;
c->x = wax; nx = wax;
c->y = way; ny = way;
if(i < nmaster) { if(i < nmaster) {
c->y += i * mh; ny += i * mh;
c->w = mw - 2 * BORDERPX; nw = mw - 2 * BORDERPX;
c->h = mh - 2 * BORDERPX; nh = mh - 2 * BORDERPX;
} }
else { /* tile window */ else { /* tile window */
c->x += mw; nx += mw;
c->w = tw - 2 * BORDERPX; nw = tw - 2 * BORDERPX;
if(th > 2 * BORDERPX) { if(th > 2 * BORDERPX) {
c->y += (i - nmaster) * th; ny += (i - nmaster) * th;
c->h = th - 2 * BORDERPX; nh = th - 2 * BORDERPX;
} }
else /* fallback if th <= 2 * BORDERPX */ else /* fallback if th <= 2 * BORDERPX */
c->h = wah - 2 * BORDERPX; nh = wah - 2 * BORDERPX;
} }
resize(c, False); resize(c, nx, ny, nw, nh, False);
i++; i++;
} }
else else {
ban(c); c->isbanned = True;
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
}
if(!sel || !isvisible(sel)) { if(!sel || !isvisible(sel)) {
for(c = stack; c && !isvisible(c); c = c->snext); for(c = stack; c && !isvisible(c); c = c->snext);
focus(c); focus(c);

Write Preview
Loading…
Cancel
Save