aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/qregisters.h
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-01 17:56:34 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-01 18:20:27 +0100
commit83ebaea1abc39cae990e0fd22b6e4b428abfa95f (patch)
treed297dab707836d05b9d46bad621b8e02d6506ab9 /src/qregisters.h
parent68eb8e5c427877abae43f2e2aba7fcca5a3471de (diff)
downloadsciteco-83ebaea1abc39cae990e0fd22b6e4b428abfa95f.tar.gz
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()
Diffstat (limited to 'src/qregisters.h')
-rw-r--r--src/qregisters.h21
1 files changed, 17 insertions, 4 deletions
diff --git a/src/qregisters.h b/src/qregisters.h
index 8414439..ff4da87 100644
--- a/src/qregisters.h
+++ b/src/qregisters.h
@@ -18,6 +18,8 @@
#ifndef __QREGISTERS_H
#define __QREGISTERS_H
+#include <string.h>
+
#include <bsd/sys/queue.h>
#include <glib.h>
@@ -94,9 +96,20 @@ public:
return integer;
}
- virtual void set_string(const gchar *str);
+ virtual void set_string(const gchar *str, gsize len);
+ inline void
+ set_string(const gchar *str)
+ {
+ set_string(str, str ? strlen(str) : 0);
+ }
virtual void undo_set_string(void);
- virtual void append_string(const gchar *str);
+
+ virtual void append_string(const gchar *str, gsize len);
+ inline void
+ append_string(const gchar *str)
+ {
+ append_string(str, str ? strlen(str) : 0);
+ }
virtual inline void
undo_append_string(void)
{
@@ -155,9 +168,9 @@ public:
tecoInt get_integer(void);
- void set_string(const gchar *str) {}
+ void set_string(const gchar *str, gsize len) {}
void undo_set_string(void) {}
- void append_string(const gchar *str) {}
+ void append_string(const gchar *str, gsize len) {}
void undo_append_string(void) {}
gchar *get_string(void);