Changeset e51abc748ac27b1dfa0fccd9de3ba9cdecb743f0

Timestamp:

01/06/07 23:33:33 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

93ca35407082705407d4ec2fb58c684dab77407d

Children:

0f676825acafe08500114fc64f438732f780fb0a

git-committer:

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

Message:

[project @ StatusBar? showing cursor position and current language]

Original author: Armin Burgmeier <armin@…>
Date: 2005-05-06 19:48:57+00:00

Files:

• Makefile.am (modified) (2 diffs)
• TODO (modified) (1 diff)
• inc/document.hpp (modified) (4 diffs)
• inc/folder.hpp (modified) (3 diffs)
• inc/sourceview/sourcelanguage.hpp (modified) (2 diffs)
• inc/statusbar.hpp (added)
• inc/window.hpp (modified) (3 diffs)
• src/document.cpp (modified) (7 diffs)
• src/folder.cpp (modified) (2 diffs)
• src/sourceview/sourcebuffer.cpp (modified) (1 diff)
• src/sourceview/sourcelanguage.cpp (modified) (2 diffs)
• src/statusbar.cpp (added)
• src/window.cpp (modified) (11 diffs)

Makefile.am

@@ -26 +26 @@
 noinst_HEADERS += inc/logview.hpp
 noinst_HEADERS += inc/document.hpp
+noinst_HEADERS += inc/statusbar.hpp
 noinst_HEADERS += inc/header.hpp
 noinst_HEADERS += inc/folder.hpp
@@ -56 +57 @@
 gobby_SOURCES += src/logview.cpp
 gobby_SOURCES += src/document.cpp
+gobby_SOURCES += src/statusbar.cpp
 gobby_SOURCES += src/header.cpp
 gobby_SOURCES += src/folder.cpp

TODO

@@ -14 +14 @@
  * Initialise size of paned widgets
  * configure should detect the presence of gtksourceview automatically
- * Implement a statusbar
-   - Cursor position
-   - Current highlighting scheme
-   - Current syncronisation state 
  * Prompt before overwriting existing files when explicitly choosing path
  * Chat command infrastructure (/me, /ignore)

inc/document.hpp

