cvs: php-gtk / TODO /generator arg_types.php gtk.defs gtk.overrides /src php_gtk.h php_gtk_object.c
| From: | Andrei Zmievski | Date: | Sat, 03 Mar 2001 06:25:23 +0000 |
| Subject: | cvs: php-gtk / TODO /generator arg_types.php gtk.defs gtk.overrides /src php_gtk.h php_gtk_object.c | ||
| Groups: | php.gtk | ||
| Request: | Send a blank email to php-gtk+get-177@lists.php.net to get a copy of this message | ||
andrei Fri Mar 2 22:25:23 2001 EDT
Modified files:
/php-gtk TODO
/php-gtk/generator arg_types.php gtk.defs gtk.overrides
/php-gtk/src php_gtk.h php_gtk_object.c
Log:
* Fixed returning objects from methods.
* Implemented GtkTipsQuery class.
* Added GtkObject::connect_object method.
* Modified GtkToggleButton constructor to accept optional label.
Index: php-gtk/TODO diff -u php-gtk/TODO:1.17 php-gtk/TODO:1.18 --- php-gtk/TODO:1.17 Wed Feb 28 13:49:55 2001 +++ php-gtk/TODO Fri Mar 2 22:25:22 2001 @@ -10,6 +10,5 @@ In PHP ------ -* Fix call_user_method_*() functions to force object by reference. * Modify var_dump() and print_r() to check get property handlers when dumping information. Index: php-gtk/generator/arg_types.php diff -u php-gtk/generator/arg_types.php:1.14 php-gtk/generator/arg_types.php:1.15 --- php-gtk/generator/arg_types.php:1.14 Thu Mar 1 08:43:33 2001 +++ php-gtk/generator/arg_types.php Fri Mar 2 22:25:22 2001 @@ -392,6 +392,7 @@ { $var_list->add('zval', '*ret'); return " ret = php_gtk_new((GtkObject *)%s);\n" . + " SEPARATE_ZVAL(&ret);\n" . " *return_value = *ret;\n" . " return;"; } Index: php-gtk/generator/gtk.defs diff -u php-gtk/generator/gtk.defs:1.1.1.1 php-gtk/generator/gtk.defs:1.2 --- php-gtk/generator/gtk.defs:1.1.1.1 Mon Jan 29 14:15:59 2001 +++ php-gtk/generator/gtk.defs Fri Mar 2 22:25:22 2001 @@ -595,6 +595,12 @@ (field (type-and-name GtkWidget* help_button)) ) +(object TipsQuery + (in-module Gtk) + (parent Label (Gtk)) + (c-name GtkTipsQuery) +) + ;; Enumerations and flags ... (flags AccelFlags Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.16 php-gtk/generator/gtk.overrides:1.17 --- php-gtk/generator/gtk.overrides:1.16 Tue Feb 27 13:43:02 2001 +++ php-gtk/generator/gtk.overrides Fri Mar 2 22:25:22 2001 @@ -313,13 +313,53 @@ } extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS()); - data = php_gtk_build_value("(VN)", func, extra); + data = php_gtk_build_value("(VNi)", func, extra, 1); signum = gtk_signal_connect_full(PHP_GTK_GET(this_ptr), name, NULL, (GtkCallbackMarshal)php_gtk_callback_marshal, data, php_gtk_destroy_notify, FALSE, FALSE); RETURN_LONG(signum); } %% +override gtk_signal_connect_object +PHP_FUNCTION(wrap_gtk_signal_connect_object) +{ + char *name = NULL; + char *func; + zval *extra, *data, *obj; + zval *method; + int signum; + + NOT_STATIC_METHOD(); + + if (ZEND_NUM_ARGS() < 2) { + php_error(E_WARNING, "%s() requires at least 3 arguments, %d given", + get_active_function_name(), ZEND_NUM_ARGS()); + return; + } + + if (!php_gtk_parse_args(3, "ssO", &name, &func, &obj, gtk_object_ce)) + return; + + MAKE_STD_ZVAL(method); + array_init(method); + zval_add_ref(&obj); + add_next_index_zval(method, obj); + add_next_index_string(method, func, 1); + + if (!php_gtk_check_callable(method)) { + php_error(E_WARNING, "%s() expects argument 2 to be callable method of argument 3", get_active_function_name()); + zval_dtor(method); + return; + } + + extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 3, ZEND_NUM_ARGS()); + data = php_gtk_build_value("(VNi)", method, extra, 0); + signum = gtk_signal_connect_full(PHP_GTK_GET(this_ptr), name, NULL, + (GtkCallbackMarshal)php_gtk_callback_marshal, + data, php_gtk_destroy_notify, FALSE, FALSE); + RETURN_LONG(signum); +} +%% override gtk_widget_intersect PHP_FUNCTION(wrap_gtk_widget_intersect) { @@ -736,6 +776,35 @@ if (!wrapped_obj) { php_error(E_WARNING, "%s(): could not create GtkButton object", + get_active_function_name()); + return; + } + + php_gtk_object_init(wrapped_obj, this_ptr); +} +%% +ignore gtk_toggle_button_new_with_label +%% +override gtk_toggle_button_new +PHP_FUNCTION(wrap_gtk_toggle_button_new) +{ + GtkObject *wrapped_obj; + gchar *text = NULL; + + NOT_STATIC_METHOD(); + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|s", &text)) { + php_gtk_invalidate(this_ptr); + return; + } + + if (text) + wrapped_obj = (GtkObject *)gtk_toggle_button_new_with_label(text); + else + wrapped_obj = (GtkObject *)gtk_toggle_button_new(); + + if (!wrapped_obj) { + php_error(E_WARNING, "%s(): could not create GtkToggleButton object", get_active_function_name()); return; } Index: php-gtk/src/php_gtk.h diff -u php-gtk/src/php_gtk.h:1.17 php-gtk/src/php_gtk.h:1.18 --- php-gtk/src/php_gtk.h:1.17 Thu Mar 1 08:43:33 2001 +++ php-gtk/src/php_gtk.h Fri Mar 2 22:25:22 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.17 2001/03/01 16:43:33 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.18 2001/03/03 06:25:22 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -105,6 +105,7 @@ int php_gtk_get_flag_value(GtkType flag_type, zval *flag_val, int *result); zval php_gtk_get_property(zend_property_reference *property_reference); int php_gtk_set_property(zend_property_reference *property_reference, zval *value); +void php_gtk_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); static inline void php_gtk_register_prop_getter(zend_class_entry *ce, prop_getter_t getter) { Index: php-gtk/src/php_gtk_object.c diff -u php-gtk/src/php_gtk_object.c:1.14 php-gtk/src/php_gtk_object.c:1.15 --- php-gtk/src/php_gtk_object.c:1.14 Thu Mar 1 08:43:33 2001 +++ php-gtk/src/php_gtk_object.c Fri Mar 2 22:25:22 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_object.c,v 1.14 2001/03/01 16:43:33 andrei Exp $ */ +/* $Id: php_gtk_object.c,v 1.15 2001/03/03 06:25:22 andrei Exp $ */ #include "php_gtk.h" @@ -143,9 +143,8 @@ { zval *gtk_args; zval *signal_data = (zval *)data; - zval **func, **extra = NULL; + zval **func, **extra = NULL, **pass_wrapper; zval *wrapper = NULL; - zval **wrapper_ptr = &wrapper; zval *params; zval *retval = NULL; zval *tmp; @@ -157,20 +156,18 @@ if (!php_gtk_check_callable(signal_data)) { zend_hash_index_find(Z_ARRVAL_P(signal_data), 0, (void **)&func); zend_hash_index_find(Z_ARRVAL_P(signal_data), 1, (void **)&extra); - if (zend_hash_num_elements(Z_ARRVAL_P(signal_data)) > 2) { - zend_hash_index_find(Z_ARRVAL_P(signal_data), 2, (void **)&wrapper_ptr); - zval_add_ref(&wrapper); - } + zend_hash_index_find(Z_ARRVAL_P(signal_data), 2, (void **)&pass_wrapper); } else func = &signal_data; - if (!wrapper && o) + if (Z_LVAL_PP(pass_wrapper) && o) wrapper = php_gtk_new(o); if (wrapper) { MAKE_STD_ZVAL(params); array_init(params); - zend_hash_next_index_insert(Z_ARRVAL_P(params), &wrapper, sizeof(zval *), NULL); + if (Z_LVAL_PP(pass_wrapper)) + zend_hash_next_index_insert(Z_ARRVAL_P(params), &wrapper, sizeof(zval *), NULL); php_array_merge(Z_ARRVAL_P(params), Z_ARRVAL_P(gtk_args), 0); zval_ptr_dtor(>k_args); } else @@ -636,5 +633,55 @@ zval_dtor(&overloaded_property->element); return retval; } + + +void php_gtk_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference) +{ + zval result; + zend_overloaded_element *overloaded_property; + zval method_name = ((zend_overloaded_element *)property_reference->elements_list->tail->data)->element; + zend_llist_element *element; + zend_llist_element *stop_element; + zval *object = property_reference->object; + prop_getter_t *getter; + zend_class_entry *ce; + int found = FAILURE; + + /* + * We want to stop at the last overloaded object reference - the rest can + * contain array and method references, that's fine. + */ + for (stop_element=property_reference->elements_list->tail; + stop_element && + (Z_TYPE_P((zend_overloaded_element *)stop_element->data) == OE_IS_ARRAY || + Z_TYPE_P((zend_overloaded_element *)stop_element->data) == OE_IS_METHOD); + stop_element=stop_element->prev); + + for (element=property_reference->elements_list->head; element && element!=stop_element; element=element->next) { + overloaded_property = (zend_overloaded_element *) element->data; + if (Z_TYPE_P(overloaded_property) != OE_IS_OBJECT || + Z_TYPE(overloaded_property->element) != IS_STRING || + Z_TYPE_P(object) != IS_OBJECT) { + php_error(E_WARNING, "Error invoking method '%s'", Z_STRVAL(method_name)); + return; + } + + for (ce = Z_OBJCE_P(object); ce != NULL && found != SUCCESS; ce = ce->parent) { + if (zend_hash_index_find(&php_gtk_prop_getters, (long)ce, (void **)&getter) == SUCCESS) { + (*getter)(&result, object, &element, &found); + } + } + if (found == FAILURE) { + php_error(E_WARNING, "Error invoking method '%s' on property '%s'", Z_STRVAL(method_name), Z_STRVAL(overloaded_property->element)); + return; + } + object = &result; + + zval_dtor(&overloaded_property->element); + } + + zval_dtor(&method_name); +} + #endif /* HAVE_PHP_GTK */
Index: php-gtk/TODO diff -u php-gtk/TODO:1.17 php-gtk/TODO:1.18 --- php-gtk/TODO:1.17 Wed Feb 28 13:49:55 2001 +++ php-gtk/TODO Fri Mar 2 22:25:22 2001 @@ -10,6 +10,5 @@ In PHP ------ -* Fix call_user_method_*() functions to force object by reference. * Modify var_dump() and print_r() to check get property handlers when dumping information. Index: php-gtk/generator/arg_types.php diff -u php-gtk/generator/arg_types.php:1.14 php-gtk/generator/arg_types.php:1.15 --- php-gtk/generator/arg_types.php:1.14 Thu Mar 1 08:43:33 2001 +++ php-gtk/generator/arg_types.php Fri Mar 2 22:25:22 2001 @@ -392,6 +392,7 @@ { $var_list->add('zval', '*ret'); return " ret = php_gtk_new((GtkObject *)%s);\n" . + " SEPARATE_ZVAL(&ret);\n" . " *return_value = *ret;\n" . " return;"; } Index: php-gtk/generator/gtk.defs diff -u php-gtk/generator/gtk.defs:1.1.1.1 php-gtk/generator/gtk.defs:1.2 --- php-gtk/generator/gtk.defs:1.1.1.1 Mon Jan 29 14:15:59 2001 +++ php-gtk/generator/gtk.defs Fri Mar 2 22:25:22 2001 @@ -595,6 +595,12 @@ (field (type-and-name GtkWidget* help_button)) ) +(object TipsQuery + (in-module Gtk) + (parent Label (Gtk)) + (c-name GtkTipsQuery) +) + ;; Enumerations and flags ... (flags AccelFlags Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.16 php-gtk/generator/gtk.overrides:1.17 --- php-gtk/generator/gtk.overrides:1.16 Tue Feb 27 13:43:02 2001 +++ php-gtk/generator/gtk.overrides Fri Mar 2 22:25:22 2001 @@ -313,13 +313,53 @@ } extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS()); - data = php_gtk_build_value("(VN)", func, extra); + data = php_gtk_build_value("(VNi)", func, extra, 1); signum = gtk_signal_connect_full(PHP_GTK_GET(this_ptr), name, NULL, (GtkCallbackMarshal)php_gtk_callback_marshal, data, php_gtk_destroy_notify, FALSE, FALSE); RETURN_LONG(signum); } %% +override gtk_signal_connect_object +PHP_FUNCTION(wrap_gtk_signal_connect_object) +{ + char *name = NULL; + char *func; + zval *extra, *data, *obj; + zval *method; + int signum; + + NOT_STATIC_METHOD(); + + if (ZEND_NUM_ARGS() < 2) { + php_error(E_WARNING, "%s() requires at least 3 arguments, %d given", + get_active_function_name(), ZEND_NUM_ARGS()); + return; + } + + if (!php_gtk_parse_args(3, "ssO", &name, &func, &obj, gtk_object_ce)) + return; + + MAKE_STD_ZVAL(method); + array_init(method); + zval_add_ref(&obj); + add_next_index_zval(method, obj); + add_next_index_string(method, func, 1); + + if (!php_gtk_check_callable(method)) { + php_error(E_WARNING, "%s() expects argument 2 to be callable method of argument 3", get_active_function_name()); + zval_dtor(method); + return; + } + + extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 3, ZEND_NUM_ARGS()); + data = php_gtk_build_value("(VNi)", method, extra, 0); + signum = gtk_signal_connect_full(PHP_GTK_GET(this_ptr), name, NULL, + (GtkCallbackMarshal)php_gtk_callback_marshal, + data, php_gtk_destroy_notify, FALSE, FALSE); + RETURN_LONG(signum); +} +%% override gtk_widget_intersect PHP_FUNCTION(wrap_gtk_widget_intersect) { @@ -736,6 +776,35 @@ if (!wrapped_obj) { php_error(E_WARNING, "%s(): could not create GtkButton object", + get_active_function_name()); + return; + } + + php_gtk_object_init(wrapped_obj, this_ptr); +} +%% +ignore gtk_toggle_button_new_with_label +%% +override gtk_toggle_button_new +PHP_FUNCTION(wrap_gtk_toggle_button_new) +{ + GtkObject *wrapped_obj; + gchar *text = NULL; + + NOT_STATIC_METHOD(); + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|s", &text)) { + php_gtk_invalidate(this_ptr); + return; + } + + if (text) + wrapped_obj = (GtkObject *)gtk_toggle_button_new_with_label(text); + else + wrapped_obj = (GtkObject *)gtk_toggle_button_new(); + + if (!wrapped_obj) { + php_error(E_WARNING, "%s(): could not create GtkToggleButton object", get_active_function_name()); return; } Index: php-gtk/src/php_gtk.h diff -u php-gtk/src/php_gtk.h:1.17 php-gtk/src/php_gtk.h:1.18 --- php-gtk/src/php_gtk.h:1.17 Thu Mar 1 08:43:33 2001 +++ php-gtk/src/php_gtk.h Fri Mar 2 22:25:22 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.17 2001/03/01 16:43:33 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.18 2001/03/03 06:25:22 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -105,6 +105,7 @@ int php_gtk_get_flag_value(GtkType flag_type, zval *flag_val, int *result); zval php_gtk_get_property(zend_property_reference *property_reference); int php_gtk_set_property(zend_property_reference *property_reference, zval *value); +void php_gtk_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); static inline void php_gtk_register_prop_getter(zend_class_entry *ce, prop_getter_t getter) { Index: php-gtk/src/php_gtk_object.c diff -u php-gtk/src/php_gtk_object.c:1.14 php-gtk/src/php_gtk_object.c:1.15 --- php-gtk/src/php_gtk_object.c:1.14 Thu Mar 1 08:43:33 2001 +++ php-gtk/src/php_gtk_object.c Fri Mar 2 22:25:22 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_object.c,v 1.14 2001/03/01 16:43:33 andrei Exp $ */ +/* $Id: php_gtk_object.c,v 1.15 2001/03/03 06:25:22 andrei Exp $ */ #include "php_gtk.h" @@ -143,9 +143,8 @@ { zval *gtk_args; zval *signal_data = (zval *)data; - zval **func, **extra = NULL; + zval **func, **extra = NULL, **pass_wrapper; zval *wrapper = NULL; - zval **wrapper_ptr = &wrapper; zval *params; zval *retval = NULL; zval *tmp; @@ -157,20 +156,18 @@ if (!php_gtk_check_callable(signal_data)) { zend_hash_index_find(Z_ARRVAL_P(signal_data), 0, (void **)&func); zend_hash_index_find(Z_ARRVAL_P(signal_data), 1, (void **)&extra); - if (zend_hash_num_elements(Z_ARRVAL_P(signal_data)) > 2) { - zend_hash_index_find(Z_ARRVAL_P(signal_data), 2, (void **)&wrapper_ptr); - zval_add_ref(&wrapper); - } + zend_hash_index_find(Z_ARRVAL_P(signal_data), 2, (void **)&pass_wrapper); } else func = &signal_data; - if (!wrapper && o) + if (Z_LVAL_PP(pass_wrapper) && o) wrapper = php_gtk_new(o); if (wrapper) { MAKE_STD_ZVAL(params); array_init(params); - zend_hash_next_index_insert(Z_ARRVAL_P(params), &wrapper, sizeof(zval *), NULL); + if (Z_LVAL_PP(pass_wrapper)) + zend_hash_next_index_insert(Z_ARRVAL_P(params), &wrapper, sizeof(zval *), NULL); php_array_merge(Z_ARRVAL_P(params), Z_ARRVAL_P(gtk_args), 0); zval_ptr_dtor(>k_args); } else @@ -636,5 +633,55 @@ zval_dtor(&overloaded_property->element); return retval; } + + +void php_gtk_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference) +{ + zval result; + zend_overloaded_element *overloaded_property; + zval method_name = ((zend_overloaded_element *)property_reference->elements_list->tail->data)->element; + zend_llist_element *element; + zend_llist_element *stop_element; + zval *object = property_reference->object; + prop_getter_t *getter; + zend_class_entry *ce; + int found = FAILURE; + + /* + * We want to stop at the last overloaded object reference - the rest can + * contain array and method references, that's fine. + */ + for (stop_element=property_reference->elements_list->tail; + stop_element && + (Z_TYPE_P((zend_overloaded_element *)stop_element->data) == OE_IS_ARRAY || + Z_TYPE_P((zend_overloaded_element *)stop_element->data) == OE_IS_METHOD); + stop_element=stop_element->prev); + + for (element=property_reference->elements_list->head; element && element!=stop_element; element=element->next) { + overloaded_property = (zend_overloaded_element *) element->data; + if (Z_TYPE_P(overloaded_property) != OE_IS_OBJECT || + Z_TYPE(overloaded_property->element) != IS_STRING || + Z_TYPE_P(object) != IS_OBJECT) { + php_error(E_WARNING, "Error invoking method '%s'", Z_STRVAL(method_name)); + return; + } + + for (ce = Z_OBJCE_P(object); ce != NULL && found != SUCCESS; ce = ce->parent) { + if (zend_hash_index_find(&php_gtk_prop_getters, (long)ce, (void **)&getter) == SUCCESS) { + (*getter)(&result, object, &element, &found); + } + } + if (found == FAILURE) { + php_error(E_WARNING, "Error invoking method '%s' on property '%s'", Z_STRVAL(method_name), Z_STRVAL(overloaded_property->element)); + return; + } + object = &result; + + zval_dtor(&overloaded_property->element); + } + + zval_dtor(&method_name); +} + #endif /* HAVE_PHP_GTK */