On 23 April 2011 14:11, Ciprian Dorin Craciun <[email protected]> wrote:
> I've tried to apply the attached patch (and the one on the dmenu
> web-site) with both patch and git-apply, and they've both complained:
>
> Am I missing something?
Don't think so, I must've bodged the patch, give this a try.
Cheers,
Rob.
diff -r c2e77ee26371 dmenu.c
--- a/dmenu.c Fri Jan 07 18:55:00 2011 +0000
+++ b/dmenu.c Tue Apr 26 19:50:05 2011 +0100
@@ -66,6 +66,7 @@
int
main(int argc, char *argv[]) {
int i;
+ Bool fastgrab = False;
progname = "dmenu";
for(i = 1; i < argc; i++)
@@ -78,6 +79,8 @@
topbar = False;
else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp;
+ else if(!strcmp(argv[i], "-f"))
+ fastgrab = True;
else if(i == argc-1)
usage();
/* double flags */
@@ -103,7 +106,19 @@
dc = initdc();
initfont(dc, font);
readstdin();
- setup();
+
+
+ if(fastgrab)
+ setup(); /* grab X _now_ */
+
+ readstdin();
+
+ if(!fastgrab)
+ setup();
+ else
+ match(); /* need to re-match now we've read the input */
+
+
run();
return EXIT_FAILURE; /* should not reach */
@@ -536,7 +551,7 @@
void
usage(void) {
- fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+ fputs("usage: dmenu [-b] [-i] [-f] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
" [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
exit(EXIT_FAILURE);
}