@@ -33 +33 @@
 {
 
+class Folder;
+
 class Document : public Gtk::ScrolledWindow
 {
 public:
         typedef std::map<Glib::ustring, Glib::ustring> MimeMap;
+        typedef sigc::signal<void> signal_update_type;
 
-        Document(obby::document& doc);
+        Document(obby::document& doc, const Folder& folder);
         virtual ~Document();
 
@@ -44 +47 @@
         obby::document& get_document();
 
+        // Statusbar information
+        void get_cursor_position(unsigned int& row, unsigned int& col);
+        unsigned int get_unsynced_changes_count() const;
+#ifdef WITH_GTKSOURCEVIEW
+        Glib::RefPtr<Gtk::SourceLanguage> get_language() const;
+#endif
+
+        /** Signal which will be emitted if the document gets updated in a way
+         * that is interesting for the status bar.
+         */
+        signal_update_type update_event() const;
+
 protected:
-        void on_insert(const Gtk::TextBuffer::iterator& begin,
-                       const Glib::ustring& text,
-                       int bytes);
-        void on_erase(const Gtk::TextBuffer::iterator& begin,
-                      const Gtk::TextBuffer::iterator& end);
+        void on_insert_before(const Gtk::TextBuffer::iterator& begin,
+                              const Glib::ustring& text,
+                              int bytes);
+        void on_erase_before(const Gtk::TextBuffer::iterator& begin,
+                             const Gtk::TextBuffer::iterator& end);
 
         void on_obby_insert(const obby::insert_record& record);
         void on_obby_delete(const obby::delete_record& record);
 
+        void on_insert_after(const Gtk::TextBuffer::iterator& begin,
+                             const Glib::ustring& text,
+                             int bytes);
+        void on_erase_after(const Gtk::TextBuffer::iterator& begin,
+                            const Gtk::TextBuffer::iterator& end);
+
+        void on_cursor_changed(const Gtk::TextBuffer::iterator& location,
+                               const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark);
+
         obby::document& m_doc;
+        const Folder& m_folder;
+
 #ifdef WITH_GTKSOURCEVIEW
         Gtk::SourceView m_view;
@@ -62 +88 @@
 #endif
         bool m_editing;
+        
+        signal_update_type m_signal_update;
 
 public:
@@ -68 +96 @@
         static const MimeMap& m_mime_map;
 #endif
-
 };
 

inc/folder.hpp

@@ -20 +20 @@
 #define _GOBBY_FOLDER_HPP_
 
+#include <sigc++/signal.h>
 #include <gtkmm/notebook.h>
 #include <obby/user.hpp>
 #include <obby/document.hpp>
+#include "document.hpp"
+#include "sourceview/sourcelanguage.hpp"
 
 namespace Gobby
@@ -33 +36 @@
 {
 public:
+        typedef sigc::signal<void, Document&> signal_document_update_type;
+
         Folder();
         ~Folder();
@@ -44 +49 @@
         void obby_document_remove(obby::document& document);
 
+        signal_document_update_type document_update_event() const;
+
 protected:
+        // Signal handlers
+        virtual void on_switch_page(GtkNotebookPage* page, guint page_num);
+        virtual void on_document_update(Document& document);
+
+        signal_document_update_type m_signal_document_update;
 };
 

inc/sourceview/sourcelanguage.hpp

@@ -47 +47 @@
 private:
         friend class SourceLanguage_Class;
-        static CppClassType sourcelanguage_class_;
 
         // noncopyable
@@ -57 +56 @@
 // though...
 public:
+        static CppClassType sourcelanguage_class_;
         SourceLanguage();
         explicit SourceLanguage(const Glib::ConstructParams& construct_params);

inc/window.hpp

@@ -29 +29 @@
 #include "userlist.hpp"
 #include "chat.hpp"
+#include "statusbar.hpp"
 
 namespace Gobby
@@ -54 +55 @@
 
         void on_chat(const Glib::ustring& message);
+        void on_document_update(Document& document);
 
         // Obby signal handlers
@@ -77 +79 @@
         Gtk::VBox m_mainbox;
         Header m_header;
+        StatusBar m_statusbar;
 
         Gtk::VPaned m_mainpaned;

src/document.cpp

@@ -17 +17 @@
  */
 
+#include <obby/client_document.hpp>
 #ifdef WITH_GTKSOURCEVIEW
 #include "sourceview/sourcelanguagesmanager.hpp"
 #endif
 #include "document.hpp"
+#include "folder.hpp"
 
 #ifdef WITH_GTKSOURCEVIEW
@@ -27 +29 @@
 #endif
 
-Gobby::Document::Document(obby::document& doc)
- : Gtk::ScrolledWindow(), m_doc(doc), m_editing(true)
+Gobby::Document::Document(obby::document& doc, const Folder& folder)
+ : Gtk::ScrolledWindow(), m_doc(doc), m_folder(folder), m_editing(true)
 #ifdef WITH_GTKSOURCEVIEW
    ,m_lang_manager(Gtk::SourceLanguagesManager::create() )
@@ -84 +86 @@
         // Textbuffer signal handlers
         buf->signal_insert().connect(
-                sigc::mem_fun(*this, &Document::on_insert), false);
+                sigc::mem_fun(*this, &Document::on_insert_before), false);
         buf->signal_erase().connect(
-                sigc::mem_fun(*this, &Document::on_erase), false);
+                sigc::mem_fun(*this, &Document::on_erase_before), false);
+        buf->signal_insert().connect(
+                sigc::mem_fun(*this, &Document::on_insert_after), true);
+        buf->signal_erase().connect(
+                sigc::mem_fun(*this, &Document::on_erase_after), true);
+        buf->signal_mark_set().connect(
+                sigc::mem_fun(*this, &Document::on_cursor_changed) );
 
         // Obby signal handlers
@@ -117 +125 @@
 }
 
