-/* (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.
- */
+/* See LICENSE file for copyright and license details. */
#include "dmenu.h"
-
#include <ctype.h>
#include <locale.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
-#include <sys/select.h>
-#include <sys/time.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
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 Bool
+grabkeyboard(void) {
+ unsigned int len;
+
+ for(len = 1000; len; len--) {
+ if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+ == GrabSuccess)
+ break;
+ usleep(1000);
+ }
+ return len > 0;
+}
+
static unsigned long
-getcolor(const char *colstr) {
+initcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
}
static void
-setfont(const char *fontstr) {
+initfont(const char *fontstr) {
char *def, **missing;
int i, n;
+ if(!fontstr || fontstr[0] == '\0')
+ eprint("error, cannot load font: '%s'\n", fontstr);
missing = NULL;
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
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);
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) {
+ if(!(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+ 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 int
+strido(const char *text, const char *pattern) {
+ for(; *text && *pattern; text++)
+ if (*text == *pattern)
+ pattern++;
+ return !*pattern;
+}
+
static void
match(char *pattern) {
unsigned int plen;
for(i = allitems; 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++;
+ }
+ for(i = allitems; i; i=i->next)
+ if(plen && strncmp(pattern, i->text, plen)
+ && !strstr(i->text, pattern)
+ && strido(i->text,pattern)) {
if(!j)
item = i;
else
static void
kpress(XKeyEvent * e) {
char buf[32];
- int i, num, prev_nitem;
+ int i, num;
unsigned int len;
KeySym ksym;
len = strlen(text);
buf[0] = 0;
num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+ if(IsKeypadKey(ksym)) {
+ if(ksym == XK_KP_Enter) {
+ ksym = XK_Return;
+ } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) {
+ ksym = (ksym - XK_KP_0) + XK_0;
+ }
+ }
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|| IsPrivateKeypadKey(ksym))
}
break;
case XK_BackSpace:
- if((i = len)) {
- prev_nitem = nitem;
- do {
- text[--i] = 0;
- match(text);
- } while(i && nitem && prev_nitem == nitem);
+ if(len) {
+ text[--len] = 0;
match(text);
}
break;
return maxname;
}
+static void
+usage(void) {
+ eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+ " [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+}
+
/* extern */
int screen;
char *normfg = NORMFGCOLOR;
char *selbg = SELBGCOLOR;
char *selfg = SELFGCOLOR;
- fd_set rd;
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], "-b", 3)) {
+ if(!strcmp(argv[i], "-b")) {
bottom = True;
}
- else if(!strncmp(argv[i], "-fn", 4)) {
+ else if(!strcmp(argv[i], "-fn")) {
if(++i < argc) font = argv[i];
}
- else if(!strncmp(argv[i], "-nb", 4)) {
+ else if(!strcmp(argv[i], "-nb")) {
if(++i < argc) normbg = argv[i];
}
- else if(!strncmp(argv[i], "-nf", 4)) {
+ else if(!strcmp(argv[i], "-nf")) {
if(++i < argc) normfg = argv[i];
}
- else if(!strncmp(argv[i], "-p", 3)) {
+ else if(!strcmp(argv[i], "-p")) {
if(++i < argc) prompt = argv[i];
}
- else if(!strncmp(argv[i], "-sb", 4)) {
+ else if(!strcmp(argv[i], "-sb")) {
if(++i < argc) selbg = argv[i];
}
- else if(!strncmp(argv[i], "-sf", 4)) {
+ else if(!strcmp(argv[i], "-sf")) {
if(++i < argc) selfg = 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-MMVII Anselm R. Garbe\n", stdout);
- exit(EXIT_SUCCESS);
- }
+ else if(!strcmp(argv[i], "-v"))
+ eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
else
- eprint("usage: dmenu [-b] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt>]\n"
- " [-sb <color>] [-sf <color>] [-t <seconds>] [-v]\n", stdout);
+ usage();
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dmenu: cannot open display\n");
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
-
- /* Note, the select() construction allows to grab all keypresses as
- * early as possible, to not loose them. But if there is no standard
- * input supplied, we will make sure to exit after MAX_WAIT_STDIN
- * seconds. This is convenience behavior for rapid typers.
- */
- while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
- GrabModeAsync, CurrentTime) != GrabSuccess)
- usleep(1000);
- FD_ZERO(&rd);
- FD_SET(STDIN_FILENO, &rd);
- if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
- goto UninitializedEnd;
- maxname = readstdin();
+ if(isatty(STDIN_FILENO)) {
+ maxname = readstdin();
+ running = grabkeyboard();
+ }
+ else { /* prevent keypress loss */
+ running = grabkeyboard();
+ 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))
+ 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);
- dc.sel[ColBG] = getcolor(selbg);
- dc.sel[ColFG] = getcolor(selfg);
- setfont(font);
+ dc.norm[ColBG] = initcolor(normbg);
+ dc.norm[ColFG] = initcolor(normfg);
+ dc.sel[ColBG] = initcolor(selbg);
+ dc.sel[ColFG] = initcolor(selfg);
+ initfont(font);
/* menu window */
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ if(!dc.font.set)
+ XSetFont(dpy, dc.gc, dc.font.xfont->fid);
if(maxname)
cmdw = textw(maxname);
if(cmdw > mw / 3)
XFreePixmap(dpy, dc.drawable);
XFreeGC(dpy, dc.gc);
XDestroyWindow(dpy, win);
-UninitializedEnd:
XUngrabKeyboard(dpy, CurrentTime);
XCloseDisplay(dpy);
return ret;
projects / dmenu.git / blobdiff