cvs: php-gtk / TODO /src php_gtk_types.c php_gtk_util.c

From: Date: Sat, 10 Feb 2001 05:10:44 +0000
Subject: cvs: php-gtk / TODO /src php_gtk_types.c php_gtk_util.c
Groups: php.gtk 
Request: Send a blank email to php-gtk+get-13@lists.php.net to get a copy of this message
andrei Fri Feb 9 21:10:44 2001 EDT Modified files: /php-gtk TODO /php-gtk/src php_gtk_types.c php_gtk_util.c Log: * Deal with non-pseudocolor colormaps properly. * Implemented GdkFont functions. * Added support for 's#' parse arg spec. Index: php-gtk/TODO diff -u php-gtk/TODO:1.9 php-gtk/TODO:1.10 --- php-gtk/TODO:1.9 Thu Feb 8 21:31:33 2001 +++ php-gtk/TODO Fri Feb 9 21:10:44 2001 @@ -7,7 +7,6 @@ * Modify generic get/set property handlers to percolate up the inheritance chain looking for attributes. * Implemented optional zval separation when parsing arguments. -* Implement s# parse arg support. * Think about separating static class methods, Gtk::widget_push_colormap -> GtkWidget::push_colormap. Index: php-gtk/src/php_gtk_types.c diff -u php-gtk/src/php_gtk_types.c:1.8 php-gtk/src/php_gtk_types.c:1.9 --- php-gtk/src/php_gtk_types.c:1.8 Thu Feb 8 21:31:34 2001 +++ php-gtk/src/php_gtk_types.c Fri Feb 9 21:10:44 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_types.c,v 1.8 2001/02/09 05:31:34 andrei Exp $ */ +/* $Id: php_gtk_types.c,v 1.9 2001/02/10 05:10:44 andrei Exp $ */ #include "php_gtk.h" @@ -508,11 +508,11 @@ zend_overloaded_element *property = (zend_overloaded_element *)(*element)->data; zend_llist_element *next; char *prop_name = Z_STRVAL(property->element); - int prop_index; + int prop_index, i; ZVAL_NULL(result); - if (!strcmp(prop_name, "colors")) { + if (!strcmp(prop_name, "colors") && cmap->colors) { next = (*element)->next; if (next) { property = (zend_overloaded_element *)next->data; @@ -526,6 +526,10 @@ *result = *php_gdk_color_new(&cmap->colors[prop_index]); } } else { + array_init(result); + + for (i = 0; i < cmap->size; i++) + add_next_index_zval(result, php_gdk_color_new(&cmap->colors[i])); } } } @@ -670,19 +674,47 @@ /* GdkFont */ PHP_FUNCTION(gdk_font_width) { - + char *text; + int length; + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s#", &text, &length)) + return; + + RETURN_LONG(gdk_text_width(PHP_GDK_FONT_GET(this_ptr), text, length)); } PHP_FUNCTION(gdk_font_height) { + char *text; + int length; + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s#", &text, &length)) + return; + + RETURN_LONG(gdk_text_height(PHP_GDK_FONT_GET(this_ptr), text, length)); } PHP_FUNCTION(gdk_font_measure) { + char *text; + int length; + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s#", &text, &length)) + return; + + RETURN_LONG(gdk_text_measure(PHP_GDK_FONT_GET(this_ptr), text, length)); } PHP_FUNCTION(gdk_font_extents) { + char *text; + int length, lbearing, rbearing, width, ascent, descent; + + if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "s#", &text, &length)) + return; + + gdk_text_extents(PHP_GDK_FONT_GET(this_ptr), text, length, &lbearing, &rbearing, &width, &ascent, &descent); + *return_value = *php_gtk_build_value("(iiiii)", lbearing, rbearing, width, ascent, descent); } static function_entry php_gdk_font_functions[] = { Index: php-gtk/src/php_gtk_util.c diff -u php-gtk/src/php_gtk_util.c:1.4 php-gtk/src/php_gtk_util.c:1.5 --- php-gtk/src/php_gtk_util.c:1.4 Sat Feb 3 16:08:49 2001 +++ php-gtk/src/php_gtk_util.c Fri Feb 9 21:10:44 2001 @@ -18,15 +18,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_util.c,v 1.4 2001/02/04 00:08:49 andrei Exp $ */ +/* $Id: php_gtk_util.c,v 1.5 2001/02/10 05:10:44 andrei Exp $ */ #include "php_gtk.h" #if HAVE_PHP_GTK -static char *parse_arg_impl(zval **arg, va_list *va, int spec, char *buf) +static char *parse_arg_impl(zval **arg, va_list *va, char **spec, char *buf) { - switch (spec) { + char *spec_walk = *spec; + char c = *spec_walk++; + + switch (c) { case 'h': { short *p = va_arg(*va, short *); @@ -66,6 +69,10 @@ *p = Z_STRVAL_PP(arg); if ((int)strlen(*p) != Z_STRLEN_PP(arg)) return "string without null bytes"; + if (*spec_walk == '#') { + int *p = va_arg(*va, int *); + *p = Z_STRLEN_PP(arg); + } } break; @@ -138,12 +145,17 @@ *p = *arg; } break; + + default: + return "<unknown>"; } + *spec = spec_walk; + return NULL; } -static int parse_arg(int arg_num, zval **arg, va_list *va, int spec, int quiet) +static int parse_arg(int arg_num, zval **arg, va_list *va, char **spec, int quiet) { char *expected_type; char *actual_type; @@ -230,6 +242,10 @@ max_argc++; break; + case '#': + /* Pass */ + break; + default: g_assert_not_reached(); break; @@ -252,10 +268,10 @@ return 0; } - for (i = 0; i < argc; i++, format++) { + for (i = 0; i < argc; i++) { if (*format == '|') format++; - if (!parse_arg(i+1, args[i], va, *format, quiet)) + if (!parse_arg(i+1, args[i], va, &format, quiet)) return 0; }

« previous php.gtk (#13) next »