-void Gobby::Document::on_insert(const Gtk::TextBuffer::iterator& begin,
-                                const Glib::ustring& text,
-                                int bytes)
+Gobby::Document::signal_update_type Gobby::Document::update_event() const
+{
+        return m_signal_update;
+}
+        
+void Gobby::Document::get_cursor_position(unsigned int& row,
+                                          unsigned int& col)
+{
+        // Get insert mark
+        Glib::RefPtr<Gtk::TextBuffer::Mark> mark =
+                m_view.get_buffer()->get_mark("insert");
+
+        // Get corresponding iterator
+        // Gtk::TextBuffer::Mark::get_iter is not const. Why not? It prevents
+        // this function from being const.
+        const Gtk::TextBuffer::iterator iter = mark->get_iter();
+
+        // Read line and column
+        row = iter.get_line();
+        col = iter.get_line_offset();
+}
+
+unsigned int Gobby::Document::get_unsynced_changes_count() const
+{
+        obby::client_document* doc = 
+                dynamic_cast<obby::client_document*>(&m_doc);
+
+        // Changes in Server/Host documents are always synced
+        if(doc == NULL)
+                return 0;
+
+        return doc->get_unsynced_changes_count();
+}
+
+#ifdef WITH_GTKSOURCEVIEW
+Glib::RefPtr<Gtk::SourceLanguage> Gobby::Document::get_language() const
+{
+        return m_view.get_buffer()->get_language();
+}
+#endif
+
+void Gobby::Document::on_insert_before(const Gtk::TextBuffer::iterator& begin,
+                                       const Glib::ustring& text,
+                                       int bytes)
 {
         if(m_editing) return;
@@ -135 +184 @@
 }
 
-void Gobby::Document::on_erase(const Gtk::TextBuffer::iterator& begin,
-                               const Gtk::TextBuffer::iterator& end)
+void Gobby::Document::on_erase_before(const Gtk::TextBuffer::iterator& begin,
+                                      const Gtk::TextBuffer::iterator& end)
 {
         if(m_editing) return;
@@ -190 +239 @@
 }
 
+void Gobby::Document::on_insert_after(const Gtk::TextBuffer::iterator& begin,
+                                      const Glib::ustring& text,
+                                      int bytes)
+{
+        // Document changed: Update statusbar
+        m_signal_update.emit();
+}
+
+void Gobby::Document::on_erase_after(const Gtk::TextBuffer::iterator& begin,
+                                     const Gtk::TextBuffer::iterator& end)
+{
+        // Document changed: Update statusbar
+        m_signal_update.emit();
+}
+
+void Gobby::Document::on_cursor_changed(
+        const Gtk::TextBuffer::iterator& location,
+        const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark
+)
+{
+        // Insert mark changed position: Update status bar
+        if(mark->get_name() == "insert")
+                m_signal_update.emit();
+}
+
 #ifdef WITH_GTKSOURCEVIEW
 const Gobby::Document::MimeMap& Gobby::Document::create_mime_map()
@@ -204 +278 @@
         map["cc"] = "text/x-c++";
         map["css"] = "text/css";
+        map["cs"] = "text/x-csharp";
         map["diff"] = "text/x-diff";
         map["f"] = "text/x-fortran";

src/folder.cpp

@@ -61 +61 @@
 void Gobby::Folder::obby_document_insert(obby::document& document)
 {
-        Document* new_doc = new Document(document);
+        Document* new_doc = new Document(document, *this);
+        new_doc->update_event().connect(
+                sigc::bind(
+                        sigc::mem_fun(*this, &Folder::on_document_update),
+                        sigc::ref(*new_doc)
+                )
+        );
+
         append_page(*new_doc, document.get_title());
         new_doc->show_all();
@@ -80 +87 @@
 }
 
+Gobby::Folder::signal_document_update_type
+Gobby::Folder::document_update_event() const
+{
+        return m_signal_document_update;
+}
+
+void Gobby::Folder::on_switch_page(GtkNotebookPage* page, guint page_num)
+{
+        m_signal_document_update.emit(
+                *static_cast<Document*>(get_nth_page(page_num))
+        );
+        Gtk::Notebook::on_switch_page(page, page_num);
+}
+
+void Gobby::Folder::on_document_update(Document& document)
+{
+        if(get_current_page() == page_num(document) )
+                m_signal_document_update.emit(document);
+}
+

src/sourceview/sourcebuffer.cpp

