Added a no-color mode with inverse A_REVERSE and A_STANDOUT for the

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index f1b4ad8..8616f1c 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -1,9 +1,10 @@
+

 /*
  *  selector is a simple shell command for selection of strings with a
  *  dynamic pattern-matching.
  *
  *  Copyright (c) 2009 Francois Fleuret
 /*
  *  selector is a simple shell command for selection of strings with a
  *  dynamic pattern-matching.
  *
  *  Copyright (c) 2009 Francois Fleuret

- *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
+ *  Written by Francois Fleuret <francois@fleuret.org>

  *
  *  This file is part of selector.
  *
  *
  *  This file is part of selector.
  *


@@ -24,6 +25,9 @@
 // Here is how to use it as a super-history-search
 // ./selector -v -f ${HISTFILE}
 
 // Here is how to use it as a super-history-search
 // ./selector -v -f ${HISTFILE}
 

+// This software is highly Linux-specific, but I would be glad to get
+// patches to make it work on other OS
+

 #include <fstream>
 #include <iostream>
 
 #include <fstream>
 #include <iostream>
 


@@ -37,12 +41,15 @@
 
 using namespace std;
 
 
 using namespace std;
 

+#define VERSION "1.0"
+

 // Yeah, global variables!
 
 int buffer_size = 1024;
 // Yeah, global variables!
 
 int buffer_size = 1024;

-int nb_lines_max = 1000;
+int nb_lines_max = 10000;

 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;

+int with_colors = 0;

 
 //////////////////////////////////////////////////////////////////////
 
 
 //////////////////////////////////////////////////////////////////////
 


@@ -225,9 +232,15 @@ void update_screen(int *current_line, int *temporary_line, int motion,
         // Highlight the highlighted line ...
 
         if(l == new_line) {
         // Highlight the highlighted line ...
 
         if(l == new_line) {

-          attron(COLOR_PAIR(2));
-          addnstr(buffer, console_width);
-          attroff(COLOR_PAIR(2));
+          if(with_colors) {
+            attron(COLOR_PAIR(2));
+            addnstr(buffer, console_width);
+            attroff(COLOR_PAIR(2));
+          } else {
+            attron(A_STANDOUT);
+            addnstr(buffer, console_width);
+            attroff(A_STANDOUT);
+          }

         } else {
           addnstr(buffer, console_width);
         }
         } else {
           addnstr(buffer, console_width);
         }


@@ -270,9 +283,15 @@ void update_screen(int *current_line, int *temporary_line, int motion,
   buffer[console_width] = '\0';
 
   move(0, 0);
   buffer[console_width] = '\0';
 
   move(0, 0);

-  attron(COLOR_PAIR(1));
-  addnstr(buffer, console_width);
-  attroff(COLOR_PAIR(1));
+  if(with_colors) {
+    attron(COLOR_PAIR(1));
+    addnstr(buffer, console_width);
+    attroff(COLOR_PAIR(1));
+  } else {
+    attron(A_REVERSE);
+    addnstr(buffer, console_width);
+    attroff(A_REVERSE);
+  }

 
   // We are done
 
 
   // We are done
 


@@ -285,9 +304,10 @@ int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;

+  int theme = 0;

 
   char input_filename[buffer_size], output_filename[buffer_size];
 
   char input_filename[buffer_size], output_filename[buffer_size];

-  strcpy(input_filename, "/dev/stdin");
+  strcpy(input_filename, "");

   strcpy(output_filename, "/tmp/selector.out");
 
   int i = 1;
   strcpy(output_filename, "/tmp/selector.out");
 
   int i = 1;


@@ -326,8 +346,27 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
       i += 2;
     }
 

+    else if(strcmp(argv[i], "-t") == 0) {
+      check_opt(argc, argv, i, 1, "<color theme number>");
+      theme = atoi(argv[i+1]);
+      i += 2;
+    }
+

     else {
     else {

-      cerr << argv[0] << " [-h] [-o <output filename>] [-b] [-l <max number of lines>] [-s <pattern separator>] [-v]" << endl;
+      cerr << "Selector version " << VERSION
+           << endl
+           << "Written by Francois Fleuret <francois@fleuret.org>"
+           << endl
+           << argv[0]
+           << " [-h]"
+           << " [-b]"
+           << " [-v]"
+           << " [-t <color theme number>]"
+           << " [-o <output filename>]"
+           << " [-s <pattern separator>]"
+           << " [-l <max number of lines>]"
+           << " -f <input filename>"
+           << endl;

       if(strcmp(argv[i], "-h") == 0) {
         exit(0);
       } else {
       if(strcmp(argv[i], "-h") == 0) {
         exit(0);
       } else {


@@ -336,10 +375,15 @@ int main(int argc, char **argv) {
     }
   }
 
     }
   }
 

+  if(!input_filename[0]) {
+    cerr << "You must specify a input file with -f." << endl;
+    exit(1);
+  }
+

   ifstream file(input_filename);
 
   if(file.fail()) {
   ifstream file(input_filename);
 
   if(file.fail()) {

-    cerr << "Can not open \"" << input_filename << "\"" << endl;
+    cerr << "Can not open " << input_filename << endl;

     return 1;
   }
 
     return 1;
   }
 


@@ -358,22 +402,27 @@ int main(int argc, char **argv) {
 
   initscr();
 
 
   initscr();
 

-  if(!has_colors()) {
-    cerr << "No colors." << endl;
-    return 1;
+  if(has_colors()) {
+    with_colors = 1;
+    start_color();
+    switch(theme) {
+    default:
+    case 0:
+      init_pair(1, COLOR_WHITE, COLOR_GREEN);
+      init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+      break;
+    case 1:
+      init_pair(1, COLOR_BLACK, COLOR_GREEN);
+      init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+      break;
+    }

   }
 
   noecho();
   }
 
   noecho();

-  curs_set(0);
-  keypad(stdscr, TRUE);
-
-  start_color();
-  // init_pair(1, COLOR_WHITE, COLOR_BLACK);
-  init_pair(1, COLOR_WHITE, COLOR_GREEN);
-  init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+  curs_set(0); // Hide the cursor
+  keypad(stdscr, TRUE); // So that the arrow keys work

 
   int key;
 
   int key;

-

   int current_line = 0, temporary_line = 0;
 
   update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink);
   int current_line = 0, temporary_line = 0;
 
   update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink);


@@ -428,9 +477,9 @@ int main(int argc, char **argv) {
   curs_set(1);
   endwin();
 
   curs_set(1);
   endwin();
 

-  if(output_to_vt_buffer) {
-    if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
-      char *tty = ttyname (STDIN_FILENO);
+  if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
+    if(output_to_vt_buffer) {
+      char *tty = ttyname(STDIN_FILENO);

       int fd = open(tty, O_WRONLY);
 
       struct termios oldtio, newtio;
       int fd = open(tty, O_WRONLY);
 
       struct termios oldtio, newtio;


@@ -453,17 +502,13 @@ int main(int argc, char **argv) {
         cerr << "Can not open " << tty << "." << endl;
         exit(1);
       }
         cerr << "Can not open " << tty << "." << endl;
         exit(1);
       }

-    }
-  } else {
-    ofstream out(output_filename);
-    if(out.fail()) {
-      cerr << "Can not open " << output_filename << " for writing." << endl;
-      exit(1);

     } else {
     } else {

-      if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
-        out << lines[temporary_line] << endl;
+      ofstream out(output_filename);
+      if(out.fail()) {
+        cerr << "Can not open " << output_filename << " for writing." << endl;
+        exit(1);

       } else {
       } else {

-        out << endl;
+        out << lines[temporary_line] << endl;

       }
       out.flush();
     }
       }
       out.flush();
     }


@@ -473,5 +518,8 @@ int main(int argc, char **argv) {
     delete[] lines[l];
   }
 
     delete[] lines[l];
   }
 

+  curs_set(1);
+  endwin();
+

   exit(0);
 }
   exit(0);
 }