1 files changed, 16 insertions, 31 deletions

diff --git a/src/qreg.c b/src/qreg.c
index 8ef82c0..559373c 100644
--- a/src/qreg.c
+++ b/src/qreg.c
@@ -138,15 +138,9 @@ teco_qreg_set_eol_mode(teco_qreg_t *qreg, gint mode)
 static gboolean
 teco_qreg_plain_set_integer(teco_qreg_t *qreg, teco_int_t value, GError **error)
 {
-	qreg->integer = value;
-	return TRUE;
-}
-
-static gboolean
-teco_qreg_plain_undo_set_integer(teco_qreg_t *qreg, GError **error)
-{
 	if (qreg->must_undo) // FIXME
 		teco_undo_int(qreg->integer);
+	qreg->integer = value;
 	return TRUE;
 }
 
@@ -237,8 +231,10 @@ teco_qreg_plain_get_character(teco_qreg_t *qreg, teco_int_t position,
 
 	teco_doc_edit(&qreg->string, teco_default_codepage());
 
+	sptr_t curpos = teco_view_ssm(teco_qreg_view, SCI_GETCURRENTPOS, 0, 0);
 	sptr_t len = teco_view_ssm(teco_qreg_view, SCI_GETLENGTH, 0, 0);
-	gssize off = teco_view_glyphs2bytes(teco_qreg_view, position);
+	gssize off = teco_view_glyphs2bytes_rel(teco_qreg_view, qreg->string.dot, curpos,
+	                                        position - qreg->string.dot);
 
 	*chr = off >= 0 && off != len ? teco_view_get_character(teco_qreg_view, off, len) : -1;
 
@@ -256,8 +252,10 @@ teco_qreg_plain_get_length(teco_qreg_t *qreg, GError **error)
 
 	teco_doc_edit(&qreg->string, teco_default_codepage());
 
+	sptr_t curpos = teco_view_ssm(teco_qreg_view, SCI_GETCURRENTPOS, 0, 0);
 	sptr_t len = teco_view_ssm(teco_qreg_view, SCI_GETLENGTH, 0, 0);
-	teco_int_t ret = teco_view_bytes2glyphs(teco_qreg_view, len);
+	teco_int_t ret = teco_view_bytes2glyphs_rel(teco_qreg_view, qreg->string.dot,
+	                                            curpos, len - curpos);
 
 	if (teco_qreg_current)
 		teco_doc_edit(&teco_qreg_current->string, 0);
@@ -366,7 +364,6 @@ teco_qreg_plain_save(teco_qreg_t *qreg, const gchar *filename, GError **error)
  */
 #define TECO_INIT_QREG(...) { \
 	.set_integer		= teco_qreg_plain_set_integer, \
-	.undo_set_integer	= teco_qreg_plain_undo_set_integer, \
 	.get_integer		= teco_qreg_plain_get_integer, \
 	.set_string		= teco_qreg_plain_set_string, \
 	.undo_set_string	= teco_qreg_plain_undo_set_string, \
@@ -396,23 +393,20 @@ teco_qreg_plain_new(const gchar *name, gsize len)
 static gboolean
 teco_qreg_dot_set_integer(teco_qreg_t *qreg, teco_int_t value, GError **error)
 {
-	gssize pos = teco_interface_glyphs2bytes(value);
+	gssize pos = teco_interface_glyphs2bytes_absdot(value);
 	if (pos < 0) {
 		g_set_error_literal(error, TECO_ERROR, TECO_ERROR_MOVE,
 		                    "Attempt to move pointer off page when setting Q-Register \":\"");
 		return FALSE;
 	}
 
-	teco_interface_ssm(SCI_GOTOPOS, pos, 0);
-	return TRUE;
-}
-
-static gboolean
-teco_qreg_dot_undo_set_integer(teco_qreg_t *qreg, GError **error)
-{
 	if (teco_current_doc_must_undo())
 		undo__teco_interface_ssm(SCI_GOTOPOS,
 		                         teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0), 0);
+
+	teco_interface_ssm(SCI_GOTOPOS, pos, 0);
+	teco_current_doc_set_dot(value);
+
 	return TRUE;
 }
 
@@ -420,8 +414,7 @@ teco_qreg_dot_undo_set_integer(teco_qreg_t *qreg, GError **error)
 static gboolean
 teco_qreg_dot_get_integer(teco_qreg_t *qreg, teco_int_t *ret, GError **error)
 {
-	sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0);
-	*ret = teco_interface_bytes2glyphs(pos);
+	*ret = teco_current_doc_get_dot();
 	return TRUE;
 }
 
@@ -431,7 +424,6 @@ teco_qreg_dot_new(void)
 {
 	static teco_qreg_vtable_t vtable = TECO_INIT_QREG(
 		.set_integer = teco_qreg_dot_set_integer,
-		.undo_set_integer = teco_qreg_dot_undo_set_integer,
 		.get_integer = teco_qreg_dot_get_integer
 	);
 
@@ -631,13 +623,8 @@ teco_qreg_external_save(teco_qreg_t *qreg, const gchar *filename, GError **error
 static gboolean
 teco_qreg_bufferinfo_set_integer(teco_qreg_t *qreg, teco_int_t value, GError **error)
 {
-	return teco_ring_edit(value, error);
-}
-
-static gboolean
-teco_qreg_bufferinfo_undo_set_integer(teco_qreg_t *qreg, GError **error)
-{
-	return teco_current_doc_undo_edit(error);
+	return teco_current_doc_undo_edit(error) &&
+	       teco_ring_edit(value, error);
 }
 
 static gboolean
@@ -703,7 +690,6 @@ teco_qreg_bufferinfo_new(void)
 {
 	static teco_qreg_vtable_t vtable = TECO_INIT_QREG_EXTERNAL(
 		.set_integer		= teco_qreg_bufferinfo_set_integer,
-		.undo_set_integer	= teco_qreg_bufferinfo_undo_set_integer,
 		.get_integer		= teco_qreg_bufferinfo_get_integer,
 		.set_string		= teco_qreg_bufferinfo_set_string,
 		.undo_set_string	= teco_qreg_bufferinfo_undo_set_string,
@@ -1260,8 +1246,7 @@ teco_qreg_stack_pop(teco_qreg_t *qreg, GError **error)
 	teco_qreg_stack_entry_t *entry;
 	entry = &g_array_index(teco_qreg_stack, teco_qreg_stack_entry_t, teco_qreg_stack->len-1);
 
-	if (!qreg->vtable->undo_set_integer(qreg, error) ||
-	    !qreg->vtable->set_integer(qreg, entry->integer, error))
+	if (!qreg->vtable->set_integer(qreg, entry->integer, error))
 		return FALSE;
 
 	/* exchange document ownership between stack entry and Q-Register */