Browse Source

applied Gottox' adjustborder removal patch (thanks!)

main
Anselm R Garbe 15 years ago
parent
commit
1e350be229
2 changed files with 2 additions and 20 deletions
  1. +1
    -1
      config.mk
  2. +1
    -19
      dwm.c

+ 1
- 1
config.mk View File

@ -1,5 +1,5 @@
# dwm version # dwm version
VERSION = 5.4.1
VERSION = 5.5
# Customize below to fit your system # Customize below to fit your system


+ 1
- 19
dwm.c View File

@ -128,7 +128,6 @@ typedef struct {
} Rule; } Rule;
/* function declarations */ /* function declarations */
static void adjustborder(Client *c, unsigned int bw);
static void applyrules(Client *c); static void applyrules(Client *c);
static void arrange(void); static void arrange(void);
static void attach(Client *c); static void attach(Client *c);
@ -245,16 +244,6 @@ static Window root, barwin;
struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; }; struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1 : 1]; };
/* function implementations */ /* function implementations */
void
adjustborder(Client *c, unsigned int bw) {
XWindowChanges wc;
if(c->bw != bw) {
c->bw = wc.border_width = bw;
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
}
}
void void
applyrules(Client *c) { applyrules(Client *c) {
unsigned int i; unsigned int i;
@ -939,12 +928,9 @@ maprequest(XEvent *e) {
void void
monocle(void) { monocle(void) {
unsigned int n;
Client *c; Client *c;
for(n = 0, c = nexttiled(clients); c && n < 2; c = nexttiled(c->next), n++);
for(c = nexttiled(clients); c; c = nexttiled(c->next)) { for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
adjustborder(c, n == 1 ? 0 : borderpx);
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, resizehints);
} }
} }
@ -1349,8 +1335,6 @@ showhide(Client *c, unsigned int ntiled) {
if(!c) if(!c)
return; return;
if(ISVISIBLE(c)) { /* show clients top down */ if(ISVISIBLE(c)) { /* show clients top down */
if(c->isfloating || ntiled > 1) /* avoid unnecessary border reverts */
adjustborder(c, borderpx);
XMoveWindow(dpy, c->win, c->x, c->y); XMoveWindow(dpy, c->win, c->x, c->y);
if(!lt[sellt]->arrange || c->isfloating) if(!lt[sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True); resize(c, c->x, c->y, c->w, c->h, True);
@ -1414,7 +1398,6 @@ tile(void) {
/* master */ /* master */
c = nexttiled(clients); c = nexttiled(clients);
mw = mfact * ww; mw = mfact * ww;
adjustborder(c, n == 1 ? 0 : borderpx);
resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints); resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
if(--n == 0) if(--n == 0)
@ -1429,7 +1412,6 @@ tile(void) {
h = wh; h = wh;
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++) {
adjustborder(c, borderpx);
resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n) resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints); ? wy + wh - y - 2 * c->bw : h - 2 * c->bw), resizehints);
if(h != wh) if(h != wh)
@ -1713,7 +1695,7 @@ main(int argc, char *argv[]) {
die("usage: dwm [-v]\n"); die("usage: dwm [-v]\n");
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fprintf(stderr, "warning: no locale support\n");
fputs("warning: no locale support\n", stderr);
if(!(dpy = XOpenDisplay(0))) if(!(dpy = XOpenDisplay(0)))
die("dwm: cannot open display\n"); die("dwm: cannot open display\n");


Loading…
Cancel
Save