Changeset 16937

Timestamp:

06/27/13 22:21:34 (11 years ago)

Author:

tbretz

Message:

Some fixes for the display of command completion results; fixed the removal of double entries from the history; added Home and End to key bindings output

File:

• trunk/FACT++/src/Readline.cc (modified) (6 diffs)

trunk/FACT++/src/Readline.cc

@@ -50 +50 @@
 
  - <A HREF="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">GNU Readline</A>
+ - <A HREF="http://www.rendezvousalpha.com/f/bash_d596c169?fn=1670">GNU Readline (src code)</A>
 
  */
@@ -59 +60 @@
 #include <iostream>
 
+#include <sys/ioctl.h>
 #include <readline/readline.h>
 #include <readline/history.h>
@@ -328 +330 @@
         rl_on_new_line();
 
-    if (rl_prompt==p)
-    {
-        Redisplay();
+    if (rl_prompt==p && !newline)
         return;
-    }
 
     UpdatePrompt(p);
@@ -387 +386 @@
 {
     rl_display_match_list(matches, num, max);
+    rl_forced_update_display();
 }
 
@@ -574 +574 @@
             break;
 
-        // It seems like history_search_pos works more like
-        // history_search_prefix, therefore the identity is checked again
-        const HIST_ENTRY *e = history_get(p+1);
-        if (e && str==e->line)
-            free(remove_history(p));
+        HIST_ENTRY *e = remove_history(p--);
+
+        free(e->line);
+        free(e);
     }
 
@@ -1031 +1030 @@
     fprintf(rl_outstream, "   Ctrl-left       One word backward\n");
     fprintf(rl_outstream, "   Ctrl-right      One word forward\n");
+    fprintf(rl_outstream, "   Home            Beginning of line\n");
+    fprintf(rl_outstream, "   End             End of line\n");
     fprintf(rl_outstream, "   Ctrl-d          Quit\n");
     fprintf(rl_outstream, "   Ctrl-y          Delete line\n");