cvs: php-gtk / NEWS TODO makedist /generator gtk.defs /src php_gtk_types.c

From: Date: Thu, 08 Mar 2001 02:35:50 +0000
Subject: cvs: php-gtk / NEWS TODO makedist /generator gtk.defs /src php_gtk_types.c
Groups: php.gtk 
Request: Send a blank email to php-gtk+get-536@lists.php.net to get a copy of this message
andrei Wed Mar 7 18:35:50 2001 EDT Modified files: /php-gtk NEWS TODO makedist /php-gtk/generator gtk.defs /php-gtk/src php_gtk_types.c Log: * Added 'child' property to GtkBin and its descendants. * Added an internal function for querying color values (not used yet). Index: php-gtk/NEWS diff -u php-gtk/NEWS:1.8 php-gtk/NEWS:1.9 --- php-gtk/NEWS:1.8 Mon Mar 5 20:55:09 2001 +++ php-gtk/NEWS Wed Mar 7 18:35:49 2001 @@ -1,14 +1,19 @@ +php-gtk-0.0.2: x-Mar-2001 + - added 'child' property to GtkBin and its descendants. (Andrei) + - all callbacks now take user supplied extra arguments and better error + messages are shown if the callbacks are not valid. (Andrei) - added GtkCombo::set_popdown_strings(), GdkPixmap::create_from_xpm(). - - implemented support for creating menus via GtkItemFactory. - - fixed loading of the extension via php.ini. + (Andrei) + - implemented support for creating menus via GtkItemFactory. (Andrei) + - fixed loading of the extension via php.ini. (Andrei) - fixed timeout and idle handler marshaller so that they are called more - than once. + than once. (Andrei) - added connect_object() method that allows calling an object method as a - signal callback. - - fixed a silent crash that was happening due to object corruption. - - implemented GtkTipsQuery class. + signal callback. (Andrei) + - fixed a silent crash that was happening due to object corruption. (Andrei) + - implemented GtkTipsQuery class. (Andrei) php-gtk-0.0.1: 1-Mar-2001 - - first release + - first release. (Andrei) # vim: set et tw=80 ai sts=4: Index: php-gtk/TODO diff -u php-gtk/TODO:1.20 php-gtk/TODO:1.21 --- php-gtk/TODO:1.20 Mon Mar 5 07:57:42 2001 +++ php-gtk/TODO Wed Mar 7 18:35:49 2001 @@ -1,11 +1,9 @@ -* Finish boxed type support. * Investigate how to improve h2def.py or modify gdk.defs to define boxed type objects (GdkColormap, etc.) * Figure out what's up with getting/setting gc background/foreground colors and how to get RGB values from pixels. * Provide access to GTK version number. * Fix $dialog->vbox->show() crash. -* Think about better 'connect_object' semantics. * See what other object definitions might have been missed by h2def.py. In PHP Index: php-gtk/makedist diff -u php-gtk/makedist:1.3 php-gtk/makedist:1.4 --- php-gtk/makedist:1.3 Thu Mar 1 09:01:38 2001 +++ php-gtk/makedist Wed Mar 7 18:35:49 2001 @@ -25,7 +25,7 @@ # Written by Stig Bakken <ssb@guardian.no> 1997-05-28. # Modified by Andrei Zmievski <andrei@php.net> 2001-03-01 # -# $Id: makedist,v 1.3 2001/03/01 17:01:38 andrei Exp $ +# $Id: makedist,v 1.4 2001/03/08 02:35:49 andrei Exp $ # if test "$#" != "2"; then @@ -82,7 +82,7 @@ cd $DIR || exit 3 # remove CVS stuff... -find . \( \( -name makedist \) -o -name .cvsignore \) -exec rm -rf {} \; +find . \( -name makedist -o -name .cvsignore -o -name docs \) -exec rm -rf {} \; cd $MY_OLDPWD $ECHO_N "makedist: making gzipped tar archive...$ECHO_C" Index: php-gtk/generator/gtk.defs diff -u php-gtk/generator/gtk.defs:1.2 php-gtk/generator/gtk.defs:1.3 --- php-gtk/generator/gtk.defs:1.2 Fri Mar 2 22:25:22 2001 +++ php-gtk/generator/gtk.defs Wed Mar 7 18:35:50 2001 @@ -323,6 +323,7 @@ (in-module Gtk) (parent Container (Gtk)) (c-name GtkBin) + (field (type-and-name GtkWidget* child)) ) (object Viewport Index: php-gtk/src/php_gtk_types.c diff -u php-gtk/src/php_gtk_types.c:1.19 php-gtk/src/php_gtk_types.c:1.20 --- php-gtk/src/php_gtk_types.c:1.19 Mon Mar 5 20:53:39 2001 +++ php-gtk/src/php_gtk_types.c Wed Mar 7 18:35:50 2001 @@ -18,11 +18,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk_types.c,v 1.19 2001/03/06 04:53:39 andrei Exp $ */ +/* $Id: php_gtk_types.c,v 1.20 2001/03/08 02:35:50 andrei Exp $ */ #include "php_gtk.h" #if HAVE_PHP_GTK +#include <gdk/gdkx.h> int le_gdk_event; int le_gdk_window; @@ -661,7 +662,7 @@ gdk_window_get_geometry(win, NULL, NULL, NULL, NULL, &x); ZVAL_LONG(return_value, x); } -#ifndef G_OS_WIN32 +#ifndef PHP_WIN32 else if (!strcmp(prop_name, "xid")) { ZVAL_LONG(return_value, GDK_WINDOW_XWINDOW(win)); } @@ -1221,6 +1222,55 @@ { GdkGC *obj = (GdkGC *)rsrc->ptr; gdk_gc_unref(obj); +} + + +static void gdk_colormap_query_color (GdkColormap *colormap, gulong pixel, GdkColor *result) +{ +#ifndef PHP_WIN32 + XColor xcolor; +#endif + GdkVisual *visual; + + g_return_if_fail (GDK_IS_COLORMAP (colormap)); + + visual = gdk_colormap_get_visual (colormap); + + switch (visual->type) { + case GDK_VISUAL_DIRECT_COLOR: + case GDK_VISUAL_TRUE_COLOR: + result->red = 65535. * (double)((pixel & visual->red_mask) >> + visual->red_shift) / ((1 << visual->red_prec) - 1); + result->green = 65535. * (double)((pixel & visual->green_mask) >> + visual->green_shift) / ((1 << visual->green_prec) - 1); + result->blue = 65535. * (double)((pixel & visual->blue_mask) >> + visual->blue_shift) / ((1 << visual->blue_prec) - 1); + break; + case GDK_VISUAL_STATIC_GRAY: + case GDK_VISUAL_GRAYSCALE: + result->red = result->green = result->blue = 65535. * + (double)pixel/((1<<visual->depth) - 1); + break; + case GDK_VISUAL_STATIC_COLOR: +#ifdef PHP_WIN32 + g_assert_not_reached (); +#else + xcolor.pixel = pixel; + XQueryColor(GDK_DISPLAY(), GDK_COLORMAP_XCOLORMAP(colormap), &xcolor); + result->red = xcolor.red; + result->green = xcolor.green; + result->blue = xcolor.blue; +#endif + break; + case GDK_VISUAL_PSEUDO_COLOR: + result->red = colormap->colors[pixel].red; + result->green = colormap->colors[pixel].green; + result->blue = colormap->colors[pixel].blue; + break; + default: + g_assert_not_reached (); + break; + } } static void gdk_gc_get_property(zval *return_value, zval *object, zend_llist_element **element, int *found)

« previous php.gtk (#536) next »