|
@ -187,7 +187,7 @@ grabkeyboard(void) |
|
|
return; |
|
|
return; |
|
|
nanosleep(&ts, NULL); |
|
|
nanosleep(&ts, NULL); |
|
|
} |
|
|
} |
|
|
die("cannot grab keyboard\n"); |
|
|
|
|
|
|
|
|
die("cannot grab keyboard"); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
static void |
|
|
static void |
|
@ -205,7 +205,7 @@ match(void) |
|
|
/* separate input text into tokens to be matched individually */ |
|
|
/* 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))) |
|
|
die("cannot realloc %u bytes\n", tokn * sizeof *tokv); |
|
|
|
|
|
|
|
|
die("cannot realloc %u bytes:", tokn * sizeof *tokv); |
|
|
len = tokc ? strlen(tokv[0]) : 0; |
|
|
len = tokc ? strlen(tokv[0]) : 0; |
|
|
|
|
|
|
|
|
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; |
|
|
matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; |
|
@ -647,14 +647,14 @@ main(int argc, char *argv[]) |
|
|
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) |
|
|
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) |
|
|
fputs("warning: no locale support\n", stderr); |
|
|
fputs("warning: no locale support\n", stderr); |
|
|
if (!(dpy = XOpenDisplay(NULL))) |
|
|
if (!(dpy = XOpenDisplay(NULL))) |
|
|
die("cannot open display\n"); |
|
|
|
|
|
|
|
|
die("cannot open display"); |
|
|
screen = DefaultScreen(dpy); |
|
|
screen = DefaultScreen(dpy); |
|
|
root = RootWindow(dpy, screen); |
|
|
root = RootWindow(dpy, screen); |
|
|
sw = DisplayWidth(dpy, screen); |
|
|
sw = DisplayWidth(dpy, screen); |
|
|
sh = DisplayHeight(dpy, screen); |
|
|
sh = DisplayHeight(dpy, screen); |
|
|
drw = drw_create(dpy, screen, root, sw, sh); |
|
|
drw = drw_create(dpy, screen, root, sw, sh); |
|
|
if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) |
|
|
if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) |
|
|
die("no fonts could be loaded.\n"); |
|
|
|
|
|
|
|
|
die("no fonts could be loaded."); |
|
|
lrpad = drw->fonts->h; |
|
|
lrpad = drw->fonts->h; |
|
|
|
|
|
|
|
|
if (fast) { |
|
|
if (fast) { |
|
|