Hey,
On 21 April 2011 09:20, Anselm R Garbe <garb...@gmail.com> wrote:
> The best compromise we came up with is having a shared draw.c among
> dwm and dmenu at least, which is on the agenda for dwm 6.0. Probably
> this could also be used for st.
For what it's worth, I have been running a version of dwm which uses
draw.c for quite some time. I've attached a diff if anyone's
interested -- you will need to also grab draw.c and draw.h from the
dmenu repo.
Thanks,
cls
diff -r e901e70f69e8 Makefile
--- a/Makefile Fri Apr 15 08:13:06 2011 +0000
+++ b/Makefile Fri Apr 22 01:30:12 2011 +0100
@@ -3,7 +3,7 @@
include config.mk
-SRC = dwm.c
+SRC = dwm.c draw.c
OBJ = ${SRC:.c=.o}
all: options dwm
diff -r e901e70f69e8 dwm.c
--- a/dwm.c Fri Apr 15 08:13:06 2011 +0000
+++ b/dwm.c Fri Apr 22 01:30:12 2011 +0100
@@ -39,24 +39,23 @@
#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif /* XINERAMA */
+#include "draw.h"
/* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define CLEANMASK(mask) ((mask) & ~(numlockmask|LockMask))
#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
-#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
-#define LENGTH(X) (sizeof X / sizeof X[0])
+#define ISVISIBLE(C) (((C)->tags & (C)->mon->tagset[(C)->mon->seltags]))
+#define LENGTH(X) (sizeof (X) / sizeof *(X))
#define MAX(A, B) ((A) > (B) ? (A) : (B))
#define MIN(A, B) ((A) < (B) ? (A) : (B))
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
-#define TEXTW(X) (textnw(X, strlen(X)) + dc.font.height)
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
enum { NetSupported, NetWMName, NetWMState,
NetWMFullscreen, NetActiveWindow, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
@@ -96,21 +95,6 @@
};
typedef struct {
- int x, y, w, h;
- unsigned long norm[ColLast];
- unsigned long sel[ColLast];
- Drawable drawable;
- GC gc;
- struct {
- int ascent;
- int descent;
- int height;
- XFontSet set;
- XFontStruct *xfont;
- } font;
-} DC; /* draw context */
-
-typedef struct {
unsigned int mod;
KeySym keysym;
void (*func)(const Arg *);
@@ -171,25 +155,20 @@
static void destroynotify(XEvent *e);
static void detach(Client *c);
static void detachstack(Client *c);
-static void die(const char *errstr, ...);
static Monitor *dirtomon(int dir);
static void drawbar(Monitor *m);
static void drawbars(void);
-static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-static void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
static void enternotify(XEvent *e);
static void expose(XEvent *e);
static void focus(Client *c);
static void focusin(XEvent *e);
static void focusmon(const Arg *arg);
static void focusstack(const Arg *arg);
-static unsigned long getcolor(const char *colstr);
static Bool getrootptr(int *x, int *y);
static long getstate(Window w);
static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
static void grabbuttons(Client *c, Bool focused);
static void grabkeys(void);
-static void initfont(const char *fontstr);
static void keypress(XEvent *e);
static void killclient(const Arg *arg);
static void manage(Window w, XWindowAttributes *wa);
@@ -198,7 +177,7 @@
static void monocle(Monitor *m);
static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c);
-static void pop(Client *);
+static void pop(Client *c);
static void propertynotify(XEvent *e);
static Monitor *ptrtomon(int x, int y);
static void quit(const Arg *arg);
@@ -220,8 +199,7 @@
static void spawn(const Arg *arg);
static void tag(const Arg *arg);
static void tagmon(const Arg *arg);
-static int textnw(const char *text, unsigned int len);
-static void tile(Monitor *);
+static void tile(Monitor *m);
static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg);
static void toggletag(const Arg *arg);
@@ -253,6 +231,8 @@
static int bh, blw = 0; /* bar geometry */
static int (*xerrorxlib)(Display *, XErrorEvent *);
static unsigned int numlockmask = 0;
+static unsigned long normcol[ColLast];
+static unsigned long selcol[ColLast];
static void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ClientMessage] = clientmessage,
@@ -272,7 +252,7 @@
static Bool running = True;
static Cursor cursor[CurLast];
static Display *dpy;
-static DC dc;
+static DC *dc;
static Monitor *mons = NULL, *selmon = NULL;
static Window root;
@@ -434,7 +414,7 @@
if(ev->window == selmon->barwin) {
i = x = 0;
do {
- x += TEXTW(tags[i]);
+ x += textw(dc, tags[i]);
} while(ev->x >= x && ++i < LENGTH(tags));
if(i < LENGTH(tags)) {
click = ClkTagBar;
@@ -442,7 +422,7 @@
}
else if(ev->x < x + blw)
click = ClkLtSymbol;
- else if(ev->x > selmon->wx + selmon->ww - TEXTW(stext))
+ else if(ev->x > selmon->wx + selmon->ww - textw(dc, stext))
click = ClkStatusText;
else
click = ClkWinTitle;
@@ -478,13 +458,7 @@
for(m = mons; m; m = m->next)
while(m->stack)
unmanage(m->stack, False);
- if(dc.font.set)
- XFreeFontSet(dpy, dc.font.set);
- else
- XFreeFont(dpy, dc.font.xfont);
XUngrabKey(dpy, AnyKey, AnyModifier, root);
- XFreePixmap(dpy, dc.drawable);
- XFreeGC(dpy, dc.gc);
XFreeCursor(dpy, cursor[CurNormal]);
XFreeCursor(dpy, cursor[CurResize]);
XFreeCursor(dpy, cursor[CurMove]);
@@ -492,6 +466,7 @@
cleanupmon(mons);
XSync(dpy, False);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+ freedc(dc);
}
void
@@ -531,7 +506,7 @@
if(cme->message_type == netatom[NetWMState] && cme->data.l[1] == netatom[NetWMFullscreen]) {
if(cme->data.l[0]) {
XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
- PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
+ PropModeReplace, (unsigned char *)&netatom[NetWMFullscreen], 1);
c->oldstate = c->isfloating;
c->oldbw = c->bw;
c->bw = 0;
@@ -541,7 +516,7 @@
}
else {
XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
- PropModeReplace, (unsigned char*)0, 0);
+ PropModeReplace, NULL, 0);
c->isfloating = c->oldstate;
c->bw = c->oldbw;
c->x = c->oldx;
@@ -588,9 +563,7 @@
sw = ev->width;
sh = ev->height;
if(updategeom()) {
- if(dc.drawable != 0)
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ resizedc(dc, sw, bh);
updatebars();
for(m = mons; m; m = m->next)
XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
@@ -648,8 +621,8 @@
createmon(void) {
Monitor *m;
- if(!(m = (Monitor *)calloc(1, sizeof(Monitor))))
- die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
+ if(!(m = calloc(1, sizeof *m)))
+ eprintf("cannot malloc %u bytes\n", sizeof *m);
m->tagset[0] = m->tagset[1] = 1;
m->mfact = mfact;
m->showbar = showbar;
@@ -690,16 +663,6 @@
}
}
-void
-die(const char *errstr, ...) {
- va_list ap;
-
- va_start(ap, errstr);
- vfprintf(stderr, errstr, ap);
- va_end(ap);
- exit(EXIT_FAILURE);
-}
-
Monitor *
dirtomon(int dir) {
Monitor *m = NULL;
@@ -720,7 +683,7 @@
void
drawbar(Monitor *m) {
int x;
- unsigned int i, occ = 0, urg = 0;
+ unsigned int i, occ = 0, urg = 0, sel = 0;
unsigned long *col;
Client *c;
@@ -729,41 +692,45 @@
if(c->isurgent)
urg |= c->tags;
}
- dc.x = 0;
+ dc->x = 0;
for(i = 0; i < LENGTH(tags); i++) {
- dc.w = TEXTW(tags[i]);
- col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
- drawtext(tags[i], col, urg & 1 << i);
- drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
- occ & 1 << i, urg & 1 << i, col);
- dc.x += dc.w;
+ dc->w = textw(dc, tags[i]);
+ dc->invert = (urg & 1 << i);
+ col = m->tagset[m->seltags] & 1 << i ? selcol : normcol;
+ sel = m == selmon && selmon->sel && selmon->sel->tags & 1 << i;
+ drawtext(dc, tags[i], col);
+ if(sel || (occ & 1 << i))
+ drawrect(dc, 1, 1, (bh/4)+1, (bh/4)+1, sel, FG(dc, col));
+ dc->x += dc->w;
}
- dc.w = blw = TEXTW(m->ltsymbol);
- drawtext(m->ltsymbol, dc.norm, False);
- dc.x += dc.w;
- x = dc.x;
+ dc->invert = False;
+ dc->w = blw = textw(dc, m->ltsymbol);
+ drawtext(dc, m->ltsymbol, normcol);
+ dc->x += dc->w;
+ x = dc->x;
if(m == selmon) { /* status is only drawn on selected monitor */
- dc.w = TEXTW(stext);
- dc.x = m->ww - dc.w;
- if(dc.x < x) {
- dc.x = x;
- dc.w = m->ww - x;
+ dc->w = textw(dc, stext);
+ dc->x = m->ww - dc->w;
+ if(dc->x < x) {
+ dc->x = x;
+ dc->w = m->ww - x;
}
- drawtext(stext, dc.norm, False);
+ drawtext(dc, stext, normcol);
}
else
- dc.x = m->ww;
- if((dc.w = dc.x - x) > bh) {
- dc.x = x;
+ dc->x = m->ww;
+ if((dc->w = dc->x - x) > bh) {
+ dc->x = x;
if(m->sel) {
- col = m == selmon ? dc.sel : dc.norm;
- drawtext(m->sel->name, col, False);
- drawsquare(m->sel->isfixed, m->sel->isfloating, False, col);
+ col = m == selmon ? selcol : normcol;
+ drawtext(dc, m->sel->name, col);
+ if(m->sel->isfixed || m->sel->isfloating)
+ drawrect(dc, 1, 1, (bh/4)+1, (bh/4)+1, m->sel->isfixed, FG(dc, col));
}
else
- drawtext(NULL, dc.norm, False);
+ drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, normcol));
}
- XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
+ mapdc(dc, m->barwin, m->ww, bh);
XSync(dpy, False);
}
@@ -776,55 +743,6 @@
}
void
-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
- int x;
- XGCValues gcv;
- XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
- gcv.foreground = col[invert ? ColBG : ColFG];
- XChangeGC(dpy, dc.gc, GCForeground, &gcv);
- x = (dc.font.ascent + dc.font.descent + 2) / 4;
- r.x = dc.x + 1;
- r.y = dc.y + 1;
- if(filled) {
- r.width = r.height = x + 1;
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- }
- else if(empty) {
- r.width = r.height = x;
- XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- }
-}
-
-void
-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
- char buf[256];
- int i, x, y, h, len, olen;
- XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
- XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
- XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
- if(!text)
- return;
- olen = strlen(text);
- h = dc.font.ascent + dc.font.descent;
- y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
- x = dc.x + (h / 2);
- /* shorten text if necessary */
- for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
- if(!len)
- return;
- memcpy(buf, text, len);
- if(len < olen)
- for(i = len; i && i > len - 3; buf[--i] = '.');
- XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
- if(dc.font.set)
- XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
- else
- XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-}
-
-void
enternotify(XEvent *e) {
Monitor *m;
XCrossingEvent *ev = &e->xcrossing;
@@ -862,7 +780,7 @@
detachstack(c);
attachstack(c);
grabbuttons(c, True);
- XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+ XSetWindowBorder(dpy, c->win, selcol[ColBorder]);
setfocus(c);
}
else
@@ -918,16 +836,6 @@
}
}
-unsigned long
-getcolor(const char *colstr) {
- Colormap cmap = DefaultColormap(dpy, screen);
- XColor color;
-
- if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
- die("error, cannot allocate color '%s'\n", colstr);
- return color.pixel;
-}
-
Bool
getrootptr(int *x, int *y) {
int di;
@@ -1019,41 +927,6 @@
}
}
-void
-initfont(const char *fontstr) {
- char *def, **missing;
- int n;
-
- missing = NULL;
- dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
- if(missing) {
- while(n--)
- fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
- XFreeStringList(missing);
- }
- if(dc.font.set) {
- XFontStruct **xfonts;
- char **font_names;
-
- dc.font.ascent = dc.font.descent = 0;
- XExtentsOfFontSet(dc.font.set);
- n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
- while(n--) {
- dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
- dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
- xfonts++;
- }
- }
- else {
- if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
- && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
- die("error, cannot load font: '%s'\n", fontstr);
- dc.font.ascent = dc.font.xfont->ascent;
- dc.font.descent = dc.font.xfont->descent;
- }
- dc.font.height = dc.font.ascent + dc.font.descent;
-}
-
#ifdef XINERAMA
static Bool
isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
@@ -1101,8 +974,8 @@
Window trans = None;
XWindowChanges wc;
- if(!(c = calloc(1, sizeof(Client))))
- die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+ if(!(c = calloc(1, sizeof *c)))
+ eprintf("cannot malloc %u bytes\n", sizeof *c);
c->win = w;
updatetitle(c);
if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
@@ -1138,7 +1011,7 @@
}
wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
- XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+ XSetWindowBorder(dpy, w, normcol[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
updatesizehints(c);
updatewmhints(c);
@@ -1304,6 +1177,7 @@
return m;
return selmon;
}
+
void
quit(const Arg *arg) {
running = False;
@@ -1407,7 +1281,6 @@
run(void) {
XEvent ev;
/* main event loop */
- XSync(dpy, False);
while(running && !XNextEvent(dpy, &ev)) {
if(handler[ev.type])
handler[ev.type](&ev); /* call handler */
@@ -1531,16 +1404,16 @@
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- initfont(font);
+ initfont(dc, font);
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
- bh = dc.h = dc.font.height + 2;
+ bh = dc->h = dc->font.height + 2;
updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
- netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
+ netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
@@ -1551,17 +1424,13 @@
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
/* init appearance */
- dc.norm[ColBorder] = getcolor(normbordercolor);
- dc.norm[ColBG] = getcolor(normbgcolor);
- dc.norm[ColFG] = getcolor(normfgcolor);
- dc.sel[ColBorder] = getcolor(selbordercolor);
- dc.sel[ColBG] = getcolor(selbgcolor);
- dc.sel[ColFG] = getcolor(selfgcolor);
- dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, NULL);
- XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
- if(!dc.font.set)
- XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+ normcol[ColBorder] = getcolor(dc, normbordercolor);
+ normcol[ColBG] = getcolor(dc, normbgcolor);
+ normcol[ColFG] = getcolor(dc, normfgcolor);
+ selcol[ColBorder] = getcolor(dc, selbordercolor);
+ selcol[ColBG] = getcolor(dc, selbgcolor);
+ selcol[ColFG] = getcolor(dc, selfgcolor);
+ resizedc(dc, DisplayWidth(dpy, screen), bh);
/* init bars */
updatebars();
updatestatus();
@@ -1597,7 +1466,7 @@
void
sigchld(int unused) {
if(signal(SIGCHLD, sigchld) == SIG_ERR)
- die("Can't install SIGCHLD handler");
+ eprintf("cannot install SIGCHLD handler\n");
while(0 < waitpid(-1, NULL, WNOHANG));
}
@@ -1629,17 +1498,6 @@
sendmon(selmon->sel, dirtomon(arg->i));
}
-int
-textnw(const char *text, unsigned int len) {
- XRectangle r;
-
- if(dc.font.set) {
- XmbTextExtents(dc.font.set, text, len, NULL, &r);
- return r.width;
- }
- return XTextWidth(dc.font.xfont, text, len);
-}
-
void
tile(Monitor *m) {
int x, y, h, w, mw;
@@ -1717,7 +1575,7 @@
if(!c)
return;
grabbuttons(c, False);
- XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+ XSetWindowBorder(dpy, c->win, normcol[ColBorder]);
if(setfocus)
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
@@ -1799,11 +1657,11 @@
for(n = 0, m = mons; m; m = m->next, n++);
/* only consider unique geometries as separate screens */
- if(!(unique = (XineramaScreenInfo *)malloc(sizeof(XineramaScreenInfo) * nn)))
- die("fatal: could not malloc() %u bytes\n", sizeof(XineramaScreenInfo) * nn);
+ if(!(unique = malloc(nn * sizeof *unique)))
+ eprintf("cannot malloc %u bytes\n", nn * sizeof *unique);
for(i = 0, j = 0; i < nn; i++)
if(isuniquegeom(unique, j, &info[i]))
- memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
+ memcpy(&unique[j++], &info[i], sizeof *unique);
XFree(info);
nn = j;
if(n <= nn) {
@@ -2020,7 +1878,7 @@
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
- ee->request_code, ee->error_code);
+ ee->request_code, ee->error_code);
return xerrorxlib(dpy, ee); /* may call exit */
}
@@ -2033,7 +1891,7 @@
* is already running. */
int
xerrorstart(Display *dpy, XErrorEvent *ee) {
- die("dwm: another window manager is already running\n");
+ eprintf("another window manager is already running\n");
return -1;
}
@@ -2053,19 +1911,21 @@
int
main(int argc, char *argv[]) {
- if(argc == 2 && !strcmp("-v", argv[1]))
- die("dwm-"VERSION", © 2006-2010 dwm engineers, see LICENSE for details\n");
- else if(argc != 1)
- die("usage: dwm [-v]\n");
- if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
- fputs("warning: no locale support\n", stderr);
- if(!(dpy = XOpenDisplay(NULL)))
- die("dwm: cannot open display\n");
+ progname = "dwm";
+ if(argc == 2 && !strcmp("-v", argv[1])) {
+ fputs("dwm-"VERSION", © 2006-2011 dwm engineers, see LICENSE for details\n", stdout);
+ exit(EXIT_SUCCESS);
+ }
+ else if(argc != 1) {
+ fputs("usage: dwm [-v]\n", stderr);
+ exit(EXIT_FAILURE);
+ }
+ dc = initdc();
+ dpy = dc->dpy;
checkotherwm();
setup();
scan();
run();
cleanup();
- XCloseDisplay(dpy);
return 0;
}
