From: Francois Fleuret <francois@fleuret.org>
Date: Fri, 13 Mar 2009 08:33:29 +0000 (+0100)
Subject: Automatic commit
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=18b5fa3a68a27a487b77923604e9de05d6263bf7;p=selector.git

Automatic commit
---

diff --git a/Makefile b/Makefile
index 451aeb4..b723ea1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+
 #
 #  selector is a simple shell command for selection of strings with a
 #  dynamic pattern-matching.
diff --git a/selector.1 b/selector.1
index 7fa8376..4d3c350 100644
--- a/selector.1
+++ b/selector.1
@@ -7,8 +7,8 @@ selector - A simple shell command for dynamic pattern selection
 .SH "DESCRIPTION"
 .PP
 \fBselector\fP is a command line dynamic string selection. A you type
-a list of strings separated by ';', the display is updated to show
-only the lines containing all the said strings.
+a list of strings separated by ';', the display is updated in real
+time to show only the lines containing all the said strings.
 
 The main usage of selector is as an efficient search in the shell
 command history. With the correct option, it will inject the selected
@@ -22,7 +22,7 @@ one character from the pattern string.
 The Up and Down cursor keys move the selected line accordingly, and
 PageUp and PageDown move by ten lines. The Home and End key move to
 the top and the bottom of the list respectively. The return key
-selects the current line and quits.
+selects the current line and exits.
 
 You can cancel the selection either by interrupting the command with
 ^C or by typing ^G.
@@ -34,7 +34,7 @@ display help and exits
 inject the selected line into the tty input buffer
 .IP "\fB-m\fP" 10
 force the monochrome mode
-.IP "\fB-c <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>\fP" 10
+.IP "\fB-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\fP" 10
 select the display colors for the modeline and the highlighted line
 .IP "\fB-o <output filename>\fP" 10
 write the selected line into the specified file
@@ -51,6 +51,11 @@ To use selector to search into your shell history:
 
 selector -f ${HISTFILE} -v
 
+.SH "BUGS"
+
+Probably many. The main problem is the usage of Linux-specific ioctl()
+to put the selected line in the tty buffer.
+
 .SH "AUTHOR"
 .PP
 Written by Francois Fleuret <francois@fleuret.org>. Permission is
diff --git a/selector.cc b/selector.cc
index ecf4e76..f909ba0 100644
--- a/selector.cc
+++ b/selector.cc
@@ -335,11 +335,13 @@ int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;
+  int color_fg_modeline, color_bg_modeline;
+  int color_fg_highlight, color_bg_highlight;
 
-  int color_fg_modeline = COLOR_WHITE;
-  int color_bg_modeline = COLOR_BLACK;
-  int color_fg_highlight = COLOR_BLACK;
-  int color_bg_highlight = COLOR_YELLOW;
+  color_fg_modeline = COLOR_WHITE;
+  color_bg_modeline = COLOR_BLACK;
+  color_fg_highlight = COLOR_BLACK;
+  color_bg_highlight = COLOR_YELLOW;
 
   setlocale(LC_ALL, "");
 
@@ -389,7 +391,7 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-c") == 0) {
-      check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
+      check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
       color_fg_modeline = atoi(argv[i+1]);
       color_bg_modeline = atoi(argv[i+2]);
       color_fg_highlight = atoi(argv[i+3]);
@@ -404,10 +406,9 @@ int main(int argc, char **argv) {
            << endl
            << argv[0]
            << " [-h]"
-           << " [-b]"
            << " [-v]"
            << " [-m]"
-           << " [-c <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
+           << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"