cvs: php-gtk /generator gtk.overrides /src php_gtk_types.c php_gtk_util.c /test gtk.php

From: Date: Tue, 06 Mar 2001 04:53:39 +0000
Subject: cvs: php-gtk /generator gtk.overrides /src php_gtk_types.c php_gtk_util.c /test gtk.php
Groups: php.gtk 
Request: Send a blank email to php-gtk+get-380@lists.php.net to get a copy of this message
andrei Mon Mar 5 20:53:39 2001 EDT Modified files: /php-gtk/generator gtk.overrides /php-gtk/src php_gtk_types.c php_gtk_util.c /php-gtk/test gtk.php Log: * Each factory item can now specify as the last entry an array of additional arguments to be passed to the callback. * Implemented GtkCombo::set_popdown_strings(), see gtk.php for example. * Added GdkPixmap::create_from_xpm(). * Added toggle buttons and entry examples to gtk.php.

Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.23 php-gtk/generator/gtk.overrides:1.24 --- php-gtk/generator/gtk.overrides:1.23 Mon Mar 5 10:36:05 2001 +++ php-gtk/generator/gtk.overrides Mon Mar 5 20:53:39 2001 @@ -447,14 +447,13 @@ } gtk_curve_set_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), veclen, vector); - RETURN_NULL(); + RETURN_TRUE; } %% overrides gtk_rc_get_default_files PHP_FUNCTION(wrap_gtk_rc_get_default_files) { gchar **ret; - int i = 0; if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "")) return; @@ -463,7 +462,7 @@ if (ret) { array_init(return_value); while (*ret) { - add_index_string(return_value, i, *ret, 1); + add_next_index_string(return_value, *ret, 1); *ret++; } g_free(ret); @@ -996,35 +995,41 @@ } %% override gtk_item_factory_create_items -static void item_factory_callback(zval *callback, guint action, GtkWidget *widget) +static void item_factory_callback(zval *callback_data, guint action, GtkWidget *widget) { zval *retval = NULL; - zval *action_arg, *widget_arg; - zval **args[2]; + zval **callback, **extra; + zval *params; + zval ***args; char *callable_name = NULL; ELS_FETCH(); - if (!php_gtk_is_callable(callback, &callable_name)) { + zend_hash_index_find(Z_ARRVAL_P(callback_data), 0, (void **)&callback); + if (!php_gtk_is_callable(*callback, &callable_name)) { php_error(E_WARNING, "unable to call item factory callback %s", callable_name); g_free(callable_name); return; } + + params = php_gtk_build_value("(iN)", action, php_gtk_new((GtkObject *)widget)); + if (zend_hash_num_elements(Z_ARRVAL_P(callback_data)) > 1) { + zend_hash_index_find(Z_ARRVAL_P(callback_data), 1, (void **)&extra); + php_array_merge(Z_ARRVAL_P(params), Z_ARRVAL_PP(extra), 0); + } - MAKE_STD_ZVAL(action_arg); - ZVAL_LONG(action_arg, action); - widget_arg = php_gtk_new((GtkObject *)widget); - args[0] = &action_arg; - args[1] = &widget_arg; + args = php_gtk_hash_as_array(params); - call_user_function_ex(EG(function_table), NULL, callback, &retval, 2, args, 1, NULL); - zval_ptr_dtor(&widget_arg); + call_user_function_ex(EG(function_table), NULL, *callback, &retval, zend_hash_num_elements(Z_ARRVAL_P(params)), args, 1, NULL); if (retval) zval_ptr_dtor(&retval); + efree(args); + zval_ptr_dtor(&params); } PHP_FUNCTION(wrap_gtk_item_factory_create_items) { - zval *list, **item, *callback; + zval *list, **item, *callback_data, + *callback, *extra = NULL; GtkItemFactoryEntry entry; GtkItemFactory *factory; int i = 0; @@ -1038,9 +1043,9 @@ zend_hash_internal_pointer_reset(Z_ARRVAL_P(list)); while (zend_hash_get_current_data(Z_ARRVAL_P(list), (void**)&item) == SUCCESS) { if (Z_TYPE_PP(item) != IS_ARRAY || - !php_gtk_parse_args_hash(*item, "ssVis", &entry.path, + !php_gtk_parse_args_hash(*item, "ssVis|a", &entry.path, &entry.accelerator, &callback, - &entry.callback_action, &entry.item_type)) { + &entry.callback_action, &entry.item_type, &extra)) { php_error(E_WARNING, "%s() was unable to parse item #%d in the input array", get_active_function_name(), i+1); return; @@ -1049,15 +1054,41 @@ if (Z_TYPE_P(callback) == IS_NULL) entry.callback = NULL; else { - zval_add_ref(&callback); + if (extra) + callback_data = php_gtk_build_value("(VV)", callback, extra); + else + callback_data = php_gtk_build_value("(V)", callback); entry.callback = (GtkItemFactoryCallback)item_factory_callback; } - gtk_item_factory_create_item(factory, &entry, callback, 1); + gtk_item_factory_create_item(factory, &entry, callback_data, 1); i++; zend_hash_move_forward(Z_ARRVAL_P(list)); } + RETURN_TRUE; +} +%% +override gtk_combo_set_popdown_strings +PHP_FUNCTION(wrap_gtk_combo_set_popdown_strings) +{ + zval *php_list, **item; + GList *list = NULL; + + NOT_STATIC_METHOD(); + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a/", &php_list)) + return; + + zend_hash_internal_pointer_reset(Z_ARRVAL_P(php_list)); + while (zend_hash_get_current_data(Z_ARRVAL_P(php_list), (void **)&item) == SUCCESS) { + convert_to_string_ex(item); + list = g_list_append(list, Z_STRVAL_PP(item)); + zend_hash_move_forward(Z_ARRVAL_P(php_list)); + } + + gtk_combo_set_popdown_strings(GTK_COMBO(PHP_GTK_GET(this_ptr)), list); + g_list_free(list); RETURN_TRUE; } Index: php-gtk/src/php_gtk_types.c diff -u php-gtk/src/php_gtk_types.c:1.18 php-gtk/src/php_gtk_types.c:1.19 --- php-gtk/src/php_gtk_types.c:1.18 Sun Mar 4 20:47:49 2001 +++ php-gtk/src/php_gtk_types.c Mon Mar 5 20:53:39 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_types.c,v 1.18 2001/03/05 04:47:49 andrei Exp $ */ +/* $Id: php_gtk_types.c,v 1.19 2001/03/06 04:53:39 andrei Exp $ */ #include "php_gtk.h" @@ -554,6 +554,42 @@ {NULL, NULL, NULL} }; +PHP_FUNCTION(gdk_pixmap_create_from_xpm) +{ + zval *window, *php_trans_color; + gchar *filename; + GdkColor *trans_color = NULL; + GdkPixmap *pixmap = NULL; + GdkBitmap *mask; + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "ONs", &window, gdk_window_ce, + &php_trans_color, gdk_color_ce, &filename)) + return; + + if (Z_TYPE_P(php_trans_color) != IS_NULL) + trans_color = PHP_GDK_COLOR_GET(php_trans_color); + + pixmap = gdk_pixmap_create_from_xpm(PHP_GDK_WINDOW_GET(window), &mask, trans_color, filename); + if (!pixmap) { + php_error(E_WARNING, "%s() cannot load pixmap", get_active_function_name()); + return; + } + + *return_value = *php_gtk_build_value("(NN)", php_gdk_window_new(pixmap), php_gdk_window_new(mask)); + gdk_pixmap_unref(pixmap); + gdk_bitmap_unref(mask); +} + +static function_entry php_gdk_pixmap_functions[] = { + {"gdkpixmap", PHP_FN(wrap_no_direct_constructor), NULL}, + {"new_gc", PHP_FN(gdk_window_new_gc), NULL}, + {"property_get", PHP_FN(gdk_window_property_get), NULL}, + {"property_change", PHP_FN(gdk_window_property_change), NULL}, + {"property_delete", PHP_FN(gdk_window_property_delete), NULL}, + {"create_from_xpm", PHP_FN(gdk_pixmap_create_from_xpm), NULL}, + {NULL, NULL, NULL} +}; + zval *php_gdk_window_new(GdkWindow *window) { zval *result; @@ -1973,7 +2009,7 @@ INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkwindow", php_gdk_window_functions, NULL, php_gtk_get_property, NULL); gdk_window_ce = zend_register_internal_class_ex(&ce, NULL, NULL); - INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkpixmap", php_gdk_window_functions, NULL, php_gtk_get_property, NULL); + INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkpixmap", php_gdk_pixmap_functions, NULL, php_gtk_get_property, NULL); gdk_pixmap_ce = zend_register_internal_class_ex(&ce, NULL, NULL); INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkbitmap", php_gdk_window_functions, NULL, php_gtk_get_property, NULL); gdk_bitmap_ce = zend_register_internal_class_ex(&ce, NULL, NULL); Index: php-gtk/src/php_gtk_util.c diff -u php-gtk/src/php_gtk_util.c:1.9 php-gtk/src/php_gtk_util.c:1.10 --- php-gtk/src/php_gtk_util.c:1.9 Sun Mar 4 20:47:49 2001 +++ php-gtk/src/php_gtk_util.c Mon Mar 5 20:53:39 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_util.c,v 1.9 2001/03/05 04:47:49 andrei Exp $ */ +/* $Id: php_gtk_util.c,v 1.10 2001/03/06 04:53:39 andrei Exp $ */ #include "php_gtk.h" @@ -573,6 +573,10 @@ return php_gtk_build_hash(format, va, ')', php_gtk_count_specs(*format, ')')); case 'b': + MAKE_STD_ZVAL(result); + ZVAL_BOOL(result, (zend_bool)va_arg(*va, int)); + return result; + case 'h': case 'i': MAKE_STD_ZVAL(result); Index: php-gtk/test/gtk.php diff -u php-gtk/test/gtk.php:1.10 php-gtk/test/gtk.php:1.11 --- php-gtk/test/gtk.php:1.10 Fri Mar 2 22:25:03 2001 +++ php-gtk/test/gtk.php Mon Mar 5 20:53:39 2001 @@ -1,5 +1,5 @@ <?php -/* $Id: gtk.php,v 1.10 2001/03/03 06:25:03 andrei Exp $ */ +/* $Id: gtk.php,v 1.11 2001/03/06 04:53:39 andrei Exp $ */ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') dl('php_gtk.dll'); @@ -289,32 +289,6 @@ } -function tips_query_widget_entered($tips_query, $widget, $tip_text, - $tip_private, $toggle) -{ - if ($toggle->get_active()) { - $tips_query->set_text($tip_text ? 'There is a Tip!' : 'There is no Tip!'); - /* don't let GtkTipsQuery reset its label */ - $tips_query->emit_stop_by_name('widget_entered'); - } -} - - -function tips_query_widget_selected($tips_query, $widget, $tip_text, - $tip_private, $event) -{ - if ($widget) { - print 'Help "'; - print $tip_private ? $tip_private : 'None'; - print '" requested for <'; - print get_class($widget); - print ">\n"; - } - - return true; -} - - function create_tooltips() { global $windows; @@ -367,6 +341,31 @@ $button->connect_object('clicked', 'start_query', $tips_query); $tooltips->set_tip($button, 'Start the Tooltips Inspector', 'ContextHelp/buttons/?'); + function tips_query_widget_entered($tips_query, $widget, $tip_text, + $tip_private, $toggle) + { + if ($toggle->get_active()) { + $tips_query->set_text($tip_text ? 'There is a Tip!' : 'There is no Tip!'); + /* don't let GtkTipsQuery reset its label */ + $tips_query->emit_stop_by_name('widget_entered'); + } + } + + + function tips_query_widget_selected($tips_query, $widget, $tip_text, + $tip_private, $event) + { + if ($widget) { + print 'Help "'; + print $tip_private ? $tip_private : 'None'; + print '" requested for <'; + print get_class($widget); + print ">\n"; + } + + return true; + } + $box3->pack_start($tips_query); $tips_query->set_caller($button); $tips_query->connect('widget_entered', 'tips_query_widget_entered', $toggle); @@ -403,16 +402,162 @@ } +function create_toggle_buttons() +{ + global $windows; + + if (!isset($windows['toggle_buttons'])) { + $window = &new GtkWindow; + $windows['toggle_buttons'] = $window; + $window->connect('delete-event', 'delete_event'); + $window->set_title('Toggle buttons'); + $window->set_border_width(0); + + $box1 = &new GtkVBox(); + $window->add($box1); + $box1->show(); + + $box2 = &new GtkVBox(false, 10); + $box2->set_border_width(10); + $box1->pack_start($box2); + $box2->show(); + + for ($i = 1; $i <= 4; $i++) { + $button = &new GtkToggleButton('button' . $i); + $box2->pack_start($button); + $button->show(); + } + + $separator = &new GtkHSeparator(); + $box1->pack_start($separator, false); + $separator->show(); + + $box2 = &new GtkVBox(false, 10); + $box2->set_border_width(10); + $box1->pack_start($box2, false); + $box2->show(); + + $button = &new GtkButton('close'); + $button->connect('clicked', 'close_window'); + $box2->pack_start($button); + $button->set_flags(GTK_CAN_DEFAULT); + $button->grab_default(); + $button->show(); + } + $windows['toggle_buttons']->show(); +} + + +function create_entry() +{ + global $windows; + + if (!isset($windows['entry'])) { + $window = &new GtkWindow; + $windows['entry'] = $window; + $window->connect('delete-event', 'delete_event'); + $window->set_title('entry'); + $window->set_border_width(0); + + $box1 = &new GtkVBox(); + $window->add($box1); + $box1->show(); + + $box2 = &new GtkVBox(false, 10); + $box2->set_border_width(10); + $box1->pack_start($box2); + $box2->show(); + + $entry = &new GtkEntry(); + $entry->set_text('Hello World'); + $entry->select_region(0, 5); + $box2->pack_start($entry); + $entry->show(); + + $strings[] = "item0"; + $strings[] = "item0 item1"; + $strings[] = "item0 item1 item2"; + $strings[] = "item0 item1 item2 item3"; + $strings[] = "item0 item1 item2 item3 item4"; + $strings[] = "item0 item1 item2 item3 item4 item5"; + $strings[] = "item0 item1 item2 item3 item4"; + $strings[] = "item0 item1 item2 item3"; + $strings[] = "item0 item1 item2"; + $strings[] = "item0 item1"; + $strings[] = "item0"; + + $cb = &new GtkCombo(); + $cb->set_popdown_strings($strings); + $cb_entry = $cb->entry; + $cb_entry->set_text('Hello World'); + $cb_entry->select_region(0, -1); + $box2->pack_start($cb); + $cb->show(); + + function entry_toggle_editable($check_button, $entry) + { + $entry->set_editable($check_button->get_active()); + } + + function entry_toggle_sensitive($check_button, $entry) + { + $entry->set_sensitive($check_button->get_active()); + } + + function entry_toggle_visibility($check_button, $entry) + { + $entry->set_visibility($check_button->get_active()); + } + + $editable_check = &new GtkCheckButton('Editable'); + $editable_check->connect('toggled', 'entry_toggle_editable', $entry); + $editable_check->set_active(true); + $box2->pack_start($editable_check, false); + $editable_check->show(); + + $visibility_check = &new GtkCheckButton('Visible'); + $visibility_check->connect('toggled', 'entry_toggle_visibility', $entry); + $visibility_check->set_active(true); + $box2->pack_start($visibility_check, false); + $visibility_check->show(); + + $sensitive_check = &new GtkCheckButton('Sensitive'); + $sensitive_check->connect('toggled', 'entry_toggle_sensitive', $entry); + $sensitive_check->set_active(true); + $box2->pack_start($sensitive_check, false); + $sensitive_check->show(); + + $separator = &new GtkHSeparator(); + $box1->pack_start($separator, false); + $separator->show(); + + $box2 = &new GtkVBox(false, 10); + $box2->set_border_width(10); + $box1->pack_start($box2, false); + $box2->show(); + + $button = &new GtkButton('close'); + $button->connect('clicked', 'close_window'); + $box2->pack_start($button); + $button->set_flags(GTK_CAN_DEFAULT); + $button->grab_default(); + $button->show(); + } + $windows['entry']->show(); +} + + function create_main_window() { $buttons = array( 'buttons' => 'create_buttons', 'labels' => 'create_labels', 'button box' => 'create_button_box', - 'toggle buttons' => null, + 'toggle buttons' => 'create_toggle_buttons', 'check buttons' => null, 'radio buttons' => null, 'tooltips' => 'create_tooltips', + 'entry' => 'create_entry', ); $window = &new GtkWindow();
« previous php.gtk (#380) next »