X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.cc;h=f4d79303b68634175f00eb64db4a5e6973793f07;hb=ef2a722e9da6dc7486797d1324da95e0a88138cf;hp=e119fc6db121bd36f3c9a44812b753c7be7e1f4a;hpb=7b78746dc81a4654942ae17a4604d7443fbde929;p=selector.git

diff --git a/selector.cc b/selector.cc
index e119fc6..f4d7930 100644
--- a/selector.cc
+++ b/selector.cc
@@ -58,32 +58,37 @@ int remove_duplicates = 0;
 
 //////////////////////////////////////////////////////////////////////
 
+// int test_and_set_hash(char *s, char **hashed, int hash_size) {
+  // uint32_t code = 0, mask;
+  // int result;
+
+  // for(int k = 0; s[k]; k++) {
+    // code += ((uint32_t) (s[k])) << (8 * k%4);
+  // }
+
+  // code = code%hash_table_size;
+
+  // if(hashed[code]) {
+  // } else {
+  // }
+// }
+
+//////////////////////////////////////////////////////////////////////
+
 // This looks severely Linux-only ...
 
 void inject_into_tty_buffer(char *line) {
-  char *tty = ttyname(STDIN_FILENO);
-  int fd = open(tty, O_RDWR);
-
   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);
+  tcgetattr(STDIN_FILENO,&oldtio);
+  memset(&newtio, 0, sizeof(newtio));
+  // Set input mode (non-canonical, *no echo*,...)
+  tcsetattr(STDIN_FILENO,TCSANOW, &newtio);
+  // Put the selected line in the tty input buffer
+  for(char *k = line; *k; k++) {
+    ioctl(STDIN_FILENO, TIOCSTI, k);
   }
+  // Restore the old settings
+  tcsetattr(STDIN_FILENO,TCSANOW, &oldtio);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -203,7 +208,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   addstr("\n");
 
-  int nb_printed_lines = 1;
+  int nb_printed_lines = 0;
 
   // Here new_line is either a line number matching the patterns, or -1
 
@@ -288,15 +293,14 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   *temporary_line = new_line;
 
-  if(nb_printed_lines == 1) {
+  if(nb_printed_lines == 0) {
     addnstr("[no selection]\n", console_width);
-    nb_printed_lines++;
   }
 
   // Draw the modeline
 
   sprintf(buffer, "%d/%d pattern: %s",
-          nb_printed_lines - 1,
+          nb_printed_lines,
           nb_lines,
           pattern_list);
 
@@ -459,28 +463,6 @@ int main(int argc, char **argv) {
         while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
       }
 
-      /*
-
-      // This is supposed to remove any duplicates, not only
-      // successive ones. However, it is O(N^2), we should use
-      // hash-codes
-
-      int keep = 1;
-
-      if(remove_duplicates) {
-        for(int k = 0; keep && k < nb_lines; k++) {
-          keep &= strcmp(lines[k], s);
-        }
-      }
-
-      if(keep) {
-        lines[nb_lines] = new char[strlen(s) + 1];
-        strcpy(lines[nb_lines], s);
-        nb_lines++;
-      }
-
-      */
-
       if(!remove_duplicates || nb_lines == 0 || strcmp(lines[nb_lines - 1], s)) {
         lines[nb_lines] = new char[strlen(s) + 1];
         strcpy(lines[nb_lines], s);
@@ -544,7 +526,7 @@ int main(int argc, char **argv) {
       patterns[patterns_point] = '\0';
     }
 
-    else if(key == KEY_BACKSPACE || key == '' ||
+    else if(key == KEY_BACKSPACE || key == '' || key == '' ||
             key == KEY_DC || key == '') {
       if(patterns_point > 0) {
         patterns_point--;