added newly added gobject/ headers.
Tue Oct 24 22:09:14 2000 Tim Janik <timj@gtk.org>
* glib-object.h: added newly added gobject/ headers.
* gmesage.c: print g_message() output to stderr instead of stdout.
Wed Oct 25 20:27:02 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_free_instance): for the moment, freeing object
structures will fill their memory portion with 0xAA. there's a
FIXME there, remove this line at a later point.
Tue Oct 24 23:10:26 2000 Tim Janik <timj@gtk.org>
* glib-genmarshal.1:
* glib-genmarshal.c: added publically installed marshaller generator.
* gtype.h: added G_TYPE_INSTANCE_GET_INTERFACE() to retrive a certain
interface VTable from instances.
Mon Oct 23 08:28:15 2000 Tim Janik <timj@gtk.org>
* gobject.[hc]: new functions for closure maintenance:
(g_object_watch_closure): maintain validity of the object and
the closure for objects that are used as data part of a closure.
(g_cclosure_new_object): convenience function to create C closures
that have an object as data argument.
(g_closure_new_object): convenience function to create closures
that have an object as data argument.
* gclosure.[hc]: implementation of GClosure mechanism.
a closure is basically an encapsulation of a callback function
and its environment. ideally, most places supporting callback
functions will simply take a GClosure* pointer and thus unify
callback environments wrg destroy notification etc.
GClosure provides destroy notifiers for arbitrary data pointers,
reference counting, invalidation notification (it can be invalidated
which is merely a deactivate state) and a marshallinbg abstraction.
GCClosure is also provided in these files, they present a specialized
GClosure implementation for C language callbacks.
* genum.c: macro cleanups.
* gboxed.[hc]: new files, for boxed type abstraction.
(g_boxed_copy): copy a boxed structure
(g_boxed_free): free a boxed structure
(g_value_set_boxed):
(g_value_get_boxed): standard GValue functions for boxed types
(g_boxed_type_register_static): convenience function for easy
introduction of new G_TYPE_BOXED derivatives.
* gparam.[hc]: introduced g_param_type_register_static(), a short hand
for creation of new GParamSpec derived types.
* gtype.[hc]: many fixes, introduced ability to flag individual
type nodes as ABSTRACT upon registration, added value_peek_pointer()
to the value table to peek at GValue contents as a pointer for types
that support this. fixed up GValue checks.
* gvalue.[hc]: added g_value_fits_pointer() and g_value_get_as_pointer()
to peek at the value contents as pointer.
* *.[hc]: adaptions to type macro fixes and changes in the type
registration API.
* many const corrections over the place.
Sat Oct 21 02:49:56 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_conforms_to): this function basically behaves like
and is_a check, except that it _additionally_ features interfaces
for instantiatable types. enforce this in the second branch as well
(`type' conforms_to `type') even if `type' is not an interface type.
Fri Oct 20 15:31:04 2000 Tim Janik <timj@gtk.org>
* gvaluetypes.[hc]: added G_TYPE_POINTER implementation from jrb.
* gtype.[hc]:
* gobject.c:
* gvaluetypes.c: added GTypeValueTable.value_peek_pointer and
suitable implementations of this for G_TYPE_STRING, G_TYPE_OBJECT
and G_TYPE_POINTER.
Mon Aug 21 04:13:37 2000 Tim Janik <timj@gtk.org>
* gbsearcharray.[hc]: long standing needed generic implementation
of a binary searchable, sorted and dynamically sized array.
2000-10-25 22:36:35 +02:00
|
|
|
/* GObject - GLib Type, Object, Parameter and Signal Library
|
|
|
|
* Copyright (C) 2000 Red Hat, Inc.
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General
|
|
|
|
* Public License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
#ifndef __G_CLOSURE_H__
|
|
|
|
#define __G_CLOSURE_H__
|
|
|
|
|
|
|
|
|
|
|
|
#include <gobject/gtype.h>
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* --- defines --- */
|
|
|
|
#define G_CLOSURE_NEEDS_MARSHAL(closure) (((GClosure*) (closure))->marshal == NULL)
|
|
|
|
#define G_CCLOSURE_SWAP_DATA(cclosure) (((GClosure*) (closure))->derivative_flag)
|
|
|
|
|
|
|
|
|
|
|
|
/* -- typedefs --- */
|
|
|
|
typedef struct _GClosure GClosure;
|
|
|
|
typedef struct _GClosureNotifyData GClosureNotifyData;
|
|
|
|
typedef gpointer GCallback;
|
|
|
|
typedef void (*GClosureNotify) (gpointer data,
|
|
|
|
GClosure *closure);
|
|
|
|
typedef void (*GClosureMarshal) (GClosure *closure,
|
|
|
|
GValue *return_value,
|
|
|
|
guint n_param_values,
|
|
|
|
const GValue *param_values,
|
2000-10-27 18:48:11 +02:00
|
|
|
gpointer invocation_hint,
|
added newly added gobject/ headers.
Tue Oct 24 22:09:14 2000 Tim Janik <timj@gtk.org>
* glib-object.h: added newly added gobject/ headers.
* gmesage.c: print g_message() output to stderr instead of stdout.
Wed Oct 25 20:27:02 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_free_instance): for the moment, freeing object
structures will fill their memory portion with 0xAA. there's a
FIXME there, remove this line at a later point.
Tue Oct 24 23:10:26 2000 Tim Janik <timj@gtk.org>
* glib-genmarshal.1:
* glib-genmarshal.c: added publically installed marshaller generator.
* gtype.h: added G_TYPE_INSTANCE_GET_INTERFACE() to retrive a certain
interface VTable from instances.
Mon Oct 23 08:28:15 2000 Tim Janik <timj@gtk.org>
* gobject.[hc]: new functions for closure maintenance:
(g_object_watch_closure): maintain validity of the object and
the closure for objects that are used as data part of a closure.
(g_cclosure_new_object): convenience function to create C closures
that have an object as data argument.
(g_closure_new_object): convenience function to create closures
that have an object as data argument.
* gclosure.[hc]: implementation of GClosure mechanism.
a closure is basically an encapsulation of a callback function
and its environment. ideally, most places supporting callback
functions will simply take a GClosure* pointer and thus unify
callback environments wrg destroy notification etc.
GClosure provides destroy notifiers for arbitrary data pointers,
reference counting, invalidation notification (it can be invalidated
which is merely a deactivate state) and a marshallinbg abstraction.
GCClosure is also provided in these files, they present a specialized
GClosure implementation for C language callbacks.
* genum.c: macro cleanups.
* gboxed.[hc]: new files, for boxed type abstraction.
(g_boxed_copy): copy a boxed structure
(g_boxed_free): free a boxed structure
(g_value_set_boxed):
(g_value_get_boxed): standard GValue functions for boxed types
(g_boxed_type_register_static): convenience function for easy
introduction of new G_TYPE_BOXED derivatives.
* gparam.[hc]: introduced g_param_type_register_static(), a short hand
for creation of new GParamSpec derived types.
* gtype.[hc]: many fixes, introduced ability to flag individual
type nodes as ABSTRACT upon registration, added value_peek_pointer()
to the value table to peek at GValue contents as a pointer for types
that support this. fixed up GValue checks.
* gvalue.[hc]: added g_value_fits_pointer() and g_value_get_as_pointer()
to peek at the value contents as pointer.
* *.[hc]: adaptions to type macro fixes and changes in the type
registration API.
* many const corrections over the place.
Sat Oct 21 02:49:56 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_conforms_to): this function basically behaves like
and is_a check, except that it _additionally_ features interfaces
for instantiatable types. enforce this in the second branch as well
(`type' conforms_to `type') even if `type' is not an interface type.
Fri Oct 20 15:31:04 2000 Tim Janik <timj@gtk.org>
* gvaluetypes.[hc]: added G_TYPE_POINTER implementation from jrb.
* gtype.[hc]:
* gobject.c:
* gvaluetypes.c: added GTypeValueTable.value_peek_pointer and
suitable implementations of this for G_TYPE_STRING, G_TYPE_OBJECT
and G_TYPE_POINTER.
Mon Aug 21 04:13:37 2000 Tim Janik <timj@gtk.org>
* gbsearcharray.[hc]: long standing needed generic implementation
of a binary searchable, sorted and dynamically sized array.
2000-10-25 22:36:35 +02:00
|
|
|
gpointer marshal_data);
|
|
|
|
typedef struct _GCClosure GCClosure;
|
|
|
|
|
|
|
|
|
|
|
|
/* --- structures --- */
|
|
|
|
struct _GClosureNotifyData
|
|
|
|
{
|
|
|
|
gpointer data;
|
|
|
|
GClosureNotify notify;
|
|
|
|
};
|
|
|
|
struct _GClosure
|
|
|
|
{
|
|
|
|
/*< private >*/ guint ref_count : 15;
|
|
|
|
/*< private >*/ guint meta_marshal : 1;
|
|
|
|
/*< private >*/ guint n_guards : 1;
|
|
|
|
/*< private >*/ guint n_fnotifiers : 2; /* finalization notifiers */
|
|
|
|
/*< private >*/ guint n_inotifiers : 8; /* invalidation notifiers */
|
|
|
|
/*< private >*/ guint in_inotify : 1;
|
|
|
|
/*< private >*/ guint floating : 1;
|
|
|
|
/*< protected >*/ guint derivative_flag : 1;
|
|
|
|
/*< puplic >*/ guint in_marshal : 1;
|
|
|
|
/*< public >*/ guint is_invalid : 1;
|
|
|
|
|
|
|
|
/*< private >*/ void (*marshal) (GClosure *closure,
|
|
|
|
GValue /*out*/ *return_value,
|
|
|
|
guint n_param_values,
|
|
|
|
const GValue *param_values,
|
2000-10-27 18:48:11 +02:00
|
|
|
gpointer invocation_hint,
|
added newly added gobject/ headers.
Tue Oct 24 22:09:14 2000 Tim Janik <timj@gtk.org>
* glib-object.h: added newly added gobject/ headers.
* gmesage.c: print g_message() output to stderr instead of stdout.
Wed Oct 25 20:27:02 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_free_instance): for the moment, freeing object
structures will fill their memory portion with 0xAA. there's a
FIXME there, remove this line at a later point.
Tue Oct 24 23:10:26 2000 Tim Janik <timj@gtk.org>
* glib-genmarshal.1:
* glib-genmarshal.c: added publically installed marshaller generator.
* gtype.h: added G_TYPE_INSTANCE_GET_INTERFACE() to retrive a certain
interface VTable from instances.
Mon Oct 23 08:28:15 2000 Tim Janik <timj@gtk.org>
* gobject.[hc]: new functions for closure maintenance:
(g_object_watch_closure): maintain validity of the object and
the closure for objects that are used as data part of a closure.
(g_cclosure_new_object): convenience function to create C closures
that have an object as data argument.
(g_closure_new_object): convenience function to create closures
that have an object as data argument.
* gclosure.[hc]: implementation of GClosure mechanism.
a closure is basically an encapsulation of a callback function
and its environment. ideally, most places supporting callback
functions will simply take a GClosure* pointer and thus unify
callback environments wrg destroy notification etc.
GClosure provides destroy notifiers for arbitrary data pointers,
reference counting, invalidation notification (it can be invalidated
which is merely a deactivate state) and a marshallinbg abstraction.
GCClosure is also provided in these files, they present a specialized
GClosure implementation for C language callbacks.
* genum.c: macro cleanups.
* gboxed.[hc]: new files, for boxed type abstraction.
(g_boxed_copy): copy a boxed structure
(g_boxed_free): free a boxed structure
(g_value_set_boxed):
(g_value_get_boxed): standard GValue functions for boxed types
(g_boxed_type_register_static): convenience function for easy
introduction of new G_TYPE_BOXED derivatives.
* gparam.[hc]: introduced g_param_type_register_static(), a short hand
for creation of new GParamSpec derived types.
* gtype.[hc]: many fixes, introduced ability to flag individual
type nodes as ABSTRACT upon registration, added value_peek_pointer()
to the value table to peek at GValue contents as a pointer for types
that support this. fixed up GValue checks.
* gvalue.[hc]: added g_value_fits_pointer() and g_value_get_as_pointer()
to peek at the value contents as pointer.
* *.[hc]: adaptions to type macro fixes and changes in the type
registration API.
* many const corrections over the place.
Sat Oct 21 02:49:56 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_conforms_to): this function basically behaves like
and is_a check, except that it _additionally_ features interfaces
for instantiatable types. enforce this in the second branch as well
(`type' conforms_to `type') even if `type' is not an interface type.
Fri Oct 20 15:31:04 2000 Tim Janik <timj@gtk.org>
* gvaluetypes.[hc]: added G_TYPE_POINTER implementation from jrb.
* gtype.[hc]:
* gobject.c:
* gvaluetypes.c: added GTypeValueTable.value_peek_pointer and
suitable implementations of this for G_TYPE_STRING, G_TYPE_OBJECT
and G_TYPE_POINTER.
Mon Aug 21 04:13:37 2000 Tim Janik <timj@gtk.org>
* gbsearcharray.[hc]: long standing needed generic implementation
of a binary searchable, sorted and dynamically sized array.
2000-10-25 22:36:35 +02:00
|
|
|
gpointer marshal_data);
|
|
|
|
/*< protected >*/ gpointer data;
|
|
|
|
|
|
|
|
/*< private >*/ GClosureNotifyData *notifiers;
|
|
|
|
|
|
|
|
/* invariants/constrains:
|
|
|
|
* - ->marshal and ->data are _invalid_ as soon as ->is_invalid==TRUE
|
|
|
|
* - invocation of all inotifiers occours prior to fnotifiers
|
|
|
|
* - order of inotifiers is random
|
|
|
|
* inotifiers may _not_ free/invalidate parameter values (e.g. ->data)
|
|
|
|
* - order of fnotifiers is random
|
|
|
|
* - notifiers may only be removed before or during their invocation
|
|
|
|
* - reference counting may only happen prior to fnotify invocation
|
|
|
|
* (in that sense, fnotifiers are really finalization handlers)
|
|
|
|
*/
|
|
|
|
};
|
|
|
|
/* closure for C function calls, callback() is the user function
|
|
|
|
*/
|
|
|
|
struct _GCClosure
|
|
|
|
{
|
|
|
|
GClosure closure;
|
|
|
|
gpointer callback;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* --- prototypes --- */
|
|
|
|
GClosure* g_cclosure_new (GCallback callback_func,
|
|
|
|
gpointer user_data,
|
|
|
|
GClosureNotify destroy_data);
|
|
|
|
GClosure* g_cclosure_new_swap (GCallback callback_func,
|
|
|
|
gpointer user_data,
|
|
|
|
GClosureNotify destroy_data);
|
|
|
|
GClosure* g_signal_type_closure_new (GType itype,
|
|
|
|
guint struct_offset);
|
|
|
|
|
|
|
|
|
|
|
|
/* --- prototypes --- */
|
|
|
|
GClosure* g_closure_ref (GClosure *closure);
|
|
|
|
void g_closure_unref (GClosure *closure);
|
|
|
|
/* intimidating */
|
|
|
|
GClosure* g_closure_new_simple (guint sizeof_closure,
|
|
|
|
gpointer data);
|
|
|
|
void g_closure_add_fnotify (GClosure *closure,
|
|
|
|
gpointer notify_data,
|
|
|
|
GClosureNotify notify_func);
|
|
|
|
void g_closure_remove_fnotify (GClosure *closure,
|
|
|
|
gpointer notify_data,
|
|
|
|
GClosureNotify notify_func);
|
|
|
|
void g_closure_add_inotify (GClosure *closure,
|
|
|
|
gpointer notify_data,
|
|
|
|
GClosureNotify notify_func);
|
|
|
|
void g_closure_remove_inotify (GClosure *closure,
|
|
|
|
gpointer notify_data,
|
|
|
|
GClosureNotify notify_func);
|
|
|
|
void g_closure_add_marshal_guards (GClosure *closure,
|
|
|
|
gpointer pre_marshal_data,
|
|
|
|
GClosureNotify pre_marshal_notify,
|
|
|
|
gpointer post_marshal_data,
|
|
|
|
GClosureNotify post_marshal_notify);
|
|
|
|
void g_closure_set_marshal (GClosure *closure,
|
|
|
|
GClosureMarshal marshal);
|
|
|
|
void g_closure_set_meta_marshal (GClosure *closure,
|
|
|
|
gpointer marshal_data,
|
|
|
|
GClosureMarshal meta_marshal);
|
|
|
|
void g_closure_invalidate (GClosure *closure);
|
|
|
|
void g_closure_invoke (GClosure *closure,
|
|
|
|
GValue /*out*/ *return_value,
|
|
|
|
guint n_param_values,
|
2000-10-27 18:48:11 +02:00
|
|
|
const GValue *param_values,
|
|
|
|
gpointer invocation_hint);
|
added newly added gobject/ headers.
Tue Oct 24 22:09:14 2000 Tim Janik <timj@gtk.org>
* glib-object.h: added newly added gobject/ headers.
* gmesage.c: print g_message() output to stderr instead of stdout.
Wed Oct 25 20:27:02 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_free_instance): for the moment, freeing object
structures will fill their memory portion with 0xAA. there's a
FIXME there, remove this line at a later point.
Tue Oct 24 23:10:26 2000 Tim Janik <timj@gtk.org>
* glib-genmarshal.1:
* glib-genmarshal.c: added publically installed marshaller generator.
* gtype.h: added G_TYPE_INSTANCE_GET_INTERFACE() to retrive a certain
interface VTable from instances.
Mon Oct 23 08:28:15 2000 Tim Janik <timj@gtk.org>
* gobject.[hc]: new functions for closure maintenance:
(g_object_watch_closure): maintain validity of the object and
the closure for objects that are used as data part of a closure.
(g_cclosure_new_object): convenience function to create C closures
that have an object as data argument.
(g_closure_new_object): convenience function to create closures
that have an object as data argument.
* gclosure.[hc]: implementation of GClosure mechanism.
a closure is basically an encapsulation of a callback function
and its environment. ideally, most places supporting callback
functions will simply take a GClosure* pointer and thus unify
callback environments wrg destroy notification etc.
GClosure provides destroy notifiers for arbitrary data pointers,
reference counting, invalidation notification (it can be invalidated
which is merely a deactivate state) and a marshallinbg abstraction.
GCClosure is also provided in these files, they present a specialized
GClosure implementation for C language callbacks.
* genum.c: macro cleanups.
* gboxed.[hc]: new files, for boxed type abstraction.
(g_boxed_copy): copy a boxed structure
(g_boxed_free): free a boxed structure
(g_value_set_boxed):
(g_value_get_boxed): standard GValue functions for boxed types
(g_boxed_type_register_static): convenience function for easy
introduction of new G_TYPE_BOXED derivatives.
* gparam.[hc]: introduced g_param_type_register_static(), a short hand
for creation of new GParamSpec derived types.
* gtype.[hc]: many fixes, introduced ability to flag individual
type nodes as ABSTRACT upon registration, added value_peek_pointer()
to the value table to peek at GValue contents as a pointer for types
that support this. fixed up GValue checks.
* gvalue.[hc]: added g_value_fits_pointer() and g_value_get_as_pointer()
to peek at the value contents as pointer.
* *.[hc]: adaptions to type macro fixes and changes in the type
registration API.
* many const corrections over the place.
Sat Oct 21 02:49:56 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_conforms_to): this function basically behaves like
and is_a check, except that it _additionally_ features interfaces
for instantiatable types. enforce this in the second branch as well
(`type' conforms_to `type') even if `type' is not an interface type.
Fri Oct 20 15:31:04 2000 Tim Janik <timj@gtk.org>
* gvaluetypes.[hc]: added G_TYPE_POINTER implementation from jrb.
* gtype.[hc]:
* gobject.c:
* gvaluetypes.c: added GTypeValueTable.value_peek_pointer and
suitable implementations of this for G_TYPE_STRING, G_TYPE_OBJECT
and G_TYPE_POINTER.
Mon Aug 21 04:13:37 2000 Tim Janik <timj@gtk.org>
* gbsearcharray.[hc]: long standing needed generic implementation
of a binary searchable, sorted and dynamically sized array.
2000-10-25 22:36:35 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
data_object::destroy -> closure_invalidate();
|
|
|
|
closure_invalidate() -> disconnect(closure);
|
|
|
|
disconnect(closure) -> (unlink) closure_unref();
|
|
|
|
closure_finalize() -> g_free (data_string);
|
|
|
|
|
|
|
|
1) need GObject and GType in glib
|
|
|
|
2) need GParam
|
|
|
|
3) need to resolve dtor cycles
|
|
|
|
4) need GSignal move
|
|
|
|
5) destroy on last caller ref or last data ref?
|
|
|
|
|
|
|
|
|
|
|
|
random remarks:
|
|
|
|
- don't mandate signals for GObject
|
|
|
|
- OTOH, don't mandate GObject for GSignal
|
|
|
|
- need marshaller repo with decent aliasing to base types
|
|
|
|
- provide marshaller collection, virtually covering anything out there
|
|
|
|
- at that point, still need GSignalCMarhsaller to g_signal_new() ?
|
|
|
|
- can we combine varargs collect mechanisms with marshaller stubs?
|
|
|
|
for out values (i.e. returntypes), that might get rid of the following
|
|
|
|
point...
|
|
|
|
- char* return signals with connections ala:
|
|
|
|
connect({ return "static data that can't work"; }),
|
|
|
|
connect({ return g_strdup ("properly duplicated string"); })
|
|
|
|
won't work anymore. CRASH
|
|
|
|
|
|
|
|
problems:
|
|
|
|
- accumulator needs gboolean to indicate EMISSION_STOP
|
|
|
|
- accumulator needs data
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
|
|
#endif /* __G_CLOSURE_H__ */
|