commit 7817523a685f0dbba2e074a448099558a54b1b9c Author: arg@10ksloc.org Date: Fri Aug 4 09:35:27 2006 +0200 initial import diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..aa0a3ab --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT/X Consortium License + +(C)opyright MMVI Anselm R. Garbe + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..0cfd20d --- /dev/null +++ b/Makefile @@ -0,0 +1,61 @@ +# dmenu - dynamic menu +# (C)opyright MMVI Anselm R. Garbe + +include config.mk + +SRC = draw.c main.c util.c +OBJ = ${SRC:.c=.o} + +all: options dmenu + @echo finished + +options: + @echo dmenu build options: + @echo "CFLAGS = ${CFLAGS}" + @echo "LDFLAGS = ${LDFLAGS}" + @echo "CC = ${CC}" + +.c.o: + @echo CC $< + @${CC} -c ${CFLAGS} $< + +${OBJ}: dmenu.h config.h + +config.h: + @echo creating $@ from config.default.h + @cp config.default.h $@ + +dmenu: ${OBJ} + @echo LD $@ + @${CC} -o $@ ${OBJ} ${LDFLAGS} + +clean: + @echo cleaning + @rm -f dmenu ${OBJ} dmenu-${VERSION}.tar.gz + +dist: clean + @echo creating dist tarball + @mkdir -p dmenu-${VERSION} + @cp -R LICENSE Makefile README config.mk \ + dmenu.1 dmenu.h ${SRC} dmenu-${VERSION} + @tar -cf dmenu-${VERSION}.tar dmenu-${VERSION} + @gzip dmenu-${VERSION}.tar + @rm -rf dmenu-${VERSION} + +install: all + @echo installing executable file to ${DESTDIR}${PREFIX}/bin + @mkdir -p ${DESTDIR}${PREFIX}/bin + @cp -f dmenu ${DESTDIR}${PREFIX}/bin + @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu + @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 + @mkdir -p ${DESTDIR}${MANPREFIX}/man1 + @cp -f dmenu.1 ${DESTDIR}${MANPREFIX}/man1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1 + +uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin + @rm -f ${DESTDIR}${PREFIX}/bin/dmenu + @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 + @rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1 + +.PHONY: all options clean dist install uninstall diff --git a/README b/README new file mode 100644 index 0000000..5915a27 --- /dev/null +++ b/README @@ -0,0 +1,48 @@ +dwm - dynamic window manager +---------------------------- +dwm is an extremely fast, small, and dynamic X11 window manager. + + +Requirements +------------ +In order to build dwm you need the Xlib header files. + + +Installation +------------ +Edit config.mk to match your local setup (dwm is installed into +the /usr/local namespace by default). + +Afterwards enter the following command to build and install dwm (if +necessary as root): + + make clean install + + +Running dwm +----------- +Add the following line to your .xinitrc to start dwm using startx: + + exec dwm + +In order to connect dwm to a specific display, make sure that +the DISPLAY environment variable is set correctly, e.g.: + + DISPLAY=foo.bar:1 exec dwm + +(This will start dwm on display :1 of the host foo.bar.) + +In order to display status info in the bar, you can do something +like this in your .xinitrc: + + while true + do + echo `date` `uptime | sed 's/.*://; s/,//g'` + sleep 1 + done | dwm + + +Configuration +------------- +The configuration of dwm is done by creating a custom config.h +and (re)compiling the source code. diff --git a/config.arg.h b/config.arg.h new file mode 100644 index 0000000..008161d --- /dev/null +++ b/config.arg.h @@ -0,0 +1,9 @@ +/* + * (C)opyright MMVI Anselm R. Garbe + * See LICENSE file for license details. + */ + +#define FONT "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*" +#define BGCOLOR "#0a2c2d" +#define FGCOLOR "#ddeeee" +#define BORDERCOLOR "#176164" diff --git a/config.default.h b/config.default.h new file mode 100644 index 0000000..cf1baea --- /dev/null +++ b/config.default.h @@ -0,0 +1,9 @@ +/* + * (C)opyright MMVI Anselm R. Garbe + * See LICENSE file for license details. + */ + +#define FONT "fixed" +#define BGCOLOR "#666699" +#define FGCOLOR "#eeeeee" +#define BORDERCOLOR "#9999CC" diff --git a/config.h b/config.h new file mode 100644 index 0000000..008161d --- /dev/null +++ b/config.h @@ -0,0 +1,9 @@ +/* + * (C)opyright MMVI Anselm R. Garbe + * See LICENSE file for license details. + */ + +#define FONT "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*" +#define BGCOLOR "#0a2c2d" +#define FGCOLOR "#ddeeee" +#define BORDERCOLOR "#176164" diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..a4d21ac --- /dev/null +++ b/config.mk @@ -0,0 +1,24 @@ +# dwm version +VERSION = 0.0 + +# Customize below to fit your system + +# paths +PREFIX = /usr/local +MANPREFIX = ${PREFIX}/share/man + +X11INC = /usr/X11R6/include +X11LIB = /usr/X11R6/lib + +# includes and libs +INCS = -I/usr/lib -I${X11INC} +LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 + +# flags +CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" +LDFLAGS = ${LIBS} +#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" +#LDFLAGS = -g ${LIBS} + +# compiler +CC = cc diff --git a/dmenu.1 b/dmenu.1 new file mode 100644 index 0000000..da69047 --- /dev/null +++ b/dmenu.1 @@ -0,0 +1,68 @@ +.TH DMENU 1 d-0.0 +.SH NAME +dmenu \- dynamic menu +.SH SYNOPSIS +.B dmenu +.RB [ \-v ] +.RB [ \-t +.IR title ] +.SH DESCRIPTION +.SS Overview +.B dmenu +is a generic, highly customizable, and efficient menu for the X Window System, +originally designed for +.BR dwm (1). +It supports arbitrary, user defined menu contents. +.SS Options +.TP +.B \-v +prints version information to stdout, then exits. +.TP +.BI \-t " title" +displays +.I title +above the menu. +.SS Usage +.B dmenu +reads a list of newline-separated items from stdin and creates a menu. +When the user selects an item or enters any text and presses Enter, his choice +is printed to stdout and +.B dmenu +terminates. +.SS Keyboard Control +.B dmenu +is completely controlled by the keyboard. The following keys are recognized: +.TP 2 +Any printable character +appends the character to the text in the input field. This works as a filter: +only items containing this text will be displayed. +.TP 2 +Left/Right (Control-p/Control-n) +select the previous/next item. +.TP 2 +Tab (Control-i) +copy the selected item to the input field. +.TP 2 +Enter (Control-j) +confirm selection and quit (print the selected item to stdout). +.TP 2 +Shift-Enter (Shift-Control-j) +confirm selection and quit (print the text in the input field to stdout). +.TP 2 +Escape (Control-[) +quit without selecting an item. +.TP 2 +Backspace (Control-h) +remove enough characters from the input field to change its filtering effect. +.TP 2 +Control-u +remove all characters from the input field. +.SS Exit codes +.B dmenu +returns +.B 0 +if Enter is pressed on termination, +.B 1 +if Escape is pressed. +.SH SEE ALSO +.BR dwm (1) diff --git a/dmenu.h b/dmenu.h new file mode 100644 index 0000000..8d630ba --- /dev/null +++ b/dmenu.h @@ -0,0 +1,58 @@ +/* + * (C)opyright MMVI Anselm R. Garbe + * See LICENSE file for license details. + */ + +#include "config.h" +#include +#include + +typedef struct Brush Brush; +typedef struct DC DC; +typedef struct Fnt Fnt; + +struct Fnt { + XFontStruct *xfont; + XFontSet set; + int ascent; + int descent; + int height; +}; + +struct DC { /* draw context */ + int x, y, w, h; + unsigned long bg; + unsigned long fg; + unsigned long border; + Drawable drawable; + Fnt font; + GC gc; +}; + +struct Brush { + GC gc; + Drawable drawable; + int x, y, w, h; + Fnt font; + unsigned long bg; + unsigned long fg; + unsigned long border; +}; + + + +/* draw.c */ +extern void draw(Display *dpy, Brush *b, Bool border, const char *text); +extern void loadcolors(Display *dpy, int screen, Brush *b, + const char *bg, const char *fg, const char *bo); +extern void loadfont(Display *dpy, Fnt *font, const char *fontstr); +extern unsigned int textnw(Fnt *font, char *text, unsigned int len); +extern unsigned int textw(Fnt *font, char *text); +extern unsigned int texth(Fnt *font); + +/* util.c */ +extern void *emalloc(unsigned int size); +extern void *emallocz(unsigned int size); +extern void eprint(const char *errstr, ...); +extern char *estrdup(const char *str); +extern void swap(void **p1, void **p2); diff --git a/draw.c b/draw.c new file mode 100644 index 0000000..d747629 --- /dev/null +++ b/draw.c @@ -0,0 +1,171 @@ +/* + * (C)opyright MMIV-MMVI Anselm R. Garbe + * See LICENSE file for license details. + */ + +#include +#include + +#include "dmenu.h" + +static void +drawborder(Display *dpy, Brush *b) +{ + XPoint points[5]; + XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter); + XSetForeground(dpy, b->gc, b->border); + points[0].x = b->x; + points[0].y = b->y; + points[1].x = b->w - 1; + points[1].y = 0; + points[2].x = 0; + points[2].y = b->h - 1; + points[3].x = -(b->w - 1); + points[3].y = 0; + points[4].x = 0; + points[4].y = -(b->h - 1); + XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious); +} + +void +draw(Display *dpy, Brush *b, Bool border, const char *text) +{ + unsigned int x, y, w, h, len; + static char buf[256]; + XGCValues gcv; + XRectangle r = { b->x, b->y, b->w, b->h }; + + XSetForeground(dpy, b->gc, b->bg); + XFillRectangles(dpy, b->drawable, b->gc, &r, 1); + + w = 0; + if(border) + drawborder(dpy, b); + + if(!text) + return; + + len = strlen(text); + if(len >= sizeof(buf)) + len = sizeof(buf) - 1; + memcpy(buf, text, len); + buf[len] = 0; + + h = b->font.ascent + b->font.descent; + y = b->y + (b->h / 2) - (h / 2) + b->font.ascent; + x = b->x + (h / 2); + + /* shorten text if necessary */ + while(len && (w = textnw(&b->font, buf, len)) > b->w - h) + buf[--len] = 0; + + if(w > b->w) + return; /* too long */ + + gcv.foreground = b->fg; + gcv.background = b->bg; + if(b->font.set) { + XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv); + XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc, + x, y, buf, len); + } + else { + gcv.font = b->font.xfont->fid; + XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv); + XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len); + } +} + +static unsigned long +xloadcolors(Display *dpy, Colormap cmap, const char *colstr) +{ + XColor color; + XAllocNamedColor(dpy, cmap, colstr, &color, &color); + return color.pixel; +} + +void +loadcolors(Display *dpy, int screen, Brush *b, + const char *bg, const char *fg, const char *border) +{ + Colormap cmap = DefaultColormap(dpy, screen); + b->bg = xloadcolors(dpy, cmap, bg); + b->fg = xloadcolors(dpy, cmap, fg); + b->border = xloadcolors(dpy, cmap, border); +} + +unsigned int +textnw(Fnt *font, char *text, unsigned int len) +{ + XRectangle r; + if(font->set) { + XmbTextExtents(font->set, text, len, NULL, &r); + return r.width; + } + return XTextWidth(font->xfont, text, len); +} + +unsigned int +textw(Fnt *font, char *text) +{ + return textnw(font, text, strlen(text)); +} + +unsigned int +texth(Fnt *font) +{ + return font->height + 4; +} + +void +loadfont(Display *dpy, Fnt *font, const char *fontstr) +{ + char **missing, *def; + int n; + + missing = NULL; + def = "?"; + setlocale(LC_ALL, ""); + if(font->set) + XFreeFontSet(dpy, font->set); + font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); + if(missing) { + while(n--) + fprintf(stderr, "missing fontset: %s\n", missing[n]); + XFreeStringList(missing); + if(font->set) { + XFreeFontSet(dpy, font->set); + font->set = NULL; + } + } + if(font->set) { + XFontSetExtents *font_extents; + XFontStruct **xfonts; + char **font_names; + unsigned int i; + + font->ascent = font->descent = 0; + font_extents = XExtentsOfFontSet(font->set); + n = XFontsOfFontSet(font->set, &xfonts, &font_names); + for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) { + if(font->ascent < (*xfonts)->ascent) + font->ascent = (*xfonts)->ascent; + if(font->descent < (*xfonts)->descent) + font->descent = (*xfonts)->descent; + xfonts++; + } + } + else { + if(font->xfont) + XFreeFont(dpy, font->xfont); + font->xfont = NULL; + font->xfont = XLoadQueryFont(dpy, fontstr); + if (!font->xfont) + font->xfont = XLoadQueryFont(dpy, "fixed"); + if (!font->xfont) + eprint("error, cannot load 'fixed' font\n"); + font->ascent = font->xfont->ascent; + font->descent = font->xfont->descent; + } + font->height = font->ascent + font->descent; +} diff --git a/main.c b/main.c new file mode 100644 index 0000000..18263d5 --- /dev/null +++ b/main.c @@ -0,0 +1,426 @@ +/* + * (C)opyright MMVI Anselm R. Garbe + * (C)opyright MMVI Sander van Dijk + * See LICENSE file for license details. + */ + +#include "dmenu.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +typedef struct Item Item; + +struct Item { + Item *next; /* traverses all items */ + Item *left, *right; /* traverses items matching current search pattern */ + char *text; +}; + +static Display *dpy; +static Window root; +static Window win; +static Bool done = False; + +static Item *allitem = NULL; /* first of all items */ +static Item *item = NULL; /* first of pattern matching items */ +static Item *sel = NULL; +static Item *nextoff = NULL; +static Item *prevoff = NULL; +static Item *curroff = NULL; + +static int screen, mx, my, mw, mh; +static char *title = NULL; +static char text[4096]; +static int ret = 0; +static int nitem = 0; +static unsigned int cmdw = 0; +static unsigned int tw = 0; +static unsigned int cw = 0; +static const int seek = 30; /* 30px */ + +static Brush brush = {0}; + +static void draw_menu(); +static void kpress(XKeyEvent * e); + +static char version[] = "dmenu - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n"; + +static void +update_offsets() +{ + unsigned int tw, w = cmdw + 2 * seek; + + if(!curroff) + return; + + for(nextoff = curroff; nextoff; nextoff=nextoff->right) { + tw = textw(&brush.font, nextoff->text); + if(tw > mw / 3) + tw = mw / 3; + w += tw + brush.font.height; + if(w > mw) + break; + } + + w = cmdw + 2 * seek; + for(prevoff = curroff; prevoff && prevoff->left; prevoff=prevoff->left) { + tw = textw(&brush.font, prevoff->left->text); + if(tw > mw / 3) + tw = mw / 3; + w += tw + brush.font.height; + if(w > mw) + break; + } +} + +static void +update_items(char *pattern) +{ + unsigned int plen = strlen(pattern); + Item *i, *j; + + if(!pattern) + return; + + if(!title || *pattern) + cmdw = cw; + else + cmdw = tw; + + item = j = NULL; + nitem = 0; + + for(i = allitem; i; i=i->next) + if(!plen || !strncmp(pattern, i->text, plen)) { + if(!j) + item = i; + else + j->right = i; + i->left = j; + i->right = NULL; + j = i; + nitem++; + } + for(i = allitem; i; i=i->next) + if(plen && strncmp(pattern, i->text, plen) + && strstr(i->text, pattern)) { + if(!j) + item = i; + else + j->right = i; + i->left = j; + i->right = NULL; + j = i; + nitem++; + } + + curroff = prevoff = nextoff = sel = item; + + update_offsets(); +} + +/* creates brush structs for brush mode drawing */ +static void +draw_menu() +{ + Item *i; + + brush.x = 0; + brush.y = 0; + brush.w = mw; + brush.h = mh; + draw(dpy, &brush, False, 0); + + /* print command */ + if(!title || text[0]) { + cmdw = cw; + if(cmdw && item) + brush.w = cmdw; + draw(dpy, &brush, False, text); + } + else { + cmdw = tw; + brush.w = cmdw; + draw(dpy, &brush, False, title); + } + brush.x += brush.w; + + if(curroff) { + brush.w = seek; + draw(dpy, &brush, False, (curroff && curroff->left) ? "<" : 0); + brush.x += brush.w; + + /* determine maximum items */ + for(i = curroff; i != nextoff; i=i->right) { + brush.border = False; + brush.w = textw(&brush.font, i->text); + if(brush.w > mw / 3) + brush.w = mw / 3; + brush.w += brush.font.height; + if(sel == i) { + swap((void **)&brush.fg, (void **)&brush.bg); + draw(dpy, &brush, True, i->text); + swap((void **)&brush.fg, (void **)&brush.bg); + } + else + draw(dpy, &brush, False, i->text); + brush.x += brush.w; + } + + brush.x = mw - seek; + brush.w = seek; + draw(dpy, &brush, False, nextoff ? ">" : 0); + } + XCopyArea(dpy, brush.drawable, win, brush.gc, 0, 0, mw, mh, 0, 0); + XFlush(dpy); +} + +static void +kpress(XKeyEvent * e) +{ + KeySym ksym; + char buf[32]; + int num, prev_nitem; + unsigned int i, len = strlen(text); + + buf[0] = 0; + num = XLookupString(e, buf, sizeof(buf), &ksym, 0); + + if(IsFunctionKey(ksym) || IsKeypadKey(ksym) + || IsMiscFunctionKey(ksym) || IsPFKey(ksym) + || IsPrivateKeypadKey(ksym)) + return; + + /* first check if a control mask is omitted */ + if(e->state & ControlMask) { + switch (ksym) { + default: /* ignore other control sequences */ + return; + break; + case XK_h: + ksym = XK_BackSpace; + break; + case XK_U: + case XK_u: + text[0] = 0; + update_items(text); + draw_menu(); + return; + break; + case XK_bracketleft: + ksym = XK_Escape; + break; + } + } + switch(ksym) { + case XK_Left: + if(!(sel && sel->left)) + return; + sel=sel->left; + if(sel->right == curroff) { + curroff = prevoff; + update_offsets(); + } + break; + case XK_Tab: + if(!sel) + return; + strncpy(text, sel->text, sizeof(text)); + update_items(text); + break; + case XK_Right: + if(!(sel && sel->right)) + return; + sel=sel->right; + if(sel == nextoff) { + curroff = nextoff; + update_offsets(); + } + break; + case XK_Return: + if(e->state & ShiftMask) { + if(text) + fprintf(stdout, "%s", text); + } + else if(sel) + fprintf(stdout, "%s", sel->text); + else if(text) + fprintf(stdout, "%s", text); + fflush(stdout); + done = True; + break; + case XK_Escape: + ret = 1; + done = True; + break; + case XK_BackSpace: + if((i = len)) { + prev_nitem = nitem; + do { + text[--i] = 0; + update_items(text); + } while(i && nitem && prev_nitem == nitem); + update_items(text); + } + break; + default: + if(num && !iscntrl((int) buf[0])) { + buf[num] = 0; + if(len > 0) + strncat(text, buf, sizeof(text)); + else + strncpy(text, buf, sizeof(text)); + update_items(text); + } + } + draw_menu(); +} + +static char * +read_allitems() +{ + static char *maxname = NULL; + char *p, buf[1024]; + unsigned int len = 0, max = 0; + Item *i, *new; + + i = 0; + while(fgets(buf, sizeof(buf), stdin)) { + len = strlen(buf); + if (buf[len - 1] == '\n') + buf[len - 1] = 0; + p = estrdup(buf); + if(max < len) { + maxname = p; + max = len; + } + + new = emalloc(sizeof(Item)); + new->next = new->left = new->right = NULL; + new->text = p; + if(!i) + allitem = new; + else + i->next = new; + i = new; + } + + return maxname; +} + +int +main(int argc, char *argv[]) +{ + int i; + XSetWindowAttributes wa; + char *maxname; + XEvent ev; + + /* command line args */ + for(i = 1; i < argc; i++) { + if (argv[i][0] == '-') + switch (argv[i][1]) { + case 'v': + fprintf(stdout, "%s", version); + exit(0); + break; + case 't': + if(++i < argc) { + title = argv[i]; + break; + } + default: + eprint("usage: dmenu [-v] [-t ]\n"); + break; + } + else + eprint("usage: dmenu [-v] [-t <title>]\n"); + } + + dpy = XOpenDisplay(0); + if(!dpy) + eprint("dmenu: cannot open dpy\n"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + + maxname = read_allitems(); + + /* grab as early as possible, but after reading all items!!! */ + while(XGrabKeyboard(dpy, root, True, GrabModeAsync, + GrabModeAsync, CurrentTime) != GrabSuccess) + usleep(1000); + + /* style */ + loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR); + loadfont(dpy, &brush.font, FONT); + + wa.override_redirect = 1; + wa.background_pixmap = ParentRelative; + wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; + + mx = my = 0; + mw = DisplayWidth(dpy, screen); + mh = texth(&brush.font); + + win = XCreateWindow(dpy, root, mx, my, mw, mh, 0, + DefaultDepth(dpy, screen), CopyFromParent, + DefaultVisual(dpy, screen), + CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); + XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm)); + XFlush(dpy); + + /* pixmap */ + brush.gc = XCreateGC(dpy, root, 0, 0); + brush.drawable = XCreatePixmap(dpy, win, mw, mh, + DefaultDepth(dpy, screen)); + XFlush(dpy); + + if(maxname) + cw = textw(&brush.font, maxname) + brush.font.height; + if(cw > mw / 3) + cw = mw / 3; + + if(title) { + tw = textw(&brush.font, title) + brush.font.height; + if(tw > mw / 3) + tw = mw / 3; + } + + cmdw = title ? tw : cw; + + text[0] = 0; + update_items(text); + XMapRaised(dpy, win); + draw_menu(); + XFlush(dpy); + + /* main event loop */ + while(!done && !XNextEvent(dpy, &ev)) { + switch (ev.type) { + case KeyPress: + kpress(&ev.xkey); + break; + case Expose: + if(ev.xexpose.count == 0) + draw_menu(); + break; + default: + break; + } + } + + XUngrabKeyboard(dpy, CurrentTime); + XFreePixmap(dpy, brush.drawable); + XFreeGC(dpy, brush.gc); + XDestroyWindow(dpy, win); + XCloseDisplay(dpy); + + return ret; +} diff --git a/util.c b/util.c new file mode 100644 index 0000000..dff7af7 --- /dev/null +++ b/util.c @@ -0,0 +1,68 @@ +/* + * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com> + * See LICENSE file for license details. + */ +#include "dmenu.h" +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/wait.h> +#include <unistd.h> + +/* static */ + +static void +bad_malloc(unsigned int size) +{ + eprint("fatal: could not malloc() %u bytes\n", size); +} + +/* extern */ + +void * +emalloc(unsigned int size) +{ + void *res = malloc(size); + if(!res) + bad_malloc(size); + return res; +} + +void * +emallocz(unsigned int size) +{ + void *res = calloc(1, size); + + if(!res) + bad_malloc(size); + return res; +} + +void +eprint(const char *errstr, ...) +{ + va_list ap; + + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); + exit(EXIT_FAILURE); +} + +char * +estrdup(const char *str) +{ + void *res = strdup(str); + if(!res) + bad_malloc(strlen(str)); + return res; +} + +void +swap(void **p1, void **p2) +{ + void *tmp = *p1; + *p1 = *p2; + *p2 = tmp; +}