Wrote a better short help.

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index 7422fd6..51333b4 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -388,7 +388,13 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 //////////////////////////////////////////////////////////////////////
 
 int main(int argc, char **argv) {
-  char buffer[buffer_size];
+
+  if(!ttyname(STDIN_FILENO)) {
+    cerr << "The standard input is not a tty." << endl;
+    exit(1);
+  }
+
+  char buffer[buffer_size], raw_line[buffer_size];;
   int color_fg_modeline, color_bg_modeline;
   int color_fg_highlight, color_bg_highlight;
 
@@ -494,20 +500,24 @@ int main(int argc, char **argv) {
          << "Written by Francois Fleuret <francois@fleuret.org>."
          << endl
          << endl
-         << argv[0]
-         << " [-h]"
-         << " [-v]"
-         << " [-m]"
-         << " [-d]"
-         << " [-e]"
-         << " [-b]"
-         << " [-z]"
-         << " [-i]"
-         << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
-         << " [-o <output filename>]"
-         << " [-s <pattern separator>]"
-         << " [-l <max number of lines>]"
-         << " -f <input filename>"
+         << "Usage: " << argv[0] << " [options] -f <file>" << endl
+         << endl
+         << " -h      show this help" << endl
+         << " -v      inject the selection in the tty" << endl
+         << " -m      monochrome mode" << endl
+         << " -d      remove duplicated lines" << endl
+         << " -e      regexp mode when starting" << endl
+         << " -b      remove the bash history line prefix" << endl
+         << " -z      remove the zsh history line prefix" << endl
+         << " -i      invert the line order" << endl
+         << " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>" << endl
+         << "         set the display colors" << endl
+         << " -o <output filename>" << endl
+         << "         set a file to write the selected line to" << endl
+         << " -s <pattern separator>" << endl
+         << "         set the symbol to separate substrings in the pattern" << endl
+         << " -l <max number of lines>" << endl
+         << "         set the maximum number of lines to take into account" << endl
          << endl;
 
     exit(error);
@@ -537,9 +547,23 @@ int main(int argc, char **argv) {
   }
 
   while(nb_lines < nb_lines_max && !file.eof()) {
-    file.getline(buffer, buffer_size);
-    if(strcmp(buffer, "") != 0) {
-      char *s = buffer;
+
+    file.getline(raw_line, buffer_size);
+
+    if(strcmp(raw_line, "") != 0) {
+
+      char *s, *t;
+      const char *u;
+
+      s = buffer;
+      t = raw_line;
+      while(*t) {
+        u = unctrl(*t++);
+        while(*u) { *s++ = *u++; }
+      }
+      *s = '\0';
+
+      s = buffer;
 
       if(zsh_history && *s == ':') {
         while(*s && *s != ';') s++;
@@ -562,6 +586,8 @@ int main(int argc, char **argv) {
         lines[nb_lines] = new char[strlen(s) + 1];
         strcpy(lines[nb_lines], s);
       } else {
+        // We do not allocate a new string but use the pointer to the
+        // first occurence of it
         lines[nb_lines] = lines[dup];
         lines[dup] = 0;
       }
@@ -572,6 +598,8 @@ int main(int argc, char **argv) {
 
   delete[] hash_table;
 
+  // Now remove the null strings
+
   int n = 0;
   for(int k = 0; k < nb_lines; k++) {
     if(lines[k]) {
@@ -593,8 +621,19 @@ int main(int argc, char **argv) {
   int pattern_point;
   pattern_point = 0;
 
+  //////////////////////////////////////////////////////////////////////
+  // Here we start to display with curse
+
   initscr();
 
+  noecho();
+
+  // Hide the cursor
+  curs_set(0);
+
+  // So that the arrow keys work
+  keypad(stdscr, TRUE);
+
   if(with_colors) {
     if(has_colors()) {
       start_color();
@@ -615,10 +654,6 @@ int main(int argc, char **argv) {
     }
   }
 
-  noecho();
-  curs_set(0); // Hide the cursor
-  keypad(stdscr, TRUE); // So that the arrow keys work
-
   int key;
   int current_line = 0, temporary_line = 0;
 
@@ -685,6 +720,9 @@ int main(int argc, char **argv) {
   curs_set(1);
   endwin();
 
+  //////////////////////////////////////////////////////////////////////
+  // Here we come back to standard display
+
   if((key == KEY_ENTER || key == '\n')) {
 
     if(output_to_vt_buffer) {