git.stevedylan.dev

Makefile +2 −6

	@echo CC $<
	@${CC} -c ${CFLAGS} $<

${OBJ}: config.h config.mk draw/libdraw.a
${OBJ}: config.h config.mk

config.h:
	@echo creating $@ from config.def.h

	@echo CC -o $@
	@${CC} -o $@ $< ${LDFLAGS}

draw/libdraw.a:
	@cd draw && make

clean:
	@echo cleaning
	@rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
	@cd draw && make clean

dist: clean
	@echo creating dist tarball
	@mkdir -p dmenu-${VERSION}
	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run draw ${SRC} dmenu-${VERSION}
	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
	@gzip dmenu-${VERSION}.tar
	@rm -rf dmenu-${VERSION}

README +2 −0

Requirements
------------
In order to build dmenu you need the Xlib header files.
You also need libdraw, available from http://hg.suckless.org/libdraw

Pasting the X selection to dmenu requires the sselp utility at runtime.



config.mk +2 −2

XINERAMAFLAGS = -DXINERAMA

# includes and libs
INCS = -I. -Idraw -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -Ldraw -ldraw ${XINERAMALIBS}
INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -ldraw ${XINERAMALIBS}

# flags
CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}

dinput.c +1 −1

#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#include <draw.h>

/* macros */
#define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))

static void setup(Bool topbar);

#include "config.h"
#include "draw.h"

/* variables */
static char *prompt = NULL;

dmenu.c +1 −1

#ifdef XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
#include <draw.h>

/* macros */
#define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))

static void setup(void);

#include "config.h"
#include "draw.h"

/* variables */
static char **argp = NULL;

draw/Makefile (deleted) +0 −26

# libdraw - dynamic drawing library
# See LICENSE file for copyright and license details.

include ../config.mk

SRC = cleanupdraw.c drawsquare.c drawtext.c eprint.c getcolor.c initfont.c \
setupdraw.c textnw.c textw.c
OBJ = ${SRC:.c=.o}

all: libdraw.a

.c.o:
	@echo CC $<
	@${CC} -c ${CFLAGS} $<

${OBJ}: ../config.mk draw.h

libdraw.a: ${OBJ}
	@echo AR $@
	@ar cr $@ $+

clean:
	@echo cleaning libdraw
	@rm -f libdraw.a ${OBJ}

.PHONY: all options clean

draw/cleanupdraw.c (deleted) +0 −13

/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"

void
cleanupdraw(DC *dc) {
	if(dc->font.set)
		XFreeFontSet(dc->dpy, dc->font.set);
	else
		XFreeFont(dc->dpy, dc->font.xfont);
	XFreePixmap(dc->dpy, dc->drawable);
	XFreeGC(dc->dpy, dc->gc);
}

draw/draw.h (deleted) +0 −34

/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>

/* enums */
enum { ColBorder, ColFG, ColBG, ColLast };

/* typedefs */
typedef struct {
	int x, y, w, h;
	Drawable drawable;
	Display *dpy;
	GC gc;
	struct {
		XFontStruct *xfont;
		XFontSet set;
		int ascent;
		int descent;
		int height;
	} font;
} DC; /* draw context */

/* forward declarations */
void cleanupdraw(DC *dc);
void drawsquare(DC *dc, Bool filled, unsigned long col[ColLast], Bool invert);
void drawtext(DC *dc, const char *text, unsigned long col[ColLast], Bool invert);
void eprint(const char *fmt, ...);
unsigned long getcolor(DC *dc, const char *colstr);
void initfont(DC *dc, const char *fontstr);
void setupdraw(DC *dc, Window w);
int textnw(DC *dc, const char *text, unsigned int len);
int textw(DC *dc, const char *text);

/* variables */
extern const char *progname;

draw/drawsquare.c (deleted) +0 −19

/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"

void
drawsquare(DC *dc, Bool filled, unsigned long col[ColLast], Bool invert) {
	int n;
	XRectangle r = { dc->x, dc->y, dc->w, dc->h };

	XSetForeground(dc->dpy, dc->gc, col[invert ? ColBG : ColFG]);
	n = ((dc->font.ascent + dc->font.descent + 2) / 4) + (filled ? 1 : 0);
	r.width = r.height = n;
	r.x = dc->x + 1;
	r.y = dc->y + 1;
	if(filled)
		XFillRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
	else
		XDrawRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
}

draw/drawtext.c (deleted) +0 −34

/* See LICENSE file for copyright and license details. */
#include <string.h>
#include <X11/Xlib.h>
#include "draw.h"

#define MIN(a, b)               ((a) < (b) ? (a) : (b))

