Changeset 71db57df5f3df49a8805a14783f6c09f30c2350b

Timestamp:

11/05/08 23:53:19 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

3841c97f73b9283df816e998739bd742cffce0b5

Children:

2589612557ec8e5888f7b574a3a08fe748dc11e5

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-11-05T23:53:19Z+0100

Message:

Added a hack to re-enable scrolling to position of undo/redo

2008-11-05 Armin Burgmeier <armin@…>

• code/commands/edit-commands.cpp: Added a (hopefully) temporary hack to set the cursor position to the place where a Undo/Redo has occurred. This stopped to work with the latest changes in libinfinity (which in turn fix other caret stuff, such as no longer moving the caret around on block indent/unindent, or allowing to paste text over a selected area). This can be properly implemented as soon as libinfinity supports caret-aware requests.

Files:

• ChangeLog (modified) (1 diff)
• code/commands/edit-commands.cpp (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2008-11-05  Armin Burgmeier  <armin@arbur.net>
+
+        * code/commands/edit-commands.cpp: Added a (hopefully) temporary hack
+        to set the cursor position to the place where a Undo/Redo has
+        occurred. This stopped to work with the latest changes in libinfinity
+        (which in turn fix other caret stuff, such as no longer moving the 
+        caret around on block indent/unindent, or allowing to paste text
+        over a selected area). This can be properly implemented as soon as
+        libinfinity supports caret-aware requests.
+
 2008-10-18  Armin Burgmeier  <armin@arbur.net>
 

code/commands/edit-commands.cpp

@@ -300 +300 @@
 }
 
+// TODO: The following is basically a hack to set the cursor to the position
+// where a Undo/Redo has happened. This can be properly fixed as soon as
+// libinfinity supports caret-aware requests, by generating undo-caret and
+// redo-caret requests.
+namespace {
+        bool check_set = false;
+        GtkTextIter check;
+
+        void recaret_i(GtkTextBuffer* buffer,
+                       GtkTextIter* location,
+                       gchar* text,
+                       gint len,
+                       gpointer user_data)
+        {
+                check = *location;
+                check_set = true;
+        }
+
+        void recaret_e(GtkTextBuffer* buffer,
+                       GtkTextIter* start,
+                       GtkTextIter* end,
+                       gpointer user_data)
+        {
+                check = *start;
+                check_set = true;
+        }
+}
+
 void Gobby::EditCommands::on_undo()
 {
         g_assert(m_current_document != NULL);
+
+        gulong i_ = g_signal_connect_after(m_current_document->get_text_buffer(), "insert-text", G_CALLBACK(recaret_i), NULL);
+        gulong e_ = g_signal_connect_after(m_current_document->get_text_buffer(), "delete-range", G_CALLBACK(recaret_e), NULL);
 
         inf_adopted_session_undo(
@@ -309 +340 @@
         );
 
+        g_signal_handler_disconnect(m_current_document->get_text_buffer(), i_);
+        g_signal_handler_disconnect(m_current_document->get_text_buffer(), e_);
+
+        if(check_set)
+                gtk_text_buffer_select_range(GTK_TEXT_BUFFER(m_current_document->get_text_buffer()), &check, &check);
+        check_set = false;
         m_current_document->scroll_to_cursor_position(0.0);
 }
@@ -315 +352 @@
 {
         g_assert(m_current_document != NULL);
+
+        gulong i_ = g_signal_connect_after(m_current_document->get_text_buffer(), "insert-text", G_CALLBACK(recaret_i), NULL);
+        gulong e_ = g_signal_connect_after(m_current_document->get_text_buffer(), "delete-range", G_CALLBACK(recaret_e), NULL);
 
         inf_adopted_session_redo(
@@ -321 +361 @@
         );
 
+        g_signal_handler_disconnect(m_current_document->get_text_buffer(), i_);
+        g_signal_handler_disconnect(m_current_document->get_text_buffer(), e_);
+
+        if(check_set)
+                gtk_text_buffer_select_range(GTK_TEXT_BUFFER(m_current_document->get_text_buffer()), &check, &check);
+        check_set = false;
         m_current_document->scroll_to_cursor_position(0.0);
 }