-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+ * (C)opyright MMVI
-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>
* See LICENSE file for license details.
*/
#include "dmenu.h"
#include <X11/Xutil.h>
#include <X11/keysym.h>
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+
typedef struct Item Item;
struct Item {
Item *next; /* traverses all items */
static char text[4096];
static char *prompt = NULL;
-static int mx, my, mw, mh;
+static int mw, mh;
static int ret = 0;
static int nitem = 0;
static unsigned int cmdw = 0;
static unsigned int promptw = 0;
+static unsigned int numlockmask = 0;
static Bool running = True;
static Item *allitems = NULL; /* first of all items */
static Item *item = NULL; /* first of pattern matching items */
static Window root;
static Window win;
+static unsigned 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);
+}
+
+static unsigned int
+textw(const char *text) {
+ return textnw(text, strlen(text)) + dc.font.height;
+}
+
static void
calcoffsets(void) {
unsigned int tw, w;
}
}
+static void
+drawtext(const char *text, unsigned long col[ColLast]) {
+ int x, y, w, h;
+ static char buf[256];
+ unsigned int len, olen;
+ XGCValues gcv;
+ XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+
+ XSetForeground(dpy, dc.gc, col[ColBG]);
+ XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+ if(!text)
+ return;
+ w = 0;
+ olen = len = strlen(text);
+ if(len >= sizeof buf)
+ len = sizeof buf - 1;
+ memcpy(buf, text, len);
+ buf[len] = 0;
+ 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 */
+ while(len && (w = textnw(buf, len)) > dc.w - h)
+ buf[--len] = 0;
+ if(len < olen) {
+ if(len > 1)
+ buf[len - 1] = '.';
+ if(len > 2)
+ buf[len - 2] = '.';
+ if(len > 3)
+ buf[len - 3] = '.';
+ }
+ if(w > dc.w)
+ return; /* too long */
+ gcv.foreground = col[ColFG];
+ if(dc.font.set) {
+ XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+ XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,
+ x, y, buf, len);
+ }
+ else {
+ gcv.font = dc.font.xfont->fid;
+ XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+ XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+ }
+}
+
static void
drawmenu(void) {
Item *i;
XFlush(dpy);
}
+static unsigned long
+getcolor(const char *colstr) {
+ Colormap cmap = DefaultColormap(dpy, screen);
+ XColor color;
+
+ if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+ eprint("error, cannot allocate color '%s'\n", colstr);
+ return color.pixel;
+}
+
+static void
+setfont(const char *fontstr) {
+ char *def, **missing;
+ int i, n;
+
+ missing = NULL;
+ if(dc.font.set)
+ XFreeFontSet(dpy, dc.font.set);
+ dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+ if(missing)
+ XFreeStringList(missing);
+ if(dc.font.set) {
+ XFontSetExtents *font_extents;
+ XFontStruct **xfonts;
+ char **font_names;
+ dc.font.ascent = dc.font.descent = 0;
+ font_extents = XExtentsOfFontSet(dc.font.set);
+ n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+ for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+ if(dc.font.ascent < (*xfonts)->ascent)
+ dc.font.ascent = (*xfonts)->ascent;
+ if(dc.font.descent < (*xfonts)->descent)
+ dc.font.descent = (*xfonts)->descent;
+ xfonts++;
+ }
+ }
+ else {
+ if(dc.font.xfont)
+ XFreeFont(dpy, dc.font.xfont);
+ dc.font.xfont = NULL;
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+ eprint("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;
+}
+
static void
match(char *pattern) {
unsigned int plen;
static void
kpress(XKeyEvent * e) {
char buf[32];
- int num, prev_nitem;
- unsigned int i, len;
+ int i, num, prev_nitem;
+ unsigned int len;
KeySym ksym;
len = strlen(text);
switch (ksym) {
default: /* ignore other control sequences */
return;
+ case XK_bracketleft:
+ ksym = XK_Escape;
break;
case XK_h:
case XK_H:
ksym = XK_BackSpace;
break;
+ case XK_i:
+ case XK_I:
+ ksym = XK_Tab;
+ break;
+ case XK_j:
+ case XK_J:
+ ksym = XK_Return;
+ break;
case XK_u:
case XK_U:
text[0] = 0;
match(text);
drawmenu();
return;
+ case XK_w:
+ case XK_W:
+ if(len) {
+ i = len - 1;
+ while(i >= 0 && text[i] == ' ')
+ text[i--] = 0;
+ while(i >= 0 && text[i] != ' ')
+ text[i--] = 0;
+ match(text);
+ drawmenu();
+ }
+ return;
+ }
+ }
+ if(CLEANMASK(e->state) & Mod1Mask) {
+ switch(ksym) {
+ default: return;
+ case XK_h:
+ ksym = XK_Left;
+ break;
+ case XK_l:
+ ksym = XK_Right;
+ break;
+ case XK_j:
+ ksym = XK_Next;
+ break;
+ case XK_k:
+ ksym = XK_Prior;
+ break;
+ case XK_g:
+ ksym = XK_Home;
+ break;
+ case XK_G:
+ ksym = XK_End;
break;
}
}
int
main(int argc, char *argv[]) {
+ Bool bottom = False;
char *font = FONT;
char *maxname;
char *normbg = NORMBGCOLOR;
char *selbg = SELBGCOLOR;
char *selfg = SELFGCOLOR;
fd_set rd;
- int i;
+ int i, j;
struct timeval timeout;
Item *itm;
XEvent ev;
+ XModifierKeymap *modmap;
XSetWindowAttributes wa;
timeout.tv_usec = 0;
timeout.tv_sec = 3;
/* command line args */
for(i = 1; i < argc; i++)
- if(!strncmp(argv[i], "-font", 6)) {
+ if(!strncmp(argv[i], "-b", 3)) {
+ bottom = True;
+ }
+ else if(!strncmp(argv[i], "-fn", 4)) {
if(++i < argc) font = argv[i];
}
- else if(!strncmp(argv[i], "-normbg", 8)) {
+ else if(!strncmp(argv[i], "-nb", 4)) {
if(++i < argc) normbg = argv[i];
}
- else if(!strncmp(argv[i], "-normfg", 8)) {
+ else if(!strncmp(argv[i], "-nf", 4)) {
if(++i < argc) normfg = argv[i];
}
- else if(!strncmp(argv[i], "-selbg", 7)) {
+ else if(!strncmp(argv[i], "-p", 3)) {
+ if(++i < argc) prompt = argv[i];
+ }
+ else if(!strncmp(argv[i], "-sb", 4)) {
if(++i < argc) selbg = argv[i];
}
- else if(!strncmp(argv[i], "-selfg", 7)) {
+ else if(!strncmp(argv[i], "-sf", 4)) {
if(++i < argc) selfg = argv[i];
}
- else if(!strncmp(argv[i], "-p", 3)) {
- if(++i < argc) prompt = argv[i];
- }
else if(!strncmp(argv[i], "-t", 3)) {
if(++i < argc) timeout.tv_sec = atoi(argv[i]);
}
else if(!strncmp(argv[i], "-v", 3)) {
- fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+ fputs("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS);
}
else
- eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+ eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt>]\n"
+ " [-sb <color>] [-sf <color>] [-t <seconds>] [-v]\n", stdout);
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
goto UninitializedEnd;
maxname = readstdin();
+ /* init modifier map */
+ modmap = XGetModifierMapping(dpy);
+ for (i = 0; i < 8; i++) {
+ for (j = 0; j < modmap->max_keypermod; j++) {
+ if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+ numlockmask = (1 << i);
+ }
+ }
+ XFreeModifiermap(modmap);
/* style */
dc.norm[ColBG] = getcolor(normbg);
dc.norm[ColFG] = getcolor(normfg);
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
- mx = my = 0;
mw = DisplayWidth(dpy, screen);
mh = dc.font.height + 2;
- win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
+ win = XCreateWindow(dpy, root, 0,
+ bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);