@@ -525 +525 @@
 Glib::RefPtr<Gtk::SourceLanguage> Gtk::SourceBuffer::get_language() const
 {
-        return Glib::wrap(gtk_source_buffer_get_language(
-                const_cast<GtkSourceBuffer*>(gobj())
-        ) );
+        GtkSourceBuffer* self = const_cast<GtkSourceBuffer*>(gobj() );
+        if(gtk_source_buffer_get_language(self) == NULL)
+                return Glib::RefPtr<Gtk::SourceLanguage>(NULL);
+
+        return Glib::wrap(gtk_source_buffer_get_language(self), true);
 }
 

src/sourceview/sourcelanguage.cpp

@@ -29 +29 @@
                 class_init_func_ = &SourceLanguage_Class::class_init_function;
                 register_derived_type(gtk_source_language_get_type() );
+
+                Glib::wrap_register(
+                        GTK_TYPE_SOURCE_LANGUAGE,
+                        &Gtk::SourceLanguage_Class::wrap_new
+                );
         }
 
@@ -146 +151 @@
 Glib::wrap(GtkSourceLanguage* object, bool take_copy)
 {
-        // The Code below does not work - don't know why
-        return Glib::RefPtr<Gtk::SourceLanguage>(new Gtk::SourceLanguage(GTK_SOURCE_LANGUAGE( (GObject*)(object))));
-/*      return Glib::RefPtr<Gtk::SourceLanguage>(
+        Gtk::SourceLanguage::sourcelanguage_class_.init();
+        return Glib::RefPtr<Gtk::SourceLanguage>(
                 dynamic_cast<Gtk::SourceLanguage*>(Glib::wrap_auto(
                         reinterpret_cast<GObject*>(object),
                         take_copy
                 ) )
-        );*/
+        );
 }

src/window.cpp

@@ -65 +65 @@
         m_chat.chat_event().connect(
                 sigc::mem_fun(*this, &Window::on_chat) );
+        m_folder.document_update_event().connect(
+                sigc::mem_fun(*this, &Window::on_document_update) );
 
         m_frame_chat.set_shadow_type(Gtk::SHADOW_IN);
@@ -83 +85 @@
         m_mainbox.pack_start(m_header, Gtk::PACK_SHRINK);
         m_mainbox.pack_start(m_mainpaned, Gtk::PACK_EXPAND_WIDGET);
+        m_mainbox.pack_start(m_statusbar, Gtk::PACK_SHRINK);
 
         add(m_mainbox);
@@ -138 +141 @@
                 m_userlist.obby_start();
                 m_chat.obby_start();
+                m_statusbar.obby_start();
 
                 // Let the local user join
@@ -231 +235 @@
                         m_userlist.obby_end();
                         m_chat.obby_end();
+                        m_statusbar.obby_end();
 
                         m_running = false;
@@ -336 +341 @@
 }
 
+void Gobby::Window::on_document_update(Document& document)
+{
+        // Update statusbar
+        m_statusbar.update(document);
+}
+
 void Gobby::Window::on_obby_login_failed(const std::string& reason)
 {
@@ -352 +363 @@
         // Send documents to components
         obby::buffer::document_iterator iter = m_buffer->document_begin();
-        for(iter; iter != m_buffer->document_end(); ++ iter)
+        for(; iter != m_buffer->document_end(); ++ iter)
                 on_obby_document_insert(*iter);
 }
@@ -379 +390 @@
                         m_userlist.obby_start();
                         m_chat.obby_start();
+                        m_statusbar.obby_start();
 
                         m_running = true;
@@ -389 +401 @@
         m_userlist.obby_user_join(user);
         m_chat.obby_user_join(user);
+        m_statusbar.obby_user_join(user);
 }
 
@@ -398 +411 @@
         m_userlist.obby_user_part(user);
         m_chat.obby_user_part(user);
+        m_statusbar.obby_user_part(user);
 }
 
@@ -406 +420 @@
         m_userlist.obby_document_insert(document);
         m_chat.obby_document_insert(document);
+        m_statusbar.obby_document_insert(document);
 }
 
@@ -414 +429 @@
         m_userlist.obby_document_remove(document);
         m_chat.obby_document_remove(document);
+        m_statusbar.obby_document_remove(document);
 }