Changeset 16869

Timestamp:

06/19/13 17:09:29 (11 years ago)

Author:

tbretz

Message:

When we output something ourselves before the event hook is called in readline, we have to signal readline that we have started a new row, so that readline can properly update the prompt. I hope this finally solves the flickering issue on my laptop and/or the problematic display in the fadctrl.

Location:

trunk/FACT++/src

Files:

• Console.cc (modified) (3 diffs)
• Console.h (modified) (1 diff)
• Readline.cc (modified) (2 diffs)
• Readline.h (modified) (3 diffs)
• ReadlineWindow.h (modified) (1 diff)

trunk/FACT++/src/Console.cc

@@ -149 +149 @@
 //! EventHook to update the prompt.
 //
-void Console::EventHook()
+void Console::EventHook(bool)
 {
     // If the output is continous and we are going to output something
@@ -155 +155 @@
     // doesn't work well if the input line is already two lines)
     // and then flush the buffer.
-    if (fContinous && fLogO.GetSizeBacklog()>0)
+    const bool newline = fContinous && fLogO.GetSizeBacklog()>0;
+    if (newline)
     {
         // Clear the line we are going to overwrite
@@ -163 +164 @@
 
     // Call Readline's EventHook to update the prompt
-    Readline::EventHook();
+    Readline::EventHook(newline);
 }
 

trunk/FACT++/src/Console.h

@@ -69 +69 @@
 
     void Startup();
-    void EventHook();
+    void EventHook(bool);
     void Run(const char * = 0);
 };

trunk/FACT++/src/Readline.cc

@@ -310 +310 @@
 //! with some information (e.g. time) just by overwriting GetUpdatePrompt()
 //!
-void Readline::EventHook()
+void Readline::EventHook(bool newline)
 {
     const string cpy = fExternalInput;
@@ -325 +325 @@
         p = rl_prompt;
 
-    const string line_buffer = rl_line_buffer;
-    const int    point       = rl_point;
-
-    rl_replace_line("", 1);
-    UpdatePrompt("");
-    Redisplay();
-
-    rl_replace_line(line_buffer.c_str(), 1);
-    rl_point = point;
+    if (newline)
+        rl_on_new_line();
 
     UpdatePrompt(p);

trunk/FACT++/src/Readline.h

@@ -6 +6 @@
 #include <vector>
 #include <fstream>
+#include <iostream>
 
 class Readline
@@ -50 +51 @@
     virtual int  Getc(FILE *);
     virtual void Startup();
-    virtual void EventHook();
+    virtual void EventHook(bool newline=false);
     virtual void Shutdown(const char *buf);
     virtual void Redisplay();
@@ -99 +100 @@
     virtual bool PreProcess(const std::string &str);
     virtual bool Process(const std::string &str);
-    virtual std::string GetUpdatePrompt() const { return ""; }
+    virtual std::string GetUpdatePrompt() const { std::cout << "**********" << std::endl; return ""; }
     virtual bool PromptEOF(std::string &str);
     virtual std::string Prompt(const std::string &prompt);

trunk/FACT++/src/ReadlineWindow.h

@@ -20 +20 @@
     void Startup();
     void Redisplay();
-    void EventHook();
+    void EventHook(bool = false);
     void CompletionDisplay(char **matches, int num, int max);