Changeset 6c9d74065d52c4d84d6feefb2cf82387956d527b

Timestamp:

01/06/07 23:32:52 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

a6a7a4b670967df95a82c0d1e7ba565ce99d114d

Children:

f49bdc2a81e372ad133581e2f56a92d47a1fe7ab

git-committer:

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

Message:

[project @ Gobby sends positions now in bytes and no longer in characters.]
libobby takes all positions in bytes to having not to care about different
encodings.

Original author: Armin Burgmeier <armin@…>
Date: 2005-05-05 14:00:18+00:00

Files:

• src/document.cpp (modified) (4 diffs)

src/document.cpp

@@ -89 +89 @@
 
         // Obby signal handlers
-        doc.insert_event().connect(
+        doc.insert_event().before().connect(
                 sigc::mem_fun(*this, &Document::on_obby_insert) );
-        doc.delete_event().connect(
+        doc.delete_event().before().connect(
                 sigc::mem_fun(*this, &Document::on_obby_delete) );
 
@@ -122 +122 @@
 {
         if(m_editing) return;
-        m_doc.insert(begin.get_offset(), text);
+        m_editing = true;
+        
+        m_doc.insert(
+                m_doc.coord_to_position(
+                        begin.get_line(),
+                        begin.get_line_index()
+                ),
+                text
+        );
+
+        m_editing = false;
 }
 
@@ -129 +139 @@
 {
         if(m_editing) return;
-        m_doc.erase(begin.get_offset(), end.get_offset() );
+        m_editing = true;
+
+        m_doc.erase(
+                m_doc.coord_to_position(
+                        begin.get_line(),
+                        begin.get_line_index()
+                ),
+                m_doc.coord_to_position(
+                        end.get_line(),
+                        end.get_line_index()
+                )
+        );
+
+        m_editing = false;
 }
 
 void Gobby::Document::on_obby_insert(const obby::insert_record& record)
 {
-        m_editing = true;
+        if(m_editing) return;
+        m_editing = true;
+
         Glib::RefPtr<Gtk::TextBuffer> buffer = m_view.get_buffer();
-        buffer->insert(buffer->get_iter_at_offset(record.get_position()),
-                       record.get_text() );
+
+        unsigned int row, col;
+        m_doc.position_to_coord(record.get_position(), row, col);
+        buffer->insert(
+                buffer->get_iter_at_line_index(row, col),
+                record.get_text()
+        );
+
         m_editing = false;
 }
@@ -143 +174 @@
 void Gobby::Document::on_obby_delete(const obby::delete_record& record)
 {
-        m_editing = true;
+        if(m_editing) return;
+        m_editing = true;
+
         Glib::RefPtr<Gtk::TextBuffer> buffer = m_view.get_buffer();
-        buffer->erase(buffer->get_iter_at_offset(record.get_begin()),
-                      buffer->get_iter_at_offset(record.get_end()) );
+
+        unsigned int brow, bcol, erow, ecol;
+        m_doc.position_to_coord(record.get_begin(), brow, bcol);
+        m_doc.position_to_coord(record.get_end(), erow, ecol);
+
+        buffer->erase(
+                buffer->get_iter_at_line_index(brow, bcol),
+                buffer->get_iter_at_line_index(erow, ecol)
+        );
         m_editing = false;
 }