Changeset 619dd18

Timestamp:

2010-06-07T18:40:08Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6ef9065

Parents:

a4d920b

Message:

Paste buffer functionality is back, now for users *and* rooms.

Files:

• irc.h (modified) (2 diffs)
• irc_im.c (modified) (3 diffs)
• irc_user.c (modified) (1 diff)

irc.h

@@ -109 +109 @@
         irc_user_flags_t flags;
         
-        char *sendbuf;
-        int sendbuf_len;
-        guint sendbuf_timer;
-        //int sendbuf_flags;
+        GString *pastebuf;
+        guint pastebuf_timer;
         
         struct bee_user *bu;
@@ -150 +148 @@
         GSList *users;
         struct set *set;
+        
+        GString *pastebuf;
+        guint pastebuf_timer;
         
         const struct irc_channel_funcs *f;

irc_im.c

@@ -273 +273 @@
 /* IRC->IM calls */
 
+static gboolean bee_irc_user_privmsg_cb( gpointer data, gint fd, b_input_condition cond );
+
 static gboolean bee_irc_user_privmsg( irc_user_t *iu, const char *msg )
 {
-        if( iu->bu )
+        if( iu->bu == NULL )
+                return FALSE;
+        else if( set_getbool( &iu->irc->b->set, "paste_buffer" ) )
+        {
+                int delay;
+                
+                if( iu->pastebuf == NULL )
+                        iu->pastebuf = g_string_new( msg );
+                else
+                {
+                        b_event_remove( iu->pastebuf_timer );
+                        g_string_append_printf( iu->pastebuf, "\n%s", msg );
+                }
+                
+                if( ( delay = set_getint( &iu->irc->b->set, "paste_buffer_delay" ) ) <= 5 )
+                        delay *= 1000;
+                
+                iu->pastebuf_timer = b_timeout_add( delay, bee_irc_user_privmsg_cb, iu );
+                
+                return TRUE;
+        }
+        else
                 return bee_user_msg( iu->irc->b, iu->bu, msg, 0 );
-        else
-                return FALSE;
+}
+
+static gboolean bee_irc_user_privmsg_cb( gpointer data, gint fd, b_input_condition cond )
+{
+        irc_user_t *iu = data;
+        
+        bee_user_msg( iu->irc->b, iu->bu, iu->pastebuf->str, 0 );
+        
+        g_string_free( iu->pastebuf, TRUE );
+        iu->pastebuf = 0;
+        iu->pastebuf_timer = 0;
+        
+        return FALSE;
 }
 
@@ -468 +502 @@
 
 /* IRC->IM */
+static gboolean bee_irc_channel_chat_privmsg_cb( gpointer data, gint fd, b_input_condition cond );
+
 static gboolean bee_irc_channel_chat_privmsg( irc_channel_t *ic, const char *msg )
 {
@@ -474 +510 @@
         if( c == NULL )
                 return FALSE;
-        
-        bee_chat_msg( ic->irc->b, c, msg, 0 );
-        
-        return TRUE;
+        else if( set_getbool( &ic->irc->b->set, "paste_buffer" ) )
+        {
+                int delay;
+                
+                if( ic->pastebuf == NULL )
+                        ic->pastebuf = g_string_new( msg );
+                else
+                {
+                        b_event_remove( ic->pastebuf_timer );
+                        g_string_append_printf( ic->pastebuf, "\n%s", msg );
+                }
+                
+                if( ( delay = set_getint( &ic->irc->b->set, "paste_buffer_delay" ) ) <= 5 )
+                        delay *= 1000;
+                
+                ic->pastebuf_timer = b_timeout_add( delay, bee_irc_channel_chat_privmsg_cb, ic );
+                
+                return TRUE;
+        }
+        else
+                bee_chat_msg( ic->irc->b, c, msg, 0 );
+        
+        return TRUE;
+}
+
+static gboolean bee_irc_channel_chat_privmsg_cb( gpointer data, gint fd, b_input_condition cond )
+{
+        irc_channel_t *ic = data;
+        
+        bee_chat_msg( ic->irc->b, ic->data, ic->pastebuf->str, 0 );
+        
+        g_string_free( ic->pastebuf, TRUE );
+        ic->pastebuf = 0;
+        ic->pastebuf_timer = 0;
+        
+        return FALSE;
 }
 

irc_user.c

@@ -104 +104 @@
         if( iu->nick != iu->host ) g_free( iu->host );
         if( iu->nick != iu->fullname ) g_free( iu->fullname );
-        g_free( iu->sendbuf );
-        if( iu->sendbuf_timer ) b_event_remove( iu->sendbuf_timer );
+        g_free( iu->pastebuf );
+        if( iu->pastebuf_timer ) b_event_remove( iu->pastebuf_timer );
         g_free( iu->key );