Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index f740e89..4d86da2 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -23,13 +23,14 @@
  */
 
 // To use it as a super-history-search for bash:
-// selector -q -b -i -d -v -w -l 10000 <(history)
+// selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
 
 #include <fstream>
 #include <iostream>
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <ncurses.h>
 #include <fcntl.h>
@@ -60,10 +61,6 @@ int case_sensitive = 0;
 char *title = 0;
 int error_flash = 0;
 
-#define COLOR_MODELINE 1
-#define COLOR_FOCUS_LINE 2
-#define COLOR_ERROR 3
-
 int attr_modeline, attr_focus_line, attr_error;
 
 //////////////////////////////////////////////////////////////////////
@@ -130,7 +127,7 @@ void error_feedback() {
 //////////////////////////////////////////////////////////////////////
 // A quick and dirty hash table
 
-// The table itself stores index of the strings in a char
+// The table itself stores indexes of the strings taken in a char
 // **table. When a string is added, if it was already in the table,
 // the new index replaces the previous one.
 
@@ -148,7 +145,8 @@ int *new_hash_table(int hash_table_size) {
 // the previous index it had.
 
 int test_and_add(char *new_string, int new_index,
-                 char **strings, int *hash_table, int hash_table_size) {
+                 char **strings,
+                 int *hash_table, int hash_table_size) {
 
   unsigned int code = 0;
 
@@ -334,16 +332,17 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche
 //////////////////////////////////////////////////////////////////////
 
 // The value passed to this routine in current_focus_line is the index
-// of the line to highlighted if it matches the matcher. The line
-// highlighted is the first the one matching the matcher in that
-// order: The current_focus_line itself, the first with a greated
-// index, the first with a lesser index.
+// of the line we should have highlited if there was no motion and if
+// it matched the matcher. So, the line actually highlighted is the
+// first one matching the matcher in that order: (1)
+// current_focus_line after motion, (2) the first with a greater
+// index, (3) the first with a lesser index.
 
 // The index of the line actually shown highlighted is written in
 // displayed_focus_line (it can be -1)
 
 // If there is a motion and a line is actually shown highlighted, its
-// value is written in current_focus_line
+// value is written in current_focus_line.
 
 void update_screen(int *current_focus_line, int *displayed_focus_line,
                    int motion,
@@ -359,12 +358,12 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
   int console_width = getmaxx(stdscr);
   int console_height = getmaxy(stdscr);
 
-  // First, we find a visible line. In priority: The current, or the
-  // first visible after it, or the first visible before it.
+  // First, we find a visible line.
 
   int nb_printed_lines = 0;
 
   use_default_colors();
+
   addstr("\n");
 
   if(matcher.regexp_error) {
@@ -915,13 +914,14 @@ int main(int argc, char **argv) {
       exit(1);
     }
 
-    init_pair(COLOR_MODELINE, color_fg_modeline, color_bg_modeline);
-    init_pair(COLOR_FOCUS_LINE, color_fg_highlight, color_bg_highlight);
-    init_pair(COLOR_ERROR, COLOR_WHITE, COLOR_RED);
+    init_pair(1, color_fg_modeline, color_bg_modeline);
+    attr_modeline = COLOR_PAIR(1);
 
-    attr_modeline = COLOR_PAIR(COLOR_MODELINE);
-    attr_focus_line = COLOR_PAIR(COLOR_FOCUS_LINE);
-    attr_error = COLOR_PAIR(COLOR_ERROR);
+    init_pair(2, color_fg_highlight, color_bg_highlight);
+    attr_focus_line = COLOR_PAIR(2);
+
+    init_pair(3, COLOR_WHITE, COLOR_RED);
+    attr_error = COLOR_PAIR(3);
 
   }
 
@@ -1037,10 +1037,20 @@ int main(int argc, char **argv) {
 
   if((key == KEY_ENTER || key == '\n')) {
 
-    if(output_to_vt_buffer) {
-      if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) {
-        inject_into_tty_buffer(lines[displayed_focus_line]);
+    char *t;
+
+    if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) {
+      t = lines[displayed_focus_line];
+      if(label_separator) {
+        while(*t && *t != label_separator) t++;
+        if(*t) t++;
       }
+    } else {
+      t = 0;
+    }
+
+    if(output_to_vt_buffer && t) {
+      inject_into_tty_buffer(t);
     }
 
     if(output_filename[0]) {
@@ -1049,14 +1059,15 @@ int main(int argc, char **argv) {
         cerr << "Can not open " << output_filename << " for writing." << endl;
         exit(1);
       } else {
-        if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) {
-          out << lines[displayed_focus_line] << endl;
+        if(t) {
+          out << t << endl;
         } else {
           out << endl;
         }
       }
       out.flush();
     }
+
   } else {
     cout << "Aborted." << endl;
   }