Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
minor bugfix
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
f51d801
..
0071379
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-96,7
+96,8
@@
typedef struct {
const char *symbol;
void (*arrange)(void);
Bool isfloating;
const char *symbol;
void (*arrange)(void);
Bool isfloating;
-} Layout;
+} Layout; /* TODO: layout should keep an auxilliary pointer to its Geometry,
+ instead of having all those layout specific vars globally */
typedef struct {
const char *prop;
typedef struct {
const char *prop;
@@
-160,6
+161,7
@@
void restack(void);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
+void setdefaultgeoms(void);
void setlayout(const char *arg);
void setup(void);
void spawn(const char *arg);
void setlayout(const char *arg);
void setup(void);
void spawn(const char *arg);
@@
-177,6
+179,7
@@
void toggleview(const char *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
+void updatebarpos(void);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
@@
-191,7
+194,7
@@
void zoom(const char *arg);
char stext[256], buf[256];
int screen, sx, sy, sw, sh;
int (*xerrorxlib)(Display *, XErrorEvent *);
char stext[256], buf[256];
int screen, sx, sy, sw, sh;
int (*xerrorxlib)(Display *, XErrorEvent *);
-
unsigned int bh, blw = 0
;
+
int bx, by, bw, bh, blw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh
;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
@@
-220,6
+223,7
@@
Display *dpy;
DC dc = {0};
Layout *lt = NULL;
Window root, barwin;
DC dc = {0};
Layout *lt = NULL;
Window root, barwin;
+void (*setgeoms)(void) = setdefaultgeoms;
/* configuration, allows nested code to access above variables */
#include "config.h"
/* configuration, allows nested code to access above variables */
#include "config.h"
@@
-404,11
+408,8
@@
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
if(ev->window == root && (ev->width != sw || ev->height != sh)) {
XConfigureEvent *ev = &e->xconfigure;
if(ev->window == root && (ev->width != sw || ev->height != sh)) {
- sw = ev->width;
- sh = ev->height;
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, BW, bh, DefaultDepth(dpy, screen));
- XMoveResizeWindow(dpy, barwin, BX, BY, BW, bh);
+ setgeoms();
+ updatebarpos();
arrange();
}
}
arrange();
}
}
@@
-508,10
+509,10
@@
drawbar(void) {
drawtext(lt->symbol, dc.norm, False);
x = dc.x + dc.w;
dc.w = textw(stext);
drawtext(lt->symbol, dc.norm, False);
x = dc.x + dc.w;
dc.w = textw(stext);
- dc.x =
BW
- dc.w;
+ dc.x =
bw
- dc.w;
if(dc.x < x) {
dc.x = x;
if(dc.x < x) {
dc.x = x;
- dc.w =
BW
- x;
+ dc.w =
bw
- x;
}
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
}
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
@@
-523,7
+524,7
@@
drawbar(void) {
else
drawtext(NULL, dc.norm, False);
}
else
drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0,
BW
, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0,
bw
, bh, 0, 0);
XSync(dpy, False);
}
XSync(dpy, False);
}
@@
-981,14
+982,14
@@
manage(Window w, XWindowAttributes *wa) {
c->border = wa->border_width;
}
else {
c->border = wa->border_width;
}
else {
- if(c->x + c->w + 2 * c->border >
WX + WW
)
- c->x =
WX + WW
- c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border >
WY + WH
)
- c->y =
WY + WH
- c->h - 2 * c->border;
- if(c->x <
WX
)
- c->x =
WX
;
- if(c->y <
WY
)
- c->y =
WY
;
+ if(c->x + c->w + 2 * c->border >
wx + ww
)
+ c->x =
wx + ww
- c->w - 2 * c->border;
+ if(c->y + c->h + 2 * c->border >
wy + wh
)
+ c->y =
wy + wh
- c->h - 2 * c->border;
+ if(c->x <
wx
)
+ c->x =
wx
;
+ if(c->y <
wy
)
+ c->y =
wy
;
c->border = BORDERPX;
}
c->border = BORDERPX;
}
@@
-1045,7
+1046,7
@@
monocle(void) {
for(c = clients; c; c = c->next)
if(isvisible(c))
for(c = clients; c; c = c->next)
if(isvisible(c))
- resize(c,
MOX, MOY, MOW, MOH
, RESIZEHINTS);
+ resize(c,
mox, moy, mow, moh
, RESIZEHINTS);
}
void
}
void
@@
-1076,14
+1077,14
@@
movemouse(Client *c) {
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- if(abs(
WX
- nx) < SNAP)
- nx =
WX
;
- else if(abs((
WX + WW
) - (nx + c->w + 2 * c->border)) < SNAP)
- nx =
WX + WW
- c->w - 2 * c->border;
- if(abs(
WY
- ny) < SNAP)
- ny =
WY
;
- else if(abs((
WY + WH
) - (ny + c->h + 2 * c->border)) < SNAP)
- ny =
WY + WH
- c->h - 2 * c->border;
+ if(abs(
wx
- nx) < SNAP)
+ nx =
wx
;
+ else if(abs((
wx + ww
) - (nx + c->w + 2 * c->border)) < SNAP)
+ nx =
wx + ww
- c->w - 2 * c->border;
+ if(abs(
wy
- ny) < SNAP)
+ ny =
wy
;
+ else if(abs((
wy + wh
) - (ny + c->h + 2 * c->border)) < SNAP)
+ ny =
wy + wh
- c->h - 2 * c->border;
if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
togglefloating(NULL);
if((lt->isfloating) || c->isfloating)
if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
togglefloating(NULL);
if((lt->isfloating) || c->isfloating)
@@
-1378,6
+1379,46
@@
setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
PropModeReplace, (unsigned char *)data, 2);
}
+void
+setdefaultgeoms(void) {
+
+ /* screen dimensions */
+ sx = 0;
+ sy = 0;
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
+
+ /* bar position */
+ bx = sx;
+ by = sy;
+ bw = sw;
+ bh = dc.font.height + 2;
+
+ /* window area */
+ wx = sx;
+ wy = sy + bh;
+ ww = sw;
+ wh = sh - bh;
+
+ /* master area */
+ mx = wx;
+ my = wy;
+ mw = ((float)sw) * 0.55;
+ mh = wh;
+
+ /* tile area */
+ tx = mx + mw;
+ ty = wy;
+ tw = ww - mw;
+ th = wh;
+
+ /* monocle area */
+ mox = wx;
+ moy = wy;
+ mow = ww;
+ moh = wh;
+}
+
void
setlayout(const char *arg) {
static Layout *revert = 0;
void
setlayout(const char *arg) {
static Layout *revert = 0;
@@
-1410,10
+1451,10
@@
setup(void) {
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
-
sx = 0
;
- sy = 0;
- sw = DisplayWidth(dpy, screen);
- s
h = DisplayHeight(dpy, screen
);
+
initfont(FONT)
;
+
+ /* apply default geometries */
+ s
etgeoms(
);
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@
-1436,7
+1477,7
@@
setup(void) {
dc.sel[ColBG] = getcolor(SELBGCOLOR);
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
dc.sel[ColBG] = getcolor(SELBGCOLOR);
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
- dc.h = bh
= dc.font.height + 2
;
+ dc.h = bh;
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
@@
-1462,7
+1503,7
@@
setup(void) {
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
- barwin = XCreateWindow(dpy, root,
BX, BY, BW
, bh, 0, DefaultDepth(dpy, screen),
+ barwin = XCreateWindow(dpy, root,
bx, by, bw
, bh, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
@@
-1558,20
+1599,20
@@
tilehstack(unsigned int n) {
if(n == 0)
return;
if(n == 0)
return;
- x =
TX
;
- w =
(TW)
/ n;
+ x =
tx
;
+ w =
tw
/ n;
if(w < bh)
if(w < bh)
- w =
TW
;
+ w =
tw
;
for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
if(i > 0) {
if(i > 1 && i == n) /* remainder */
for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
if(i > 0) {
if(i > 1 && i == n) /* remainder */
- tileresize(c, x,
TY, ((TX) + (TW)
) - x - 2 * c->border,
-
TH
- 2 * c->border);
+ tileresize(c, x,
ty, (tx + tw
) - x - 2 * c->border,
+
th
- 2 * c->border);
else
else
- tileresize(c, x,
TY
, w - 2 * c->border,
-
TH
- 2 * c->border);
- if(w !=
TW
)
+ tileresize(c, x,
ty
, w - 2 * c->border,
+
th
- 2 * c->border);
+ if(w !=
tw
)
x = c->x + c->w + 2 * c->border;
}
}
x = c->x + c->w + 2 * c->border;
}
}
@@
-1586,9
+1627,9
@@
tilemaster(void) {
if(n == 0)
return 0;
if(n == 1)
if(n == 0)
return 0;
if(n == 1)
- tileresize(mc,
MOX, MOY, (MOW) - 2 * mc->border, (MOH)
- 2 * mc->border);
+ tileresize(mc,
mox, moy, mow - 2 * mc->border, moh
- 2 * mc->border);
else
else
- tileresize(mc,
MX, MY, (MW) - 2 * mc->border, (MH)
- 2 * mc->border);
+ tileresize(mc,
mx, my, mw - 2 * mc->border, mh
- 2 * mc->border);
return n - 1;
}
return n - 1;
}
@@
-1605,20
+1646,20
@@
tilevstack(unsigned int n) {
if(n == 0)
return;
if(n == 0)
return;
- y =
TY
;
- h =
(TH)
/ n;
+ y =
ty
;
+ h =
th
/ n;
if(h < bh)
if(h < bh)
- h =
TH
;
+ h =
th
;
for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
if(i > 0) {
if(i > 1 && i == n) /* remainder */
for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
if(i > 0) {
if(i > 1 && i == n) /* remainder */
- tileresize(c,
TX, y, (TW)
- 2 * c->border,
- (
(TY) + (TH)
) - y - 2 * c->border);
+ tileresize(c,
tx, y, tw
- 2 * c->border,
+ (
ty + th
) - y - 2 * c->border);
else
else
- tileresize(c,
TX, y, (TW)
- 2 * c->border,
+ tileresize(c,
tx, y, tw
- 2 * c->border,
h - 2 * c->border);
h - 2 * c->border);
- if(h !=
TH
)
+ if(h !=
th
)
y = c->y + c->h + 2 * c->border;
}
}
y = c->y + c->h + 2 * c->border;
}
}
@@
-1699,6
+1740,15
@@
unmapnotify(XEvent *e) {
unmanage(c);
}
unmanage(c);
}
+void
+updatebarpos(void) {
+
+ if(dc.drawable != 0)
+ XFreePixmap(dpy, dc.drawable);
+ dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+}
+
void
updatesizehints(Client *c) {
long msize;
void
updatesizehints(Client *c) {
long msize;