Automatic commit

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index 0865015..807f1a7 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -41,10 +41,12 @@
 
 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;
 


@@ -289,6 +291,7 @@ 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];
   strcpy(input_filename, "");
 
   char input_filename[buffer_size], output_filename[buffer_size];
   strcpy(input_filename, "");


@@ -330,11 +333,22 @@ 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]
+      cerr << "Selector version " << VERSION
+           << endl
+           << "Written by Francois Fleuret <francois@fleuret.org>"
+           << endl
+           << argv[0]

            << " [-h]"
            << " [-b]"
            << " [-v]"
            << " [-h]"
            << " [-b]"
            << " [-v]"

+           << " [-t <color theme number>]"

            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"


@@ -356,7 +370,7 @@ int main(int argc, char **argv) {
   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;
   }
 


@@ -377,7 +391,9 @@ int main(int argc, char **argv) {
 
   if(!has_colors()) {
     cerr << "No colors." << endl;
 
   if(!has_colors()) {
     cerr << "No colors." << endl;

-    return 1;
+    curs_set(1);
+    endwin();
+    exit(1);

   }
 
   noecho();
   }
 
   noecho();


@@ -385,9 +401,18 @@ int main(int argc, char **argv) {
   keypad(stdscr, TRUE);
 
   start_color();
   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);
+
+  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;
+  }

 
   int key;
 
 
   int key;
 


@@ -447,7 +472,7 @@ int main(int argc, char **argv) {
 
   if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
     if(output_to_vt_buffer) {
 
   if((key == KEY_ENTER || key == '\n') && temporary_line >= 0 && temporary_line < nb_lines) {
     if(output_to_vt_buffer) {

-      char *tty = ttyname (STDIN_FILENO);
+      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;