void
drawtext(DC *dc, 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(dc->dpy, dc->gc, col[invert ? ColFG : ColBG]);
	XFillRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
	if(!text)
		return;
	olen = strlen(text);
	h = dc->font.height;
	y = dc->y + ((h+2) / 2) - (h / 2) + dc->font.ascent;
	x = dc->x + (h / 2);
	/* shorten text if necessary */
	for(len = MIN(olen, sizeof buf); len && textnw(dc, 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(dc->dpy, dc->gc, col[invert ? ColBG : ColFG]);
	if(dc->font.set)
		XmbDrawString(dc->dpy, dc->drawable, dc->font.set, dc->gc, x, y, buf, len);
	else
		XDrawString(dc->dpy, dc->drawable, dc->gc, x, y, buf, len);
}

draw/eprint.c (deleted) +0 −18

/* See LICENSE file for copyright and license details. */
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "draw.h"

const char *progname;

void
eprint(const char *fmt, ...) {
	va_list ap;

	fprintf(stderr, "%s: ", progname);
	va_start(ap, fmt);
	vfprintf(stderr, fmt, ap);
	va_end(ap);
	exit(EXIT_FAILURE);
}

draw/getcolor.c (deleted) +0 −13

/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"

unsigned long
getcolor(DC *dc, const char *colstr) {
	Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
	XColor color;

	if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
		eprint("cannot allocate color '%s'\n", colstr);
	return color.pixel;
}

draw/initfont.c (deleted) +0 −36

/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"

#define MAX(a, b)               ((a) > (b) ? (a) : (b))

void
initfont(DC *dc, const char *fontstr) {
	char *def, **missing = NULL;
	int i, n;

	if(!fontstr || !*fontstr)
		eprint("cannot load null font\n");
	dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def);
	if(missing)
		XFreeStringList(missing);
	if(dc->font.set) {
		XFontStruct **xfonts;
		char **font_names;
		dc->font.ascent = dc->font.descent = 0;
		n = XFontsOfFontSet(dc->font.set, &xfonts, &font_names);
		for(i = 0; i < n; i++) {
			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(dc->dpy, fontstr))
		&& !(dc->font.xfont = XLoadQueryFont(dc->dpy, "fixed")))
			eprint("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;
}

draw/setupdraw.c (deleted) +0 −16

/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"

void
setupdraw(DC *dc, Window w) {
	XWindowAttributes wa;

	XGetWindowAttributes(dc->dpy, w, &wa);
	dc->drawable = XCreatePixmap(dc->dpy, w, wa.width, wa.height,
		DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
	dc->gc = XCreateGC(dc->dpy, w, 0, NULL);
	XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
	if(!dc->font.set)
		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
}

draw/textnw.c (deleted) +0 −14

/* See LICENSE file for copyright and license details. */
#include <X11/Xlib.h>
#include "draw.h"

int
textnw(DC *dc, 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);
}

draw/textw.c (deleted) +0 −9

/* See LICENSE file for copyright and license details. */
#include <string.h>
#include <X11/Xlib.h>
#include "draw.h"

int
textw(DC *dc, const char *text) {
	return textnw(dc, text, strlen(text)) + dc->font.height;
}

18	18		@echo CC $<
19	19		@${CC} -c ${CFLAGS} $<
20	20
21		-	${OBJ}: config.h config.mk draw/libdraw.a
	21	+	${OBJ}: config.h config.mk
22	22
23	23		config.h:
24	24		@echo creating $@ from config.def.h

28	28		@echo CC -o $@
29	29		@${CC} -o $@ $< ${LDFLAGS}
30	30
31		-	draw/libdraw.a:
32		-	@cd draw && make
33		-
34	31		clean:
35	32		@echo cleaning
36	33		@rm -f dinput dmenu ${OBJ} dmenu-${VERSION}.tar.gz
37		-	@cd draw && make clean
38	34
39	35		dist: clean
40	36		@echo creating dist tarball
41	37		@mkdir -p dmenu-${VERSION}
42		-	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run draw ${SRC} dmenu-${VERSION}
	38	+	@cp -R LICENSE Makefile README config.mk dmenu.1 config.def.h dmenu_path dmenu_run ${SRC} dmenu-${VERSION}
43	39		@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
44	40		@gzip dmenu-${VERSION}.tar
45	41		@rm -rf dmenu-${VERSION}

6	6		Requirements
7	7		------------
8	8		In order to build dmenu you need the Xlib header files.
	9	+	You also need libdraw, available from http://hg.suckless.org/libdraw
	10	+
9	11		Pasting the X selection to dmenu requires the sselp utility at runtime.
10	12
11	13

15	15		XINERAMAFLAGS = -DXINERAMA
16	16
17	17		# includes and libs
18		-	INCS = -I. -Idraw -I/usr/include -I${X11INC}
19		-	LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -Ldraw -ldraw ${XINERAMALIBS}
	18	+	INCS = -I. -I/usr/include -I${X11INC}
	19	+	LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -ldraw ${XINERAMALIBS}
20	20
21	21		# flags
22	22		CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}

12	12		#ifdef XINERAMA
13	13		#include <X11/extensions/Xinerama.h>
14	14		#endif
	15	+	#include <draw.h>
15	16
16	17		/* macros */
17	18		#define CLEANMASK(mask) (mask & ~(numlockmask \| LockMask))

30	31		static void setup(Bool topbar);
31	32
32	33		#include "config.h"
33		-	#include "draw.h"
34	34
35	35		/* variables */
36	36		static char *prompt = NULL;

1	-	# libdraw - dynamic drawing library
2	-	# See LICENSE file for copyright and license details.
3	-
4	-	include ../config.mk
5	-
6	-	SRC = cleanupdraw.c drawsquare.c drawtext.c eprint.c getcolor.c initfont.c \
7	-	setupdraw.c textnw.c textw.c
8	-	OBJ = ${SRC:.c=.o}
9	-
10	-	all: libdraw.a
11	-
12	-	.c.o:
13	-	@echo CC $<
14	-	@${CC} -c ${CFLAGS} $<
15	-
16	-	${OBJ}: ../config.mk draw.h
17	-
18	-	libdraw.a: ${OBJ}
19	-	@echo AR $@
20	-	@ar cr $@ $+
21	-
22	-	clean:
23	-	@echo cleaning libdraw
24	-	@rm -f libdraw.a ${OBJ}
25	-
26	-	.PHONY: all options clean

1	-	/* See LICENSE file for copyright and license details. */
2	-	#include <X11/Xlib.h>
3	-	#include "draw.h"
4	-
5	-	void
6	-	cleanupdraw(DC *dc) {
7	-	if(dc->font.set)
8	-	XFreeFontSet(dc->dpy, dc->font.set);
9	-	else
10	-	XFreeFont(dc->dpy, dc->font.xfont);
11	-	XFreePixmap(dc->dpy, dc->drawable);
12	-	XFreeGC(dc->dpy, dc->gc);
13	-	}

1	-	/* See LICENSE file for copyright and license details. */
2	-	#include <X11/Xlib.h>
3	-
4	-	/* enums */
5	-	enum { ColBorder, ColFG, ColBG, ColLast };
6	-
7	-	/* typedefs */
8	-	typedef struct {
9	-	int x, y, w, h;
10	-	Drawable drawable;
11	-	Display *dpy;
12	-	GC gc;
13	-	struct {
14	-	XFontStruct *xfont;
15	-	XFontSet set;
16	-	int ascent;
17	-	int descent;
18	-	int height;
19	-	} font;
20	-	} DC; /* draw context */
21	-
22	-	/* forward declarations */
23	-	void cleanupdraw(DC *dc);
24	-	void drawsquare(DC *dc, Bool filled, unsigned long col[ColLast], Bool invert);
25	-	void drawtext(DC dc, const char text, unsigned long col[ColLast], Bool invert);
26	-	void eprint(const char *fmt, ...);
27	-	unsigned long getcolor(DC dc, const char colstr);
28	-	void initfont(DC dc, const char fontstr);
29	-	void setupdraw(DC *dc, Window w);
30	-	int textnw(DC dc, const char text, unsigned int len);
31	-	int textw(DC dc, const char text);
32	-
33	-	/* variables */
34	-	extern const char *progname;

1	-	/* See LICENSE file for copyright and license details. */
2	-	#include <string.h>
3	-	#include <X11/Xlib.h>
4	-	#include "draw.h"
5	-
6	-	#define MIN(a, b) ((a) < (b) ? (a) : (b))
7	-
8	-	void
9	-	drawtext(DC dc, const char text, unsigned long col[ColLast], Bool invert) {
10	-	char buf[256];
11	-	int i, x, y, h, len, olen;
12	-	XRectangle r = { dc->x, dc->y, dc->w, dc->h };
13	-
14	-	XSetForeground(dc->dpy, dc->gc, col[invert ? ColFG : ColBG]);
15	-	XFillRectangles(dc->dpy, dc->drawable, dc->gc, &r, 1);
16	-	if(!text)
17	-	return;
18	-	olen = strlen(text);
19	-	h = dc->font.height;
20	-	y = dc->y + ((h+2) / 2) - (h / 2) + dc->font.ascent;
21	-	x = dc->x + (h / 2);
22	-	/* shorten text if necessary */
23	-	for(len = MIN(olen, sizeof buf); len && textnw(dc, text, len) > dc->w - h; len--);
24	-	if(!len)
25	-	return;
26	-	memcpy(buf, text, len);
27	-	if(len < olen)
28	-	for(i = len; i && i > len - 3; buf[--i] = '.');
29	-	XSetForeground(dc->dpy, dc->gc, col[invert ? ColBG : ColFG]);
30	-	if(dc->font.set)
31	-	XmbDrawString(dc->dpy, dc->drawable, dc->font.set, dc->gc, x, y, buf, len);
32	-	else
33	-	XDrawString(dc->dpy, dc->drawable, dc->gc, x, y, buf, len);
34	-	}

1	-	/* See LICENSE file for copyright and license details. */
2	-	#include <stdarg.h>
3	-	#include <stdio.h>
4	-	#include <stdlib.h>
5	-	#include "draw.h"
6	-
7	-	const char *progname;
8	-
9	-	void
10	-	eprint(const char *fmt, ...) {
11	-	va_list ap;
12	-
13	-	fprintf(stderr, "%s: ", progname);
14	-	va_start(ap, fmt);
15	-	vfprintf(stderr, fmt, ap);
16	-	va_end(ap);
17	-	exit(EXIT_FAILURE);
18	-	}