sites

commit 24a908b195d074afacde96ce3ce67ccfe4b2a52b
parent e89aca721077fc163c5f82f369d93cca236a7930
Author: Rob Pilling <my name at gmail dot com>
Date:   Sat, 20 Nov 2010 18:55:59 +0000

Updated incremental-tip patch
Diffstat:
M
tools.suckless.org/dmenu/patches/dmenu-tip-incremental.diff
 | 
50
+++++++++++++++++++++++++-------------------------

1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/tools.suckless.org/dmenu/patches/dmenu-tip-incremental.diff b/tools.suckless.org/dmenu/patches/dmenu-tip-incremental.diff
@@ -1,6 +1,6 @@
-diff -r ccb2b92086bf dmenu.1
---- a/dmenu.1	Thu Aug 12 15:35:51 2010 +0100
-+++ b/dmenu.1	Wed Aug 18 10:59:14 2010 +0100
+diff -r a79e4a9cb167 dmenu.1
+--- a/dmenu.1	Sat Nov 20 09:25:08 2010 +0000
++++ b/dmenu.1	Sat Nov 20 18:51:43 2010 +0000
 @@ -5,6 +5,7 @@
  .B dmenu
  .RB [ \-b ]
@@ -8,8 +8,8 @@ diff -r ccb2b92086bf dmenu.1
 +.RB [ \-r ]
  .RB [ \-l
  .IR lines ]
- .RB [ \-p
-@@ -48,6 +49,9 @@
+ .RB [ \-m
+@@ -50,6 +51,9 @@
  .B \-i
  dmenu matches menu items case insensitively.
  .TP
@@ -19,10 +19,10 @@ diff -r ccb2b92086bf dmenu.1
  .BI \-l " lines"
  dmenu lists items vertically, with the given number of lines.
  .TP
-diff -r ccb2b92086bf dmenu.c
---- a/dmenu.c	Thu Aug 12 15:35:51 2010 +0100
-+++ b/dmenu.c	Wed Aug 18 10:59:14 2010 +0100
-@@ -53,7 +53,7 @@
+diff -r a79e4a9cb167 dmenu.c
+--- a/dmenu.c	Sat Nov 20 09:25:08 2010 +0000
++++ b/dmenu.c	Sat Nov 20 18:51:43 2010 +0000
+@@ -54,7 +54,7 @@
  static unsigned long normcol[ColLast];
  static unsigned long selcol[ColLast];
  static Atom utf8;
@@ -31,7 +31,16 @@ diff -r ccb2b92086bf dmenu.c
  static DC *dc;
  static Item *items = NULL;
  static Item *matches, *sel;
-@@ -317,6 +317,10 @@
+@@ -78,6 +78,8 @@
+ 			topbar = False;
+ 		else if(!strcmp(argv[i], "-i"))
+ 			fstrncmp = strncasecmp;
++		else if(!strcmp(argv[i], "-r"))
++			incremental = 1;
+ 		else if(i == argc-1)
+ 			usage();
+ 		/* double flags */
+@@ -364,6 +366,10 @@
  		match();
  		break;
  	}
@@ -41,22 +50,13 @@ diff -r ccb2b92086bf dmenu.c
 +	}
  	drawmenu();
  }
-
-@@ -487,7 +491,7 @@
-
+ 
+@@ -536,7 +542,7 @@
+ 
  void
  usage(void) {
--	fputs("usage: dmenu [-b] [-i] [-l lines] [-p prompt] [-fn font] [-nb color]\n"
-+	fputs("usage: dmenu [-b] [-r] [-i] [-l lines] [-p prompt] [-fn font] [-nb color]\n"
- 	      "             [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+-	fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
++	fputs("usage: dmenu [-b] [-i] [-r] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+ 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
  	exit(EXIT_FAILURE);
  }
-@@ -505,6 +509,8 @@
- 		}
- 		else if(!strcmp(argv[i], "-b"))
- 			topbar = False;
-+		else if(!strcmp(argv[i], "-r"))
-+			incremental = True;
- 		else if(!strcmp(argv[i], "-i"))
- 			fstrncmp = strncasecmp;
- 		else if(i == argc-1)