cvs: php-gtk / TODO /generator arg_types.php gtk.overrides /src php_gtk.h php_gtk_object.c php_gtk_types.c
| From: | Andrei Zmievski | Date: | Thu, 08 Feb 2001 05:02:17 +0000 |
| Subject: | cvs: php-gtk / TODO /generator arg_types.php gtk.overrides /src php_gtk.h php_gtk_object.c php_gtk_types.c | ||
| Groups: | php.gtk | ||
| Request: | Send a blank email to php-gtk+get-11@lists.php.net to get a copy of this message | ||
andrei Wed Feb 7 21:02:17 2001 EDT
Modified files:
/php-gtk TODO
/php-gtk/generator arg_types.php gtk.overrides
/php-gtk/src php_gtk.h php_gtk_object.c php_gtk_types.c
Log:
* Support for GdkCursor, GdkVisual
* Rewrote a lot of overridden functions
Index: php-gtk/TODO diff -u php-gtk/TODO:1.7 php-gtk/TODO:1.8 --- php-gtk/TODO:1.7 Sat Feb 3 17:03:34 2001 +++ php-gtk/TODO Wed Feb 7 21:02:17 2001 @@ -6,6 +6,7 @@ * Modify generic get/set property handlers to handle array index accesses. * Modify generic get/set property handlers to percolate up the inheritance chain looking for attributes. +* Implemented optional zval separation when parsing arguments. In PHP ------ Index: php-gtk/generator/arg_types.php diff -u php-gtk/generator/arg_types.php:1.6 php-gtk/generator/arg_types.php:1.7 --- php-gtk/generator/arg_types.php:1.6 Mon Feb 5 19:56:52 2001 +++ php-gtk/generator/arg_types.php Wed Feb 7 21:02:17 2001 @@ -556,5 +556,7 @@ $matcher->register('GdkDrawable*', $matcher->get('GdkWindow*')); $matcher->register_boxed('GdkColor', 'gdk_color'); $matcher->register_boxed('GdkColormap', 'gdk_colormap'); +$matcher->register_boxed('GdkCursor', 'gdk_cursor'); +$matcher->register_boxed('GdkVisual', 'gdk_visual'); ?> Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.5 php-gtk/generator/gtk.overrides:1.6 --- php-gtk/generator/gtk.overrides:1.5 Sun Feb 4 20:26:58 2001 +++ php-gtk/generator/gtk.overrides Wed Feb 7 21:02:17 2001 @@ -320,14 +320,8 @@ if (gtk_widget_intersect(GTK_WIDGET(PHP_GTK_GET(this_ptr)), &area, &intersection)) { array_init(return_value); - add_index_long(return_value, 0, (int)area.x); - add_index_long(return_value, 1, (int)area.y); - add_index_long(return_value, 2, (int)area.width); - add_index_long(return_value, 3, (int)area.height); - return; + *return_value = *php_gtk_build_value("(iiii)", area.x, area.y, area.width, area.height); } - else - RETURN_NULL(); } %% override gtk_menu_attach_to_widget @@ -359,16 +353,18 @@ override gtk_curve_get_vector PHP_FUNCTION(wrap_gtk_curve_get_vector) { - long veclen, i; + int veclen = -1, i; gfloat *vector = NULL; NOT_STATIC_METHOD(); - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "i", &veclen)) + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|i", &veclen)) return; + if (veclen < 0) + veclen = GTK_CURVE(PHP_GTK_GET(this_ptr))->num_points; vector = emalloc(sizeof(gfloat) * veclen); - gtk_curve_get_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), (int)veclen, vector); + gtk_curve_get_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), veclen, vector); array_init(return_value); for (i = 0; i < veclen; i++) add_index_double(return_value, i, vector[i]); @@ -378,7 +374,7 @@ override gtk_curve_set_vector PHP_FUNCTION(wrap_gtk_curve_set_vector) { - long veclen, i; + int veclen, i; gfloat *vector = NULL; zval *php_vector, **temp_vector; HashTable *target_hash; @@ -390,16 +386,15 @@ target_hash = HASH_OF(php_vector); veclen = zend_hash_num_elements(target_hash); - vector = emalloc(sizeof(gfloat) * veclen + 1); + vector = emalloc(sizeof(gfloat) * veclen); zend_hash_internal_pointer_reset(target_hash); i = 0; while (zend_hash_get_current_data(target_hash, (void **)&temp_vector) == SUCCESS) { - vector[i] = Z_DVAL_PP(temp_vector); - i++; + vector[i++] = Z_DVAL_PP(temp_vector); zend_hash_move_forward(target_hash); } - gtk_curve_set_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), (int)veclen, vector); + gtk_curve_set_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), veclen, vector); RETURN_NULL(); } %% @@ -423,43 +418,53 @@ } else RETURN_NULL(); } +%% +ignore gtk_clist_new_with_titles %% -override gtk_clist_new_with_titles -PHP_FUNCTION(wrap_gtk_clist_new_with_titles) +override gtk_clist_new +PHP_FUNCTION(wrap_gtk_clist_new) { GtkObject *wrapped_obj; gint columns, i; gchar **titles; - zval *php_titles, **temp_title; + zval *php_titles = NULL, **temp_title; HashTable *target_hash; NOT_STATIC_METHOD(); - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a", &php_titles)) { + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "i|a", &columns, &php_titles)) { php_gtk_invalidate(this_ptr); return; } - - target_hash = HASH_OF(php_titles); - columns = zend_hash_num_elements(target_hash); - if (columns > 0) { - titles = emalloc(sizeof(gchar *) * (columns + 1)); + + if (columns <= 0) { + php_error(E_WARNING, "%s() needs number of columns to be > 0", get_active_function_name()); + return; + } + + if (php_titles) { + SEPARATE_ZVAL(&php_titles); + if (zend_hash_num_elements(Z_ARRVAL_P(php_titles)) < columns) { + php_error(E_WARNING, "%s(): the array of titles is not long enough", get_active_function_name()); + return; + } + + target_hash = HASH_OF(php_titles); + titles = emalloc(sizeof(gchar *) * columns); i = 0; + zend_hash_internal_pointer_reset(target_hash); while (zend_hash_get_current_data(target_hash, (void **)&temp_title) == SUCCESS) { convert_to_string_ex(temp_title); - titles[i] = estrdup(Z_STRVAL_PP(temp_title)); - i++; + titles[i++] = estrndup(Z_STRVAL_PP(temp_title), Z_STRLEN_PP(temp_title)); zend_hash_move_forward(target_hash); } - titles[i] = NULL; wrapped_obj = (GtkObject *)gtk_clist_new_with_titles(columns, titles); efree(titles); - } - else - wrapped_obj = (GtkObject *)gtk_clist_new(0); + } else + wrapped_obj = (GtkObject *)gtk_clist_new(columns); + if (!wrapped_obj) { - php_error(E_WARNING, "%s(): could not create GtkScrolledWindow object", - get_active_function_name()); + php_error(E_WARNING, "%s(): could not create GtkCList object", get_active_function_name()); return; } @@ -470,34 +475,34 @@ PHP_FUNCTION(wrap_gtk_clist_append) { gint columns, i, res; - gchar **titles; - zval *php_titles, **temp_title; + gchar **list; + zval *php_list, **text; HashTable *target_hash; NOT_STATIC_METHOD(); - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a", &php_titles)) { + 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_titles); - columns = zend_hash_num_elements(target_hash); - if (columns > 0) { - titles = emalloc(sizeof(gchar *) * (columns + 1)); - i = 0; - while (zend_hash_get_current_data(target_hash, (void **)&temp_title) == SUCCESS) { - convert_to_string_ex(temp_title); - titles[i] = estrdup(Z_STRVAL_PP(temp_title)); - i++; - zend_hash_move_forward(target_hash); - } - titles[i] = NULL; - RETURN_LONG(gtk_clist_append(GTK_CLIST(PHP_GTK_GET(this_ptr)), titles)); - efree(titles); + 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); } - else - RETURN_NULL(); + ZVAL_LONG(return_value, gtk_clist_append(GTK_CLIST(PHP_GTK_GET(this_ptr)), list)); + efree(list); } %% override gtk_menu_item_new_with_label Index: php-gtk/src/php_gtk.h diff -u php-gtk/src/php_gtk.h:1.6 php-gtk/src/php_gtk.h:1.7 --- php-gtk/src/php_gtk.h:1.6 Sun Feb 4 20:26:58 2001 +++ php-gtk/src/php_gtk.h Wed Feb 7 21:02:17 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.6 2001/02/05 04:26:58 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.7 2001/02/08 05:02:17 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -35,12 +35,16 @@ extern int le_gdk_window; extern int le_gdk_color; extern int le_gdk_colormap; +extern int le_gdk_cursor; +extern int le_gdk_visual; extern zend_class_entry *gdk_event_ce; 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; +extern zend_class_entry *gdk_cursor_ce; +extern zend_class_entry *gdk_visual_ce; /* Useful macros. */ #define PHP_GTK_GET(w) ((GtkObject *)php_gtk_get_object(w, le_gtk)) @@ -49,6 +53,8 @@ #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)) +#define PHP_GDK_CURSOR_GET(w) ((GdkCursor *)php_gtk_get_object(w, le_gdk_cursor)) +#define PHP_GDK_VISUAL_GET(w) ((GdkVisual *)php_gtk_get_object(w, le_gdk_visual)) /* True globals. */ extern GHashTable *php_gtk_class_hash; @@ -76,6 +82,8 @@ zval *php_gdk_color_new(GdkColor *obj); zval *php_gdk_colormap_new(GdkColormap *obj); zval *php_gdk_atom_new(GdkAtom obj); +zval *php_gdk_cursor_new(GdkCursor *obj); +zval *php_gdk_visual_new(GdkVisual *obj); /* Utility functions. */ int php_gtk_parse_args(int argc, char *format, ...); Index: php-gtk/src/php_gtk_object.c diff -u php-gtk/src/php_gtk_object.c:1.4 php-gtk/src/php_gtk_object.c:1.5 --- php-gtk/src/php_gtk_object.c:1.4 Sat Feb 3 16:08:49 2001 +++ php-gtk/src/php_gtk_object.c Wed Feb 7 21:02:17 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_object.c,v 1.4 2001/02/04 00:08:49 andrei Exp $ */ +/* $Id: php_gtk_object.c,v 1.5 2001/02/08 05:02:17 andrei Exp $ */ #include "php_gtk.h" @@ -320,6 +320,12 @@ value = php_gdk_event_new(GTK_VALUE_BOXED(*arg)); else if (arg->type == GTK_TYPE_GDK_WINDOW) value = php_gdk_window_new(GTK_VALUE_BOXED(*arg)); + else if (arg->type == GTK_TYPE_GDK_COLOR) + value = php_gdk_color_new(GTK_VALUE_BOXED(*arg)); + else if (arg->type == GTK_TYPE_GDK_COLORMAP) + value = php_gdk_colormap_new(GTK_VALUE_BOXED(*arg)); + else if (arg->type == GTK_TYPE_GDK_VISUAL) + value = php_gdk_visual_new(GTK_VALUE_BOXED(*arg)); else ZVAL_NULL(value); break; @@ -413,6 +419,21 @@ } else if (ret->type == GTK_TYPE_GDK_WINDOW) { if (php_gtk_check_class(value, gdk_window_ce)) *GTK_RETLOC_BOXED(*ret) = PHP_GDK_WINDOW_GET(value); + else + *GTK_RETLOC_BOXED(*ret) = NULL; + } else if (ret->type == GTK_TYPE_GDK_COLOR) { + if (php_gtk_check_class(value, gdk_color_ce)) + *GTK_RETLOC_BOXED(*ret) = PHP_GDK_COLOR_GET(value); + else + *GTK_RETLOC_BOXED(*ret) = NULL; + } else if (ret->type == GTK_TYPE_GDK_COLORMAP) { + if (php_gtk_check_class(value, gdk_colormap_ce)) + *GTK_RETLOC_BOXED(*ret) = PHP_GDK_COLORMAP_GET(value); + else + *GTK_RETLOC_BOXED(*ret) = NULL; + } else if (ret->type == GTK_TYPE_GDK_VISUAL) { + if (php_gtk_check_class(value, gdk_visual_ce)) + *GTK_RETLOC_BOXED(*ret) = PHP_GDK_VISUAL_GET(value); else *GTK_RETLOC_BOXED(*ret) = NULL; } else Index: php-gtk/src/php_gtk_types.c diff -u php-gtk/src/php_gtk_types.c:1.6 php-gtk/src/php_gtk_types.c:1.7 --- php-gtk/src/php_gtk_types.c:1.6 Mon Feb 5 19:56:52 2001 +++ php-gtk/src/php_gtk_types.c Wed Feb 7 21:02:17 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_types.c,v 1.6 2001/02/06 03:56:52 andrei Exp $ */ +/* $Id: php_gtk_types.c,v 1.7 2001/02/08 05:02:17 andrei Exp $ */ #include "php_gtk.h" @@ -28,12 +28,16 @@ int le_gdk_window; int le_gdk_color; int le_gdk_colormap; +int le_gdk_cursor; +int le_gdk_visual; zend_class_entry *gdk_event_ce; zend_class_entry *gdk_window_ce; zend_class_entry *gdk_color_ce; zend_class_entry *gdk_colormap_ce; zend_class_entry *gdk_atom_ce; +zend_class_entry *gdk_cursor_ce; +zend_class_entry *gdk_visual_ce; /* GdkEvent */ zval *php_gdk_event_new(GdkEvent *obj) @@ -234,14 +238,25 @@ return; gdk_input_window_get_pointer(PHP_GDK_WINDOW_GET(this_ptr), deviceid, &x, &y, &pressure, &xtilt, &ytilt, &mask); - *return_value = * php_gtk_build_value("(dddddi)", x, y, pressure, xtilt, ytilt, mask); + *return_value = *php_gtk_build_value("(dddddi)", x, y, pressure, xtilt, ytilt, mask); } +PHP_FUNCTION(gdk_window_set_cursor) +{ + zval *cursor; + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "O", &cursor, gdk_cursor_ce)) + return; + + gdk_window_set_cursor(PHP_GDK_WINDOW_GET(this_ptr), PHP_GDK_CURSOR_GET(cursor)); +} + static function_entry php_gdk_window_functions[] = { /* TODO implement other functions similar to PyGtk */ {"raise", PHP_FN(gdk_window_raise), NULL}, {"lower", PHP_FN(gdk_window_lower), NULL}, {"get_pointer", PHP_FN(gdk_window_get_pointer), NULL}, + {"set_cursor", PHP_FN(gdk_window_set_cursor), NULL}, {NULL, NULL, NULL} }; @@ -539,7 +554,124 @@ return result; } +/* GdkCursor */ +zval *php_gdk_cursor_new(GdkCursor *obj) +{ + zval *result; + + MAKE_STD_ZVAL(result); + + if (!obj) { + ZVAL_NULL(result); + return result; + } + + object_init_ex(result, gdk_cursor_ce); + php_gtk_set_object(result, obj, le_gdk_cursor); + + return result; +} + +static void release_gdk_cursor_rsrc(zend_rsrc_list_entry *rsrc) +{ + GdkCursor *obj = (GdkCursor *)rsrc->ptr; + gdk_cursor_destroy(obj); +} + +static void gdk_cursor_get_property(zval *result, zval *object, zval *property) +{ + GdkCursor *cursor = PHP_GDK_CURSOR_GET(object); + char *prop_name; + + ZVAL_NULL(result); + if (Z_TYPE_P(property) == IS_LONG) + return; + else + prop_name = Z_STRVAL_P(property); + + if (!strcmp(prop_name, "type")) { + ZVAL_LONG(result, cursor->type); + } else if (!strcmp(prop_name, "name")) { + GtkEnumValue *vals = gtk_type_enum_get_values(GTK_TYPE_GDK_CURSOR_TYPE); + while (vals->value_name != NULL && vals->value != cursor->type) + vals++; + if (vals->value_nick) { + ZVAL_STRING(result, vals->value_nick, 1); + } else { + ZVAL_STRINGL(result, "*unknown*", sizeof("*unknown*"), 1); + } + } +} + + +/* GdkVisual */ +zval *php_gdk_visual_new(GdkVisual *obj) +{ + zval *result; + + MAKE_STD_ZVAL(result); + + if (!obj) { + ZVAL_NULL(result); + return result; + } + + object_init_ex(result, gdk_visual_ce); + gdk_visual_ref(obj); + php_gtk_set_object(result, obj, le_gdk_visual); + + return result; +} + +static void release_gdk_visual_rsrc(zend_rsrc_list_entry *rsrc) +{ + GdkVisual *obj = (GdkVisual *)rsrc->ptr; + gdk_visual_unref(obj); +} +static void gdk_visual_get_property(zval *result, zval *object, zval *property) +{ + GdkVisual *visual = PHP_GDK_VISUAL_GET(object); + char *prop_name; + + ZVAL_NULL(result); + if (Z_TYPE_P(property) == IS_LONG) + return; + else + prop_name = Z_STRVAL_P(property); + + if (!strcmp(prop_name, "type")) { + ZVAL_LONG(result, visual->type); + } else if (!strcmp(prop_name, "depth")) { + ZVAL_LONG(result, visual->depth); + } else if (!strcmp(prop_name, "byte_order")) { + ZVAL_LONG(result, visual->byte_order); + } else if (!strcmp(prop_name, "colormap_size")) { + ZVAL_LONG(result, visual->colormap_size); + } else if (!strcmp(prop_name, "bits_per_rgb")) { + ZVAL_LONG(result, visual->bits_per_rgb); + } else if (!strcmp(prop_name, "red_mask")) { + ZVAL_LONG(result, visual->red_shift); + } else if (!strcmp(prop_name, "red_shift")) { + ZVAL_LONG(result, visual->red_prec); + } else if (!strcmp(prop_name, "red_prec")) { + ZVAL_LONG(result, visual->red_mask); + } else if (!strcmp(prop_name, "green_mask")) { + ZVAL_LONG(result, visual->green_mask); + } else if (!strcmp(prop_name, "green_shift")) { + ZVAL_LONG(result, visual->green_shift); + } else if (!strcmp(prop_name, "green_prec")) { + ZVAL_LONG(result, visual->green_prec); + } else if (!strcmp(prop_name, "blue_mask")) { + ZVAL_LONG(result, visual->blue_mask); + } else if (!strcmp(prop_name, "blue_shift")) { + ZVAL_LONG(result, visual->blue_shift); + } else if (!strcmp(prop_name, "blue_prec")) { + ZVAL_LONG(result, visual->blue_prec); + } +} + + /* Generic get/set property handlers. */ static zval php_gtk_get_property(zend_property_reference *property_reference) { @@ -563,6 +695,10 @@ gdk_color_get_property(&result, object, &overloaded_property->element); } else if (php_gtk_check_class(object, gdk_colormap_ce)) { gdk_colormap_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_cursor_ce)) { + gdk_cursor_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_visual_ce)) { + gdk_visual_get_property(&result, object, &overloaded_property->element); } else { convert_to_null(&result); return result; @@ -597,6 +733,10 @@ gdk_color_get_property(&result, object, &overloaded_property->element); } else if (php_gtk_check_class(object, gdk_colormap_ce)) { gdk_colormap_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_cursor_ce)) { + gdk_cursor_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_visual_ce)) { + gdk_visual_get_property(&result, object, &overloaded_property->element); } else { return FAILURE; } @@ -625,6 +765,8 @@ le_gdk_window = zend_register_list_destructors_ex(release_gdk_window_rsrc, NULL, "GdkWindow", module_number); le_gdk_color = zend_register_list_destructors_ex(release_gdk_color_rsrc, NULL, "GdkColor", module_number); le_gdk_colormap = zend_register_list_destructors_ex(release_gdk_colormap_rsrc, NULL, "GdkColormap", module_number); + le_gdk_colormap = zend_register_list_destructors_ex(release_gdk_cursor_rsrc, NULL, "GdkCursor", module_number); + le_gdk_visual = zend_register_list_destructors_ex(release_gdk_visual_rsrc, NULL, "GdkVisual", module_number); INIT_CLASS_ENTRY(ce, "gdkevent", NULL); @@ -641,6 +783,12 @@ INIT_CLASS_ENTRY(ce, "gdkatom", NULL); gdk_atom_ce = zend_register_internal_class_ex(&ce, NULL, NULL); + + INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkcursor", NULL, NULL, php_gtk_get_property, NULL); + gdk_cursor_ce = zend_register_internal_class_ex(&ce, NULL, NULL); + + INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkvisual", NULL, NULL, php_gtk_get_property, NULL); + gdk_visual_ce = zend_register_internal_class_ex(&ce, NULL, NULL); } #endif
Index: php-gtk/TODO diff -u php-gtk/TODO:1.7 php-gtk/TODO:1.8 --- php-gtk/TODO:1.7 Sat Feb 3 17:03:34 2001 +++ php-gtk/TODO Wed Feb 7 21:02:17 2001 @@ -6,6 +6,7 @@ * Modify generic get/set property handlers to handle array index accesses. * Modify generic get/set property handlers to percolate up the inheritance chain looking for attributes. +* Implemented optional zval separation when parsing arguments. In PHP ------ Index: php-gtk/generator/arg_types.php diff -u php-gtk/generator/arg_types.php:1.6 php-gtk/generator/arg_types.php:1.7 --- php-gtk/generator/arg_types.php:1.6 Mon Feb 5 19:56:52 2001 +++ php-gtk/generator/arg_types.php Wed Feb 7 21:02:17 2001 @@ -556,5 +556,7 @@ $matcher->register('GdkDrawable*', $matcher->get('GdkWindow*')); $matcher->register_boxed('GdkColor', 'gdk_color'); $matcher->register_boxed('GdkColormap', 'gdk_colormap'); +$matcher->register_boxed('GdkCursor', 'gdk_cursor'); +$matcher->register_boxed('GdkVisual', 'gdk_visual'); ?> Index: php-gtk/generator/gtk.overrides diff -u php-gtk/generator/gtk.overrides:1.5 php-gtk/generator/gtk.overrides:1.6 --- php-gtk/generator/gtk.overrides:1.5 Sun Feb 4 20:26:58 2001 +++ php-gtk/generator/gtk.overrides Wed Feb 7 21:02:17 2001 @@ -320,14 +320,8 @@ if (gtk_widget_intersect(GTK_WIDGET(PHP_GTK_GET(this_ptr)), &area, &intersection)) { array_init(return_value); - add_index_long(return_value, 0, (int)area.x); - add_index_long(return_value, 1, (int)area.y); - add_index_long(return_value, 2, (int)area.width); - add_index_long(return_value, 3, (int)area.height); - return; + *return_value = *php_gtk_build_value("(iiii)", area.x, area.y, area.width, area.height); } - else - RETURN_NULL(); } %% override gtk_menu_attach_to_widget @@ -359,16 +353,18 @@ override gtk_curve_get_vector PHP_FUNCTION(wrap_gtk_curve_get_vector) { - long veclen, i; + int veclen = -1, i; gfloat *vector = NULL; NOT_STATIC_METHOD(); - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "i", &veclen)) + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|i", &veclen)) return; + if (veclen < 0) + veclen = GTK_CURVE(PHP_GTK_GET(this_ptr))->num_points; vector = emalloc(sizeof(gfloat) * veclen); - gtk_curve_get_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), (int)veclen, vector); + gtk_curve_get_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), veclen, vector); array_init(return_value); for (i = 0; i < veclen; i++) add_index_double(return_value, i, vector[i]); @@ -378,7 +374,7 @@ override gtk_curve_set_vector PHP_FUNCTION(wrap_gtk_curve_set_vector) { - long veclen, i; + int veclen, i; gfloat *vector = NULL; zval *php_vector, **temp_vector; HashTable *target_hash; @@ -390,16 +386,15 @@ target_hash = HASH_OF(php_vector); veclen = zend_hash_num_elements(target_hash); - vector = emalloc(sizeof(gfloat) * veclen + 1); + vector = emalloc(sizeof(gfloat) * veclen); zend_hash_internal_pointer_reset(target_hash); i = 0; while (zend_hash_get_current_data(target_hash, (void **)&temp_vector) == SUCCESS) { - vector[i] = Z_DVAL_PP(temp_vector); - i++; + vector[i++] = Z_DVAL_PP(temp_vector); zend_hash_move_forward(target_hash); } - gtk_curve_set_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), (int)veclen, vector); + gtk_curve_set_vector(GTK_CURVE(PHP_GTK_GET(this_ptr)), veclen, vector); RETURN_NULL(); } %% @@ -423,43 +418,53 @@ } else RETURN_NULL(); } +%% +ignore gtk_clist_new_with_titles %% -override gtk_clist_new_with_titles -PHP_FUNCTION(wrap_gtk_clist_new_with_titles) +override gtk_clist_new +PHP_FUNCTION(wrap_gtk_clist_new) { GtkObject *wrapped_obj; gint columns, i; gchar **titles; - zval *php_titles, **temp_title; + zval *php_titles = NULL, **temp_title; HashTable *target_hash; NOT_STATIC_METHOD(); - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a", &php_titles)) { + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "i|a", &columns, &php_titles)) { php_gtk_invalidate(this_ptr); return; } - - target_hash = HASH_OF(php_titles); - columns = zend_hash_num_elements(target_hash); - if (columns > 0) { - titles = emalloc(sizeof(gchar *) * (columns + 1)); + + if (columns <= 0) { + php_error(E_WARNING, "%s() needs number of columns to be > 0", get_active_function_name()); + return; + } + + if (php_titles) { + SEPARATE_ZVAL(&php_titles); + if (zend_hash_num_elements(Z_ARRVAL_P(php_titles)) < columns) { + php_error(E_WARNING, "%s(): the array of titles is not long enough", get_active_function_name()); + return; + } + + target_hash = HASH_OF(php_titles); + titles = emalloc(sizeof(gchar *) * columns); i = 0; + zend_hash_internal_pointer_reset(target_hash); while (zend_hash_get_current_data(target_hash, (void **)&temp_title) == SUCCESS) { convert_to_string_ex(temp_title); - titles[i] = estrdup(Z_STRVAL_PP(temp_title)); - i++; + titles[i++] = estrndup(Z_STRVAL_PP(temp_title), Z_STRLEN_PP(temp_title)); zend_hash_move_forward(target_hash); } - titles[i] = NULL; wrapped_obj = (GtkObject *)gtk_clist_new_with_titles(columns, titles); efree(titles); - } - else - wrapped_obj = (GtkObject *)gtk_clist_new(0); + } else + wrapped_obj = (GtkObject *)gtk_clist_new(columns); + if (!wrapped_obj) { - php_error(E_WARNING, "%s(): could not create GtkScrolledWindow object", - get_active_function_name()); + php_error(E_WARNING, "%s(): could not create GtkCList object", get_active_function_name()); return; } @@ -470,34 +475,34 @@ PHP_FUNCTION(wrap_gtk_clist_append) { gint columns, i, res; - gchar **titles; - zval *php_titles, **temp_title; + gchar **list; + zval *php_list, **text; HashTable *target_hash; NOT_STATIC_METHOD(); - if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a", &php_titles)) { + 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_titles); - columns = zend_hash_num_elements(target_hash); - if (columns > 0) { - titles = emalloc(sizeof(gchar *) * (columns + 1)); - i = 0; - while (zend_hash_get_current_data(target_hash, (void **)&temp_title) == SUCCESS) { - convert_to_string_ex(temp_title); - titles[i] = estrdup(Z_STRVAL_PP(temp_title)); - i++; - zend_hash_move_forward(target_hash); - } - titles[i] = NULL; - RETURN_LONG(gtk_clist_append(GTK_CLIST(PHP_GTK_GET(this_ptr)), titles)); - efree(titles); + 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); } - else - RETURN_NULL(); + ZVAL_LONG(return_value, gtk_clist_append(GTK_CLIST(PHP_GTK_GET(this_ptr)), list)); + efree(list); } %% override gtk_menu_item_new_with_label Index: php-gtk/src/php_gtk.h diff -u php-gtk/src/php_gtk.h:1.6 php-gtk/src/php_gtk.h:1.7 --- php-gtk/src/php_gtk.h:1.6 Sun Feb 4 20:26:58 2001 +++ php-gtk/src/php_gtk.h Wed Feb 7 21:02:17 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.6 2001/02/05 04:26:58 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.7 2001/02/08 05:02:17 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -35,12 +35,16 @@ extern int le_gdk_window; extern int le_gdk_color; extern int le_gdk_colormap; +extern int le_gdk_cursor; +extern int le_gdk_visual; extern zend_class_entry *gdk_event_ce; 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; +extern zend_class_entry *gdk_cursor_ce; +extern zend_class_entry *gdk_visual_ce; /* Useful macros. */ #define PHP_GTK_GET(w) ((GtkObject *)php_gtk_get_object(w, le_gtk)) @@ -49,6 +53,8 @@ #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)) +#define PHP_GDK_CURSOR_GET(w) ((GdkCursor *)php_gtk_get_object(w, le_gdk_cursor)) +#define PHP_GDK_VISUAL_GET(w) ((GdkVisual *)php_gtk_get_object(w, le_gdk_visual)) /* True globals. */ extern GHashTable *php_gtk_class_hash; @@ -76,6 +82,8 @@ zval *php_gdk_color_new(GdkColor *obj); zval *php_gdk_colormap_new(GdkColormap *obj); zval *php_gdk_atom_new(GdkAtom obj); +zval *php_gdk_cursor_new(GdkCursor *obj); +zval *php_gdk_visual_new(GdkVisual *obj); /* Utility functions. */ int php_gtk_parse_args(int argc, char *format, ...); Index: php-gtk/src/php_gtk_object.c diff -u php-gtk/src/php_gtk_object.c:1.4 php-gtk/src/php_gtk_object.c:1.5 --- php-gtk/src/php_gtk_object.c:1.4 Sat Feb 3 16:08:49 2001 +++ php-gtk/src/php_gtk_object.c Wed Feb 7 21:02:17 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_object.c,v 1.4 2001/02/04 00:08:49 andrei Exp $ */ +/* $Id: php_gtk_object.c,v 1.5 2001/02/08 05:02:17 andrei Exp $ */ #include "php_gtk.h" @@ -320,6 +320,12 @@ value = php_gdk_event_new(GTK_VALUE_BOXED(*arg)); else if (arg->type == GTK_TYPE_GDK_WINDOW) value = php_gdk_window_new(GTK_VALUE_BOXED(*arg)); + else if (arg->type == GTK_TYPE_GDK_COLOR) + value = php_gdk_color_new(GTK_VALUE_BOXED(*arg)); + else if (arg->type == GTK_TYPE_GDK_COLORMAP) + value = php_gdk_colormap_new(GTK_VALUE_BOXED(*arg)); + else if (arg->type == GTK_TYPE_GDK_VISUAL) + value = php_gdk_visual_new(GTK_VALUE_BOXED(*arg)); else ZVAL_NULL(value); break; @@ -413,6 +419,21 @@ } else if (ret->type == GTK_TYPE_GDK_WINDOW) { if (php_gtk_check_class(value, gdk_window_ce)) *GTK_RETLOC_BOXED(*ret) = PHP_GDK_WINDOW_GET(value); + else + *GTK_RETLOC_BOXED(*ret) = NULL; + } else if (ret->type == GTK_TYPE_GDK_COLOR) { + if (php_gtk_check_class(value, gdk_color_ce)) + *GTK_RETLOC_BOXED(*ret) = PHP_GDK_COLOR_GET(value); + else + *GTK_RETLOC_BOXED(*ret) = NULL; + } else if (ret->type == GTK_TYPE_GDK_COLORMAP) { + if (php_gtk_check_class(value, gdk_colormap_ce)) + *GTK_RETLOC_BOXED(*ret) = PHP_GDK_COLORMAP_GET(value); + else + *GTK_RETLOC_BOXED(*ret) = NULL; + } else if (ret->type == GTK_TYPE_GDK_VISUAL) { + if (php_gtk_check_class(value, gdk_visual_ce)) + *GTK_RETLOC_BOXED(*ret) = PHP_GDK_VISUAL_GET(value); else *GTK_RETLOC_BOXED(*ret) = NULL; } else Index: php-gtk/src/php_gtk_types.c diff -u php-gtk/src/php_gtk_types.c:1.6 php-gtk/src/php_gtk_types.c:1.7 --- php-gtk/src/php_gtk_types.c:1.6 Mon Feb 5 19:56:52 2001 +++ php-gtk/src/php_gtk_types.c Wed Feb 7 21:02:17 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_types.c,v 1.6 2001/02/06 03:56:52 andrei Exp $ */ +/* $Id: php_gtk_types.c,v 1.7 2001/02/08 05:02:17 andrei Exp $ */ #include "php_gtk.h" @@ -28,12 +28,16 @@ int le_gdk_window; int le_gdk_color; int le_gdk_colormap; +int le_gdk_cursor; +int le_gdk_visual; zend_class_entry *gdk_event_ce; zend_class_entry *gdk_window_ce; zend_class_entry *gdk_color_ce; zend_class_entry *gdk_colormap_ce; zend_class_entry *gdk_atom_ce; +zend_class_entry *gdk_cursor_ce; +zend_class_entry *gdk_visual_ce; /* GdkEvent */ zval *php_gdk_event_new(GdkEvent *obj) @@ -234,14 +238,25 @@ return; gdk_input_window_get_pointer(PHP_GDK_WINDOW_GET(this_ptr), deviceid, &x, &y, &pressure, &xtilt, &ytilt, &mask); - *return_value = * php_gtk_build_value("(dddddi)", x, y, pressure, xtilt, ytilt, mask); + *return_value = *php_gtk_build_value("(dddddi)", x, y, pressure, xtilt, ytilt, mask); } +PHP_FUNCTION(gdk_window_set_cursor) +{ + zval *cursor; + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "O", &cursor, gdk_cursor_ce)) + return; + + gdk_window_set_cursor(PHP_GDK_WINDOW_GET(this_ptr), PHP_GDK_CURSOR_GET(cursor)); +} + static function_entry php_gdk_window_functions[] = { /* TODO implement other functions similar to PyGtk */ {"raise", PHP_FN(gdk_window_raise), NULL}, {"lower", PHP_FN(gdk_window_lower), NULL}, {"get_pointer", PHP_FN(gdk_window_get_pointer), NULL}, + {"set_cursor", PHP_FN(gdk_window_set_cursor), NULL}, {NULL, NULL, NULL} }; @@ -539,7 +554,124 @@ return result; } +/* GdkCursor */ +zval *php_gdk_cursor_new(GdkCursor *obj) +{ + zval *result; + + MAKE_STD_ZVAL(result); + + if (!obj) { + ZVAL_NULL(result); + return result; + } + + object_init_ex(result, gdk_cursor_ce); + php_gtk_set_object(result, obj, le_gdk_cursor); + + return result; +} + +static void release_gdk_cursor_rsrc(zend_rsrc_list_entry *rsrc) +{ + GdkCursor *obj = (GdkCursor *)rsrc->ptr; + gdk_cursor_destroy(obj); +} + +static void gdk_cursor_get_property(zval *result, zval *object, zval *property) +{ + GdkCursor *cursor = PHP_GDK_CURSOR_GET(object); + char *prop_name; + + ZVAL_NULL(result); + if (Z_TYPE_P(property) == IS_LONG) + return; + else + prop_name = Z_STRVAL_P(property); + + if (!strcmp(prop_name, "type")) { + ZVAL_LONG(result, cursor->type); + } else if (!strcmp(prop_name, "name")) { + GtkEnumValue *vals = gtk_type_enum_get_values(GTK_TYPE_GDK_CURSOR_TYPE); + while (vals->value_name != NULL && vals->value != cursor->type) + vals++; + if (vals->value_nick) { + ZVAL_STRING(result, vals->value_nick, 1); + } else { + ZVAL_STRINGL(result, "*unknown*", sizeof("*unknown*"), 1); + } + } +} + + +/* GdkVisual */ +zval *php_gdk_visual_new(GdkVisual *obj) +{ + zval *result; + + MAKE_STD_ZVAL(result); + + if (!obj) { + ZVAL_NULL(result); + return result; + } + + object_init_ex(result, gdk_visual_ce); + gdk_visual_ref(obj); + php_gtk_set_object(result, obj, le_gdk_visual); + + return result; +} + +static void release_gdk_visual_rsrc(zend_rsrc_list_entry *rsrc) +{ + GdkVisual *obj = (GdkVisual *)rsrc->ptr; + gdk_visual_unref(obj); +} +static void gdk_visual_get_property(zval *result, zval *object, zval *property) +{ + GdkVisual *visual = PHP_GDK_VISUAL_GET(object); + char *prop_name; + + ZVAL_NULL(result); + if (Z_TYPE_P(property) == IS_LONG) + return; + else + prop_name = Z_STRVAL_P(property); + + if (!strcmp(prop_name, "type")) { + ZVAL_LONG(result, visual->type); + } else if (!strcmp(prop_name, "depth")) { + ZVAL_LONG(result, visual->depth); + } else if (!strcmp(prop_name, "byte_order")) { + ZVAL_LONG(result, visual->byte_order); + } else if (!strcmp(prop_name, "colormap_size")) { + ZVAL_LONG(result, visual->colormap_size); + } else if (!strcmp(prop_name, "bits_per_rgb")) { + ZVAL_LONG(result, visual->bits_per_rgb); + } else if (!strcmp(prop_name, "red_mask")) { + ZVAL_LONG(result, visual->red_shift); + } else if (!strcmp(prop_name, "red_shift")) { + ZVAL_LONG(result, visual->red_prec); + } else if (!strcmp(prop_name, "red_prec")) { + ZVAL_LONG(result, visual->red_mask); + } else if (!strcmp(prop_name, "green_mask")) { + ZVAL_LONG(result, visual->green_mask); + } else if (!strcmp(prop_name, "green_shift")) { + ZVAL_LONG(result, visual->green_shift); + } else if (!strcmp(prop_name, "green_prec")) { + ZVAL_LONG(result, visual->green_prec); + } else if (!strcmp(prop_name, "blue_mask")) { + ZVAL_LONG(result, visual->blue_mask); + } else if (!strcmp(prop_name, "blue_shift")) { + ZVAL_LONG(result, visual->blue_shift); + } else if (!strcmp(prop_name, "blue_prec")) { + ZVAL_LONG(result, visual->blue_prec); + } +} + + /* Generic get/set property handlers. */ static zval php_gtk_get_property(zend_property_reference *property_reference) { @@ -563,6 +695,10 @@ gdk_color_get_property(&result, object, &overloaded_property->element); } else if (php_gtk_check_class(object, gdk_colormap_ce)) { gdk_colormap_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_cursor_ce)) { + gdk_cursor_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_visual_ce)) { + gdk_visual_get_property(&result, object, &overloaded_property->element); } else { convert_to_null(&result); return result; @@ -597,6 +733,10 @@ gdk_color_get_property(&result, object, &overloaded_property->element); } else if (php_gtk_check_class(object, gdk_colormap_ce)) { gdk_colormap_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_cursor_ce)) { + gdk_cursor_get_property(&result, object, &overloaded_property->element); + } else if (php_gtk_check_class(object, gdk_visual_ce)) { + gdk_visual_get_property(&result, object, &overloaded_property->element); } else { return FAILURE; } @@ -625,6 +765,8 @@ le_gdk_window = zend_register_list_destructors_ex(release_gdk_window_rsrc, NULL, "GdkWindow", module_number); le_gdk_color = zend_register_list_destructors_ex(release_gdk_color_rsrc, NULL, "GdkColor", module_number); le_gdk_colormap = zend_register_list_destructors_ex(release_gdk_colormap_rsrc, NULL, "GdkColormap", module_number); + le_gdk_colormap = zend_register_list_destructors_ex(release_gdk_cursor_rsrc, NULL, "GdkCursor", module_number); + le_gdk_visual = zend_register_list_destructors_ex(release_gdk_visual_rsrc, NULL, "GdkVisual", module_number); INIT_CLASS_ENTRY(ce, "gdkevent", NULL); @@ -641,6 +783,12 @@ INIT_CLASS_ENTRY(ce, "gdkatom", NULL); gdk_atom_ce = zend_register_internal_class_ex(&ce, NULL, NULL); + + INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkcursor", NULL, NULL, php_gtk_get_property, NULL); + gdk_cursor_ce = zend_register_internal_class_ex(&ce, NULL, NULL); + + INIT_OVERLOADED_CLASS_ENTRY(ce, "gdkvisual", NULL, NULL, php_gtk_get_property, NULL); + gdk_visual_ce = zend_register_internal_class_ex(&ce, NULL, NULL); } #endif