X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=617edf0f1ef698cf7963d7efe8a69a3f0a89a39b;hb=42294c6ab7b85294b8f2931291c1dcc977642806;hp=2418ae9a0363e8dbeb12138e083154a61ae3cb36;hpb=fa9e318e1e27d44a9522ad5d53dfe24392b7e7ba;p=selector.git

diff --git a/selector.cc b/selector.cc
index 2418ae9..617edf0 100644
--- a/selector.cc
+++ b/selector.cc
@@ -22,8 +22,9 @@
  *
  */
 
-// To use it as a super-history-search:
-// ./selector -v -f ${HISTFILE}
+// To use it as a super-history-search for bash:
+//
+// alias h='./selector -i -b -v -f <(history)'
 
 // This software is highly Linux-specific, but I would be glad to get
 // patches to make it work on other OS
@@ -47,11 +48,11 @@ const int buffer_size = 1024;
 
 // Yeah, global variables!
 
-int nb_lines_max = 10000;
+int nb_lines_max = 1000;
 char pattern_separator = ';';
 int output_to_vt_buffer = 0;
 int with_colors = 1;
-int zsh_history = 0;
+int zsh_history = 0, bash_history = 0;
 int inverse_order = 0;
 
 //////////////////////////////////////////////////////////////////////
@@ -125,8 +126,7 @@ int next_visible(int current_line, int nb_lines, char **lines, int nb_patterns,
 
 void update_screen(int *current_line, int *temporary_line, int motion,
                    int nb_lines, char **lines,
-                   char *pattern_list,
-                   int no_blink) {
+                   char *pattern_list) {
 
   char buffer[buffer_size];
 
@@ -196,9 +196,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     }
   }
 
-  if(!no_blink) {
-    clear();
-  }
+  clear();
 
   use_default_colors();
 
@@ -253,7 +251,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
         // We fill the rest of the line with blanks if either we did
         // not clear() or if this is the highlighted line
 
-        if(no_blink || l == new_line) {
+        if(l == new_line) {
           while(k < console_width) {
             buffer[k++] = ' ';
           }
@@ -294,18 +292,6 @@ void update_screen(int *current_line, int *temporary_line, int motion,
     nb_printed_lines++;
   }
 
-  if(no_blink) { // Erase the rest of the window. That's slightly ugly.
-    int k = 0;
-    while(k < console_width) {
-      buffer[k++] = ' ';
-    }
-    buffer[k++] = '\n';
-    buffer[k++] = '\0';
-    for(int l = nb_printed_lines; l < console_height; l++) {
-      addnstr(buffer, console_width);
-    }
-  }
-
   // Draw the modeline
 
   sprintf(buffer, "%d/%d pattern: %s",
@@ -336,13 +322,11 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
 int main(int argc, char **argv) {
   char buffer[buffer_size];
-  char *lines[nb_lines_max];
-  int no_blink = 0;
   int color_fg_modeline, color_bg_modeline;
   int color_fg_highlight, color_bg_highlight;
 
-  color_fg_modeline = COLOR_WHITE;
-  color_bg_modeline = COLOR_BLACK;
+  color_fg_modeline  = COLOR_WHITE;
+  color_bg_modeline  = COLOR_BLACK;
   color_fg_highlight = COLOR_BLACK;
   color_bg_highlight = COLOR_YELLOW;
 
@@ -355,6 +339,7 @@ int main(int argc, char **argv) {
 
   int i = 1;
   while(i < argc) {
+
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
       strncpy(output_filename, argv[i+1], buffer_size);
@@ -383,11 +368,6 @@ int main(int argc, char **argv) {
       i += 2;
     }
 
-    else if(strcmp(argv[i], "-b") == 0) {
-      no_blink = 1;
-      i++;
-    }
-
     else if(strcmp(argv[i], "-i") == 0) {
       inverse_order = 1;
       i++;
@@ -398,6 +378,11 @@ int main(int argc, char **argv) {
       i++;
     }
 
+    else if(strcmp(argv[i], "-b") == 0) {
+      bash_history = 1;
+      i++;
+    }
+
     else if(strcmp(argv[i], "-l") == 0) {
       check_opt(argc, argv, i, 1, "<maximum number of lines>");
       nb_lines_max = atoi(argv[i+1]);
@@ -438,11 +423,15 @@ int main(int argc, char **argv) {
     }
   }
 
+  char **lines = new char *[nb_lines_max];
+
   if(!input_filename[0]) {
     cerr << "You must specify a input file with -f." << endl;
     exit(1);
   }
 
+  int nb_lines = 0;
+
   ifstream file(input_filename);
 
   if(file.fail()) {
@@ -450,7 +439,6 @@ int main(int argc, char **argv) {
     return 1;
   }
 
-  int nb_lines = 0;
   while(nb_lines < nb_lines_max && !file.eof()) {
     file.getline(buffer, buffer_size);
     if(strcmp(buffer, "") != 0) {
@@ -459,6 +447,11 @@ int main(int argc, char **argv) {
         while(*s && *s != ';') s++;
         if(*s == ';') s++;
       }
+
+      if(bash_history && (*s == ' ' || (*s >= '0' && *s <= '9'))) {
+        while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
+      }
+
       lines[nb_lines] = new char[strlen(s) + 1];
       strcpy(lines[nb_lines], s);
       nb_lines++;
@@ -507,7 +500,7 @@ int main(int argc, char **argv) {
   int key;
   int current_line = 0, temporary_line = 0;
 
-  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns, no_blink);
+  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, patterns);
 
   do {
 
@@ -520,7 +513,8 @@ int main(int argc, char **argv) {
       patterns[patterns_point] = '\0';
     }
 
-    else if(key == KEY_BACKSPACE || key == KEY_DC || key == '') {
+    else if(key == KEY_BACKSPACE || key == '' ||
+            key == KEY_DC || key == '') {
       if(patterns_point > 0) {
         patterns_point--;
         patterns[patterns_point] = '\0';
@@ -552,7 +546,7 @@ int main(int argc, char **argv) {
     }
 
     update_screen(&current_line, &temporary_line, motion,
-                  nb_lines, lines, patterns, no_blink);
+                  nb_lines, lines, patterns);
 
   } while(key != '\n' && key != KEY_ENTER && key != '');
 
@@ -561,6 +555,7 @@ int main(int argc, char **argv) {
   endwin();
 
   if((key == KEY_ENTER || key == '\n')) {
+
     if(output_to_vt_buffer) {
       if(temporary_line >= 0 && temporary_line < nb_lines) {
         inject_into_tty_buffer(lines[temporary_line]);
@@ -581,11 +576,13 @@ int main(int argc, char **argv) {
       }
       out.flush();
     }
+
   }
 
   for(int l = 0; l < nb_lines; l++) {
     delete[] lines[l];
   }
+  delete[] lines;
 
   exit(0);
 }