]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtksignal.c
Merges from gtk-1-2
[~andy/gtk] / gtk / gtksignal.c
index d3ce62d60ce063e9563db44db95cbb52c81ddc48..97ea7cf1d49bb0afbbee1cef56d83e9af79e5f37 100644 (file)
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
@@ -73,6 +81,8 @@ struct _GtkSignalHash
 struct _GtkHandler
 {
   guint                   id;
+  GtkHandler     *next;
+  GtkHandler     *prev;
   guint                   blocked : 20;
   guint                   object_signal : 1;
   guint                   after : 1;
@@ -82,8 +92,6 @@ struct _GtkHandler
   GtkSignalFunc           func;
   gpointer        func_data;
   GtkSignalDestroy destroy_func;
-  GtkHandler     *prev;
-  GtkHandler     *next;
 };
 
 struct _GtkEmission
@@ -124,8 +132,6 @@ static void     gtk_signal_handler_insert  (GtkObject     *object,
 static void        gtk_signal_real_emit       (GtkObject     *object,
                                                guint          signal_id,
                                                GtkArg        *params);
-static GtkHandler*  gtk_signal_get_handlers    (GtkObject     *object,
-                                               guint          signal_type);
 static guint       gtk_signal_connect_by_type (GtkObject     *object,
                                                guint          signal_id,
                                                GtkSignalFunc  func,
@@ -159,8 +165,8 @@ static gboolean     gtk_signal_collect_params      (GtkArg         *params,
                                                va_list         var_args);
 
 #define LOOKUP_SIGNAL_ID(signal_id)    ( \
-  signal_id > 0 && signal_id < gtk_n_signals ? \
-    (GtkSignal*) gtk_signals + signal_id : \
+  signal_id > 0 && signal_id < _gtk_private_n_signals ? \
+    (GtkSignal*) _gtk_private_signals + signal_id : \
     (GtkSignal*) 0 \
 )
 
@@ -169,10 +175,10 @@ static GtkSignalMarshal global_marshaller = NULL;
 static GtkSignalDestroy global_destroy_notify = NULL;
 
 static guint                    gtk_handler_id = 1;
-static guint                    handler_quark = 0;
+static guint                    gtk_handler_quark = 0;
 static GHashTable              *gtk_signal_hash_table = NULL;
-static GtkSignal               *gtk_signals = NULL;
-static guint                    gtk_n_signals = 0;
+       GtkSignal               *_gtk_private_signals = NULL;
+       guint                    _gtk_private_n_signals = 0;
 static GMemChunk               *gtk_signal_hash_mem_chunk = NULL;
 static GMemChunk               *gtk_disconnect_info_mem_chunk = NULL;
 static GtkHandler              *gtk_handler_free_list = NULL;
@@ -201,24 +207,24 @@ gtk_signal_next_and_invalidate (void)
       
       /* nearest pow
        */
-      size = gtk_n_signals + SIGNAL_BLOCK_SIZE;
+      size = _gtk_private_n_signals + SIGNAL_BLOCK_SIZE;
       size *= sizeof (GtkSignal);
       i = 1;
       while (i < size)
        i <<= 1;
       size = i;
       
-      gtk_signals = g_realloc (gtk_signals, size);
+      _gtk_private_signals = g_realloc (_gtk_private_signals, size);
       
-      gtk_n_free_signals = size / sizeof (GtkSignal) - gtk_n_signals;
+      gtk_n_free_signals = size / sizeof (GtkSignal) - _gtk_private_n_signals;
       
-      memset (gtk_signals + gtk_n_signals, 0, gtk_n_free_signals * sizeof (GtkSignal));
+      memset (_gtk_private_signals + _gtk_private_n_signals, 0, gtk_n_free_signals * sizeof (GtkSignal));
     }
   
-  new_signal_id = gtk_n_signals++;
+  new_signal_id = _gtk_private_n_signals++;
   gtk_n_free_signals--;
 
-  g_assert (gtk_n_signals < 65535);
+  g_assert (_gtk_private_n_signals < 65535);
   
   signal = LOOKUP_SIGNAL_ID (new_signal_id);
   if (signal)
