Add various readline related fixes

- Add missing unbind key
- Fix colored messages
- Add command completion
- Preserve last command input
- Fix cursor position issues
- Fix trailing whitespace in commands
- Synchronize set_prompt
This commit is contained in:
Jethro Grassie 2017-07-07 15:40:32 -04:00
parent 605ad09a3e
commit 6955976b2d
No known key found for this signature in database
GPG key ID: DE8ED755616565BB
4 changed files with 76 additions and 18 deletions

View file

@ -374,6 +374,9 @@ namespace epee
} }
else else
{ {
#ifdef HAVE_READLINE
rdln::suspend_readline pause_readline;
#endif
std::cout << "unknown command: " << command << std::endl; std::cout << "unknown command: " << command << std::endl;
std::cout << usage; std::cout << usage;
} }
@ -477,6 +480,9 @@ namespace epee
lookup::mapped_type & vt = m_command_handlers[cmd]; lookup::mapped_type & vt = m_command_handlers[cmd];
vt.first = hndlr; vt.first = hndlr;
vt.second = usage; vt.second = usage;
#ifdef HAVE_READLINE
rdln::readline_buffer::add_completion(cmd);
#endif
} }
bool process_command_vec(const std::vector<std::string>& cmd) bool process_command_vec(const std::vector<std::string>& cmd)

View file

@ -3,6 +3,8 @@
#include <streambuf> #include <streambuf>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <vector>
#include <algorithm>
namespace rdln namespace rdln
{ {
@ -19,12 +21,23 @@ namespace rdln
} }
void get_line(std::string& line) const; void get_line(std::string& line) const;
void set_prompt(const std::string& prompt); void set_prompt(const std::string& prompt);
static void add_completion(const std::string& command)
{
if(std::find(completion_commands.begin(), completion_commands.end(), command) != completion_commands.end())
return;
completion_commands.push_back(command);
}
static const std::vector<std::string>& get_completions()
{
return completion_commands;
}
protected: protected:
virtual int sync(); virtual int sync();
private: private:
std::streambuf* m_cout_buf; std::streambuf* m_cout_buf;
static std::vector<std::string> completion_commands;
}; };
class suspend_readline class suspend_readline

View file

@ -6,6 +6,7 @@
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/algorithm/string.hpp>
static int process_input(); static int process_input();
static void install_line_handler(); static void install_line_handler();
@ -16,6 +17,8 @@ static std::string last_prompt;
std::mutex line_mutex, sync_mutex, process_mutex; std::mutex line_mutex, sync_mutex, process_mutex;
std::condition_variable have_line; std::condition_variable have_line;
std::vector<std::string> rdln::readline_buffer::completion_commands = {"exit"};
namespace namespace
{ {
rdln::readline_buffer* current = NULL; rdln::readline_buffer* current = NULL;
@ -78,6 +81,7 @@ void rdln::readline_buffer::set_prompt(const std::string& prompt)
last_prompt = prompt; last_prompt = prompt;
if(m_cout_buf == NULL) if(m_cout_buf == NULL)
return; return;
std::lock_guard<std::mutex> lock(sync_mutex);
rl_set_prompt(last_prompt.c_str()); rl_set_prompt(last_prompt.c_str());
rl_redisplay(); rl_redisplay();
} }
@ -112,8 +116,7 @@ int rdln::readline_buffer::sync()
do do
{ {
char x = this->sgetc(); m_cout_buf->sputc( this->sgetc() );
m_cout_buf->sputc(x);
} }
while ( this->snextc() != EOF ); while ( this->snextc() != EOF );
@ -148,17 +151,13 @@ static int process_input()
static void handle_line(char* line) static void handle_line(char* line)
{ {
if (line != NULL) if(last_line == "exit" || last_line == "q")
{ {
std::lock_guard<std::mutex> lock(sync_mutex);
rl_set_prompt(last_prompt.c_str());
rl_already_prompted = 1;
return; return;
} }
rl_set_prompt(""); std::lock_guard<std::mutex> lock(sync_mutex);
rl_replace_line("", 0);
rl_redisplay();
rl_set_prompt(last_prompt.c_str()); rl_set_prompt(last_prompt.c_str());
rl_already_prompted = 1;
} }
static int handle_enter(int x, int y) static int handle_enter(int x, int y)
@ -167,21 +166,26 @@ static int handle_enter(int x, int y)
char* line = NULL; char* line = NULL;
line = rl_copy_text(0, rl_end); line = rl_copy_text(0, rl_end);
rl_crlf();
rl_on_new_line();
rl_set_prompt(""); rl_set_prompt("");
rl_replace_line("", 1); rl_replace_line("", 1);
rl_redisplay(); rl_redisplay();
if (strcmp(line, "") != 0) std::string test_line = line;
boost::trim_right(test_line);
if (test_line.length() > 0)
{ {
last_line = line; last_line = test_line;
add_history(line); add_history(test_line.c_str());
have_line.notify_one(); have_line.notify_one();
} }
free(line); free(line);
if(last_line != "exit") if(last_line != "exit" && last_line != "q")
{ {
rl_set_prompt(last_prompt.c_str()); rl_set_prompt(last_prompt.c_str());
rl_on_new_line_with_prompt();
rl_redisplay(); rl_redisplay();
} }
@ -196,15 +200,50 @@ static int startup_hook()
return 0; return 0;
} }
static char* completion_matches(const char* text, int state)
{
static size_t list_index;
static size_t len;
if(state == 0)
{
list_index = 0;
len = strlen(text);
}
const std::vector<std::string>& completions = rdln::readline_buffer::get_completions();
for(; list_index<completions.size(); )
{
const std::string& cmd = completions[list_index++];
if(cmd.compare(0, len, text) == 0)
{
return strdup(cmd.c_str());
}
}
return NULL;
}
static char** attempted_completion(const char* text, int start, int end)
{
rl_attempted_completion_over = 1;
return rl_completion_matches(text, completion_matches);
}
static void install_line_handler() static void install_line_handler()
{ {
rl_startup_hook = startup_hook; rl_startup_hook = startup_hook;
rl_attempted_completion_function = attempted_completion;
rl_callback_handler_install("", handle_line); rl_callback_handler_install("", handle_line);
} }
static void remove_line_handler() static void remove_line_handler()
{ {
rl_replace_line("", 0);
rl_set_prompt("");
rl_redisplay();
rl_unbind_key(RETURN); rl_unbind_key(RETURN);
rl_unbind_key(NEWLINE);
rl_callback_handler_remove(); rl_callback_handler_remove();
} }

View file

@ -65,8 +65,7 @@
#ifdef HAVE_READLINE #ifdef HAVE_READLINE
#include "readline_buffer.h" #include "readline_buffer.h"
#define PAUSE_READLINE() \ #define PAUSE_READLINE() \
rdln::suspend_readline pause_readline; \ rdln::suspend_readline pause_readline;
std::cout << std::endl
#else #else
#define PAUSE_READLINE() #define PAUSE_READLINE()
#endif #endif
@ -195,6 +194,7 @@ namespace
} }
else else
{ {
PAUSE_READLINE();
set_console_color(m_color, m_bright); set_console_color(m_color, m_bright);
std::cout << m_oss.str(); std::cout << m_oss.str();
reset_console_color(); reset_console_color();