Changeset 9f47baf8e22a0f9c7992d3386b8743fbb83a3963

Timestamp:

14/02/10 00:28:36 (2 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

61cce2ce9c8b06819912a01dad14af78444f3b64

Children:

dd8543c6808bb28cfc8420e6816e9654fbe3134d

git-committer:

Armin Burgmeier <armin@arbur.net> / 2010-02-14T00:28:36Z+0100

Message:

Show remote cursors

2010-02-13 Armin Burgmeier <armin@…>

• code/core/textsessionview.hpp:
• code/core/textsessionview.cpp: Add a InfTextGtkView?, to show remote cursors.

Files:

• ChangeLog (modified) (1 diff)
• code/core/textsessionview.cpp (modified) (3 diffs)
• code/core/textsessionview.hpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2010-02-13  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/textsessionview.hpp:
+        * code/core/textsessionview.cpp: Add a InfTextGtkView, to show remote
+        cursors.
+
 2010-02-12  Armin Burgmeier  <armin@arbur.net>
 

code/core/textsessionview.cpp

@@ -127 +127 @@
 {
         InfBuffer* buffer = inf_session_get_buffer(INF_SESSION(session));
+        InfUserTable* user_table =
+                inf_session_get_user_table(INF_SESSION(session));
         m_buffer = GTK_SOURCE_BUFFER(inf_text_gtk_buffer_get_text_buffer(
                 INF_TEXT_GTK_BUFFER(buffer)));
+
+        m_infview = inf_text_gtk_view_new(
+                inf_adopted_session_get_io(INF_ADOPTED_SESSION(session)),
+                GTK_TEXT_VIEW(m_view),
+                user_table);
 
         g_signal_connect_after(
@@ -236 +243 @@
 
         pack_start(*scroll, Gtk::PACK_EXPAND_WIDGET);
-        
-        gtk_source_buffer_set_style_scheme(m_buffer, gtk_source_style_scheme_manager_get_scheme(gtk_source_style_scheme_manager_get_default(), static_cast<Glib::ustring>(preferences.appearance.scheme_id).c_str()));
+
+        gtk_source_buffer_set_style_scheme(
+                m_buffer,
+                gtk_source_style_scheme_manager_get_scheme(
+                        gtk_source_style_scheme_manager_get_default(),
+                        static_cast<Glib::ustring>(
+                                preferences.appearance.scheme_id).c_str()));
+}
+
+Gobby::TextSessionView::~TextSessionView()
+{
+        g_object_unref(m_infview);
 }
 
@@ -323 +340 @@
                         inf_session_get_buffer(INF_SESSION(m_session))),
                 user);
+        inf_text_gtk_view_set_active_user(m_infview, user);
 
         // TODO: Make sure the active user has the color specified in the

code/core/textsessionview.hpp

@@ -30 +30 @@
 #include <gtksourceview/gtksourcelanguage.h>
 
+#include <libinftextgtk/inf-text-gtk-view.h>
 #include <libinftext/inf-text-session.h>
 #include <libinftext/inf-text-user.h>
@@ -47 +48 @@
                         Preferences& preferences,
                         GtkSourceLanguageManager* manager);
+        ~TextSessionView();
 
         InfTextSession* get_session() { return INF_TEXT_SESSION(m_session); }
@@ -127 +129 @@
         GtkSourceBuffer* m_buffer;
         std::auto_ptr<TextUndoGrouping> m_undo_grouping;
+        InfTextGtkView* m_infview;
 
         SignalLanguageChanged m_signal_language_changed;