*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* Boston, MA 02111-1307, USA.
*/
#include <stdarg.h>
+#include <string.h>
+#include <stdio.h>
#include "gtksignal.h"
-#define MAX_PARAMS 20
-#define DONE 1
-#define RESTART 2
+#define SIGNAL_BLOCK_SIZE (100)
+#define HANDLER_BLOCK_SIZE (200)
+#define EMISSION_BLOCK_SIZE (100)
+#define DISCONNECT_INFO_BLOCK_SIZE (64)
+#define MAX_SIGNAL_PARAMS (32)
-#define GTK_RUN_TYPE(x) ((x) & GTK_RUN_MASK)
+enum
+{
+ EMISSION_CONTINUE,
+ EMISSION_RESTART,
+ EMISSION_DONE
+};
+
+#define GTK_RUN_TYPE(x) ((x) & GTK_RUN_MASK)
-typedef struct _GtkSignal GtkSignal;
-typedef struct _GtkSignalInfo GtkSignalInfo;
-typedef struct _GtkHandler GtkHandler;
-typedef struct _GtkHandlerInfo GtkHandlerInfo;
-typedef struct _GtkEmission GtkEmission;
+typedef struct _GtkSignal GtkSignal;
+typedef struct _GtkSignalHash GtkSignalHash;
+typedef struct _GtkHandler GtkHandler;
+typedef struct _GtkHandlerInfo GtkHandlerInfo;
+typedef struct _GtkEmission GtkEmission;
+typedef union _GtkEmissionAllocator GtkEmissionAllocator;
+typedef struct _GtkDisconnectInfo GtkDisconnectInfo;
typedef void (*GtkSignalMarshaller0) (GtkObject *object,
- gpointer data);
+ gpointer data);
-struct _GtkSignalInfo
+struct _GtkSignal
{
- gchar *name;
- GtkType object_type;
- guint signal_type;
+ guint signal_id;
+ GtkType object_type;
+ gchar *name;
+ guint function_offset;
+ GtkSignalRunType signal_flags;
+ GtkSignalMarshaller marshaller;
+ GtkType return_val;
+ GtkType *params;
+ guint nparams;
};
-struct _GtkSignal
+struct _GtkSignalHash
{
- GtkSignalInfo info;
- guint function_offset;
- GtkSignalRunType run_type;
- GtkSignalMarshaller marshaller;
- GtkType return_val;
- GtkType *params;
- guint nparams;
+ GtkType object_type;
+ guint name_key_id;
+ guint signal_id;
};
struct _GtkHandler
{
- guint id;
- guint blocked : 20;
- guint object_signal : 1;
- guint after : 1;
- guint no_marshal : 1;
- guint16 ref_count;
- guint16 signal_type;
- GtkSignalFunc func;
- gpointer func_data;
+ guint id;
+ guint blocked : 20;
+ guint object_signal : 1;
+ guint after : 1;
+ guint no_marshal : 1;
+ guint16 ref_count;
+ guint16 signal_id;
+ GtkSignalFunc func;
+ gpointer func_data;
GtkSignalDestroy destroy_func;
- GtkHandler *prev;
- GtkHandler *next;
+ GtkHandler *prev;
+ GtkHandler *next;
};
struct _GtkHandlerInfo
{
- GtkObject *object;
+ GtkObject *object;
GtkSignalMarshaller marshaller;
- GtkArg *params;
- GtkType *param_types;
- GtkType return_val;
- GtkSignalRunType run_type;
- guint nparams;
- guint signal_type;
+ GtkArg *params;
+ GtkType *param_types;
+ GtkType return_val;
+ GtkSignalRunType signal_flags;
+ guint nparams;
+ guint signal_id;
};
struct _GtkEmission
{
GtkObject *object;
- guint signal_type;
+ guint signal_id;
+};
+
+union _GtkEmissionAllocator
+{
+ GtkEmissionAllocator *next;
+ GtkEmission emission;
};
+struct _GtkDisconnectInfo
+{
+ GtkObject *object1;
+ guint disconnect_handler1;
+ guint signal_handler;
+ GtkObject *object2;
+ guint disconnect_handler2;
+};
-static void gtk_signal_init (void);
-static guint gtk_signal_hash (guint *key);
-static gint gtk_signal_compare (guint *a,
- guint *b);
-static guint gtk_signal_info_hash (GtkSignalInfo *a);
-static gint gtk_signal_info_compare (GtkSignalInfo *a,
- GtkSignalInfo *b);
+
+static guint gtk_signal_hash (const gpointer h);
+static gint gtk_signal_compare (const gpointer h1,
+ const gpointer h2);
static GtkHandler* gtk_signal_handler_new (void);
-static void gtk_signal_handler_ref (GtkHandler *handler);
-static void gtk_signal_handler_unref (GtkHandler *handler,
+static void gtk_signal_handler_ref (GtkHandler *handler);
+static void gtk_signal_handler_unref (GtkHandler *handler,
GtkObject *object);
-static void gtk_signal_handler_insert (GtkObject *object,
+static void gtk_signal_handler_insert (GtkObject *object,
GtkHandler *handler);
-static void gtk_signal_real_emit (GtkObject *object,
- guint signal_type,
- va_list args);
+static void gtk_signal_real_emit (GtkObject *object,
+ GtkSignal *signal,
+ GtkArg *params);
static GtkHandler* gtk_signal_get_handlers (GtkObject *object,
- guint signal_type);
-static guint gtk_signal_connect_by_type (GtkObject *object,
- guint signal_type,
+ guint signal_type);
+static guint gtk_signal_connect_by_type (GtkObject *object,
+ guint signal_id,
GtkSignalFunc func,
gpointer func_data,
GtkSignalDestroy destroy_func,
- gint object_signal,
- gint after,
- gint no_marshal);
-static GtkEmission* gtk_emission_new (void);
-static void gtk_emission_destroy (GtkEmission *emission);
-static void gtk_emission_add (GList **emissions,
+ gint object_signal,
+ gint after,
+ gint no_marshal);
+static guint gtk_alive_disconnecter (GtkDisconnectInfo *info);
+static GtkEmission* gtk_emission_new (void);
+static void gtk_emission_add (GList **emissions,
GtkObject *object,
- guint signal_type);
-static void gtk_emission_remove (GList **emissions,
+ guint signal_type);
+static void gtk_emission_remove (GList **emissions,
GtkObject *object,
- guint signal_type);
-static gint gtk_emission_check (GList *emissions,
+ guint signal_type);
+static gint gtk_emission_check (GList *emissions,
GtkObject *object,
- guint signal_type);
-static gint gtk_handlers_run (GtkHandler *handlers,
+ guint signal_type);
+static gint gtk_handlers_run (GtkHandler *handlers,
GtkHandlerInfo *info,
- gint after);
-static void gtk_params_get (GtkArg *params,
- guint nparams,
- GtkType *param_types,
- GtkType return_val,
- va_list args);
+ gint after);
+static void gtk_params_get (GtkArg *params,
+ guint nparams,
+ GtkType *param_types,
+ GtkType return_val,
+ va_list args);
+
+#define LOOKUP_SIGNAL_ID(signal_id) ( \
+ signal_id > 0 && signal_id < gtk_n_signals ? \
+ (GtkSignal*) gtk_signals + signal_id : \
+ (GtkSignal*) 0 \
+)
-static gint initialize = TRUE;
-static GHashTable *signal_hash_table = NULL;
-static GHashTable *signal_info_hash_table = NULL;
-static guint next_signal = 1;
-static guint next_handler_id = 1;
+static GtkSignalMarshal global_marshaller = NULL;
+static GtkSignalDestroy global_destroy_notify = NULL;
+
+static guint gtk_handler_id = 1;
+static guint handler_key_id = 0;
+static GHashTable *gtk_signal_hash_table = NULL;
+static GtkSignal *gtk_signals = NULL;
+static guint gtk_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;
+static GtkEmissionAllocator *gtk_emission_free_list = NULL;
-static const gchar *handler_key = "gtk-signal-handlers";
-static guint handler_key_id = 0;
-static GMemChunk *handler_mem_chunk = NULL;
-static GMemChunk *emission_mem_chunk = NULL;
static GList *current_emissions = NULL;
static GList *stop_emissions = NULL;
static GList *restart_emissions = NULL;
-static GtkSignalMarshal global_marshaller = NULL;
-static GtkSignalDestroy global_destroy_notify = NULL;
-
-
-guint
-gtk_signal_new (const gchar *name,
- GtkSignalRunType run_type,
- GtkType object_type,
- guint function_offset,
- GtkSignalMarshaller marshaller,
- GtkType return_val,
- guint nparams,
- ...)
+static GtkSignal*
+gtk_signal_next_and_invalidate (void)
{
- GtkType *params;
- guint i;
- va_list args;
- guint return_id;
+ static guint gtk_n_free_signals = 0;
+ register GtkSignal *signal;
+ register guint new_signal_id;
- g_return_val_if_fail (nparams < 16, 0);
+ /* don't keep *any* GtkSignal pointers across invokation of this function!!!
+ */
- if (nparams > 0)
+ if (gtk_n_free_signals == 0)
{
- params = g_new (GtkType, nparams);
+ register guint i;
+ register guint size;
- va_start (args, nparams);
+ /* nearest pow
+ */
+ size = gtk_n_signals + SIGNAL_BLOCK_SIZE;
+ size *= sizeof (GtkSignal);
+ i = 1;
+ while (i < size)
+ i <<= 1;
+ size = i;
- for (i = 0; i < nparams; i++)
- params[i] = va_arg (args, GtkType);
+ gtk_signals = g_realloc (gtk_signals, size);
- va_end (args);
+ gtk_n_free_signals = size / sizeof (GtkSignal) - gtk_n_signals;
+
+ memset (gtk_signals + gtk_n_signals, 0, gtk_n_free_signals * sizeof (GtkSignal));
}
- else
- params = NULL;
- return_id = gtk_signal_newv (name,
- run_type,
- object_type,
- function_offset,
- marshaller,
- return_val,
- nparams,
- params);
+ new_signal_id = gtk_n_signals++;
+ gtk_n_free_signals--;
- g_free (params);
+ signal = LOOKUP_SIGNAL_ID (new_signal_id);
+ if (signal)
+ signal->signal_id = new_signal_id;
- return return_id;
+ return signal;
+}
+
+void
+gtk_signal_init (void)
+{
+ if (!handler_key_id)
+ {
+ GtkSignal *zero;
+
+ zero = gtk_signal_next_and_invalidate ();
+ g_assert (zero == NULL);
+
+ handler_key_id = gtk_object_data_force_id ("gtk-signal-handlers");
+
+ gtk_signal_hash_mem_chunk =
+ g_mem_chunk_new ("GtkSignalHash mem chunk",
+ sizeof (GtkSignalHash),
+ sizeof (GtkSignalHash) * SIGNAL_BLOCK_SIZE,
+ G_ALLOC_ONLY);
+ gtk_disconnect_info_mem_chunk =
+ g_mem_chunk_new ("GtkDisconnectInfo mem chunk",
+ sizeof (GtkDisconnectInfo),
+ sizeof (GtkDisconnectInfo) * DISCONNECT_INFO_BLOCK_SIZE,
+ G_ALLOC_AND_FREE);
+ gtk_handler_free_list = NULL;
+ gtk_emission_free_list = NULL;
+
+ gtk_signal_hash_table = g_hash_table_new (gtk_signal_hash,
+ gtk_signal_compare);
+ }
}
guint
-gtk_signal_newv (const gchar *name,
- GtkSignalRunType run_type,
- GtkType object_type,
- guint function_offset,
+gtk_signal_newv (const gchar *r_name,
+ GtkSignalRunType signal_flags,
+ GtkType object_type,
+ guint function_offset,
GtkSignalMarshaller marshaller,
- GtkType return_val,
- guint nparams,
+ GtkType return_val,
+ guint nparams,
GtkType *params)
{
GtkSignal *signal;
- GtkSignalInfo info;
- guint *type;
+ GtkSignalHash *hash;
+ guint id;
guint i;
+ gchar *name;
- g_return_val_if_fail (name != NULL, 0);
+ g_return_val_if_fail (r_name != NULL, 0);
g_return_val_if_fail (marshaller != NULL, 0);
- g_return_val_if_fail (nparams < 16, 0);
+ g_return_val_if_fail (nparams <= MAX_SIGNAL_PARAMS, 0);
if (nparams)
g_return_val_if_fail (params != NULL, 0);
- if (initialize)
+ if (!handler_key_id)
gtk_signal_init ();
-
- info.name = (char*)name;
- info.object_type = object_type;
-
- type = g_hash_table_lookup (signal_info_hash_table, &info);
- if (type)
+
+
+ name = g_strdup (r_name);
+ g_strdelimit (name, NULL, '_');
+
+ id = gtk_signal_lookup (name, object_type);
+ if (id)
{
g_warning ("gtk_signal_newv(): signal \"%s\" already exists in the `%s' class ancestry\n",
- name, gtk_type_name (object_type));
+ r_name,
+ gtk_type_name (object_type));
+ g_free (name);
return 0;
}
- signal = g_new (GtkSignal, 1);
- signal->info.name = g_strdup (name);
- signal->info.object_type = object_type;
- signal->info.signal_type = next_signal++;
+ if (return_val != GTK_TYPE_NONE &&
+ (signal_flags & GTK_RUN_BOTH) == GTK_RUN_FIRST)
+ {
+ g_warning ("gtk_signal_newv(): signal \"%s\" with return value `%s' excludes GTK_RUN_LAST",
+ name, gtk_type_name (return_val));
+ return 0;
+ }
+
+ signal = gtk_signal_next_and_invalidate ();
+
+ /* signal->signal_id already set */
+
+ signal->object_type = object_type;
+ signal->name = name;
signal->function_offset = function_offset;
- signal->run_type = run_type;
+ signal->signal_flags = signal_flags;
signal->marshaller = marshaller;
signal->return_val = return_val;
signal->nparams = nparams;
}
else
signal->params = NULL;
+
+ /* insert "signal_name" into hash table
+ */
+ hash = g_chunk_new (GtkSignalHash, gtk_signal_hash_mem_chunk);
+ hash->object_type = object_type;
+ hash->name_key_id = gtk_object_data_force_id (signal->name);
+ hash->signal_id = signal->signal_id;
+ g_hash_table_insert (gtk_signal_hash_table, hash, GUINT_TO_POINTER (hash->signal_id));
+
+ /* insert "signal-name" into hash table
+ */
+ g_strdelimit (signal->name, NULL, '-');
+ id = gtk_object_data_force_id (signal->name);
+ if (id != hash->name_key_id)
+ {
+ hash = g_chunk_new (GtkSignalHash, gtk_signal_hash_mem_chunk);
+ hash->object_type = object_type;
+ hash->name_key_id = id;
+ hash->signal_id = signal->signal_id;
+ g_hash_table_insert (gtk_signal_hash_table, hash, GUINT_TO_POINTER (hash->signal_id));
+ }
- g_hash_table_insert (signal_hash_table, &signal->info.signal_type, signal);
- g_hash_table_insert (signal_info_hash_table, &signal->info, &signal->info.signal_type);
-
- return signal->info.signal_type;
+ return signal->signal_id;
}
-GtkSignalQuery*
-gtk_signal_query (guint signal_id)
+guint
+gtk_signal_new (const gchar *name,
+ GtkSignalRunType signal_flags,
+ GtkType object_type,
+ guint function_offset,
+ GtkSignalMarshaller marshaller,
+ GtkType return_val,
+ guint nparams,
+ ...)
{
- GtkSignalQuery *query;
- GtkSignal *signal;
+ GtkType *params;
+ guint i;
+ va_list args;
+ guint signal_id;
- g_return_val_if_fail (signal_id >= 1, NULL);
+ g_return_val_if_fail (nparams <= MAX_SIGNAL_PARAMS, 0);
- signal = g_hash_table_lookup (signal_hash_table, &signal_id);
- if (signal)
+ if (nparams > 0)
{
- query = g_new (GtkSignalQuery, 1);
+ params = g_new (GtkType, nparams);
- query->object_type = signal->info.object_type;
- query->signal_id = signal_id;
- query->signal_name = signal->info.name;
- query->is_user_signal = signal->function_offset == 0;
- query->run_type = signal->run_type;
- query->return_val = signal->return_val;
- query->nparams = signal->nparams;
- query->params = signal->params;
+ va_start (args, nparams);
+
+ for (i = 0; i < nparams; i++)
+ params[i] = va_arg (args, GtkType);
+
+ va_end (args);
}
else
- query = NULL;
+ params = NULL;
- return query;
+ signal_id = gtk_signal_newv (name,
+ signal_flags,
+ object_type,
+ function_offset,
+ marshaller,
+ return_val,
+ nparams,
+ params);
+
+ g_free (params);
+
+ return signal_id;
}
guint
gtk_signal_lookup (const gchar *name,
- GtkType object_type)
+ GtkType object_type)
{
- GtkSignalInfo info;
+ GtkSignalHash hash;
g_return_val_if_fail (name != NULL, 0);
g_return_val_if_fail (gtk_type_is_a (object_type, GTK_TYPE_OBJECT), 0);
- if (initialize)
- gtk_signal_init ();
+ hash.name_key_id = gtk_object_data_try_key (name);
+ if (hash.name_key_id)
+ {
+ while (object_type)
+ {
+ guint signal_id;
+
+ hash.object_type = object_type;
+
+ signal_id = GPOINTER_TO_UINT (g_hash_table_lookup (gtk_signal_hash_table, &hash));
+ if (signal_id)
+ return signal_id;
+
+ object_type = gtk_type_parent (object_type);
+ }
+ }
- info.name = (char*)name;
+ return 0;
+}
+
+GtkSignalQuery*
+gtk_signal_query (guint signal_id)
+{
+ GtkSignalQuery *query;
+ GtkSignal *signal;
+
+ g_return_val_if_fail (signal_id >= 1, NULL);
- while (object_type)
+ signal = LOOKUP_SIGNAL_ID (signal_id);
+ if (signal)
{
- guint *type;
-
- info.object_type = object_type;
-
- type = g_hash_table_lookup (signal_info_hash_table, &info);
- if (type)
- return *type;
+ query = g_new (GtkSignalQuery, 1);
- object_type = gtk_type_parent (object_type);
+ query->object_type = signal->object_type;
+ query->signal_id = signal_id;
+ query->signal_name = signal->name;
+ query->is_user_signal = signal->function_offset == 0;
+ query->signal_flags = signal->signal_flags;
+ query->return_val = signal->return_val;
+ query->nparams = signal->nparams;
+ query->params = signal->params;
}
+ else
+ query = NULL;
- return 0;
+ return query;
}
gchar*
g_return_val_if_fail (signal_id >= 1, NULL);
- signal = g_hash_table_lookup (signal_hash_table, &signal_id);
+ signal = LOOKUP_SIGNAL_ID (signal_id);
if (signal)
- return signal->info.name;
+ return signal->name;
return NULL;
}
+void
+gtk_signal_emitv (GtkObject *object,
+ guint signal_id,
+ GtkArg *params)
+{
+ GtkSignal *signal;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (signal_id >= 1);
+
+ signal = LOOKUP_SIGNAL_ID (signal_id);
+ g_return_if_fail (signal != NULL);
+ g_return_if_fail (gtk_type_is_a (GTK_OBJECT_TYPE (object), signal->object_type));
+
+ if (signal->nparams > 0)
+ g_return_if_fail (params != NULL);
+
+ gtk_signal_real_emit (object, signal, params);
+}
+
void
gtk_signal_emit (GtkObject *object,
- guint signal_id,
+ guint signal_id,
...)
{
- va_list args;
-
+ GtkSignal *signal;
+ va_list args;
+ GtkArg params[MAX_SIGNAL_PARAMS];
+
g_return_if_fail (object != NULL);
g_return_if_fail (signal_id >= 1);
- if (initialize)
- gtk_signal_init ();
-
+ signal = LOOKUP_SIGNAL_ID (signal_id);
+ g_return_if_fail (signal != NULL);
+ g_return_if_fail (gtk_type_is_a (GTK_OBJECT_TYPE (object), signal->object_type));
+
va_start (args, signal_id);
+ gtk_params_get (params,
+ signal->nparams,
+ signal->params,
+ signal->return_val,
+ args);
+ va_end (args);
+
+ gtk_signal_real_emit (object, signal, params);
+}
+
+void
+gtk_signal_emitv_by_name (GtkObject *object,
+ const gchar *name,
+ GtkArg *params)
+{
+ guint signal_id;
- gtk_signal_real_emit (object, signal_id, args);
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (name != NULL);
+ g_return_if_fail (params != NULL);
- va_end (args);
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+
+ if (signal_id >= 1)
+ {
+ GtkSignal *signal;
+
+ signal = LOOKUP_SIGNAL_ID (signal_id);
+ g_return_if_fail (signal != NULL);
+ g_return_if_fail (gtk_type_is_a (GTK_OBJECT_TYPE (object), signal->object_type));
+
+ gtk_signal_real_emit (object, signal, params);
+ }
+ else
+ {
+ g_warning ("gtk_signal_emitv_by_name(): could not find signal \"%s\" in the `%s' class ancestry",
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
+ }
}
void
-gtk_signal_emit_by_name (GtkObject *object,
- const gchar *name,
+gtk_signal_emit_by_name (GtkObject *object,
+ const gchar *name,
...)
{
- guint type;
- va_list args;
+ guint signal_id;
g_return_if_fail (object != NULL);
g_return_if_fail (name != NULL);
- if (initialize)
- gtk_signal_init ();
-
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (type >= 1)
+ if (signal_id >= 1)
{
- va_start (args, name);
-
- gtk_signal_real_emit (object, type, args);
+ GtkSignal *signal;
+ GtkArg params[MAX_SIGNAL_PARAMS];
+ va_list args;
+ signal = LOOKUP_SIGNAL_ID (signal_id);
+ g_return_if_fail (signal != NULL);
+ g_return_if_fail (gtk_type_is_a (GTK_OBJECT_TYPE (object), signal->object_type));
+
+ va_start (args, name);
+ gtk_params_get (params,
+ signal->nparams,
+ signal->params,
+ signal->return_val,
+ args);
va_end (args);
+
+ gtk_signal_real_emit (object, signal, params);
}
else
{
g_warning ("gtk_signal_emit_by_name(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
}
}
void
gtk_signal_emit_stop (GtkObject *object,
- guint signal_id)
+ guint signal_id)
{
g_return_if_fail (object != NULL);
g_return_if_fail (signal_id >= 1);
- if (initialize)
- gtk_signal_init ();
-
if (gtk_emission_check (current_emissions, object, signal_id))
gtk_emission_add (&stop_emissions, object, signal_id);
else
g_warning ("gtk_signal_emit_stop(): no current emission (%u) for object `%s'",
- signal_id, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ signal_id,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
}
void
-gtk_signal_emit_stop_by_name (GtkObject *object,
+gtk_signal_emit_stop_by_name (GtkObject *object,
const gchar *name)
{
- guint type;
+ guint signal_id;
g_return_if_fail (object != NULL);
g_return_if_fail (name != NULL);
- if (initialize)
- gtk_signal_init ();
-
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (type)
- gtk_signal_emit_stop (object, type);
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ if (signal_id)
+ gtk_signal_emit_stop (object, signal_id);
else
g_warning ("gtk_signal_emit_stop_by_name(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
}
guint
gtk_signal_n_emissions (GtkObject *object,
- guint signal_id)
+ guint signal_id)
{
- GList *tmp;
+ GList *list;
guint n;
g_return_val_if_fail (object != NULL, 0);
g_return_val_if_fail (GTK_IS_OBJECT (object), 0);
- tmp = current_emissions;
n = 0;
- while (tmp)
+ for (list = current_emissions; list; list = list->next)
{
GtkEmission *emission;
- emission = tmp->data;
- tmp = tmp->next;
+ emission = list->data;
if ((emission->object == object) &&
- (emission->signal_type == signal_id))
+ (emission->signal_id == signal_id))
n++;
}
}
guint
-gtk_signal_n_emissions_by_name (GtkObject *object,
- const gchar *name)
+gtk_signal_n_emissions_by_name (GtkObject *object,
+ const gchar *name)
{
- guint type;
+ guint signal_id;
guint n;
g_return_val_if_fail (object != NULL, 0);
g_return_val_if_fail (GTK_IS_OBJECT (object), 0);
g_return_val_if_fail (name != NULL, 0);
- if (initialize)
- gtk_signal_init ();
-
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (type)
- n = gtk_signal_n_emissions (object, type);
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ if (signal_id)
+ n = gtk_signal_n_emissions (object, signal_id);
else
{
g_warning ("gtk_signal_n_emissions_by_name(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
n = 0;
}
-
+
return n;
}
guint
-gtk_signal_connect (GtkObject *object,
- const gchar *name,
+gtk_signal_connect (GtkObject *object,
+ const gchar *name,
GtkSignalFunc func,
- gpointer func_data)
+ gpointer func_data)
{
- guint type;
+ guint signal_id;
g_return_val_if_fail (object != NULL, 0);
g_return_val_if_fail (GTK_IS_OBJECT (object), 0);
- if (initialize)
- gtk_signal_init ();
-
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (!type)
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ if (!signal_id)
{
g_warning ("gtk_signal_connect(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
return 0;
}
- return gtk_signal_connect_by_type (object, type,
+ return gtk_signal_connect_by_type (object, signal_id,
func, func_data, NULL,
FALSE, FALSE, FALSE);
}
guint
-gtk_signal_connect_after (GtkObject *object,
- const gchar *name,
- GtkSignalFunc func,
- gpointer func_data)
+gtk_signal_connect_after (GtkObject *object,
+ const gchar *name,
+ GtkSignalFunc func,
+ gpointer func_data)
{
- guint type;
+ guint signal_id;
g_return_val_if_fail (object != NULL, 0);
- if (initialize)
- gtk_signal_init ();
-
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (!type)
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ if (!signal_id)
{
g_warning ("gtk_signal_connect_after(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
return 0;
}
- return gtk_signal_connect_by_type (object, type,
+ return gtk_signal_connect_by_type (object, signal_id,
func, func_data, NULL,
FALSE, TRUE, FALSE);
}
-guint
-gtk_signal_connect_full (GtkObject *object,
- const gchar *name,
- GtkSignalFunc func,
+guint
+gtk_signal_connect_full (GtkObject *object,
+ const gchar *name,
+ GtkSignalFunc func,
GtkCallbackMarshal marshal,
- gpointer func_data,
+ gpointer func_data,
GtkDestroyNotify destroy_func,
- gint object_signal,
- gint after)
+ gint object_signal,
+ gint after)
{
- guint type;
+ guint signal_id;
g_return_val_if_fail (object != NULL, 0);
- if (initialize)
- gtk_signal_init ();
-
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (!type)
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ if (!signal_id)
{
g_warning ("gtk_signal_connect_full(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
return 0;
}
if (marshal)
- return gtk_signal_connect_by_type (object, type, (GtkSignalFunc) marshal,
+ return gtk_signal_connect_by_type (object, signal_id, (GtkSignalFunc) marshal,
func_data, destroy_func,
object_signal, after, TRUE);
else
- return gtk_signal_connect_by_type (object, type, func,
+ return gtk_signal_connect_by_type (object, signal_id, func,
func_data, destroy_func,
object_signal, after, FALSE);
}
guint
-gtk_signal_connect_interp (GtkObject *object,
- const gchar *name,
+gtk_signal_connect_interp (GtkObject *object,
+ const gchar *name,
GtkCallbackMarshal func,
- gpointer func_data,
+ gpointer func_data,
GtkDestroyNotify destroy_func,
- gint after)
+ gint after)
{
return gtk_signal_connect_full (object, name, NULL, func,
func_data, destroy_func, FALSE, after);
}
guint
-gtk_signal_connect_object (GtkObject *object,
- const gchar *name,
+gtk_signal_connect_object (GtkObject *object,
+ const gchar *name,
GtkSignalFunc func,
- GtkObject *slot_object)
+ GtkObject *slot_object)
{
- guint type;
+ guint signal_id;
g_return_val_if_fail (object != NULL, 0);
- /* slot_object needs to be treated as ordinary pointer */
-
- if (initialize)
- gtk_signal_init ();
+ /* slot_object needs to be treated as ordinary pointer
+ */
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (!type)
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ if (!signal_id)
{
g_warning ("gtk_signal_connect_object(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
return 0;
}
- return gtk_signal_connect_by_type (object, type,
+ return gtk_signal_connect_by_type (object, signal_id,
func, slot_object, NULL,
TRUE, FALSE, FALSE);
}
guint
gtk_signal_connect_object_after (GtkObject *object,
const gchar *name,
- GtkSignalFunc func,
+ GtkSignalFunc func,
GtkObject *slot_object)
{
- guint type;
+ guint signal_id;
g_return_val_if_fail (object != NULL, 0);
- if (initialize)
- gtk_signal_init ();
-
- type = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
- if (!type)
+ signal_id = gtk_signal_lookup (name, GTK_OBJECT_TYPE (object));
+ if (!signal_id)
{
g_warning ("gtk_signal_connect_object_after(): could not find signal \"%s\" in the `%s' class ancestry",
- name, gtk_type_name (GTK_OBJECT_TYPE (object)));
+ name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)));
return 0;
}
- return gtk_signal_connect_by_type (object, type,
+ return gtk_signal_connect_by_type (object, signal_id,
func, slot_object, NULL,
TRUE, TRUE, FALSE);
}
-typedef struct _GtkDisconnectInfo GtkDisconnectInfo;
-struct _GtkDisconnectInfo
-{
- GtkObject *object1;
- guint disconnect_handler1;
- guint signal_handler;
- GtkObject *object2;
- guint disconnect_handler2;
-};
-
-static guint
-gtk_alive_disconnecter (GtkDisconnectInfo *info)
-{
- g_return_val_if_fail (info != NULL, 0);
-
- gtk_signal_disconnect (info->object1, info->disconnect_handler1);
- gtk_signal_disconnect (info->object1, info->signal_handler);
- gtk_signal_disconnect (info->object2, info->disconnect_handler2);
- g_free (info);
-
- return 0;
-}
-
void
-gtk_signal_connect_while_alive (GtkObject *object,
- const gchar *signal,
- GtkSignalFunc func,
- gpointer func_data,
- GtkObject *alive_object)
+gtk_signal_connect_while_alive (GtkObject *object,
+ const gchar *signal,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkObject *alive_object)
{
GtkDisconnectInfo *info;
g_return_if_fail (alive_object != NULL);
g_return_if_fail (GTK_IS_OBJECT (alive_object));
- info = g_new (GtkDisconnectInfo, 1);
+ info = g_chunk_new (GtkDisconnectInfo, gtk_disconnect_info_mem_chunk);
info->object1 = object;
info->object2 = alive_object;
info->signal_handler = gtk_signal_connect (object, signal, func, func_data);
- info->disconnect_handler1 = gtk_signal_connect_object (info->object1,
- "destroy",
- GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
- (GtkObject*) info);
- info->disconnect_handler2 = gtk_signal_connect_object (info->object2,
- "destroy",
- GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
- (GtkObject*) info);
+ info->disconnect_handler1 =
+ gtk_signal_connect_object (info->object1,
+ "destroy",
+ GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
+ (GtkObject*) info);
+ info->disconnect_handler2 =
+ gtk_signal_connect_object (info->object2,
+ "destroy",
+ GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
+ (GtkObject*) info);
}
void
-gtk_signal_connect_object_while_alive (GtkObject *object,
- const gchar *signal,
- GtkSignalFunc func,
- GtkObject *alive_object)
+gtk_signal_connect_object_while_alive (GtkObject *object,
+ const gchar *signal,
+ GtkSignalFunc func,
+ GtkObject *alive_object)
{
GtkDisconnectInfo *info;
g_return_if_fail (alive_object != NULL);
g_return_if_fail (GTK_IS_OBJECT (alive_object));
- info = g_new (GtkDisconnectInfo, 1);
+ info = g_chunk_new (GtkDisconnectInfo, gtk_disconnect_info_mem_chunk);
info->object1 = object;
info->object2 = alive_object;
info->signal_handler = gtk_signal_connect_object (object, signal, func, alive_object);
- info->disconnect_handler1 = gtk_signal_connect_object (info->object1,
- "destroy",
- GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
- (GtkObject*) info);
- info->disconnect_handler2 = gtk_signal_connect_object (info->object2,
- "destroy",
- GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
- (GtkObject*) info);
+ info->disconnect_handler1 =
+ gtk_signal_connect_object (info->object1,
+ "destroy",
+ GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
+ (GtkObject*) info);
+ info->disconnect_handler2 =
+ gtk_signal_connect_object (info->object2,
+ "destroy",
+ GTK_SIGNAL_FUNC (gtk_alive_disconnecter),
+ (GtkObject*) info);
}
void
gtk_signal_disconnect (GtkObject *object,
- guint handler_id)
+ guint handler_id)
{
GtkHandler *handler;
void
gtk_signal_disconnect_by_func (GtkObject *object,
GtkSignalFunc func,
- gpointer data)
+ gpointer data)
{
GtkHandler *handler;
gint found_one;
void
gtk_signal_disconnect_by_data (GtkObject *object,
- gpointer data)
+ gpointer data)
{
GtkHandler *handler;
gint found_one;
}
void
-gtk_signal_handler_block_by_func (GtkObject *object,
- GtkSignalFunc func,
- gpointer data)
+gtk_signal_handler_block_by_func (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer data)
{
GtkHandler *handler;
gint found_one;
g_return_if_fail (object != NULL);
g_return_if_fail (handler_id > 0);
- if (initialize)
- gtk_signal_init ();
-
handler = gtk_object_get_data_by_id (object, handler_key_id);
while (handler)
}
void
-gtk_signal_handler_unblock_by_func (GtkObject *object,
+gtk_signal_handler_unblock_by_func (GtkObject *object,
GtkSignalFunc func,
- gpointer data)
+ gpointer data)
{
GtkHandler *handler;
gint found_one;
{
if ((handler->id > 0) &&
(handler->func_data == data) &&
- (handler->blocked > 0))
+ (handler->blocked > 0))
{
handler->blocked -= 1;
found_one = TRUE;
void
gtk_signal_default_marshaller (GtkObject *object,
GtkSignalFunc func,
- gpointer func_data,
- GtkArg *params)
+ gpointer func_data,
+ GtkArg *params)
{
GtkSignalMarshaller0 rfunc;
global_destroy_notify = destroy_func;
}
-
-static void
-gtk_signal_init (void)
-{
- if (initialize)
- {
- initialize = FALSE;
- signal_hash_table = g_hash_table_new ((GHashFunc) gtk_signal_hash,
- (GCompareFunc) gtk_signal_compare);
- signal_info_hash_table = g_hash_table_new ((GHashFunc) gtk_signal_info_hash,
- (GCompareFunc) gtk_signal_info_compare);
- }
-}
-
static guint
-gtk_signal_hash (guint *key)
+gtk_signal_hash (const gpointer h)
{
- return *key;
+ register GtkSignalHash *hash = h;
+
+ return hash->object_type ^ hash->name_key_id;
}
static gint
-gtk_signal_compare (guint *a,
- guint *b)
+gtk_signal_compare (const gpointer h1,
+ const gpointer h2)
{
- return (*a == *b);
+ register GtkSignalHash *hash1 = h1;
+ register GtkSignalHash *hash2 = h2;
+
+ return (hash1->name_key_id == hash2->name_key_id &&
+ hash1->object_type == hash2->object_type);
}
static guint
-gtk_signal_info_hash (GtkSignalInfo *a)
-{
- return (g_str_hash (a->name) + a->object_type);
-}
-
-static gint
-gtk_signal_info_compare (GtkSignalInfo *a,
- GtkSignalInfo *b)
+gtk_alive_disconnecter (GtkDisconnectInfo *info)
{
- return ((a->object_type == b->object_type) &&
- g_str_equal (a->name, b->name));
+ g_return_val_if_fail (info != NULL, 0);
+
+ gtk_signal_disconnect (info->object1, info->disconnect_handler1);
+ gtk_signal_disconnect (info->object1, info->signal_handler);
+ gtk_signal_disconnect (info->object2, info->disconnect_handler2);
+
+ g_mem_chunk_free (gtk_disconnect_info_mem_chunk, info);
+
+ return 0;
}
static GtkHandler*
gtk_signal_handler_new (void)
{
GtkHandler *handler;
-
- if (!handler_mem_chunk)
- handler_mem_chunk = g_mem_chunk_new ("handler mem chunk", sizeof (GtkHandler),
- 1024, G_ALLOC_AND_FREE);
-
- handler = g_chunk_new (GtkHandler, handler_mem_chunk);
+
+ if (!gtk_handler_free_list)
+ {
+ GtkHandler *handler_block;
+ guint i;
+
+ handler_block = g_new0 (GtkHandler, HANDLER_BLOCK_SIZE);
+ for (i = 1; i < HANDLER_BLOCK_SIZE; i++)
+ {
+ (handler_block + i)->next = gtk_handler_free_list;
+ gtk_handler_free_list = (handler_block + i);
+ }
+
+ handler = handler_block;
+ }
+ else
+ {
+ handler = gtk_handler_free_list;
+ gtk_handler_free_list = handler->next;
+ }
handler->id = 0;
handler->blocked = 0;
- handler->signal_type = 0;
+ handler->signal_id = 0;
handler->object_signal = FALSE;
handler->after = FALSE;
handler->no_marshal = FALSE;
gtk_signal_handler_unref (GtkHandler *handler,
GtkObject *object)
{
+ if (!handler->ref_count)
+ {
+ /* FIXME: i wanna get removed somewhen */
+ g_warning ("gtk_signal_handler_unref(): handler with ref_count==0!");
+ return;
+ }
+
handler->ref_count -= 1;
+
if (handler->ref_count == 0)
{
if (handler->destroy_func)
if (handler->prev)
handler->prev->next = handler->next;
- else
+ else if (handler->next)
gtk_object_set_data_by_id (object, handler_key_id, handler->next);
+ else
+ {
+ GTK_OBJECT_UNSET_FLAGS (object, GTK_CONNECTED);
+ gtk_object_set_data_by_id (object, handler_key_id, NULL);
+ }
if (handler->next)
handler->next->prev = handler->prev;
- g_mem_chunk_free (handler_mem_chunk, handler);
+ handler->next = gtk_handler_free_list;
+ gtk_handler_free_list = handler;
}
}
tmp = gtk_object_get_data_by_id (object, handler_key_id);
if (!tmp)
{
- if (!handler_key_id)
- handler_key_id = gtk_object_data_force_id (handler_key);
+ GTK_OBJECT_SET_FLAGS (object, GTK_CONNECTED);
gtk_object_set_data_by_id (object, handler_key_id, handler);
}
else
while (tmp)
{
- if (tmp->signal_type < handler->signal_type)
+ if (tmp->signal_id < handler->signal_id)
{
if (tmp->prev)
{
}
}
+static GtkObject *gtk_trace_signal_object = NULL;
+
static void
gtk_signal_real_emit (GtkObject *object,
- guint signal_type,
- va_list args)
+ GtkSignal *signal,
+ GtkArg *params)
{
- GtkSignal *signal;
- GtkHandler *handlers;
+ GtkHandler *handlers;
GtkHandlerInfo info;
- guchar **signal_func_offset;
- GtkArg params[MAX_PARAMS];
-
- signal = g_hash_table_lookup (signal_hash_table, &signal_type);
- g_return_if_fail (signal != NULL);
- g_return_if_fail (gtk_type_is_a (GTK_OBJECT_TYPE (object),
- signal->info.object_type));
-
- if ((signal->run_type & GTK_RUN_NO_RECURSE) &&
- gtk_emission_check (current_emissions, object, signal_type))
+ guchar **signal_func_offset;
+ register guint signal_id = signal->signal_id;
+
+#ifdef G_ENABLE_DEBUG
+ if (gtk_debug_flags & GTK_DEBUG_SIGNALS ||
+ object == gtk_trace_signal_object)
+ fprintf (stdout, "trace: signal_emit(\"%s\") for %s:%p\n",
+ signal->name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)),
+ object);
+#endif /* G_ENABLE_DEBUG */
+
+ if ((signal->signal_flags & GTK_RUN_NO_RECURSE) &&
+ gtk_emission_check (current_emissions, object, signal_id))
{
- gtk_emission_add (&restart_emissions, object, signal_type);
+ gtk_emission_add (&restart_emissions, object, signal_id);
return;
}
- gtk_params_get (params, signal->nparams, signal->params,
- signal->return_val, args);
-
- gtk_emission_add (¤t_emissions, object, signal_type);
-
gtk_object_ref (object);
+
+ gtk_emission_add (¤t_emissions, object, signal_id);
-restart:
- if (GTK_RUN_TYPE (signal->run_type) != GTK_RUN_LAST && signal->function_offset != 0)
+ emission_restart:
+ if (GTK_RUN_TYPE (signal->signal_flags) != GTK_RUN_LAST && signal->function_offset != 0)
{
signal_func_offset = (guchar**) ((guchar*) object->klass +
signal->function_offset);
NULL, params);
}
- info.object = object;
- info.marshaller = signal->marshaller;
- info.params = params;
- info.param_types = signal->params;
- info.return_val = signal->return_val;
- info.nparams = signal->nparams;
- info.run_type = signal->run_type;
- info.signal_type = signal_type;
-
- handlers = gtk_signal_get_handlers (object, signal_type);
- switch (gtk_handlers_run (handlers, &info, FALSE))
+ if (GTK_OBJECT_CONNECTED (object))
{
- case DONE:
- goto done;
- case RESTART:
- goto restart;
+ handlers = gtk_signal_get_handlers (object, signal_id);
+ if (handlers)
+ {
+ info.object = object;
+ info.marshaller = signal->marshaller;
+ info.params = params;
+ info.param_types = signal->params;
+ info.return_val = signal->return_val;
+ info.nparams = signal->nparams;
+ info.signal_flags = signal->signal_flags;
+ info.signal_id = signal_id;
+
+ switch (gtk_handlers_run (handlers, &info, FALSE))
+ {
+ case EMISSION_CONTINUE:
+ break;
+ case EMISSION_RESTART:
+ goto emission_restart;
+ case EMISSION_DONE:
+ goto emission_done;
+ }
+ }
+ else
+ info.object = NULL;
}
+ else
+ info.object = NULL;
- if (GTK_RUN_TYPE (signal->run_type) != GTK_RUN_FIRST && signal->function_offset != 0)
+ if (GTK_RUN_TYPE (signal->signal_flags) != GTK_RUN_FIRST && signal->function_offset != 0)
{
signal_func_offset = (guchar**) ((guchar*) object->klass +
signal->function_offset);
NULL, params);
}
- handlers = gtk_signal_get_handlers (object, signal_type);
- switch (gtk_handlers_run (handlers, &info, TRUE))
+ if (GTK_OBJECT_CONNECTED (object))
{
- case DONE:
- goto done;
- case RESTART:
- goto restart;
+ handlers = gtk_signal_get_handlers (object, signal_id);
+ if (handlers)
+ {
+ if (!info.object)
+ {
+ info.object = object;
+ info.marshaller = signal->marshaller;
+ info.params = params;
+ info.param_types = signal->params;
+ info.return_val = signal->return_val;
+ info.nparams = signal->nparams;
+ info.signal_flags = signal->signal_flags;
+ info.signal_id = signal_id;
+ }
+ switch (gtk_handlers_run (handlers, &info, TRUE))
+ {
+ case EMISSION_CONTINUE:
+ break;
+ case EMISSION_RESTART:
+ goto emission_restart;
+ case EMISSION_DONE:
+ goto emission_done;
+ }
+ }
}
-done:
+ emission_done:
- gtk_emission_remove (¤t_emissions, object, signal_type);
+ gtk_emission_remove (¤t_emissions, object, signal_id);
- if (signal->run_type & GTK_RUN_NO_RECURSE)
- gtk_emission_remove (&restart_emissions, object, signal_type);
+ if (signal->signal_flags & GTK_RUN_NO_RECURSE)
+ gtk_emission_remove (&restart_emissions, object, signal_id);
gtk_object_unref (object);
}
static GtkHandler*
gtk_signal_get_handlers (GtkObject *object,
- guint signal_type)
+ guint signal_id)
{
GtkHandler *handlers;
- g_return_val_if_fail (object != NULL, NULL);
- g_return_val_if_fail (signal_type >= 1, NULL);
-
handlers = gtk_object_get_data_by_id (object, handler_key_id);
while (handlers)
{
- if (handlers->signal_type == signal_type)
+ if (handlers->signal_id == signal_id)
return handlers;
handlers = handlers->next;
}
}
guint
-gtk_signal_handler_pending (GtkObject *object,
- guint signal_id,
+gtk_signal_handler_pending (GtkObject *object,
+ guint signal_id,
gboolean may_be_blocked)
{
GtkHandler *handlers;
g_return_val_if_fail (object != NULL, 0);
g_return_val_if_fail (signal_id >= 1, 0);
-
- handlers = gtk_signal_get_handlers (object, signal_id);
+
+ if (GTK_OBJECT_CONNECTED (object))
+ handlers = gtk_signal_get_handlers (object, signal_id);
+ else
+ return 0;
handler_id = 0;
- while (handlers && handlers->signal_type == signal_id)
+ while (handlers && handlers->signal_id == signal_id)
{
if (handlers->id > 0 &&
(may_be_blocked || handlers->blocked == 0))
}
static guint
-gtk_signal_connect_by_type (GtkObject *object,
- guint signal_type,
+gtk_signal_connect_by_type (GtkObject *object,
+ guint signal_id,
GtkSignalFunc func,
- gpointer func_data,
+ gpointer func_data,
GtkSignalDestroy destroy_func,
- gint object_signal,
- gint after,
- gint no_marshal)
+ gint object_signal,
+ gint after,
+ gint no_marshal)
{
GtkObjectClass *class;
GtkHandler *handler;
* sure the one we are adding is valid. We need to perform
* the lookup on the objects parents as well. If it isn't
* valid then issue a warning and return.
+ * As of now (1998-05-27) this lookup shouldn't be neccessarry
+ * anymore since gtk_signal_lookup() has been reworked to only
+ * return correct signal ids per class-branch.
*/
found_it = FALSE;
class = object->klass;
nsignals = class->nsignals;
for (i = 0; i < nsignals; i++)
- if (object_signals[i] == signal_type)
+ if (object_signals[i] == signal_id)
{
found_it = TRUE;
break;
if (!found_it)
{
g_warning ("gtk_signal_connect_by_type(): could not find signal id (%u) in the `%s' class ancestry",
- signal_type,
- gtk_type_name (class->type));
+ signal_id,
+ gtk_type_name (object->klass->type));
return 0;
}
handler = gtk_signal_handler_new ();
- handler->id = next_handler_id++;
- handler->signal_type = signal_type;
+ handler->id = gtk_handler_id++;
+ handler->signal_id = signal_id;
handler->object_signal = object_signal;
handler->func = func;
handler->func_data = func_data;
{
GtkEmission *emission;
- if (!emission_mem_chunk)
- emission_mem_chunk = g_mem_chunk_new ("emission mem chunk", sizeof (GtkEmission),
- 1024, G_ALLOC_AND_FREE);
-
- emission = g_chunk_new (GtkEmission, emission_mem_chunk);
-
+ if (!gtk_emission_free_list)
+ {
+ GtkEmissionAllocator *emission_block;
+ guint i;
+
+ emission_block = g_new0 (GtkEmissionAllocator, EMISSION_BLOCK_SIZE);
+ for (i = 1; i < EMISSION_BLOCK_SIZE; i++)
+ {
+ (emission_block + i)->next = gtk_emission_free_list;
+ gtk_emission_free_list = (emission_block + i);
+ }
+
+ emission = &emission_block->emission;
+ }
+ else
+ {
+ emission = >k_emission_free_list->emission;
+ gtk_emission_free_list = gtk_emission_free_list->next;
+ }
+
emission->object = NULL;
- emission->signal_type = 0;
+ emission->signal_id = 0;
return emission;
}
static void
-gtk_emission_destroy (GtkEmission *emission)
-{
- g_mem_chunk_free (emission_mem_chunk, emission);
-}
-
-static void
-gtk_emission_add (GList **emissions,
+gtk_emission_add (GList **emissions,
GtkObject *object,
- guint signal_type)
+ guint signal_id)
{
GtkEmission *emission;
emission = gtk_emission_new ();
emission->object = object;
- emission->signal_type = signal_type;
+ emission->signal_id = signal_id;
*emissions = g_list_prepend (*emissions, emission);
}
static void
gtk_emission_remove (GList **emissions,
- GtkObject *object,
- guint signal_type)
+ GtkObject *object,
+ guint signal_id)
{
- GtkEmission *emission;
GList *tmp;
g_return_if_fail (emissions != NULL);
tmp = *emissions;
while (tmp)
{
- emission = tmp->data;
+ GtkEmissionAllocator *ea;
- if ((emission->object == object) &&
- (emission->signal_type == signal_type))
+ ea = tmp->data;
+
+ if ((ea->emission.object == object) &&
+ (ea->emission.signal_id == signal_id))
{
- gtk_emission_destroy (emission);
*emissions = g_list_remove_link (*emissions, tmp);
g_list_free (tmp);
+
+ ea->next = gtk_emission_free_list;
+ gtk_emission_free_list = ea;
break;
}
static gint
gtk_emission_check (GList *emissions,
GtkObject *object,
- guint signal_type)
+ guint signal_id)
{
GtkEmission *emission;
GList *tmp;
tmp = tmp->next;
if ((emission->object == object) &&
- (emission->signal_type == signal_type))
+ (emission->signal_id == signal_id))
return TRUE;
}
return FALSE;
}
static gint
-gtk_handlers_run (GtkHandler *handlers,
+gtk_handlers_run (GtkHandler *handlers,
GtkHandlerInfo *info,
- gint after)
+ gint after)
{
- while (handlers && handlers->signal_type == info->signal_type)
+ while (handlers && handlers->signal_id == info->signal_id)
{
GtkHandler *handlers_next;
info->param_types,
info->return_val);
- if (gtk_emission_check (stop_emissions, info->object,
- info->signal_type))
+ if (gtk_emission_check (stop_emissions, info->object,
+ info->signal_id))
{
gtk_emission_remove (&stop_emissions, info->object,
- info->signal_type);
+ info->signal_id);
- if (info->run_type & GTK_RUN_NO_RECURSE)
+ if (info->signal_flags & GTK_RUN_NO_RECURSE)
gtk_emission_remove (&restart_emissions, info->object,
- info->signal_type);
+ info->signal_id);
gtk_signal_handler_unref (handlers, info->object);
- return DONE;
+ return EMISSION_DONE;
}
- else if ((info->run_type & GTK_RUN_NO_RECURSE) &&
+ else if ((info->signal_flags & GTK_RUN_NO_RECURSE) &&
gtk_emission_check (restart_emissions, info->object,
- info->signal_type))
+ info->signal_id))
{
gtk_emission_remove (&restart_emissions, info->object,
- info->signal_type);
+ info->signal_id);
gtk_signal_handler_unref (handlers, info->object);
- return RESTART;
+ return EMISSION_RESTART;
}
}
handlers = handlers_next;
}
- return 0;
+ return EMISSION_CONTINUE;
}
static void
-gtk_params_get (GtkArg *params,
- guint nparams,
- GtkType *param_types,
- GtkType return_val,
- va_list args)
+gtk_params_get (GtkArg *params,
+ guint nparams,
+ GtkType *param_types,
+ GtkType return_val,
+ va_list args)
{
gint i;
case GTK_TYPE_C_CALLBACK:
case GTK_TYPE_ARGS:
default:
- g_error ("unsupported type `%s' in signal return",
+ g_error ("Gtk: unsupported type `%s' in signal return",
gtk_type_name (return_val));
break;
}
projects / ~andy / gtk / blobdiff