From: Francois Fleuret <francois@fleuret.org>
Date: Mon, 6 Apr 2009 18:29:57 +0000 (+0200)
Subject: Added a cursor with the main shortcuts (^A, ^K, etc.)
X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=40e6ea9378f98eac922050a7fad1cc161fe291e5;p=selector.git

Added a cursor with the main shortcuts (^A, ^K, etc.)
---

diff --git a/selector.cc b/selector.cc
index 9c863a4..b84bd79 100644
--- a/selector.cc
+++ b/selector.cc
@@ -176,7 +176,9 @@ void free_matcher(matcher_t *matcher) {
   }
 }
 
-void initialize_matcher(int use_regexp, int case_sensitive, matcher_t *matcher, const char *pattern) {
+void initialize_matcher(int use_regexp, int case_sensitive,
+                        matcher_t *matcher, const char *pattern) {
+
   if(use_regexp) {
     matcher->nb_patterns = -1;
     matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
@@ -230,6 +232,7 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche
 
 void update_screen(int *current_line, int *temporary_line, int motion,
                    int nb_lines, char **lines,
+                   int cursor_position,
                    char *pattern) {
 
   char buffer[buffer_size];
@@ -379,32 +382,64 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   // Draw the modeline
 
-  if(title) {
-    sprintf(buffer, "%s %d/%d pattern: %s%s",
-            title,
-            nb_printed_lines,
-            nb_lines,
-            pattern,
-            use_regexp ? " [regexp]" : "");
+  move(0, 0);
+  if(with_colors) {
+    attron(COLOR_PAIR(1));
   } else {
-    sprintf(buffer, "%d/%d pattern: %s%s",
-            nb_printed_lines,
-            nb_lines,
-            pattern,
-            use_regexp ? " [regexp]" : "");
+    attron(A_REVERSE);
   }
 
-  for(int k = strlen(buffer); k < console_width; k++) buffer[k] = ' ';
+  for(int k = 0; k < console_width; k++) buffer[k] = ' ';
   buffer[console_width] = '\0';
+  addnstr(buffer, console_width);
 
   move(0, 0);
+
+  if(title) {
+    addstr(title);
+    addstr(" ");
+  }
+
+  printw("%d/%d ", nb_printed_lines, nb_lines);
+
+  addnstr(pattern, cursor_position);
+
+  // Now we print the cursor. All that mess to have reverse video with
+  // and without color.
+
   if(with_colors) {
-    attron(COLOR_PAIR(1));
-    addnstr(buffer, console_width);
     attroff(COLOR_PAIR(1));
+    attron(COLOR_PAIR(3));
+  } else {
+    attroff(A_REVERSE);
+  }
+
+  if(pattern[cursor_position]) {
+    addnstr(&pattern[cursor_position], 1);
+  } else {
+    addstr(" ");
+  }
+
+  if(with_colors) {
+    attroff(COLOR_PAIR(3));
+    attron(COLOR_PAIR(1));
   } else {
     attron(A_REVERSE);
-    addnstr(buffer, console_width);
+  }
+
+  if(pattern[cursor_position]) {
+    addstr(pattern + cursor_position + 1);
+  }
+
+  // Finished printing the cursor
+
+  if(use_regexp) {
+    addstr(" [regexp]");
+  }
+
+  if(with_colors) {
+    attroff(COLOR_PAIR(1));
+  } else {
     attroff(A_REVERSE);
   }
 
@@ -669,8 +704,8 @@ int main(int argc, char **argv) {
 
   char pattern[buffer_size];
   pattern[0] = '\0';
-  int pattern_point;
-  pattern_point = 0;
+  int cursor_position;
+  cursor_position = 0;
 
   //////////////////////////////////////////////////////////////////////
   // Here we start to display with curse
@@ -700,6 +735,7 @@ int main(int argc, char **argv) {
       }
       init_pair(1, color_fg_modeline, color_bg_modeline);
       init_pair(2, color_fg_highlight, color_bg_highlight);
+      init_pair(3, color_bg_modeline, color_fg_modeline);
     } else {
       with_colors = 0;
     }
@@ -708,7 +744,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, pattern);
+  update_screen(&current_line, &temporary_line, 0, nb_lines, lines, cursor_position, pattern);
 
   do {
 
@@ -716,16 +752,45 @@ int main(int argc, char **argv) {
 
     int motion = 0;
 
-    if(key >= ' ' && key <= '~') {
-      pattern[pattern_point++] = key;
-      pattern[pattern_point] = '\0';
+    if(key >= ' ' && key <= '~') { // Insert character
+      int c = cursor_position;
+      char t = pattern[c], u;
+      if(t) {
+        while(t) {
+          c++;
+          u = pattern[c];
+          pattern[c] = t;
+          t = u;
+        }
+        pattern[cursor_position++] = key;
+      } else {
+        pattern[cursor_position++] = key;
+        pattern[cursor_position] = '\0';
+      }
     }
 
-    else if(key == KEY_BACKSPACE || key == '' || key == '' ||
-            key == KEY_DC || key == '') {
-      if(pattern_point > 0) {
-        pattern_point--;
-        pattern[pattern_point] = '\0';
+    else if(key == KEY_BACKSPACE || key == '' || key == '') {
+      if(cursor_position > 0) {
+        if(pattern[cursor_position]) {
+          int c = cursor_position-1;
+          while(pattern[c]) {
+            pattern[c] = pattern[c+1];
+            c++;
+          }
+        } else {
+          pattern[cursor_position - 1] = '\0';
+        }
+        cursor_position--;
+      }
+    }
+
+    else if(key == KEY_DC || key == '') {
+      if(pattern[cursor_position]) {
+        int c = cursor_position;
+        while(pattern[c]) {
+          pattern[c] = pattern[c+1];
+          c++;
+        }
       }
     }
 
@@ -753,17 +818,42 @@ int main(int argc, char **argv) {
       motion = -1;
     }
 
+    else if(key == KEY_LEFT || key == '') {
+      if(cursor_position > 0) cursor_position--;
+    }
+
+    else if(key == KEY_RIGHT || key == '') {
+      if(pattern[cursor_position]) cursor_position++;
+    }
+
+    else if(key == '
') {
+      cursor_position = 0;
+    }
+
+    else if(key == '') {
+      cursor_position = strlen(pattern);
+    }
+
     else if(key == '') {
       use_regexp = !use_regexp;
     }
 
     else if(key == '') {
-      pattern_point = 0;
-      pattern[pattern_point] = '\0';
+      int s = 0;
+      while(pattern[cursor_position + s]) {
+        pattern[s] = pattern[cursor_position + s];
+        s++;
+      }
+      pattern[s] = '\0';
+      cursor_position = 0;
+    }
+
+    else if(key == '') {
+      pattern[cursor_position] = '\0';
     }
 
     update_screen(&current_line, &temporary_line, motion,
-                  nb_lines, lines, pattern);
+                  nb_lines, lines, cursor_position, pattern);
 
   } while(key != '\n' && key != KEY_ENTER && key != '');