keep rubbed out command line for later re-insertion and massive Cmdline cleanup/refactoring

 * characters rubbed out are not totally removed from the command line,
   but only from the *effective* command line.
 * The rubbed out command line is displayed after the command line cursor.
   On Curses it is grey and underlined.
 * When characters are inserted that are on the rubbed out part of the command line,
   the cursor simply moves forward.
   NOTE: There's currently no immediate editing command for reinserting the
   next character/word from the rubbed out command line.
 * Characters resulting in errors are no longer simply discarded but rubbed out,
   so they will stay in the rubbed out part of the command line, reminding you
   which character caused the error.
 * Improved Cmdline formatting on Curses UI:
   * Asterisk is printed bold
   * Control characters are printed in REVERSE style, similar to what
     Scinterm does. The controll character formatting has thus been moved
     from macro_echo() in cmdline.cpp to the UI implementations.
 * Updated the GTK+ UI (UNTESTED): I did only, the most important API
   adaptions. The command line still does not use any colors.
 * Refactored entire command line handling:
   * The command line is now a class (Cmdline), and most functions
     in cmdline.cpp have been converted to methods.
   * Esp. process_edit_cmd() (now Cmdline::process_edit_cmd()) has been
     simplified. There is no longer the possibility of a buffer overflow
     because of static insertion buffer sizes
   * Cleaned up usage of the cmdline_pos variable (now Cmdline::pc) which
     is really a program counter that used a different origin as macro_pc
     which was really confusing.
   * The new Cmdline class is theoretically 8-bit clean. However all of this
     will change again when we introduce Scintilla views for the command line.
 * Added 8-bit clean (null-byte aware) versions of QRegisterData::set_string()
   and QRegisterData::append_string()

1 files changed, 60 insertions, 12 deletions

diff --git a/src/cmdline.h b/src/cmdline.h
index 1a254e6..6095cbb 100644
--- a/src/cmdline.h
+++ b/src/cmdline.h
@@ -20,25 +20,73 @@
 
 #include <glib.h>
 
-#include "sciteco.h"
 #include "parser.h"
 #include "qregisters.h"
+#include "undo.h"
 
 namespace SciTECO {
 
-extern gchar *cmdline;
-extern gint cmdline_pos;
-extern bool quit_requested;
+extern class Cmdline {
+public:
+	/**
+	 * String containing the current command line.
+	 * It is not null-terminated and contains the effective
+	 * command-line up to cmdline_len followed by the recently rubbed-out
+	 * command-line of length cmdline_rubout_len.
+	 */
+	gchar *str;
+	/** Effective command line length */
+	gsize len;
+	/** Length of the rubbed out command line */
+	gsize rubout_len;
+	/** Program counter within the command-line macro */
+	guint pc;
 
-void cmdline_keypress(gchar key);
-static inline void
-cmdline_keypress(const gchar *keys)
-{
-	while (*keys)
-		cmdline_keypress(*keys++);
-}
+	Cmdline() : str(NULL), len(0), rubout_len(0), pc(0) {}
+	inline
+	~Cmdline()
+	{
+		g_free(str);
+	}
+
+	inline gchar
+	operator [](guint i) const
+	{
+		return str[i];
+	}
+
+	void keypress(gchar key);
+	inline void
+	keypress(const gchar *keys)
+	{
+		while (*keys)
+			keypress(*keys++);
+	}
+
+	void fnmacro(const gchar *name);
 
-void cmdline_fnmacro(const gchar *name);
+	void replace(void) G_GNUC_NORETURN;
+
+private:
+	bool process_edit_cmd(gchar key);
+
+	inline void
+	rubout(void)
+	{
+		undo.pop(--len);
+		rubout_len++;
+	}
+
+	void insert(const gchar *src);
+	inline void
+	insert(gchar key)
+	{
+		gchar src[] = {key, '\0'};
+		insert(src);
+	}
+} cmdline;
+
+extern bool quit_requested;
 
 const gchar *get_eol(void);