Automatic commit

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index b8011b8..bec4ed3 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -49,6 +49,7 @@ int buffer_size = 1024;
 int nb_lines_max = 10000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 int nb_lines_max = 10000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;

+int with_colors = 1;

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


@@ -231,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);
         }


@@ -276,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
 


@@ -291,7 +304,9 @@ 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;
+  int color_theme = 0;
+
+  setlocale(LC_ALL, "");

 
   char input_filename[buffer_size], output_filename[buffer_size];
   strcpy(input_filename, "");
 
   char input_filename[buffer_size], output_filename[buffer_size];
   strcpy(input_filename, "");


@@ -316,6 +331,11 @@ int main(int argc, char **argv) {
       i++;
     }
 
       i++;
     }
 

+    else if(strcmp(argv[i], "-m") == 0) {
+      with_colors = 0;
+      i++;
+    }
+

     else if(strcmp(argv[i], "-f") == 0) {
       check_opt(argc, argv, i, 1, "<input filename>");
       strncpy(input_filename, argv[i+1], buffer_size);
     else if(strcmp(argv[i], "-f") == 0) {
       check_opt(argc, argv, i, 1, "<input filename>");
       strncpy(input_filename, argv[i+1], buffer_size);


@@ -335,7 +355,7 @@ int main(int argc, char **argv) {
 
     else if(strcmp(argv[i], "-t") == 0) {
       check_opt(argc, argv, i, 1, "<color theme number>");
 
     else if(strcmp(argv[i], "-t") == 0) {
       check_opt(argc, argv, i, 1, "<color theme number>");

-      theme = atoi(argv[i+1]);
+      color_theme = atoi(argv[i+1]);

       i += 2;
     }
 
       i += 2;
     }
 


@@ -348,6 +368,7 @@ int main(int argc, char **argv) {
            << " [-h]"
            << " [-b]"
            << " [-v]"
            << " [-h]"
            << " [-b]"
            << " [-v]"

+           << " [-m]"

            << " [-t <color theme number>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-t <color theme number>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"


@@ -389,31 +410,46 @@ int main(int argc, char **argv) {
 
   initscr();
 
 
   initscr();
 

-  if(!has_colors()) {
-    cerr << "No colors." << endl;
-    return 1;
+  if(with_colors) {
+    if(has_colors()) {
+      start_color();
+      switch(color_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_WHITE, COLOR_BLACK);
+        init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+        break;
+      case 2:
+        init_pair(1, COLOR_BLACK, COLOR_GREEN);
+        init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+        break;
+      case 3:
+        init_pair(1, COLOR_BLACK, COLOR_RED);
+        init_pair(2, COLOR_BLACK, COLOR_YELLOW);
+        break;
+      case 4:
+        init_pair(1, COLOR_WHITE, COLOR_BLACK);
+        init_pair(2, COLOR_BLACK, COLOR_BLUE);
+        break;
+      case 5:
+        init_pair(1, COLOR_BLACK, COLOR_MAGENTA);
+        init_pair(2, COLOR_BLACK, COLOR_CYAN);
+        break;
+      }
+    } else {
+      with_colors = 0;
+    }

   }
 
   noecho();
   }
 
   noecho();

-  curs_set(0);
-  keypad(stdscr, TRUE);
-
-  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;
-  }
+  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);


@@ -424,7 +460,7 @@ int main(int argc, char **argv) {
 
     int motion = 0;
 
 
     int motion = 0;
 

-    if(key >= ' ' && key <= 'z') {
+    if(key >= ' ' && key <= '~') {

       patterns[patterns_point++] = key;
       patterns[patterns_point] = '\0';
     }
       patterns[patterns_point++] = key;
       patterns[patterns_point] = '\0';
     }


@@ -462,6 +498,7 @@ int main(int argc, char **argv) {
 
     update_screen(&current_line, &temporary_line, motion,
                   nb_lines, lines, patterns, no_blink);
 
     update_screen(&current_line, &temporary_line, motion,
                   nb_lines, lines, patterns, no_blink);

+

   } while(key != '\n' && key != KEY_ENTER && key != '\a');
 
   echo();
   } while(key != '\n' && key != KEY_ENTER && key != '\a');
 
   echo();


@@ -478,7 +515,7 @@ int main(int argc, char **argv) {
       if (fd >= 0) {
         // Save current port settings
         tcgetattr(fd,&oldtio);
       if (fd >= 0) {
         // Save current port settings
         tcgetattr(fd,&oldtio);

-        bzero(&newtio, sizeof(newtio));
+        memset(&newtio, 0, sizeof(newtio));

         // Set input mode (non-canonical, *no echo*,...)
         tcflush(fd, TCIFLUSH);
         tcsetattr(fd,TCSANOW, &newtio);
         // Set input mode (non-canonical, *no echo*,...)
         tcflush(fd, TCIFLUSH);
         tcsetattr(fd,TCSANOW, &newtio);