From 5ff0b55cd6a1c39f3d711036319244e18151d46f Mon Sep 17 00:00:00 2001
From: Francois Fleuret <francois@fleuret.org>
Date: Thu, 11 Jun 2009 11:51:30 +0200
Subject: [PATCH] When using the -x option, the part of the line before the
 separator is not returned.

---
 REVISION_NUMBER |  2 +-
 selector.1      |  8 ++++----
 selector.cc     | 20 +++++++++++++++-----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/REVISION_NUMBER b/REVISION_NUMBER
index 1b9cba4..492dff0 100644
--- a/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@ -1 +1 @@
-151
+152
diff --git a/selector.1 b/selector.1
index 8ca04cd..11edc9f 100644
--- a/selector.1
+++ b/selector.1
@@ -17,9 +17,9 @@ line into the virtual tty input buffer, hence allowing the user to
 edit the line and execute it as a standard command.
 
 Selector is also a good tool to test regexps, or a way to display
-menus. The -x option allows to specify a label delimiter: Only the
-part of each line before that character will appear during the
-selection, but the full line will be returned.
+menus. The -x option allows to specify a label delimiter: the part of
+each line before that character will appear during the selection, and
+the part after that character will be returned.
 
 .SH "KEYS"
 .PP
@@ -79,7 +79,7 @@ write the selected line into the specified file
 specify the symbol to separate the substrings in the search pattern
 .IP "\fB-x <label separator>\fP" 10
 specify the symbol to separate what to show to the user during the
-selection from the rest of the line
+selection from the line to return
 .IP "\fB-l <max number of lines>\fP" 10
 specify the maximum number of lines to take into account
 .IP "\fB-f <input filename>\fP" 10
diff --git a/selector.cc b/selector.cc
index 8e03818..4d86da2 100644
--- a/selector.cc
+++ b/selector.cc
@@ -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,8 +1059,8 @@ 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;
         }
-- 
2.20.1