X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.cc;h=c387c68cf99716f20b191c535525d096c89180ec;hb=ad25fa46db2e693f887638a4afa35555cd1e5646;hp=2a6a4f3c14a3613e0e7877524cfbbae2b7c73d9e;hpb=c564ca3db05b1497b68c77ddceeb632d1e85a1b0;p=selector.git

diff --git a/selector.cc b/selector.cc
index 2a6a4f3..c387c68 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);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -290,7 +295,6 @@ void update_screen(int *current_line, int *temporary_line, int motion,
 
   if(nb_printed_lines == 1) {
     addnstr("[no selection]\n", console_width);
-    nb_printed_lines++;
   }
 
   // Draw the modeline
@@ -522,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--;