Changeset c5c18c1

Timestamp:

2009-10-10T23:57:26Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4164e62

Parents:

e046390

Message:

Hacked up a B_EV_FLAG_FORCE_REPEAT event handler flag to make libpurple
happy.

Files:

• lib/events.h (modified) (1 diff)
• lib/events_glib.c (modified) (3 diffs)
• lib/events_libevent.c (modified) (3 diffs)
• protocols/purple/purple.c (modified) (1 diff)

lib/events.h

@@ -49 +49 @@
 typedef enum {
         B_EV_IO_READ = 1 << 0,
-        B_EV_IO_WRITE = 1 << 1
+        B_EV_IO_WRITE = 1 << 1,
+        B_EV_FLAG_FORCE_ONCE = 1 << 16,
+        B_EV_FLAG_FORCE_REPEAT = 1 << 17,
 } b_input_condition;
 typedef gboolean (*b_event_handler)(gpointer data, gint fd, b_input_condition cond);

lib/events_glib.c

@@ -49 +49 @@
         b_event_handler function;
         gpointer data;
+        guint flags;
 } GaimIOClosure;
 
@@ -87 +88 @@
                 event_debug( "Returned FALSE, cancelling.\n" );
         
-        return st;
+        if (closure->flags & B_EV_FLAG_FORCE_ONCE)
+                return FALSE;
+        else if (closure->flags & B_EV_FLAG_FORCE_REPEAT)
+                return TRUE;
+        else
+                return st;
 }
 
@@ -105 +111 @@
         closure->function = function;
         closure->data = data;
+        closure->flags = condition;
         
         if (condition & B_EV_IO_READ)

lib/events_libevent.c

@@ -60 +60 @@
         b_event_handler function;
         void *data;
+        guint flags;
 };
 
@@ -150 +151 @@
                 return;
         }
-        else if( !st )
+        else if( !st && !( b_ev->flags & B_EV_FLAG_FORCE_REPEAT ) )
         {
                 event_debug( "Handler returned FALSE: " );
@@ -212 +213 @@
         }
         
+        b_ev->flags = condition;
         g_hash_table_insert( id_hash, &b_ev->id, b_ev );
         return b_ev->id;

protocols/purple/purple.c

@@ -70 +70 @@
 static guint prplcb_ev_input_add( int fd, PurpleInputCondition cond, PurpleInputFunction func, gpointer udata )
 {
-        return (guint) b_input_add( fd, cond, (b_event_handler) func, udata );
+        return (guint) b_input_add( fd, cond | B_EV_FLAG_FORCE_REPEAT, (b_event_handler) func, udata );
 }