cvs: php-gtk / NEWS /generator gtk.defs gtk.overrides libglade.overrides /test gtk.php
| From: | Andrei Zmievski | Date: | Tue, 20 Mar 2001 05:01:22 +0000 |
| Subject: | cvs: php-gtk / NEWS /generator gtk.defs gtk.overrides libglade.overrides /test gtk.php | ||
| Groups: | php.gtk | ||
| Request: | Send a blank email to php-gtk+get-1003@lists.php.net to get a copy of this message | ||
andrei Mon Mar 19 21:01:22 2001 EDT
Modified files:
/php-gtk NEWS
/php-gtk/generator gtk.defs gtk.overrides libglade.overrides
/php-gtk/test gtk.php
Log:
* Added GladeXML::signal_autoconnect(), docs later.
* Added GtkWidget 'style' property;
* Added GtkCList::prepend() and GtkCList::insert().
* Added single row insertion to CList example in gtk.php.
Index: php-gtk/NEWS
diff -u php-gtk/NEWS:1.13 php-gtk/NEWS:1.14
--- php-gtk/NEWS:1.13 Thu Mar 15 12:00:03 2001
+++ php-gtk/NEWS Mon Mar 19 21:01:21 2001
@@ -1,5 +1,6 @@
+ - added GtkCList::prepend() and GtkClist::insert(). (Andrei)
- added GtkCList example to gtk.php. (Andrei)
- - added initial libglade support. (Andrei)
+ - added libglade support. (Andrei)
- made Gdk::input_add() work with file resources. (Andrei)
- fixed GDK locale support. (Alex Bokovoy)
- reworked the generator to make it more generalized. (Andrei)
Index: php-gtk/generator/gtk.defs
diff -u php-gtk/generator/gtk.defs:1.10 php-gtk/generator/gtk.defs:1.11
--- php-gtk/generator/gtk.defs:1.10 Thu Mar 15 20:18:14 2001
+++ php-gtk/generator/gtk.defs Mon Mar 19 21:01:21 2001
@@ -40,6 +40,7 @@
(in-module Gtk)
(parent Object (Gtk))
(c-name GtkWidget)
+ (field (type-and-name GtkStyle* style))
)
(object Separator
Index: php-gtk/generator/gtk.overrides
diff -u php-gtk/generator/gtk.overrides:1.36 php-gtk/generator/gtk.overrides:1.37
--- php-gtk/generator/gtk.overrides:1.36 Thu Mar 15 20:18:14 2001
+++ php-gtk/generator/gtk.overrides Mon Mar 19 21:01:21 2001
@@ -544,6 +544,74 @@
efree(list);
}
%%
+override gtk_clist_prepend
+PHP_FUNCTION(wrap_gtk_clist_prepend)
+{
+ gint columns, i, res;
+ gchar **list;
+ zval *php_list, **text;
+ HashTable *target_hash;
+
+ NOT_STATIC_METHOD();
+
+ if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a/", &php_list)) {
+ php_gtk_invalidate(this_ptr);
+ return;
+ }
+
+ columns = GTK_CLIST(PHP_GTK_GET(this_ptr))->columns;
+ if (zend_hash_num_elements(Z_ARRVAL_P(php_list)) < columns) {
+ php_error(E_WARNING, "%s(): the array of strings is not long enough",
get_active_function_name());
+ return;
+ }
+
+ target_hash = HASH_OF(php_list);
+ list = emalloc(sizeof(gchar *) * columns);
+ i = 0;
+ zend_hash_internal_pointer_reset(target_hash);
+ while (zend_hash_get_current_data(target_hash, (void **)&text) == SUCCESS) {
+ convert_to_string_ex(text);
+ list[i++] = estrndup(Z_STRVAL_PP(text), Z_STRLEN_PP(text));
+ zend_hash_move_forward(target_hash);
+ }
+ ZVAL_LONG(return_value, gtk_clist_prepend(GTK_CLIST(PHP_GTK_GET(this_ptr)), list));
+ efree(list);
+}
+%%
+override gtk_clist_insert
+PHP_FUNCTION(wrap_gtk_clist_insert)
+{
+ gint columns, i, row, res;
+ gchar **list;
+ zval *php_list, **text;
+ HashTable *target_hash;
+
+ NOT_STATIC_METHOD();
+
+ if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "ia/", &row, &php_list)) {
+ php_gtk_invalidate(this_ptr);
+ return;
+ }
+
+ columns = GTK_CLIST(PHP_GTK_GET(this_ptr))->columns;
+ if (zend_hash_num_elements(Z_ARRVAL_P(php_list)) < columns) {
+ php_error(E_WARNING, "%s(): the array of strings is not long enough",
get_active_function_name());
+ return;
+ }
+
+ target_hash = HASH_OF(php_list);
+ list = emalloc(sizeof(gchar *) * columns);
+ i = 0;
+ zend_hash_internal_pointer_reset(target_hash);
+ while (zend_hash_get_current_data(target_hash, (void **)&text) == SUCCESS) {
+ convert_to_string_ex(text);
+ list[i++] = estrndup(Z_STRVAL_PP(text), Z_STRLEN_PP(text));
+ zend_hash_move_forward(target_hash);
+ }
+ ZVAL_LONG(return_value, gtk_clist_insert(GTK_CLIST(PHP_GTK_GET(this_ptr)), row, list));
+ efree(list);
+}
+%%
override gtk_clist_get_text
PHP_FUNCTION(wrap_gtk_clist_get_text)
{
Index: php-gtk/generator/libglade.overrides
diff -u php-gtk/generator/libglade.overrides:1.2 php-gtk/generator/libglade.overrides:1.3
--- php-gtk/generator/libglade.overrides:1.2 Thu Mar 15 20:18:14 2001
+++ php-gtk/generator/libglade.overrides Mon Mar 19 21:01:21 2001
@@ -74,14 +74,73 @@
RETURN_NULL();
}
%%
-override glade_xml_autoconnect
+override glade_xml_signal_autoconnect
static void glade_connect_auto(const gchar *handler_name, GtkObject *obj,
const gchar *signal_name, const gchar *signal_data,
GtkObject *connect_object, gboolean after,
- zval *callback_data)
+ zval *map)
{
+ zval **callback_data = NULL;
+ zval **callback_ptr = NULL, *extra = NULL, *params = NULL;
+ zval *callback, *data, *object = NULL;
+ int pass_object = 1;
+ char *callback_filename;
+ uint callback_lineno;
+ ELS_FETCH();
+
+ if (map && zend_hash_find(Z_ARRVAL_P(map), (char *)handler_name, strlen(handler_name) + 1,
(void **)&callback_data) == SUCCESS) {
+ if (Z_TYPE_PP(callback_data) != IS_ARRAY ||
+ zend_hash_index_find(Z_ARRVAL_PP(callback_data), 0, (void **)&callback_ptr) == FAILURE) {
+ php_error(E_WARNING, "%s() is supplied with invalid callback structure for handler
'%s'", get_active_function_name(), handler_name);
+ return;
+ }
+ zval_add_ref(callback_ptr);
+ callback = *callback_ptr;
+ zend_hash_index_del(Z_ARRVAL_PP(callback_data), 0);
+ extra = *callback_data;
+ } else {
+ MAKE_STD_ZVAL(callback);
+ ZVAL_STRING(callback, (char *)handler_name, 1);
+ }
+
+ if (!zend_is_callable(callback, 0, NULL)) {
+ php_error(E_WARNING, "%s() is unable to autoconnect callback for handler
'%s'",
+ get_active_function_name(), handler_name);
+ return;
+ }
+
+ MAKE_STD_ZVAL(params);
+ array_init(params);
+
+ if (connect_object) {
+ zval *temp;
+
+ pass_object = 0;
+ object = php_gtk_new(connect_object);
+ add_next_index_zval(params, object);
+ }
+
+ if (extra)
+ php_array_merge(Z_ARRVAL_P(params), Z_ARRVAL_P(extra), 0);
+
+ callback_filename = zend_get_executed_filename(ELS_C);
+ callback_lineno = zend_get_executed_lineno(ELS_C);
+ data = php_gtk_build_value("(NNisi)", callback, params, pass_object,
+ callback_filename, callback_lineno);
+ gtk_signal_connect_full(obj, signal_name, NULL,
+ (GtkCallbackMarshal)php_gtk_callback_marshal,
+ data, php_gtk_destroy_notify, FALSE, after);
}
PHP_FUNCTION(wrap_glade_xml_signal_autoconnect)
{
+ zval *map = NULL;
+
+ NOT_STATIC_METHOD();
+
+ if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|a", &map))
+ return;
+
+ glade_xml_signal_autoconnect_full(GLADE_XML(PHP_GTK_GET(this_ptr)),
+ (GladeXMLConnectFunc)glade_connect_auto, map);
}
Index: php-gtk/test/gtk.php
diff -u php-gtk/test/gtk.php:1.14 php-gtk/test/gtk.php:1.15
--- php-gtk/test/gtk.php:1.14 Sun Mar 11 20:28:06 2001
+++ php-gtk/test/gtk.php Mon Mar 19 21:01:21 2001
@@ -1,5 +1,5 @@
<?php
-/* $Id: gtk.php,v 1.14 2001/03/12 04:28:06 andrei Exp $ */
+/* $Id: gtk.php,v 1.15 2001/03/20 05:01:21 andrei Exp $ */
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
dl('php_gtk.dll');
@@ -571,6 +571,43 @@
$hbox->set_border_width(5);
$vbox->pack_start($hbox, false, false);
$hbox->show();
+
+ function insert_row_clist($button, $clist)
+ {
+ static $style1, $style2, $style3;
+
+ $text = array('This', 'is an', 'inserted', 'row.',
+ 'This', 'is an', 'inserted', 'row.',
+ 'This', 'is an', 'inserted', 'row.');
+
+ if ($clist->focus_row >= 0)
+ $row = $clist->insert($clist->focus_row, $text);
+ else
+ $row = $clist->prepend($text);
+
+ if (!isset($style1)) {
+ $col1 = &new GdkColor(0, 56000, 0);
+ $col2 = &new GdkColor(32000, 0, 56000);
+
+ $style = $clist->style;
+ $style1 = $style->copy();
+ $style1->base[GTK_STATE_NORMAL] = $col1;
+ $style1->base[GTK_STATE_SELECTED] = $col2;
+
+ $style2 = $style->copy();
+ $style2->fg[GTK_STATE_NORMAL] = $col1;
+ $style2->fg[GTK_STATE_SELECTED] = $col2;
+
+ $style3 = $style->copy();
+ $style3->fg[GTK_STATE_NORMAL] = $col1;
+ $style3->base[GTK_STATE_NORMAL] = $col2;
+ $style3->font = gdk::font_load ("-*-courier-medium-*-*-*-*-120-*-*-*-*-*-*");
+ }
+
+ $clist->set_cell_style($row, 3, $style1);
+ $clist->set_cell_style($row, 4, $style2);
+ $clist->set_cell_style($row, 0, $style3);
+ }
$button = &new GtkButton('Insert Row');
$button->connect('clicked', 'insert_row_clist', $clist);