Changeset a046a0c50b4c83eaa0a435fb80e302aaf11bacc2

Timestamp:

01/06/07 23:44:58 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

0c7664e2841ae18fc47cb025ca4721a561ecdc99

Children:

f12139424c8680cd7a834d6fb2297156c9a582dd

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:44:58Z+0000

Message:

[project @ Column returns the real column of the text not just the nth character]

Original author: Armin Burgmeier <armin@…>
Date: 2005-07-26 17:25:00+00:00

Files:

• inc/document.hpp (modified) (1 diff)
• src/document.cpp (modified) (8 diffs)

inc/document.hpp

@@ -145 +145 @@
         /** Obby signal handlers.
          */
-        void on_obby_insert(const obby::insert_record& record);
-        void on_obby_delete(const obby::delete_record& record);
+        void on_obby_insert_before(const obby::insert_record& record);
+        void on_obby_insert_after(const obby::insert_record& record);
+        void on_obby_delete_before(const obby::delete_record& record);
+        void on_obby_delete_after(const obby::delete_record& record);
 
         void on_obby_change_before();

src/document.cpp

@@ -169 +169 @@
         row = iter.get_line();
         col = iter.get_line_offset();
+
+        // Add tab characters to col
+        if(m_doc.get_document() && is_subscribed() )
+        {
+                const std::string& line = m_doc.get_document()->get_line(row);
+                unsigned int tabs = m_preferences.editor.tab_width;
+
+                // col chars
+                std::string::size_type chars = col; col = 0;
+                for(std::string::size_type i = 0; i < chars; ++ i)
+                {
+                        unsigned int width = 1;
+                        if(line[i] == '\t')
+                        {
+                                width = (tabs - col % tabs) % tabs;
+                                if(width == 0) width = tabs;
+                        }
+                        col += width;
+                }
+        }
 }
 
@@ -206 +226 @@
 }
 
+bool Gobby::Document::is_subscribed() const
+{
+        return m_subscribed;
+}
+
 bool Gobby::Document::get_modified() const
 {
@@ -259 +284 @@
 }
 
-void Gobby::Document::on_obby_insert(const obby::insert_record& record)
+void Gobby::Document::on_obby_insert_before(const obby::insert_record& record)
 {
         if(m_editing) return;
@@ -289 +314 @@
 }
 
-void Gobby::Document::on_obby_delete(const obby::delete_record& record)
+void Gobby::Document::on_obby_insert_after(const obby::insert_record& record)
+{
+}
+
+void Gobby::Document::on_obby_delete_before(const obby::delete_record& record)
 {
         if(m_editing) return;
@@ -305 +334 @@
                 buffer->get_iter_at_line_index(erow, ecol)
         );
+
         m_editing = false;
 }
 
+void Gobby::Document::on_obby_delete_after(const obby::delete_record& record)
+{
+}
+
 void Gobby::Document::on_obby_change_before()
 {
@@ -314 +348 @@
 void Gobby::Document::on_obby_change_after()
 {
-        // Document changed
+        if(m_editing) return;
+
+        // Content may have changed / cursor have been moved
+        m_signal_cursor_moved.emit();
         m_signal_content_changed.emit();
-        // Cursor may have moved
-        m_signal_cursor_moved.emit();
 }
 
@@ -345 +380 @@
         // Install signal handlers
         doc.insert_event().before().connect(
-                sigc::mem_fun(*this, &Document::on_obby_insert) );
+                sigc::mem_fun(*this, &Document::on_obby_insert_before) );
+        doc.insert_event().after().connect(
+                sigc::mem_fun(*this, &Document::on_obby_insert_after) );
         doc.delete_event().before().connect(
-                sigc::mem_fun(*this, &Document::on_obby_delete) );
+                sigc::mem_fun(*this, &Document::on_obby_delete_before) );
+        doc.delete_event().after().connect(
+                sigc::mem_fun(*this, &Document::on_obby_delete_after) );
         doc.change_event().before().connect(
                 sigc::mem_fun(*this, &Document::on_obby_change_before) );
@@ -691 +730 @@
         set_margin(m_preferences.view.margin_pos);
         get_buffer()->set_check_brackets(m_preferences.view.bracket_highlight);
+
+        // Cursor position may have changed because tab width may have changed
+        m_signal_cursor_moved.emit();
 }