add lots of comments

This commit is contained in:
Connor Lane Smith 2011-10-26 13:20:14 +01:00
parent dd29c5d480
commit 7b1493a631
1 changed files with 33 additions and 18 deletions

51
dmenu.c
View File

@ -70,35 +70,35 @@ main(int argc, char *argv[]) {
int i; int i;
for(i = 1; i < argc; i++) for(i = 1; i < argc; i++)
/* single flags */ /* these options take no arguments */
if(!strcmp(argv[i], "-v")) { if(!strcmp(argv[i], "-v")) { /* prints version information */
puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details"); puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
else if(!strcmp(argv[i], "-b")) else if(!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
topbar = False; topbar = False;
else if(!strcmp(argv[i], "-f")) else if(!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
fast = True; fast = True;
else if(!strcmp(argv[i], "-i")) { else if(!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
fstrncmp = strncasecmp; fstrncmp = strncasecmp;
fstrstr = cistrstr; fstrstr = cistrstr;
} }
else if(i+1 == argc) else if(i+1 == argc)
usage(); usage();
/* double flags */ /* these options take one argument */
else if(!strcmp(argv[i], "-l")) else if(!strcmp(argv[i], "-l")) /* number of lines in vertical list */
lines = atoi(argv[++i]); lines = atoi(argv[++i]);
else if(!strcmp(argv[i], "-p")) else if(!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
prompt = argv[++i]; prompt = argv[++i];
else if(!strcmp(argv[i], "-fn")) else if(!strcmp(argv[i], "-fn")) /* font or font set */
font = argv[++i]; font = argv[++i];
else if(!strcmp(argv[i], "-nb")) else if(!strcmp(argv[i], "-nb")) /* normal background color */
normbgcolor = argv[++i]; normbgcolor = argv[++i];
else if(!strcmp(argv[i], "-nf")) else if(!strcmp(argv[i], "-nf")) /* normal foreground color */
normfgcolor = argv[++i]; normfgcolor = argv[++i];
else if(!strcmp(argv[i], "-sb")) else if(!strcmp(argv[i], "-sb")) /* selected background color */
selbgcolor = argv[++i]; selbgcolor = argv[++i];
else if(!strcmp(argv[i], "-sf")) else if(!strcmp(argv[i], "-sf")) /* selected foreground color */
selfgcolor = argv[++i]; selfgcolor = argv[++i];
else else
usage(); usage();
@ -140,7 +140,7 @@ calcoffsets(void) {
n = lines * bh; n = lines * bh;
else else
n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">")); n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
/* calculate which items will begin the next page and previous page */
for(i = 0, next = curr; next; next = next->right) for(i = 0, next = curr; next; next = next->right)
if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n) if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
break; break;
@ -174,12 +174,14 @@ drawmenu(void) {
drawtext(dc, prompt, selcol); drawtext(dc, prompt, selcol);
dc->x = dc->w; dc->x = dc->w;
} }
/* draw input field */
dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
drawtext(dc, text, normcol); drawtext(dc, text, normcol);
if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
if(lines > 0) { if(lines > 0) {
/* draw vertical list */
dc->w = mw - dc->x; dc->w = mw - dc->x;
for(item = curr; item != next; item = item->right) { for(item = curr; item != next; item = item->right) {
dc->y += dc->h; dc->y += dc->h;
@ -187,6 +189,7 @@ drawmenu(void) {
} }
} }
else if(matches) { else if(matches) {
/* draw horizontal list */
dc->x += inputw; dc->x += inputw;
dc->w = textw(dc, "<"); dc->w = textw(dc, "<");
if(curr->left) if(curr->left)
@ -208,6 +211,7 @@ void
grabkeyboard(void) { grabkeyboard(void) {
int i; int i;
/* try to grab keyboard, we may have to wait for another process to ungrab */
for(i = 0; i < 1000; i++) { for(i = 0; i < 1000; i++) {
if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True, if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
@ -221,6 +225,7 @@ void
insert(const char *str, ssize_t n) { insert(const char *str, ssize_t n) {
if(strlen(text) + n > sizeof text - 1) if(strlen(text) + n > sizeof text - 1)
return; return;
/* move existing text out of the way, insert new text, and update cursor */
memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
if(n > 0) if(n > 0)
memcpy(&text[cursor], str, n); memcpy(&text[cursor], str, n);
@ -297,6 +302,7 @@ keypress(XKeyEvent *ev) {
break; break;
} }
if(next) { if(next) {
/* jump to end of list and position items in reverse */
curr = matchend; curr = matchend;
calcoffsets(); calcoffsets();
curr = prev; curr = prev;
@ -378,6 +384,7 @@ match(void) {
Item *item, *lprefix, *lsubstr, *prefixend, *substrend; Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
strcpy(buf, text); strcpy(buf, text);
/* separate input text into tokens to be matched individually */
for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " ")) for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv))) if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv); eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv);
@ -388,8 +395,9 @@ match(void) {
for(i = 0; i < tokc; i++) for(i = 0; i < tokc; i++)
if(!fstrstr(item->text, tokv[i])) if(!fstrstr(item->text, tokv[i]))
break; break;
if(i != tokc) if(i != tokc) /* not all tokens match */
continue; continue;
/* exact matches go first, then prefixes, then substrings */
if(!tokc || !fstrncmp(tokv[0], item->text, len+1)) if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
appenditem(item, &matches, &matchend); appenditem(item, &matches, &matchend);
else if(!fstrncmp(tokv[0], item->text, len)) else if(!fstrncmp(tokv[0], item->text, len))
@ -423,6 +431,7 @@ size_t
nextrune(int inc) { nextrune(int inc) {
ssize_t n; ssize_t n;
/* return location of next utf8 rune in the given direction (+1 or -1) */
for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc); for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
return n; return n;
} }
@ -434,6 +443,7 @@ paste(void) {
unsigned long dl; unsigned long dl;
Atom da; Atom da;
/* we have been given the current selection, now insert it into input */
XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False, XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
utf8, &da, &di, &dl, &dl, (unsigned char **)&p); utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p)); insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
@ -446,6 +456,7 @@ readstdin(void) {
char buf[sizeof text], *p, *maxstr = NULL; char buf[sizeof text], *p, *maxstr = NULL;
size_t i, max = 0, size = 0; size_t i, max = 0, size = 0;
/* read each line from stdin and add it to the item list */
for(i = 0; fgets(buf, sizeof buf, stdin); i++) { for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
if(i+1 >= size / sizeof *items) if(i+1 >= size / sizeof *items)
if(!(items = realloc(items, (size += BUFSIZ)))) if(!(items = realloc(items, (size += BUFSIZ))))
@ -508,7 +519,7 @@ setup(void) {
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
/* menu geometry */ /* calculate menu geometry */
bh = dc->font.height + 2; bh = dc->font.height + 2;
lines = MAX(lines, 0); lines = MAX(lines, 0);
mh = (lines + 1) * bh; mh = (lines + 1) * bh;
@ -521,10 +532,12 @@ setup(void) {
XGetInputFocus(dc->dpy, &w, &di); XGetInputFocus(dc->dpy, &w, &di);
if(w != root && w != PointerRoot && w != None) { if(w != root && w != PointerRoot && w != None) {
/* find top-level window containing current input focus */
do { do {
if(XQueryTree(dc->dpy, (pw = w), &dw, &w, &dws, &du) && dws) if(XQueryTree(dc->dpy, (pw = w), &dw, &w, &dws, &du) && dws)
XFree(dws); XFree(dws);
} while(w != root && w != pw); } while(w != root && w != pw);
/* find xinerama screen with which the window intersects most */
if(XGetWindowAttributes(dc->dpy, pw, &wa)) if(XGetWindowAttributes(dc->dpy, pw, &wa))
for(j = 0; j < n; j++) for(j = 0; j < n; j++)
if((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { if((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
@ -532,10 +545,12 @@ setup(void) {
i = j; i = j;
} }
} }
/* no focused window is on screen, so use pointer location instead */
if(!area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) if(!area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
if(INTERSECT(x, y, 1, 1, info[i])) if(INTERSECT(x, y, 1, 1, info[i]))
break; break;
x = info[i].x_org; x = info[i].x_org;
y = info[i].y_org + (topbar ? 0 : info[i].height - mh); y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
mw = info[i].width; mw = info[i].width;
@ -552,7 +567,7 @@ setup(void) {
inputw = MIN(inputw, mw/3); inputw = MIN(inputw, mw/3);
match(); match();
/* menu window */ /* create menu window */
swa.override_redirect = True; swa.override_redirect = True;
swa.background_pixmap = ParentRelative; swa.background_pixmap = ParentRelative;
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
@ -561,7 +576,7 @@ setup(void) {
DefaultVisual(dc->dpy, screen), DefaultVisual(dc->dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
/* input methods */ /* open input methods */
xim = XOpenIM(dc->dpy, NULL, NULL, NULL); xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
XNClientWindow, win, XNFocusWindow, win, NULL); XNClientWindow, win, XNFocusWindow, win, NULL);