X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=selector.cc;h=f1e60c01ceb0e07c3169193a3be45f8f589894b8;hb=08270e13387994e72b20e123fed9e8b913fc6a0c;hp=8616f1ceff005c5ea27e026afa65852f38cc1159;hpb=b8f22b5a434a67c2e64b831b0ef9236ec32e611a;p=selector.git

diff --git a/selector.cc b/selector.cc
index 8616f1c..f1e60c0 100644
--- a/selector.cc
+++ b/selector.cc
@@ -49,7 +49,37 @@ int buffer_size = 1024;
 int nb_lines_max = 10000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
-int with_colors = 0;
+int with_colors = 1;
+
+//////////////////////////////////////////////////////////////////////
+
+// This looks severly Linux-only ...
+
+void inject_into_tty_buffer(char *line) {
+  char *tty = ttyname(STDIN_FILENO);
+  int fd = open(tty, O_WRONLY);
+
+  struct termios oldtio, newtio;
+
+  if (fd >= 0) {
+    // Save current port settings
+    tcgetattr(fd,&oldtio);
+    memset(&newtio, 0, sizeof(newtio));
+    // Set input mode (non-canonical, *no echo*,...)
+    tcflush(fd, TCIFLUSH);
+    tcsetattr(fd,TCSANOW, &newtio);
+    // Put the selected line in the tty input buffer
+    for(char *k = line; *k; k++) {
+      ioctl(fd, TIOCSTI, k);
+    }
+    // Restore the old settings
+    tcsetattr(fd,TCSANOW, &oldtio);
+    close(fd);
+  } else {
+    cerr << "Can not open " << tty << "." << endl;
+    exit(1);
+  }
+}
 
 //////////////////////////////////////////////////////////////////////
 
@@ -304,7 +334,13 @@ int main(int argc, char **argv) {
   char buffer[buffer_size];
   char *lines[nb_lines_max];
   int no_blink = 0;
-  int theme = 0;
+
+  int color_fg_modeline = COLOR_WHITE;
+  int color_bg_modeline = COLOR_BLACK;
+  int color_fg_highlight = COLOR_BLACK;
+  int color_bg_highlight = COLOR_YELLOW;
+
+  setlocale(LC_ALL, "");
 
   char input_filename[buffer_size], output_filename[buffer_size];
   strcpy(input_filename, "");
@@ -329,6 +365,11 @@ int main(int argc, char **argv) {
       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);
@@ -347,9 +388,12 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-t") == 0) {
-      check_opt(argc, argv, i, 1, "<color theme number>");
-      theme = atoi(argv[i+1]);
-      i += 2;
+      check_opt(argc, argv, i, 4, "<color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>");
+      color_fg_modeline = atoi(argv[i+1]);
+      color_bg_modeline = atoi(argv[i+2]);
+      color_fg_highlight = atoi(argv[i+3]);
+      color_bg_highlight = atoi(argv[i+4]);
+      i += 5;
     }
 
     else {
@@ -361,7 +405,8 @@ int main(int argc, char **argv) {
            << " [-h]"
            << " [-b]"
            << " [-v]"
-           << " [-t <color theme number>]"
+           << " [-m]"
+           << " [-t <color fg modeline> <color bg modeline> <color fg highlight> <color bg highlight>]"
            << " [-o <output filename>]"
            << " [-s <pattern separator>]"
            << " [-l <max number of lines>]"
@@ -402,19 +447,23 @@ int main(int argc, char **argv) {
 
   initscr();
 
-  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;
+  if(with_colors) {
+    if(has_colors()) {
+      start_color();
+      if(color_fg_modeline < 0  || color_fg_modeline >= COLORS ||
+         color_bg_modeline < 0  || color_bg_modeline >= COLORS ||
+         color_fg_highlight < 0 || color_bg_highlight >= COLORS ||
+         color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
+        echo();
+        curs_set(1);
+        endwin();
+        cerr << "Color numbers have to be between 0 and " << COLORS - 1 << "." << endl;
+        exit(1);
+      }
+      init_pair(1, color_fg_modeline, color_bg_modeline);
+      init_pair(2, color_fg_highlight, color_bg_highlight);
+    } else {
+      with_colors = 0;
     }
   }
 
@@ -433,7 +482,7 @@ int main(int argc, char **argv) {
 
     int motion = 0;
 
-    if(key >= ' ' && key <= 'z') {
+    if(key >= ' ' && key <= '~') {
       patterns[patterns_point++] = key;
       patterns[patterns_point] = '\0';
     }
@@ -471,6 +520,7 @@ int main(int argc, char **argv) {
 
     update_screen(&current_line, &temporary_line, motion,
                   nb_lines, lines, patterns, no_blink);
+
   } while(key != '\n' && key != KEY_ENTER && key != '');
 
   echo();
@@ -479,29 +529,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) {
-      char *tty = ttyname(STDIN_FILENO);
-      int fd = open(tty, O_WRONLY);
-
-      struct termios oldtio, newtio;
-
-      if (fd >= 0) {
-        // Save current port settings
-        tcgetattr(fd,&oldtio);
-        bzero(&newtio, sizeof(newtio));
-        // Set input mode (non-canonical, *no echo*,...)
-        tcflush(fd, TCIFLUSH);
-        tcsetattr(fd,TCSANOW, &newtio);
-        // Put the selected line in the tty input buffer
-        for(char *k = lines[temporary_line]; *k; k++) {
-          ioctl(fd, TIOCSTI, k);
-        }
-        // Restore the old settings
-        tcsetattr(fd,TCSANOW, &oldtio);
-        close(fd);
-      } else {
-        cerr << "Can not open " << tty << "." << endl;
-        exit(1);
-      }
+      inject_into_tty_buffer(lines[temporary_line]);
     } else {
       ofstream out(output_filename);
       if(out.fail()) {
@@ -518,8 +546,5 @@ int main(int argc, char **argv) {
     delete[] lines[l];
   }
 
-  curs_set(1);
-  endwin();
-
   exit(0);
 }