cvs: php-gtk /ext/gtk+ gtk.overrides php_gtk+.c php_gtk+.h /ext/libglade libglade.overrides php_libglade.c /generator generator.php /main php_gtk.c php_gtk.h php_gtk_object.c php_gtk_util.c /test gtk.php
[email protected] ("Andrei Zmievski")
| Newsgroups | php.gtk |
|---|---|
| Message-ID | <cvsandrei996520395@cvsserver> |
andrei Mon Jul 30 15:13:16 2001 EDT
Modified files:
/php-gtk/ext/gtk+ gtk.overrides php_gtk+.c php_gtk+.h
/php-gtk/ext/libglade libglade.overrides php_libglade.c
/php-gtk/generator generator.php
/php-gtk/main php_gtk.c php_gtk.h php_gtk_object.c php_gtk_util.c
/php-gtk/test gtk.php
Log:
Updated to match TSRM changes.
andrei-20010730151316.txt
(text/plain, 15 KB)
Index: php-gtk/ext/gtk+/gtk.overrides
diff -u php-gtk/ext/gtk+/gtk.overrides:1.5 php-gtk/ext/gtk+/gtk.overrides:1.6
--- php-gtk/ext/gtk+/gtk.overrides:1.5 Mon Jul 30 01:11:15 2001
+++ php-gtk/ext/gtk+/gtk.overrides Mon Jul 30 15:13:13 2001
@@ -196,8 +196,8 @@
if (!php_gtk_parse_args(2, "iV", &interval, &callback))
return;
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS());
data = php_gtk_build_value("(VNsi)", callback, extra, callback_filename, callback_lineno);
RETURN_LONG(gtk_timeout_add_full(interval, NULL,
@@ -223,8 +223,8 @@
if (!php_gtk_parse_args(1, "V", &callback))
return;
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 1, ZEND_NUM_ARGS());
data = php_gtk_build_value("(VNsi)", callback, extra, callback_filename, callback_lineno);
RETURN_LONG(gtk_idle_add_full(GTK_PRIORITY_DEFAULT, NULL,
@@ -251,8 +251,8 @@
if (!php_gtk_parse_args(2, "iV", &main_level, &callback))
return;
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS());
data = php_gtk_build_value("(VNsi)", callback, extra, callback_filename, callback_lineno);
RETURN_LONG(gtk_quit_add_full(main_level, NULL,
@@ -287,8 +287,8 @@
return;
}
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 3, ZEND_NUM_ARGS());
data = php_gtk_build_value("(VNsi)", callback, extra, callback_filename, callback_lineno);
RETURN_LONG(gtk_input_add_full(*source, condition, NULL,
@@ -317,8 +317,8 @@
if (!php_gtk_parse_args(2, "sV", &name, &callback))
return;
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS());
data = php_gtk_build_value("(VNisi)", callback, extra, pass_object, callback_filename, callback_lineno);
RETURN_LONG(gtk_signal_connect_full(PHP_GTK_GET(this_ptr), name, NULL,
@@ -1202,7 +1202,7 @@
zval **callback_filename = NULL, **callback_lineno = NULL;
zval ***args, *params;
char *callback_name;
- ELS_FETCH();
+ TSRMLS_FETCH();
zend_hash_index_find(Z_ARRVAL_P(callback_data), 0, (void **)&callback);
zend_hash_index_find(Z_ARRVAL_P(callback_data), 1, (void **)&extra);
@@ -1261,8 +1261,8 @@
if (Z_TYPE_P(php_node) != IS_NULL)
node = PHP_GTK_CTREE_NODE_GET(php_node);
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS());
data = php_gtk_build_value("(VNsi)", callback, extra, callback_filename, callback_lineno);
if (pre_order) {
@@ -1369,7 +1369,7 @@
zval *params;
zval ***args;
char *callback_name;
- ELS_FETCH();
+ TSRMLS_FETCH();
zend_hash_index_find(Z_ARRVAL_P(callback_data), 0, (void **)&callback);
zend_hash_index_find(Z_ARRVAL_P(callback_data), 1, (void **)&callback_filename);
@@ -1425,8 +1425,8 @@
if (Z_TYPE_P(callback) == IS_NULL)
entry.callback = NULL;
else {
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
if (extra)
callback_data = php_gtk_build_value("(VsiV)", callback, callback_filename, callback_lineno, extra);
else
@@ -1949,7 +1949,7 @@
zval *retval, *params;
zval ***args;
char *callback_name;
- ELS_FETCH();
+ TSRMLS_FETCH();
zend_hash_index_find(Z_ARRVAL_P(callback_data), 0, (void **)&callback);
zend_hash_index_find(Z_ARRVAL_P(callback_data), 1, (void **)&callback_filename);
@@ -1998,8 +1998,8 @@
pmi = GTK_WIDGET(PHP_GTK_GET(php_pmi));
if (Z_TYPE_P(callback) != IS_NULL) {
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
data = php_gtk_build_value("(Vsi)", callback, callback_filename, callback_lineno);
gtk_menu_popup(GTK_MENU(PHP_GTK_GET(this_ptr)), pms, pmi,
(GtkMenuPositionFunc)php_gtk_menu_position, data,
Index: php-gtk/ext/gtk+/php_gtk+.c
diff -u php-gtk/ext/gtk+/php_gtk+.c:1.5 php-gtk/ext/gtk+/php_gtk+.c:1.6
--- php-gtk/ext/gtk+/php_gtk+.c:1.5 Tue Jul 10 17:19:03 2001
+++ php-gtk/ext/gtk+/php_gtk+.c Mon Jul 30 15:13:13 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk+.c,v 1.5 2001/07/10 21:19:03 andrei Exp $: */
+/* $Id: php_gtk+.c,v 1.6 2001/07/30 19:13:13 andrei Exp $: */
#include "php_gtk.h"
#include "SAPI.h"
@@ -37,8 +37,7 @@
char **argv;
int argc, i;
zend_bool no_argc = 0;
- PLS_FETCH();
- SLS_FETCH();
+ TSRMLS_FETCH();
/* We check request_method to see if we've been called from command line or
Web server. Running GUI apps through a Web module can be dangerous to
@@ -146,8 +145,8 @@
le_gtk_object = zend_register_list_destructors_ex(release_gtk_object_rsrc, NULL, "GtkObject", module_number);
init_gtk();
- php_gtk_register_constants(module_number ELS_CC);
- php_gdk_register_constants(module_number ELS_CC);
+ php_gtk_register_constants(module_number TSRMLS_CC);
+ php_gdk_register_constants(module_number TSRMLS_CC);
php_gtk_register_classes();
php_gdk_register_classes();
php_gtk_plus_register_types(module_number);
Index: php-gtk/ext/gtk+/php_gtk+.h
diff -u php-gtk/ext/gtk+/php_gtk+.h:1.5 php-gtk/ext/gtk+/php_gtk+.h:1.6
--- php-gtk/ext/gtk+/php_gtk+.h:1.5 Thu Jul 19 01:24:16 2001
+++ php-gtk/ext/gtk+/php_gtk+.h Mon Jul 30 15:13:13 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk+.h,v 1.5 2001/07/19 05:24:16 andrei Exp $: */
+/* $Id: php_gtk+.h,v 1.6 2001/07/30 19:13:13 andrei Exp $: */
#ifndef _PHP_GTK_PLUS_H
#define _PHP_GTK_PLUS_H
@@ -105,8 +105,8 @@
zval *php_gtk_fixed_child_new(GtkFixedChild *fixed_child);
zval *php_gtk_clist_row_new(GtkCListRow *clist_row);
-void php_gtk_register_constants(int module_number ELS_DC);
-void php_gdk_register_constants(int module_number ELS_DC);
+void php_gtk_register_constants(int module_number TSRMLS_DC);
+void php_gdk_register_constants(int module_number TSRMLS_DC);
void php_gtk_register_classes(void);
void php_gdk_register_classes(void);
void php_gtk_plus_register_types(int module_number);
Index: php-gtk/ext/libglade/libglade.overrides
diff -u php-gtk/ext/libglade/libglade.overrides:1.2 php-gtk/ext/libglade/libglade.overrides:1.3
--- php-gtk/ext/libglade/libglade.overrides:1.2 Tue Jul 10 14:27:51 2001
+++ php-gtk/ext/libglade/libglade.overrides Mon Jul 30 15:13:14 2001
@@ -66,8 +66,8 @@
if (!php_gtk_parse_args(2, "sV", &handler_name, &callback))
return;
- callback_filename = zend_get_executed_filename(ELS_C);
- callback_lineno = zend_get_executed_lineno(ELS_C);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
extra = php_gtk_func_args_as_hash(ZEND_NUM_ARGS(), 2, ZEND_NUM_ARGS());
data = php_gtk_build_value("(VNisi)", callback, extra, 1, callback_filename, callback_lineno);
glade_xml_signal_connect_full(GLADE_XML(PHP_GTK_GET(this_ptr)), handler_name,
@@ -87,7 +87,7 @@
int pass_object = 1;
char *callback_filename;
uint callback_lineno;
- ELS_FETCH();
+ TSRMLS_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 ||
@@ -124,8 +124,8 @@
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);
+ callback_filename = zend_get_executed_filename(TSRMLS_C);
+ callback_lineno = zend_get_executed_lineno(TSRMLS_C);
data = php_gtk_build_value("(NNisi)", callback, params, pass_object,
callback_filename, callback_lineno);
gtk_signal_connect_full(obj, signal_name, NULL,
Index: php-gtk/ext/libglade/php_libglade.c
diff -u php-gtk/ext/libglade/php_libglade.c:1.3 php-gtk/ext/libglade/php_libglade.c:1.4
--- php-gtk/ext/libglade/php_libglade.c:1.3 Tue Jul 10 16:55:43 2001
+++ php-gtk/ext/libglade/php_libglade.c Mon Jul 30 15:13:14 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_libglade.c,v 1.3 2001/07/10 20:55:43 andrei Exp $: */
+/* $Id: php_libglade.c,v 1.4 2001/07/30 19:13:14 andrei Exp $: */
#include "php_gtk.h"
@@ -27,7 +27,7 @@
PHP_GTK_XINIT_FUNCTION(libglade)
{
glade_init();
- php_libglade_register_constants(module_number ELS_CC);
+ php_libglade_register_constants(module_number TSRMLS_CC);
php_libglade_register_classes();
return SUCCESS;
Index: php-gtk/generator/generator.php
diff -u php-gtk/generator/generator.php:1.23 php-gtk/generator/generator.php:1.24
--- php-gtk/generator/generator.php:1.23 Tue Jul 10 14:27:51 2001
+++ php-gtk/generator/generator.php Mon Jul 30 15:13:14 2001
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: generator.php,v 1.23 2001/07/10 18:27:51 andrei Exp $ */
+/* $Id: generator.php,v 1.24 2001/07/30 19:13:14 andrei Exp $ */
/*
* Significant portions of this generator are based on the pygtk code generator
@@ -72,7 +72,7 @@
function write_constants($fp)
{
- fwrite($fp, "\nvoid php_". $this->prefix . "_register_constants(int module_number ELS_DC)\n");
+ fwrite($fp, "\nvoid php_". $this->prefix . "_register_constants(int module_number TSRMLS_DC)\n");
fwrite($fp, "{\n");
foreach ($this->parser->enums as $enum) {
if ($this->overrides->is_ignored($enum->c_name)) continue;
Index: php-gtk/main/php_gtk.c
diff -u php-gtk/main/php_gtk.c:1.14 php-gtk/main/php_gtk.c:1.15
--- php-gtk/main/php_gtk.c:1.14 Tue Jul 10 17:41:19 2001
+++ php-gtk/main/php_gtk.c Mon Jul 30 15:13:14 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk.c,v 1.14 2001/07/10 21:41:19 andrei Exp $: */
+/* $Id: php_gtk.c,v 1.15 2001/07/30 19:13:14 andrei Exp $: */
#include "php_gtk.h"
#include "SAPI.h"
@@ -138,11 +138,11 @@
static int php_gtk_startup_extension(php_gtk_ext_entry *ext, int module_number)
{
- ELS_FETCH();
+ TSRMLS_FETCH();
if (ext) {
if (ext->ext_startup_func) {
- if (ext->ext_startup_func(module_number ELS_CC) == FAILURE) {
+ if (ext->ext_startup_func(module_number TSRMLS_CC) == FAILURE) {
php_error(E_WARNING, "Unable to start '%s' PHP-GTK extension", ext->name);
return FAILURE;
}
Index: php-gtk/main/php_gtk.h
diff -u php-gtk/main/php_gtk.h:1.44 php-gtk/main/php_gtk.h:1.45
--- php-gtk/main/php_gtk.h:1.44 Mon Jul 16 17:17:59 2001
+++ php-gtk/main/php_gtk.h Mon Jul 30 15:13:14 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk.h,v 1.44 2001/07/16 21:17:59 andrei Exp $: */
+/* $Id: php_gtk.h,v 1.45 2001/07/30 19:13:14 andrei Exp $: */
#ifndef _PHP_GTK_H
#define _PHP_GTK_H
@@ -36,7 +36,7 @@
typedef void (*prop_getter_t)(zval *return_value, zval *object, zend_llist_element **element, int *result);
typedef int (*prop_setter_t)(zval *object, zend_llist_element **element, zval *value);
-#define EXT_INIT_ARGS int module_number ELS_DC
+#define EXT_INIT_ARGS int module_number TSRMLS_DC
#define EXT_SHUTDOWN_ARGS void
#define PHP_GTK_XINIT(ext) php_gtk_xinit_##ext
Index: php-gtk/main/php_gtk_object.c
diff -u php-gtk/main/php_gtk_object.c:1.42 php-gtk/main/php_gtk_object.c:1.43
--- php-gtk/main/php_gtk_object.c:1.42 Thu Jul 19 15:05:35 2001
+++ php-gtk/main/php_gtk_object.c Mon Jul 30 15:13:14 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk_object.c,v 1.42 2001/07/19 19:05:35 andrei Exp $ */
+/* $Id: php_gtk_object.c,v 1.43 2001/07/30 19:13:14 andrei Exp $ */
#include "php_gtk.h"
@@ -156,7 +156,7 @@
zval *tmp;
zval ***signal_args;
char *callback_name;
- ELS_FETCH();
+ TSRMLS_FETCH();
/* Callback is always passed as the first element. */
zend_hash_index_find(Z_ARRVAL_P(callback_data), 0, (void **)&callback);
@@ -238,7 +238,7 @@
int num_handler_args = 0;
zval *retval = NULL;
char *callback_name;
- ELS_FETCH();
+ TSRMLS_FETCH();
/* Callback is always passed as the first element. */
zend_hash_index_find(Z_ARRVAL_P(callback_data), 0, (void **)&callback);
@@ -278,7 +278,7 @@
zval **callback_filename = NULL, **callback_lineno = NULL;
zval ***input_args;
char *callback_name;
- ELS_FETCH();
+ TSRMLS_FETCH();
zend_hash_index_find(Z_ARRVAL_P(callback_data), 0, (void **)&callback);
zend_hash_index_find(Z_ARRVAL_P(callback_data), 1, (void **)&extra);
Index: php-gtk/main/php_gtk_util.c
diff -u php-gtk/main/php_gtk_util.c:1.18 php-gtk/main/php_gtk_util.c:1.19
--- php-gtk/main/php_gtk_util.c:1.18 Tue Jul 10 14:27:52 2001
+++ php-gtk/main/php_gtk_util.c Mon Jul 30 15:13:14 2001
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: php_gtk_util.c,v 1.18 2001/07/10 18:27:52 andrei Exp $ */
+/* $Id: php_gtk_util.c,v 1.19 2001/07/30 19:13:14 andrei Exp $ */
#include "php_gtk.h"
@@ -413,7 +413,7 @@
{
char *lcname;
int retval = 0;
- ELS_FETCH();
+ TSRMLS_FETCH();
switch (Z_TYPE_P(callable)) {
case IS_STRING:
Index: php-gtk/test/gtk.php
diff -u php-gtk/test/gtk.php:1.27 php-gtk/test/gtk.php:1.28
--- php-gtk/test/gtk.php:1.27 Mon Jul 30 01:11:15 2001
+++ php-gtk/test/gtk.php Mon Jul 30 15:13:15 2001
@@ -1,5 +1,5 @@
<?php
-/* $Id: gtk.php,v 1.27 2001/07/30 05:11:15 andrei Exp $ */
+/* $Id: gtk.php,v 1.28 2001/07/30 19:13:15 andrei Exp $ */
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
dl('php_gtk.dll');
@@ -1967,7 +1967,7 @@
$window->set_policy(false, false, false);
$window->set_name('main window');
$window->set_usize(200, 400);
- $window->set_uposition(20, 20);
+ $window->set_position(GTK_WIN_POS_CENTER);
$window->connect_object('destroy', array('gtk', 'main_quit'));
$window->connect_object('delete-event', array('gtk', 'false'));