@@ -227,17 +233,35 @@ gtk_signal_next_and_invalidate (void)
   return signal;
 }
 
+static inline GtkHandler*
+gtk_signal_get_handlers (GtkObject *object,
+                        guint      signal_id)
+{
+  GtkHandler *handlers;
+  
+  handlers = gtk_object_get_data_by_id (object, gtk_handler_quark);
+  
+  while (handlers)
+    {
+      if (handlers->signal_id == signal_id)
+       return handlers;
+      handlers = handlers->next;
+    }
+  
+  return NULL;
+}
+
 void
 gtk_signal_init (void)
 {
-  if (!handler_quark)
+  if (!gtk_handler_quark)
     {
       GtkSignal *zero;
       
       zero = gtk_signal_next_and_invalidate ();
       g_assert (zero == NULL);
       
-      handler_quark = g_quark_from_static_string ("gtk-signal-handlers");
+      gtk_handler_quark = g_quark_from_static_string ("gtk-signal-handlers");
       
       gtk_signal_hash_mem_chunk =
        g_mem_chunk_new ("GtkSignalHash mem chunk",
@@ -279,7 +303,7 @@ gtk_signal_newv (const gchar             *r_name,
   if (nparams)
     g_return_val_if_fail (params != NULL, 0);
   
-  if (!handler_quark)
+  if (!gtk_handler_quark)
     gtk_signal_init ();
 
 
@@ -895,7 +919,7 @@ gtk_signal_disconnect (GtkObject *object,
   g_return_if_fail (object != NULL);
   g_return_if_fail (handler_id > 0);
   
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -924,7 +948,7 @@ gtk_signal_disconnect_by_func (GtkObject     *object,
   g_return_if_fail (func != NULL);
   
   found_one = FALSE;
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -957,7 +981,7 @@ gtk_signal_disconnect_by_data (GtkObject *object,
   g_return_if_fail (object != NULL);
   
   found_one = FALSE;
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -988,7 +1012,7 @@ gtk_signal_handler_block (GtkObject *object,
   g_return_if_fail (object != NULL);
   g_return_if_fail (handler_id > 0);
   
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -1015,7 +1039,7 @@ gtk_signal_handler_block_by_func (GtkObject       *object,
   g_return_if_fail (func != NULL);
   
   found_one = FALSE;
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -1043,7 +1067,7 @@ gtk_signal_handler_block_by_data (GtkObject *object,
   g_return_if_fail (object != NULL);
   
   found_one = FALSE;
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -1069,7 +1093,7 @@ gtk_signal_handler_unblock (GtkObject *object,
   g_return_if_fail (object != NULL);
   g_return_if_fail (handler_id > 0);
   
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -1099,7 +1123,7 @@ gtk_signal_handler_unblock_by_func (GtkObject       *object,
   g_return_if_fail (func != NULL);
   
   found_one = FALSE;
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -1128,7 +1152,7 @@ gtk_signal_handler_unblock_by_data (GtkObject *object,
   g_return_if_fail (object != NULL);
   
   found_one = FALSE;
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   
   while (handler)
     {
@@ -1156,7 +1180,7 @@ gtk_signal_handlers_destroy (GtkObject *object)
    * handler_key data on each removal
    */
   
-  handler = gtk_object_get_data_by_id (object, handler_quark);
+  handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
   if (handler)
     {
       handler = handler->next;
@@ -1169,7 +1193,7 @@ gtk_signal_handlers_destroy (GtkObject *object)
            gtk_signal_handler_unref (handler, object);
          handler = next;
        }
-      handler = gtk_object_get_data_by_id (object, handler_quark);
+      handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
       if (handler->id > 0)
        gtk_signal_handler_unref (handler, object);
     }
@@ -1286,11 +1310,11 @@ gtk_signal_handler_unref (GtkHandler *handler,
       if (handler->prev)
        handler->prev->next = handler->next;
       else if (handler->next)
-       gtk_object_set_data_by_id (object, handler_quark, handler->next);
+       gtk_object_set_data_by_id (object, gtk_handler_quark, handler->next);
       else
        {
          GTK_OBJECT_UNSET_FLAGS (object, GTK_CONNECTED);
-         gtk_object_set_data_by_id (object, handler_quark, NULL);
+         gtk_object_set_data_by_id (object, gtk_handler_quark, NULL);
        }
       if (handler->next)
        handler->next->prev = handler->prev;
@@ -1309,11 +1333,11 @@ gtk_signal_handler_insert (GtkObject  *object,
   /* FIXME: remove */ g_assert (handler->next == NULL);
   /* FIXME: remove */ g_assert (handler->prev == NULL);
   
-  tmp = gtk_object_get_data_by_id (object, handler_quark);
+  tmp = gtk_object_get_data_by_id (object, gtk_handler_quark);
   if (!tmp)
     {
       GTK_OBJECT_SET_FLAGS (object, GTK_CONNECTED);
-      gtk_object_set_data_by_id (object, handler_quark, handler);
+      gtk_object_set_data_by_id (object, gtk_handler_quark, handler);
     }
   else
     while (tmp)
@@ -1326,7 +1350,7 @@ gtk_signal_handler_insert (GtkObject  *object,
                handler->prev = tmp->prev;
              }
            else
-             gtk_object_set_data_by_id (object, handler_quark, handler);
+             gtk_object_set_data_by_id (object, gtk_handler_quark, handler);
            tmp->prev = handler;
            handler->next = tmp;
            break;
@@ -1503,24 +1527,6 @@ gtk_signal_real_emit (GtkObject *object,
   gtk_object_unref (object);
 }
 
-static GtkHandler*
-gtk_signal_get_handlers (GtkObject *object,
-                        guint      signal_id)
-{
-  GtkHandler *handlers;
-  
-  handlers = gtk_object_get_data_by_id (object, handler_quark);
-  
-  while (handlers)
-    {
-      if (handlers->signal_id == signal_id)
-       return handlers;
-      handlers = handlers->next;
-    }
-  
-  return NULL;
-}
-
 guint
 gtk_signal_handler_pending (GtkObject          *object,
                            guint                signal_id,
@@ -1578,7 +1584,7 @@ gtk_signal_handler_pending_by_func (GtkObject           *object,
       if (handlers->id > 0 &&
          handlers->func == func &&
          handlers->func_data == data &&
-         (may_be_blocked || handlers->blocked == FALSE))
+         (may_be_blocked || handlers->blocked == 0))
        {
          handler_id = handlers->id;
          break;
@@ -1590,6 +1596,32 @@ gtk_signal_handler_pending_by_func (GtkObject           *object,
   return handler_id;
 }
 
+gint
+gtk_signal_handler_pending_by_id (GtkObject *object,
+                                 guint      handler_id,
+                                 gboolean   may_be_blocked)
+{
+  GtkHandler *handlers;
+  
+  g_return_val_if_fail (object != NULL, FALSE);
+  g_return_val_if_fail (handler_id >= 1, FALSE);
+
+  if (GTK_OBJECT_CONNECTED (object))
+    handlers = gtk_object_get_data_by_id (object, gtk_handler_quark);
+  else
+    return FALSE;
+  
+  while (handlers)
+    {
+      if (handlers->id == handler_id)
+       return may_be_blocked || handlers->blocked == 0;
+      
+      handlers = handlers->next;
+    }
+  
+  return FALSE;
+}
+
 guint
 gtk_signal_add_emission_hook (guint           signal_id,
                              GtkEmissionHook hook_func,
@@ -1736,7 +1768,7 @@ gtk_signal_connect_by_type (GtkObject         *object,
   handler = gtk_signal_handler_new ();
   handler->id = gtk_handler_id++;
   handler->signal_id = signal_id;
-  handler->object_signal = object_signal;
+  handler->object_signal = object_signal != FALSE;
   handler->func = func;
   handler->func_data = func_data;
   handler->destroy_func = destroy_func;