cvs: php-gtk /generator arg_types.php gtk.overrides /src php_gtk.h php_gtk_types.c
| From: | Andrei Zmievski | Date: | Mon, 05 Feb 2001 04:26:58 +0000 |
| Subject: | cvs: php-gtk /generator arg_types.php gtk.overrides /src php_gtk.h php_gtk_types.c | ||
| Groups: | php.gtk | ||
| Request: | Send a blank email to php-gtk+get-8@lists.php.net to get a copy of this message | ||
andrei Sun Feb 4 20:26:58 2001 EDT
Modified files:
/php-gtk/generator arg_types.php gtk.overrides
/php-gtk/src php_gtk.h php_gtk_types.c
Log:
Implement support for GdkAtom boxed type.
Index: php-gtk/generator/arg_types.php diff -u php-gtk/generator/arg_types.php:1.4 php-gtk/generator/arg_types.php:1.5 --- php-gtk/generator/arg_types.php:1.4 Sat Feb 3 16:08:49 2001 +++ php-gtk/generator/arg_types.php Sun Feb 4 20:26:58 2001 @@ -57,8 +57,7 @@ class Arg_Type { function write_param($type, $name, $default, $null_ok, &$var_list, &$parse_list, &$arg_list, &$extra_code, &$parse_type, - $in_constructor, -$in_constructor) + $in_constructor) { trigger_error("This is an abstract class", E_USER_ERROR); } @@ -423,7 +422,11 @@ } } -class Atom_Arg extends Arg_Type { +class Atom_Arg extends Int_Arg { + function write_return($type, &$var_list) + { + return " *return_value = *php_gdk_atom_new(%s);"; + } } class Arg_Matcher { @@ -523,6 +526,9 @@ $arg = new Rect_Arg(); $matcher->register('GdkRectangle*', $arg); + +$arg = new Atom_Arg(); +$matcher->register('GdkAtom', $arg); $matcher->register_boxed('GdkEvent', 'gdk_event'); $matcher->register_boxed('GdkWindow', 'gdk_window'); Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.4 php-gtk/generator/gtk.overrides:1.5 --- php-gtk/generator/gtk.overrides:1.4 Sat Feb 3 16:41:23 2001 +++ php-gtk/generator/gtk.overrides Sun Feb 4 20:26:58 2001 @@ -597,19 +597,20 @@ override gdk_color_parse PHP_FUNCTION(wrap_gdk_color_parse) { - char *spec; + gchar *color_spec; GdkColor color; - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s", &spec)) { + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s", &color_spec)) { return; } - if (gdk_color_parse(spec, &color)) + if (gdk_color_parse(color_spec, &color)) *return_value = *php_gdk_color_new(&color); else - php_error(E_WARNING, "%s() could not parse color spec '%s'", get_active_function_name(), spec); + php_error(E_WARNING, "%s() could not parse color spec '%s'", get_active_function_name(), color_spec); } -%%override gtk_list_append_items +%% +override gtk_list_append_items PHP_FUNCTION(wrap_gtk_list_append_items) { zval *php_items, **item; Index: php-gtk/src/php_gtk.h diff -u php-gtk/src/php_gtk.h:1.5 php-gtk/src/php_gtk.h:1.6 --- php-gtk/src/php_gtk.h:1.5 Sat Feb 3 16:08:49 2001 +++ php-gtk/src/php_gtk.h Sun Feb 4 20:26:58 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.5 2001/02/04 00:08:49 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.6 2001/02/05 04:26:58 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -40,6 +40,7 @@ extern zend_class_entry *gdk_window_ce; extern zend_class_entry *gdk_color_ce; extern zend_class_entry *gdk_colormap_ce; +extern zend_class_entry *gdk_atom_ce; /* Useful macros. */ #define PHP_GTK_GET(w) ((GtkObject *)php_gtk_get_object(w, le_gtk)) @@ -47,6 +48,7 @@ #define PHP_GDK_WINDOW_GET(w) ((GdkWindow *)php_gtk_get_object(w, le_gdk_window)) #define PHP_GDK_COLOR_GET(w) ((GdkColor *)php_gtk_get_object(w, le_gdk_color)) #define PHP_GDK_COLORMAP_GET(w) ((GdkColormap *)php_gtk_get_object(w, le_gdk_colormap)) +#define PHP_GDK_ATOM_GET(w) (php_gdk_atom_get(w)) /* True globals. */ extern GHashTable *php_gtk_class_hash; @@ -73,6 +75,7 @@ zval *php_gdk_window_new(GdkWindow *obj); zval *php_gdk_color_new(GdkColor *obj); zval *php_gdk_colormap_new(GdkColormap *obj); +zval *php_gdk_atom_new(GdkAtom obj); /* Utility functions. */ int php_gtk_parse_args(int argc, char *format, ...); Index: php-gtk/src/php_gtk_types.c diff -u php-gtk/src/php_gtk_types.c:1.4 php-gtk/src/php_gtk_types.c:1.5 --- php-gtk/src/php_gtk_types.c:1.4 Sat Feb 3 16:08:49 2001 +++ php-gtk/src/php_gtk_types.c Sun Feb 4 20:26:58 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_types.c,v 1.4 2001/02/04 00:08:49 andrei Exp $ */ +/* $Id: php_gtk_types.c,v 1.5 2001/02/05 04:26:58 andrei Exp $ */ #include "php_gtk.h" @@ -33,6 +33,7 @@ zend_class_entry *gdk_window_ce; zend_class_entry *gdk_color_ce; zend_class_entry *gdk_colormap_ce; +zend_class_entry *gdk_atom_ce; /* GdkEvent */ zval *php_gdk_event_new(GdkEvent *obj) @@ -55,9 +56,9 @@ if (obj->any.window) { value = php_gdk_window_new(obj->any.window); - add_property_zval_ex(result, "window", sizeof("window"), value); + add_property_zval(result, "window", value); } else - add_property_unset(result, "window"); + add_property_null(result, "window"); add_property_bool(result, "send_event", obj->any.send_event); switch (obj->type) { @@ -121,9 +122,9 @@ case GDK_LEAVE_NOTIFY: if (obj->crossing.subwindow) { value = php_gdk_window_new(obj->crossing.subwindow); - add_property_zval_ex(result, "subwindow", sizeof("subwindow"), value); + add_property_zval(result, "subwindow", value); } else - add_property_unset(result, "subwindow"); + add_property_null(result, "subwindow"); add_property_long(result, "time", obj->crossing.time); add_property_double(result, "x", obj->crossing.x); add_property_double(result, "y", obj->crossing.y); @@ -151,7 +152,7 @@ break; case GDK_PROPERTY_NOTIFY: - /* TODO set atom property */ + add_property_zval(result, "atom", php_gdk_atom_new(obj->property.atom)); add_property_long(result, "time", obj->property.time); add_property_long(result, "state", obj->property.state); break; @@ -159,9 +160,9 @@ case GDK_SELECTION_CLEAR: case GDK_SELECTION_REQUEST: case GDK_SELECTION_NOTIFY: - /* TODO set selection property */ - /* TODO set target property */ - /* TODO set property property */ + add_property_zval(result, "selection", php_gdk_atom_new(obj->selection.selection)); + add_property_zval(result, "target", php_gdk_atom_new(obj->selection.target)); + add_property_zval(result, "property", php_gdk_atom_new(obj->selection.property)); add_property_long(result, "requestor", obj->selection.requestor); add_property_long(result, "time", obj->selection.time); break; @@ -186,7 +187,7 @@ break; case GDK_CLIENT_EVENT: - /* TODO add message_type property */ + add_property_zval(result, "message_type", php_gdk_atom_new(obj->client.message_type)); add_property_long(result, "data_format", obj->client.data_format); add_property_stringl(result, "data", obj->client.data.b, 20, 1); break; @@ -304,7 +305,6 @@ PHP_FUNCTION(gdkcolor) { char *color_spec; - int red, green, blue; GdkColor color; NOT_STATIC_METHOD(); @@ -402,8 +402,33 @@ ZVAL_LONG(return_value, PHP_GDK_COLORMAP_GET(this_ptr)->size); } +PHP_FUNCTION(gdk_colormap_alloc) +{ + gchar *color_spec; + GdkColor color = {0, 0, 0, 0}; + zend_bool writeable = 0, best_match = 1; + + if (!php_gtk_parse_args_quiet(ZEND_NUM_ARGS(), "hhh|bb", &color.red, &color.green, &color.blue, &writeable, &best_match)) { + if (!php_gtk_parse_args_quiet(ZEND_NUM_ARGS(), "s|bb", &color_spec, &writeable, &best_match)) { + php_error(E_WARNING, "%s() requires a color spec or RGB triplet", get_active_function_name()); + return; + } else if (!gdk_color_parse(color_spec, &color)) { + php_error(E_WARNING, "%s() could not parse color spec '%s'", get_active_function_name(), color_spec); + return; + } + } + + if (!gdk_colormap_alloc_color(PHP_GDK_COLORMAP_GET(this_ptr), &color, writeable, best_match)) { + php_error(E_WARNING, "%s() could not allocate color"); + return; + } + + *return_value = *php_gdk_color_new(&color); +} + static function_entry php_gdk_colormap_functions[] = { - {"size", PHP_FN(gdk_colormap_size), NULL}, + {"size", PHP_FN(gdk_colormap_size), NULL}, + {"alloc", PHP_FN(gdk_colormap_alloc), NULL}, {NULL, NULL, NULL} }; @@ -451,6 +476,33 @@ } +/* GdkAtom */ +inline GdkAtom php_gdk_atom_get(zval *wrapper) +{ + zval **atom; + + zend_hash_find(Z_OBJPROP_P(wrapper), "atom", sizeof("atom"), (void**)&atom); + return (GdkAtom)Z_LVAL_PP(atom); +} + +zval *php_gdk_atom_new(GdkAtom obj) +{ + zval *result; + gchar *atom_name; + + MAKE_STD_ZVAL(result); + object_init_ex(result, gdk_atom_ce); + add_property_long_ex(result, "atom", sizeof("atom"), obj); + atom_name = gdk_atom_name(obj); + if (atom_name) + add_property_string_ex(result, "string", sizeof("string"), gdk_atom_name(obj), 0); + else + add_property_null_ex(result, "string", sizeof("string")); + + return result; +} + + /* Generic get/set property handlers. */ static zval php_gtk_get_property(zend_property_reference *property_reference) { @@ -527,6 +579,7 @@ return retval; } + void php_gtk_register_types(int module_number) { zend_class_entry ce; @@ -548,6 +601,9 @@ INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkcolormap", php_gdk_colormap_functions, NULL, php_gtk_get_property, php_gtk_set_property); gdk_colormap_ce = zend_register_internal_class_ex(&ce, NULL, NULL); + + INIT_CLASS_ENTRY(ce, "gdkatom", NULL); + gdk_atom_ce = zend_register_internal_class_ex(&ce, NULL, NULL); } #endif
Index: php-gtk/generator/arg_types.php diff -u php-gtk/generator/arg_types.php:1.4 php-gtk/generator/arg_types.php:1.5 --- php-gtk/generator/arg_types.php:1.4 Sat Feb 3 16:08:49 2001 +++ php-gtk/generator/arg_types.php Sun Feb 4 20:26:58 2001 @@ -57,8 +57,7 @@ class Arg_Type { function write_param($type, $name, $default, $null_ok, &$var_list, &$parse_list, &$arg_list, &$extra_code, &$parse_type, - $in_constructor, -$in_constructor) + $in_constructor) { trigger_error("This is an abstract class", E_USER_ERROR); } @@ -423,7 +422,11 @@ } } -class Atom_Arg extends Arg_Type { +class Atom_Arg extends Int_Arg { + function write_return($type, &$var_list) + { + return " *return_value = *php_gdk_atom_new(%s);"; + } } class Arg_Matcher { @@ -523,6 +526,9 @@ $arg = new Rect_Arg(); $matcher->register('GdkRectangle*', $arg); + +$arg = new Atom_Arg(); +$matcher->register('GdkAtom', $arg); $matcher->register_boxed('GdkEvent', 'gdk_event'); $matcher->register_boxed('GdkWindow', 'gdk_window'); Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.4 php-gtk/generator/gtk.overrides:1.5 --- php-gtk/generator/gtk.overrides:1.4 Sat Feb 3 16:41:23 2001 +++ php-gtk/generator/gtk.overrides Sun Feb 4 20:26:58 2001 @@ -597,19 +597,20 @@ override gdk_color_parse PHP_FUNCTION(wrap_gdk_color_parse) { - char *spec; + gchar *color_spec; GdkColor color; - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s", &spec)) { + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s", &color_spec)) { return; } - if (gdk_color_parse(spec, &color)) + if (gdk_color_parse(color_spec, &color)) *return_value = *php_gdk_color_new(&color); else - php_error(E_WARNING, "%s() could not parse color spec '%s'", get_active_function_name(), spec); + php_error(E_WARNING, "%s() could not parse color spec '%s'", get_active_function_name(), color_spec); } -%%override gtk_list_append_items +%% +override gtk_list_append_items PHP_FUNCTION(wrap_gtk_list_append_items) { zval *php_items, **item; Index: php-gtk/src/php_gtk.h diff -u php-gtk/src/php_gtk.h:1.5 php-gtk/src/php_gtk.h:1.6 --- php-gtk/src/php_gtk.h:1.5 Sat Feb 3 16:08:49 2001 +++ php-gtk/src/php_gtk.h Sun Feb 4 20:26:58 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.5 2001/02/04 00:08:49 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.6 2001/02/05 04:26:58 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -40,6 +40,7 @@ extern zend_class_entry *gdk_window_ce; extern zend_class_entry *gdk_color_ce; extern zend_class_entry *gdk_colormap_ce; +extern zend_class_entry *gdk_atom_ce; /* Useful macros. */ #define PHP_GTK_GET(w) ((GtkObject *)php_gtk_get_object(w, le_gtk)) @@ -47,6 +48,7 @@ #define PHP_GDK_WINDOW_GET(w) ((GdkWindow *)php_gtk_get_object(w, le_gdk_window)) #define PHP_GDK_COLOR_GET(w) ((GdkColor *)php_gtk_get_object(w, le_gdk_color)) #define PHP_GDK_COLORMAP_GET(w) ((GdkColormap *)php_gtk_get_object(w, le_gdk_colormap)) +#define PHP_GDK_ATOM_GET(w) (php_gdk_atom_get(w)) /* True globals. */ extern GHashTable *php_gtk_class_hash; @@ -73,6 +75,7 @@ zval *php_gdk_window_new(GdkWindow *obj); zval *php_gdk_color_new(GdkColor *obj); zval *php_gdk_colormap_new(GdkColormap *obj); +zval *php_gdk_atom_new(GdkAtom obj); /* Utility functions. */ int php_gtk_parse_args(int argc, char *format, ...); Index: php-gtk/src/php_gtk_types.c diff -u php-gtk/src/php_gtk_types.c:1.4 php-gtk/src/php_gtk_types.c:1.5 --- php-gtk/src/php_gtk_types.c:1.4 Sat Feb 3 16:08:49 2001 +++ php-gtk/src/php_gtk_types.c Sun Feb 4 20:26:58 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_types.c,v 1.4 2001/02/04 00:08:49 andrei Exp $ */ +/* $Id: php_gtk_types.c,v 1.5 2001/02/05 04:26:58 andrei Exp $ */ #include "php_gtk.h" @@ -33,6 +33,7 @@ zend_class_entry *gdk_window_ce; zend_class_entry *gdk_color_ce; zend_class_entry *gdk_colormap_ce; +zend_class_entry *gdk_atom_ce; /* GdkEvent */ zval *php_gdk_event_new(GdkEvent *obj) @@ -55,9 +56,9 @@ if (obj->any.window) { value = php_gdk_window_new(obj->any.window); - add_property_zval_ex(result, "window", sizeof("window"), value); + add_property_zval(result, "window", value); } else - add_property_unset(result, "window"); + add_property_null(result, "window"); add_property_bool(result, "send_event", obj->any.send_event); switch (obj->type) { @@ -121,9 +122,9 @@ case GDK_LEAVE_NOTIFY: if (obj->crossing.subwindow) { value = php_gdk_window_new(obj->crossing.subwindow); - add_property_zval_ex(result, "subwindow", sizeof("subwindow"), value); + add_property_zval(result, "subwindow", value); } else - add_property_unset(result, "subwindow"); + add_property_null(result, "subwindow"); add_property_long(result, "time", obj->crossing.time); add_property_double(result, "x", obj->crossing.x); add_property_double(result, "y", obj->crossing.y); @@ -151,7 +152,7 @@ break; case GDK_PROPERTY_NOTIFY: - /* TODO set atom property */ + add_property_zval(result, "atom", php_gdk_atom_new(obj->property.atom)); add_property_long(result, "time", obj->property.time); add_property_long(result, "state", obj->property.state); break; @@ -159,9 +160,9 @@ case GDK_SELECTION_CLEAR: case GDK_SELECTION_REQUEST: case GDK_SELECTION_NOTIFY: - /* TODO set selection property */ - /* TODO set target property */ - /* TODO set property property */ + add_property_zval(result, "selection", php_gdk_atom_new(obj->selection.selection)); + add_property_zval(result, "target", php_gdk_atom_new(obj->selection.target)); + add_property_zval(result, "property", php_gdk_atom_new(obj->selection.property)); add_property_long(result, "requestor", obj->selection.requestor); add_property_long(result, "time", obj->selection.time); break; @@ -186,7 +187,7 @@ break; case GDK_CLIENT_EVENT: - /* TODO add message_type property */ + add_property_zval(result, "message_type", php_gdk_atom_new(obj->client.message_type)); add_property_long(result, "data_format", obj->client.data_format); add_property_stringl(result, "data", obj->client.data.b, 20, 1); break; @@ -304,7 +305,6 @@ PHP_FUNCTION(gdkcolor) { char *color_spec; - int red, green, blue; GdkColor color; NOT_STATIC_METHOD(); @@ -402,8 +402,33 @@ ZVAL_LONG(return_value, PHP_GDK_COLORMAP_GET(this_ptr)->size); } +PHP_FUNCTION(gdk_colormap_alloc) +{ + gchar *color_spec; + GdkColor color = {0, 0, 0, 0}; + zend_bool writeable = 0, best_match = 1; + + if (!php_gtk_parse_args_quiet(ZEND_NUM_ARGS(), "hhh|bb", &color.red, &color.green, &color.blue, &writeable, &best_match)) { + if (!php_gtk_parse_args_quiet(ZEND_NUM_ARGS(), "s|bb", &color_spec, &writeable, &best_match)) { + php_error(E_WARNING, "%s() requires a color spec or RGB triplet", get_active_function_name()); + return; + } else if (!gdk_color_parse(color_spec, &color)) { + php_error(E_WARNING, "%s() could not parse color spec '%s'", get_active_function_name(), color_spec); + return; + } + } + + if (!gdk_colormap_alloc_color(PHP_GDK_COLORMAP_GET(this_ptr), &color, writeable, best_match)) { + php_error(E_WARNING, "%s() could not allocate color"); + return; + } + + *return_value = *php_gdk_color_new(&color); +} + static function_entry php_gdk_colormap_functions[] = { - {"size", PHP_FN(gdk_colormap_size), NULL}, + {"size", PHP_FN(gdk_colormap_size), NULL}, + {"alloc", PHP_FN(gdk_colormap_alloc), NULL}, {NULL, NULL, NULL} }; @@ -451,6 +476,33 @@ } +/* GdkAtom */ +inline GdkAtom php_gdk_atom_get(zval *wrapper) +{ + zval **atom; + + zend_hash_find(Z_OBJPROP_P(wrapper), "atom", sizeof("atom"), (void**)&atom); + return (GdkAtom)Z_LVAL_PP(atom); +} + +zval *php_gdk_atom_new(GdkAtom obj) +{ + zval *result; + gchar *atom_name; + + MAKE_STD_ZVAL(result); + object_init_ex(result, gdk_atom_ce); + add_property_long_ex(result, "atom", sizeof("atom"), obj); + atom_name = gdk_atom_name(obj); + if (atom_name) + add_property_string_ex(result, "string", sizeof("string"), gdk_atom_name(obj), 0); + else + add_property_null_ex(result, "string", sizeof("string")); + + return result; +} + + /* Generic get/set property handlers. */ static zval php_gtk_get_property(zend_property_reference *property_reference) { @@ -527,6 +579,7 @@ return retval; } + void php_gtk_register_types(int module_number) { zend_class_entry ce; @@ -548,6 +601,9 @@ INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkcolormap", php_gdk_colormap_functions, NULL, php_gtk_get_property, php_gtk_set_property); gdk_colormap_ce = zend_register_internal_class_ex(&ce, NULL, NULL); + + INIT_CLASS_ENTRY(ce, "gdkatom", NULL); + gdk_atom_ce = zend_register_internal_class_ex(&ce, NULL, NULL); } #endif