cvs: php-gtk /generator generator.php gtk.overrides templates.php /src php_gtk.h php_gtk_object.c

From: Date: Tue, 27 Feb 2001 05:16:36 +0000
Subject: cvs: php-gtk /generator generator.php gtk.overrides templates.php /src php_gtk.h php_gtk_object.c
Groups: php.gtk 
Request: Send a blank email to php-gtk+get-42@lists.php.net to get a copy of this message
andrei Mon Feb 26 21:16:36 2001 EDT Modified files: /php-gtk/generator generator.php gtk.overrides templates.php /php-gtk/src php_gtk.h php_gtk_object.c Log: * Fixed up marshallers for idle, timeout, and input handlers. * Implemented access to object fields/properties.

Index: php-gtk/generator/generator.php diff -u php-gtk/generator/generator.php:1.6 php-gtk/generator/generator.php:1.7 --- php-gtk/generator/generator.php:1.6 Tue Feb 6 06:07:17 2001 +++ php-gtk/generator/generator.php Mon Feb 26 21:16:35 2001 @@ -285,6 +285,43 @@ return $this->parse_byref($parse_type); } + function write_prop_getter($fp, $object) + { + global $matcher, + $prop_check_tpl, + $prop_getter_tpl; + + $obj_cast = substr(convert_typename($object->c_name), 1); + $prop_checks = ''; + $else_clause = "\t"; + + foreach ($object->fields as $field_def) { + list($field_type, $field_name) = $field_def; + $var_list = new Var_List(); + $handler = &$matcher->get($field_type); + if ($handler === null) { + error_log("Could not write getter for $object->c_name '$field_name' field (field type $field_type)"); + continue; + } + + $prop_tpl = $handler->write_return($field_type, $var_list); + $prop_code = sprintf($prop_tpl, + $obj_cast . '(PHP_GTK_GET(object))->' . $field_name); + $prop_code = str_replace("\n", "\n\t", $prop_code); + + $prop_checks .= sprintf($prop_check_tpl, + $else_clause, + $field_name, + "\t" . $var_list->to_string(), + $prop_code); + $else_clause = ' else '; + } + + fwrite($fp, sprintf($prop_getter_tpl, + strtolower($object->in_module . '_' . $object->name), + $prop_checks)); + } + function write_static_vars($fp) { fwrite($fp, "\n/* static variables */\n"); foreach ($this->parser->objects as $object) @@ -293,11 +330,19 @@ function write_objects($fp) { - global $function_entry_tpl; + global $function_entry_tpl, + $register_getter_tpl, + $init_class_tpl; foreach ($this->parser->objects as $object) { + $object_module = strtolower($object->in_module); + $object_lname = strtolower($object->name); + fwrite($fp, "\n/* object $object->c_name */\n"); - $this->register_classes .= "\n\tINIT_CLASS_ENTRY(ce, \"gtk" . strtolower($object->name) . "\", " . $this->prefix . "_" . strtolower($object->name) . "_functions);\n"; + $this->register_classes .= sprintf($init_class_tpl, + $object_module . $object_lname, + 'php_' . $object_module . '_' . $object_lname, + count($object->fields) ? 'php_gtk_get_property' : 'NULL'); if ($object->parent == null) $this->register_classes .= "\t$object->ce = zend_register_internal_class_ex(&ce, NULL, NULL);\n"; else { @@ -305,7 +350,12 @@ $this->register_classes .= "\t$object->ce = zend_register_internal_class_ex(&ce, $parent_obj->ce, NULL);\n" . "\tg_hash_table_insert(php_gtk_class_hash, g_strdup(\"Gtk$object->name\"), $object->ce);\n"; } - $function_entry = sprintf($this->function_entry, $this->prefix . "_" . strtolower($object->name)); + + if (count($object->fields)) { + $this->register_classes .= sprintf($register_getter_tpl, $object->ce, $object_module . '_' . $object_lname); + } + + $function_entry = sprintf($this->function_entry, $this->prefix . "_" . $object_lname); $constructor = $this->parser->find_constructor($object); if ($this->overrides->is_overriden($constructor->c_name)) { list(, $constructor_override) = $this->overrides->get_override($constructor->c_name); @@ -351,6 +401,9 @@ } $function_entry .= $this->function_entry_end; fwrite($fp, $function_entry); + + if (count($object->fields)) + $this->write_prop_getter($fp, $object); } } Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.12 php-gtk/generator/gtk.overrides:1.13 --- php-gtk/generator/gtk.overrides:1.12 Mon Feb 26 09:38:13 2001 +++ php-gtk/generator/gtk.overrides Mon Feb 26 21:16:35 2001 @@ -182,7 +182,7 @@ extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS()); data = php_gtk_build_value("(VN)", func, extra); RETURN_LONG(gtk_timeout_add_full(interval, NULL, - (GtkCallbackMarshal)php_gtk_callback_marshal, + (GtkCallbackMarshal)php_gtk_handler_marshal, data, php_gtk_destroy_notify)); } %% @@ -194,7 +194,7 @@ zval *data; if (ZEND_NUM_ARGS() < 1) { - php_error(E_WARNING, "%s() requires at least 1 arguments, %d given", + php_error(E_WARNING, "%s() requires at least 1 argument, %d given", get_active_function_name(), ZEND_NUM_ARGS()); return; } @@ -211,7 +211,7 @@ extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 1, ZEND_NUM_ARGS()); data = php_gtk_build_value("(VN)", func, extra); RETURN_LONG(gtk_idle_add_full(GTK_PRIORITY_DEFAULT, NULL, - (GtkCallbackMarshal)php_gtk_callback_marshal, + (GtkCallbackMarshal)php_gtk_handler_marshal, data, php_gtk_destroy_notify)); } %% @@ -241,7 +241,7 @@ extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS()); data = php_gtk_build_value("(VN)", func, extra); RETURN_LONG(gtk_quit_add_full(main_level, NULL, - (GtkCallbackMarshal)php_gtk_callback_marshal, + (GtkCallbackMarshal)php_gtk_handler_marshal, data, php_gtk_destroy_notify)); } %% @@ -251,16 +251,14 @@ int source; GdkInputCondition condition; zval *func = NULL; - zval *extra; - zval *data; - if (ZEND_NUM_ARGS() < 2) { - php_error(E_WARNING, "%s() requires at least 2 arguments, %d given", + if (ZEND_NUM_ARGS() != 3) { + php_error(E_WARNING, "%s() requires exactly 3 arguments, %d given", get_active_function_name(), ZEND_NUM_ARGS()); return; } - if (!php_gtk_parse_args(2, "iiV", &source, &condition, &func)) + if (!php_gtk_parse_args(3, "iiV", &source, &condition, &func)) return; if (!php_gtk_check_callable(func)) { @@ -269,11 +267,9 @@ return; } - extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS()); - data = php_gtk_build_value("(VN)", func, extra); RETURN_LONG(gtk_input_add_full(source, condition, NULL, - (GtkCallbackMarshal)php_gtk_callback_marshal, - data, php_gtk_destroy_notify)); + (GtkCallbackMarshal)php_gtk_input_marshal, + func, php_gtk_destroy_notify)); } %% override gtk_signal_connect Index: php-gtk/generator/templates.php diff -u php-gtk/generator/templates.php:1.2 php-gtk/generator/templates.php:1.3 --- php-gtk/generator/templates.php:1.2 Mon Feb 5 19:56:52 2001 +++ php-gtk/generator/templates.php Mon Feb 26 21:16:35 2001 @@ -65,4 +65,23 @@ $function_entry_tpl = "\t{\"%s\", PHP_FN(wrap_%s), %s},\n"; +$register_getter_tpl = "\tphp_gtk_register_prop_getter(%s, %s_get_property);\n"; + +$prop_check_tpl = +"%sif (!strcmp(prop_name, \"%s\")) { +%s %s + }"; + +$prop_getter_tpl = " +static void %s_get_property(zval *return_value, zval *object, zend_llist_element **element) +{ + char *prop_name = Z_STRVAL(((zend_overloaded_element *)(*element)->data)->element); + + ZVAL_NULL(return_value); + +%s +}\n\n"; + +$init_class_tpl = "\n\tINIT_OVERLOADED_CLASS_ENTRY(ce, \"%s\", %s_functions, NULL, %s, NULL);\n"; + ?> Index: php-gtk/src/php_gtk.h diff -u php-gtk/src/php_gtk.h:1.12 php-gtk/src/php_gtk.h:1.13 --- php-gtk/src/php_gtk.h:1.12 Mon Feb 26 13:21:20 2001 +++ php-gtk/src/php_gtk.h Mon Feb 26 21:16:35 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.12 2001/02/26 21:21:20 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.13 2001/02/27 05:16:35 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -97,6 +97,8 @@ int php_gtk_get_enum_value(GtkType enum_type, zval *enum_val, int *result); void php_gtk_destroy_notify(gpointer user_data); void php_gtk_callback_marshal(GtkObject *o, gpointer data, guint nargs, GtkArg *args); +void php_gtk_handler_marshal(gpointer a, gpointer data, int nargs, GtkArg *args); +void php_gtk_input_marshal(gpointer a, zval *func, int nargs, GtkArg *args); void php_gtk_ret_from_value(GtkArg *ret, zval *value); zval *php_gtk_args_as_hash(int nargs, GtkArg *args); zval *php_gtk_arg_as_value(GtkArg *arg); Index: php-gtk/src/php_gtk_object.c diff -u php-gtk/src/php_gtk_object.c:1.9 php-gtk/src/php_gtk_object.c:1.10 --- php-gtk/src/php_gtk_object.c:1.9 Mon Feb 26 13:21:20 2001 +++ php-gtk/src/php_gtk_object.c Mon Feb 26 21:16:35 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_object.c,v 1.9 2001/02/26 21:21:20 andrei Exp $ */ +/* $Id: php_gtk_object.c,v 1.10 2001/02/27 05:16:35 andrei Exp $ */ #include "php_gtk.h" @@ -181,12 +181,63 @@ call_user_function_ex(EG(function_table), NULL, *func, &retval, zend_hash_num_elements(Z_ARRVAL_P(params)), signal_args, 1, NULL); - php_gtk_ret_from_value(&args[nargs], retval); - - if (retval) + if (retval) { + php_gtk_ret_from_value(&args[nargs], retval); zval_ptr_dtor(&retval); + } + efree(signal_args); zval_ptr_dtor(&params); +} + +void php_gtk_handler_marshal(gpointer a, gpointer data, int nargs, GtkArg *args) +{ + zval *handler_data = (zval *)data; + zval **func, **extra = NULL; + zval ***handler_args = NULL; + int num_handler_args = 0; + zval *retval = NULL; + ELS_FETCH(); + + if (!php_gtk_check_callable(handler_data)) { + zend_hash_index_find(Z_ARRVAL_P(handler_data), 0, (void **)&func); + zend_hash_index_find(Z_ARRVAL_P(handler_data), 1, (void **)&extra); + handler_args = php_gtk_hash_as_array(*extra); + num_handler_args = zend_hash_num_elements(Z_ARRVAL_PP(extra)); + } else + func = &handler_data; + + call_user_function_ex(EG(function_table), NULL, *func, &retval, num_handler_args, handler_args, 1, NULL); + + *GTK_RETLOC_BOOL(args[0]) = FALSE; + if (retval) { + if (Z_TYPE_P(retval) == IS_NULL || + (Z_TYPE_P(retval) == IS_LONG && Z_LVAL_P(retval) == 0)) + *GTK_RETLOC_BOOL(args[0]) = FALSE; + else + *GTK_RETLOC_BOOL(args[0]) = FALSE; + zval_ptr_dtor(&retval); + } + + if (handler_args) + efree(handler_args); +} + +void php_gtk_input_marshal(gpointer a, zval *func, int nargs, GtkArg *args) +{ + zval **input_args[2]; + zval *source, *condition; + zval *retval = NULL; + ELS_FETCH(); + + source = php_gtk_arg_as_value(&args[0]); + condition = php_gtk_arg_as_value(&args[1]); + input_args[0] = &source; + input_args[1] = &condition; + + call_user_function_ex(EG(function_table), NULL, func, &retval, 2, input_args, 1, NULL); + if (retval) + zval_ptr_dtor(&retval); } void php_gtk_destroy_notify(gpointer user_data)
« previous php.gtk (#42) next »