Changeset 20016

Timestamp:

12/28/20 15:03:19 (4 years ago)

Author:

tbretz

Message:

Readline 8 behaves differently. The best fix is to use the readline functions themselves and don't interfere... this does not work well for resizing for older readline libraries, but that neither worked proprly before.

Location:

trunk/FACT++/src

Files:

• Readline.cc (modified) (7 diffs)
• Readline.h (modified) (2 diffs)

trunk/FACT++/src/Readline.cc

@@ -139 +139 @@
     rl_getc_function                   = rl_ncurses_getc;
     rl_startup_hook                    = rl_ncurses_startup;
-    rl_redisplay_function              = rl_ncurses_redisplay;
+    // rl_redisplay_function              = rl_ncurses_redisplay;
     rl_event_hook                      = rl_ncurses_event_hook;
     rl_completion_display_matches_hook = rl_ncurses_completion_display;
@@ -247 +247 @@
 //! contents of the editing buffer. 
 //
+/*
 void Readline::rl_ncurses_redisplay()
 {
     This->Redisplay();
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -331 +333 @@
         rl_on_new_line();
 
-    if (rl_prompt==p && !newline)
-        return;
-
-    UpdatePrompt(p);
-
-    int w, h;
-    rl_get_screen_size(&h, &w);
-    cout << '\r' << string(w+1, ' ') << '\r';
-    rl_forced_update_display();
+    if (newline || rl_display_prompt!=p)
+    {
+        UpdatePrompt(p);
+        rl_forced_update_display();
+    }
 }
 
@@ -359 +357 @@
 //! Default: call rl_redisplay()
 //
-
+/*
 void Readline::Redisplay()
 {
@@ -379 +377 @@
     rl_forced_update_display();
 }
+*/
 
 // --------------------------------------------------------------------------
@@ -782 +781 @@
 // --------------------------------------------------------------------------
 //
-//! return strlen(rl_display_prompt) + rl_point
+//! return rl_visible_prompt_length + rl_point
+//! (the current position within the line)
 //
 int Readline::GetAbsCursor()
 {
-    return strlen(rl_display_prompt) + rl_point;
+    extern int rl_visible_prompt_length;
+    return /*strlen(rl_display_prompt)*/rl_visible_prompt_length + rl_point;
 }
 
@@ -802 +803 @@
 // --------------------------------------------------------------------------
 //
-//! return the length of the prompt plus the length of the line buffer
+//! return rl_visible_prompt_length + rl_end
+//! (the length of the prompt plus the length of the line buffer)
 //
 int Readline::GetLineLength()
 {
-    return strlen(rl_display_prompt) + rl_end;
+    extern int rl_visible_prompt_length;
+    return /*strlen(rl_display_prompt)*/rl_visible_prompt_length + rl_end;
 }
 

trunk/FACT++/src/Readline.h

@@ -38 +38 @@
     static int    rl_ncurses_getc(FILE *);
     static int    rl_ncurses_startup();
-    static void   rl_ncurses_redisplay();
+    //static void   rl_ncurses_redisplay();
     static int    rl_ncurses_event_hook();
     static void   rl_ncurses_completion_display(char **matches, int num, int max);
@@ -53 +53 @@
     virtual void EventHook(bool newline=false);
     virtual void Shutdown(const char *buf);
-    virtual void Redisplay();
+    //virtual void Redisplay();
     virtual void CompletionDisplay(char **matches, int num, int max);