Changed the option to remove duplicates from -r to -d.

[selector.git] / selector.cc

diff --git a/selector.cc b/selector.cc
index 53b65bb..1518120 100644 (file)
--- a/selector.cc
+++ b/selector.cc
@@ -58,50 +58,20 @@ 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);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -125,6 +95,38 @@ void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
   }
 }
 
+//////////////////////////////////////////////////////////////////////
+// A quick and dirty hash table
+
+int *new_hash_table(int hash_table_size) {
+  int *result;
+  result = new int[hash_table_size];
+  for(int k = 0; k < hash_table_size; k++) {
+    result[k] = -1;
+  }
+  return result;
+}
+
+int test_and_add(char *new_string, int new_index,
+                 char **strings, int *hash_table, int hash_table_size) {
+  unsigned int code = 0;
+
+  for(int k = 0; new_string[k]; k++) {
+    code += int(new_string[k]) << (8 * k%4);
+  }
+
+  code = code % hash_table_size;
+
+  while(hash_table[code] >= 0) {
+    if(strcmp(new_string, strings[hash_table[code]]) == 0) return 1;
+    code = (code + 1) % hash_table_size;
+  }
+
+  hash_table[code] = new_index;
+
+  return 0;
+}
+
 //////////////////////////////////////////////////////////////////////
 
 int previous_visible(int current_line, int nb_lines, char **lines, int nb_patterns, char **patterns) {
@@ -221,7 +223,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
 
@@ -244,7 +246,7 @@ void update_screen(int *current_line, int *temporary_line, int motion,
         }
       }
 
-      if(last_line < nb_lines - 1) {
+      if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
         last_line++;
         while(last_line < nb_lines - 1 && !match(lines[last_line], nb_patterns, patterns)) {
           last_line++;
@@ -306,15 +308,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);
 
@@ -402,7 +403,7 @@ int main(int argc, char **argv) {
       i++;
     }
 
-    else if(strcmp(argv[i], "-r") == 0) {
+    else if(strcmp(argv[i], "-d") == 0) {
       remove_duplicates = 1;
       i++;
     }
@@ -431,7 +432,7 @@ int main(int argc, char **argv) {
            << " [-h]"
            << " [-v]"
            << " [-m]"
-           << " [-r]"
+           << " [-d]"
            << " [-z]"
            << " [-i]"
            << " [-c <fg modeline> <bg modeline> <fg highlight> <bg highlight>]"
@@ -464,10 +465,18 @@ int main(int argc, char **argv) {
     return 1;
   }
 
+  int hash_table_size = nb_lines_max * 10;
+  int *hash_table = 0;
+
+  if(remove_duplicates) {
+    hash_table = new_hash_table(hash_table_size);
+  }
+
   while(nb_lines < nb_lines_max && !file.eof()) {
     file.getline(buffer, buffer_size);
     if(strcmp(buffer, "") != 0) {
       char *s = buffer;
+
       if(zsh_history && *s == ':') {
         while(*s && *s != ';') s++;
         if(*s == ';') s++;
@@ -477,7 +486,7 @@ int main(int argc, char **argv) {
         while(*s == ' ' || (*s >= '0' && *s <= '9')) s++;
       }
 
-      if(!remove_duplicates || nb_lines == 0 || strcmp(lines[nb_lines - 1], s)) {
+      if(!hash_table || !test_and_add(s, nb_lines, lines, hash_table, hash_table_size)) {
         lines[nb_lines] = new char[strlen(s) + 1];
         strcpy(lines[nb_lines], s);
         nb_lines++;
@@ -485,6 +494,8 @@ int main(int argc, char **argv) {
     }
   }
 
+  delete[] hash_table;
+
   if(inverse_order) {
     for(int i = 0; i < nb_lines/2; i++) {
       char *s = lines[nb_lines - 1 - i];
@@ -540,7 +551,7 @@ int main(int argc, char **argv) {
       patterns[patterns_point] = '\0';
     }
 
-    else if(key == KEY_BACKSPACE || key == '\b' ||
+    else if(key == KEY_BACKSPACE || key == '\b' || key == '\7f' ||
             key == KEY_DC || key == '\ 4') {
       if(patterns_point > 0) {
         patterns_point--;