Changeset fac340a5fac75b5ca9df2f78c5e5bcd7efae5ed9

Timestamp:

01/06/07 23:29:34 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

c29976f37fa4528b898c2529533ab3d5bc0edc42

Children:

bfb82f7a7bf6cc0079b05343b7d90cc306215a54

git-committer:

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

Message:

[project @ Watching on Glib::signal_io() instead of using a timer]

Original author: Armin Burgmeier <armin@…>
Date: 2005-04-09 11:23:21+00:00

Files:

• Makefile.am (modified) (1 diff)
• TODO (modified) (1 diff)
• inc/buffer_wrapper.hpp (added)
• inc/window.hpp (modified) (2 diffs)
• src/buffer_wrapper.cpp (added)
• src/document.cpp (modified) (3 diffs)
• src/window.cpp (modified) (10 diffs)

Makefile.am

@@ -5 +5 @@
 
 gobby_SOURCES = \
+        src/buffer_wrapper.cpp \
         src/config.cpp \
         src/historyentry.cpp \

TODO

@@ -2 +2 @@
 Scroll to the cursor if anotherone changed the document
 Initialize size of paned widgets
-Connect to Glib::signal_io() with network connections instead of using a timer

inc/window.hpp

@@ -67 +67 @@
         void on_obby_chat(obby::user& user, const Glib::ustring& message);
 
-        bool on_timer();
-
         // Helper functions
         void display_error(const Glib::ustring& message);
@@ -95 +93 @@
         bool m_running; // m_running is set if the obby connection has been
                         // established successfully.
-        bool m_login_failed; // Variable used to indicate a login failed event
-                             // See corresponding comments in window.cpp
 };
 

src/document.cpp

@@ -59 +59 @@
 }
 
-#include <iostream>
 void Gobby::Document::on_insert(const Gtk::TextBuffer::iterator& begin,
                                 const Glib::ustring& text,
@@ -65 +64 @@
 {
         if(m_editing) return;
-
-        std::cout << "Insert " << text << " at " << begin.get_offset() << std::endl;
         m_doc.insert(begin.get_offset(), text);
 }
@@ -74 +71 @@
 {
         if(m_editing) return;
-        
-        std::cout << "Erasing from " << begin.get_offset()
-                  << " to " << end.get_offset() << std::endl;
         m_doc.erase(begin.get_offset(), end.get_offset() );
 }

src/window.cpp

@@ -24 +24 @@
 #include <libobby/client_buffer.hpp>
 #include <libobby/host_buffer.hpp>
+#include "buffer_wrapper.hpp"
 #include "createdialog.hpp"
 #include "joindialog.hpp"
@@ -33 +34 @@
  : Gtk::Window(Gtk::WINDOW_TOPLEVEL), 
    m_config(Glib::get_home_dir() + "/.gobby/config.xml"), m_buffer(NULL),
-   m_running(false), m_login_failed(false)
+   m_running(false)
 {
         m_header.session_create_event().connect(
@@ -100 +101 @@
 
                 // Create new buffer
-                obby::host_buffer* buffer = new obby::host_buffer(
+                obby::host_buffer* buffer = new HostBuffer(
                         port, name, red, green, blue);
 
@@ -121 +122 @@
                         sigc::mem_fun(*this, &Window::on_obby_server_chat) );
 
-
-                if(!m_timer_conn.connected() )
-                        m_timer_conn = Glib::signal_timeout().connect(
-                                sigc::mem_fun(*this, &Window::on_timer), 400);
-
                 // Running
                 m_running = true;
@@ -140 +136 @@
         else
         {
-                if(m_timer_conn.connected() )
-                        m_timer_conn.disconnect();
-
                 // Delete existing buffer, if any
                 delete m_buffer;
@@ -175 +168 @@
                 // TODO: Keep existing connection if host and port did not
                 // change
-                obby::client_buffer* buffer = new obby::client_buffer(
-                        host, port);
+                obby::client_buffer* buffer = new ClientBuffer(host, port);
+
                 delete m_buffer;
                 m_buffer = buffer;
@@ -201 +194 @@
                         sigc::mem_fun(*this, &Window::on_obby_server_chat) );
 
-                if(!m_timer_conn.connected() )
-                        m_timer_conn = Glib::signal_timeout().connect(
-                                sigc::mem_fun(*this, &Window::on_timer), 400);
-
                 buffer->login(name, red, green, blue);
         }
         else
         {
-                if(m_timer_conn.connected() )
-                        m_timer_conn.disconnect();
-
                 delete m_buffer;
                 m_buffer = NULL;
@@ -240 +226 @@
                         m_running = false;
                 }
-
-                if(m_timer_conn.connected() )
-                        m_timer_conn.disconnect();
 
                 delete m_buffer;
@@ -315 +298 @@
 void Gobby::Window::on_obby_login_failed(const std::string& reason)
 {
-        // Remove timer connection, we do not need any timer calls while
-        // displaying dialogs
-        m_timer_conn.disconnect();
         display_error(reason);
-
-        // We can not call on_session_join right here. In the callstack, there
-        // is a call to the timer (which emitted the login_failed signal through
-        // obby::buffer::select). on_session_join destroys this buffer, but it
-        // still remains in the callstack. The program will crash if it regains
-        // control.
-        // TODO: A good solution would be to disable the name and port field
-        // in the dialog now, because we are already connected to a server. Only
-        // the login fields (name & color) will be editable. That ensures that
-        // we need not to create a new buffer but just resend a login request.
-        m_login_failed = true;
+        on_session_join();
 }
 
@@ -354 +324 @@
 {
         m_chat.obby_server_message(message);
-}
-
-bool Gobby::Window::on_timer()
-{
-        for(int i = 0; i < 15; ++ i)
-        {
-                if(!m_buffer) break;
-                m_buffer->select(0);
-
-                // See comment in Window::on_obby_login_failed
-                if(m_login_failed)
-                {
-                        on_session_join();
-                        m_login_failed = false;
-                        return true;
-                }
-        }
-
-        return true;
 }