cpython-lru_cache-weakref: Modules/

annotate Modules/_tkinter.c @ 51271:87fbbf22adf3 3.0

Merged revisions 69214 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r69214 | mark.dickinson | 2009-02-02 20:36:42 +0000 (Mon, 02 Feb 2009) | 4 lines Issue #1717: rename tp_compare to tp_reserved. I'll change the type of tp_compare in a separate commit, for ease of reversion should things go wrong. ........

author	Mark Dickinson <dickinsm@gmail.com>
date	Mon, 02 Feb 2009 20:41:29 +0000
parents	e9675d72e3e3
children	362d96dbe92c

rev	line source
3703 ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	1 /***********************************************************
ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	2 Copyright (C) 1994 Steen Lumholt.
ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	3
ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	4 All Rights Reserved
ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	5
ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	6 ******************************************************************/
ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	7
ff7fa59f62e8 Added CWI copyright. Guido van Rossum <guido@python.org> parents: 3554 diff changeset	8 /* _tkinter.c -- Interface to libtk.a and libtcl.a. */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	9
4005 7495322427c7 Changes for Windows NT -- this time it works, with Tcl4.1p1 (p1!!!) etc. Guido van Rossum <guido@python.org> parents: 3973 diff changeset	10 /* TCL/TK VERSION INFO:
7495322427c7 Changes for Windows NT -- this time it works, with Tcl4.1p1 (p1!!!) etc. Guido van Rossum <guido@python.org> parents: 3973 diff changeset	11
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	12 Only Tcl/Tk 8.2 and later are supported. Older versions are not
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	13 supported. (Use Python 2.2 if you cannot upgrade your Tcl/Tk
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	14 libraries.)
9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	15 */
4005 7495322427c7 Changes for Windows NT -- this time it works, with Tcl4.1p1 (p1!!!) etc. Guido van Rossum <guido@python.org> parents: 3973 diff changeset	16
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	17 /* XXX Further speed-up ideas, involving Tcl 8.0 features:
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	18
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	19 - Register a new Tcl type, "Python callable", which can be called more
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	20 efficiently and passed to Tcl_EvalObj() directly (if this is possible).
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	21
4005 7495322427c7 Changes for Windows NT -- this time it works, with Tcl4.1p1 (p1!!!) etc. Guido van Rossum <guido@python.org> parents: 3973 diff changeset	22 */
7495322427c7 Changes for Windows NT -- this time it works, with Tcl4.1p1 (p1!!!) etc. Guido van Rossum <guido@python.org> parents: 3973 diff changeset	23
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	24
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	25 #include "Python.h"
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	26 #include <ctype.h>
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	27
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	28 #ifdef WITH_THREAD
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9128 diff changeset	29 #include "pythread.h"
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	30 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	31
8446 59dfa9eb7c07 On Windows, need #include <windows.h>; and it's MS_WINDOWS, not MS_WIN32. Guido van Rossum <guido@python.org> parents: 8444 diff changeset	32 #ifdef MS_WINDOWS
59dfa9eb7c07 On Windows, need #include <windows.h>; and it's MS_WINDOWS, not MS_WIN32. Guido van Rossum <guido@python.org> parents: 8444 diff changeset	33 #include <windows.h>
59dfa9eb7c07 On Windows, need #include <windows.h>; and it's MS_WINDOWS, not MS_WIN32. Guido van Rossum <guido@python.org> parents: 8444 diff changeset	34 #endif
59dfa9eb7c07 On Windows, need #include <windows.h>; and it's MS_WINDOWS, not MS_WIN32. Guido van Rossum <guido@python.org> parents: 8444 diff changeset	35
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	36 /* Allow using this code in Python 2.[12] */
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	37 #ifndef PyDoc_STRVAR
27333 f4c694a01425 Avoid usage of PyDoc_STR in 2.2 compatibility code. Martin v. Löwis <martin@v.loewis.de> parents: 27104 diff changeset	38 #define PyDoc_STRVAR(name,str) static char name[] = str
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	39 #endif
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	40
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	41 #ifndef PyMODINIT_FUNC
27084 f7226422c1d0 Fix typo. Martin v. Löwis <martin@v.loewis.de> parents: 27083 diff changeset	42 #define PyMODINIT_FUNC void
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	43 #endif
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	44
28444 2405371be34c Fake bool API for Python 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28156 diff changeset	45 #ifndef PyBool_Check
2405371be34c Fake bool API for Python 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28156 diff changeset	46 #define PyBool_Check(o) 0
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43963 diff changeset	47 #define PyBool_FromLong PyLong_FromLong
28444 2405371be34c Fake bool API for Python 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28156 diff changeset	48 #endif
2405371be34c Fake bool API for Python 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28156 diff changeset	49
25527 5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	50 /* Starting with Tcl 8.4, many APIs offer const-correctness. Unfortunately,
5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	51 making _tkinter correct for this API means to break earlier
5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	52 versions. USE_COMPAT_CONST allows to make _tkinter work with both 8.4 and
5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	53 earlier versions. Once Tcl releases before 8.4 don't need to be supported
5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	54 anymore, this should go. */
5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	55 #define USE_COMPAT_CONST
5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	56
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	57 /* If Tcl is compiled for threads, we must also define TCL_THREAD. We define
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	58 it always; if Tcl is not threaded, the thread functions in
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	59 Tcl are empty. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	60 #define TCL_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	61
21322 1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	62 #ifdef TK_FRAMEWORK
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	63 #include <Tcl/tcl.h>
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	64 #include <Tk/tk.h>
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	65 #else
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	66 #include <tcl.h>
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	67 #include <tk.h>
21322 1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	68 #endif
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	69
26989 bcbd94c610e8 Patch #660485: Cygwin _tkinter Tcl/Tk 8.3 patch Jason Tishler <jason@tishler.net> parents: 26971 diff changeset	70 /* For Tcl 8.2 and 8.3, CONST* is not defined (except on Cygwin). */
26858 b4ca5b9ba933 Silence cast warnings for Tcl 8.3. Martin v. Löwis <martin@v.loewis.de> parents: 26814 diff changeset	71 #ifndef CONST84_RETURN
b4ca5b9ba933 Silence cast warnings for Tcl 8.3. Martin v. Löwis <martin@v.loewis.de> parents: 26814 diff changeset	72 #define CONST84_RETURN
26989 bcbd94c610e8 Patch #660485: Cygwin _tkinter Tcl/Tk 8.3 patch Jason Tishler <jason@tishler.net> parents: 26971 diff changeset	73 #undef CONST
26858 b4ca5b9ba933 Silence cast warnings for Tcl 8.3. Martin v. Löwis <martin@v.loewis.de> parents: 26814 diff changeset	74 #define CONST
b4ca5b9ba933 Silence cast warnings for Tcl 8.3. Martin v. Löwis <martin@v.loewis.de> parents: 26814 diff changeset	75 #endif
b4ca5b9ba933 Silence cast warnings for Tcl 8.3. Martin v. Löwis <martin@v.loewis.de> parents: 26814 diff changeset	76
5913 6b39f8633ca5 Compatibility with Tcl/Tk 8.0b. Guido van Rossum <guido@python.org>* parents: 5866 diff changeset	77 #define TKMAJORMINOR (TK_MAJOR_VERSION*1000 + TK_MINOR_VERSION)
6b39f8633ca5 Compatibility with Tcl/Tk 8.0b. Guido van Rossum <guido@python.org>* parents: 5866 diff changeset	78
25525 2e140700fb6c Drop support for Tk 8.0 and 8.1. Martin v. Löwis <martin@v.loewis.de> parents: 24363 diff changeset	79 #if TKMAJORMINOR < 8002
2e140700fb6c Drop support for Tk 8.0 and 8.1. Martin v. Löwis <martin@v.loewis.de> parents: 24363 diff changeset	80 #error "Tk older than 8.2 not supported"
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	81 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	82
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	83 /* Unicode conversion assumes that Tcl_UniChar is two bytes.
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	84 We cannot test this directly, so we test UTF-8 size instead,
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	85 expecting that TCL_UTF_MAX is changed if Tcl ever supports
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	86 either UTF-16 or UCS-4.
2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	87 Redhat 8 sets TCL_UTF_MAX to 6, and uses wchar_t for
28643 ca2482012b3c Support UCS-4 Tcl for UCS-4 Python builds. Fixes #719880. Martin v. Löwis <martin@v.loewis.de> parents: 28622 diff changeset	88 Tcl_Unichar. This is also ok as long as Python uses UCS-4,
ca2482012b3c Support UCS-4 Tcl for UCS-4 Python builds. Fixes #719880. Martin v. Löwis <martin@v.loewis.de> parents: 28622 diff changeset	89 as well.
ca2482012b3c Support UCS-4 Tcl for UCS-4 Python builds. Fixes #719880. Martin v. Löwis <martin@v.loewis.de> parents: 28622 diff changeset	90 */
ca2482012b3c Support UCS-4 Tcl for UCS-4 Python builds. Fixes #719880. Martin v. Löwis <martin@v.loewis.de> parents: 28622 diff changeset	91 #if TCL_UTF_MAX != 3 && !(defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==6)
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	92 #error "unsupported Tcl configuration"
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	93 #endif
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	94
30979 86fdf8fe7f17 Getting rid of all the code inside #ifdef macintosh too. Jack Jansen <jack.jansen@cwi.nl> parents: 30638 diff changeset	95 #if !(defined(MS_WINDOWS) \|\| defined(__CYGWIN__))
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	96 #define HAVE_CREATEFILEHANDLER
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	97 #endif
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	98
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	99 #ifdef HAVE_CREATEFILEHANDLER
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	100
36233 b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	101 /* This bit is to ensure that TCL_UNIX_FD is defined and doesn't interfere
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	102 with the proper calculation of FHANDLETYPE == TCL_UNIX_FD below. */
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	103 #ifndef TCL_UNIX_FD
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	104 # ifdef TCL_WIN_SOCKET
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	105 # define TCL_UNIX_FD (! TCL_WIN_SOCKET)
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	106 # else
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	107 # define TCL_UNIX_FD 1
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	108 # endif
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	109 #endif
b9dd481b3972 Fix icc warnings: try to set TCL_UNIX_FD for #if TCL_WIN_SOCKET == TCL_UNIX_FD. res is not used, add a XXX comment Neal Norwitz <nnorwitz@gmail.com> parents: 36092 diff changeset	110
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	111 /* Tcl_CreateFileHandler() changed several times; these macros deal with the
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	112 messiness. In Tcl 8.0 and later, it is not available on Windows (and on
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	113 Unix, only because Jack added it back); when available on Windows, it only
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	114 applies to sockets. */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	115
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	116 #ifdef MS_WINDOWS
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	117 #define FHANDLETYPE TCL_WIN_SOCKET
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	118 #else
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	119 #define FHANDLETYPE TCL_UNIX_FD
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	120 #endif
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	121
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	122 /* If Tcl can wait for a Unix file descriptor, define the EventHook() routine
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	123 which uses this to handle Tcl events while the user is typing commands. */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	124
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	125 #if FHANDLETYPE == TCL_UNIX_FD
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	126 #define WAIT_FOR_STDIN
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	127 #endif
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	128
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	129 #endif /* HAVE_CREATEFILEHANDLER */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	130
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	131 #ifdef MS_WINDOWS
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	132 #include <conio.h>
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	133 #define WAIT_FOR_STDIN
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	134 #endif
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	135
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	136 #ifdef WITH_THREAD
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	137
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	138 /* The threading situation is complicated. Tcl is not thread-safe, except
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	139 when configured with --enable-threads.
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	140 So we need to use a lock around all uses of Tcl. Previously, the Python
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	141 interpreter lock was used for this. However, this causes problems when
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	142 other Python threads need to run while Tcl is blocked waiting for events.
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	143
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	144 To solve this problem, a separate lock for Tcl is introduced. Holding it
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	145 is incompatible with holding Python's interpreter lock. The following four
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	146 macros manipulate both locks together.
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	147
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	148 ENTER_TCL and LEAVE_TCL are brackets, just like Py_BEGIN_ALLOW_THREADS and
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	149 Py_END_ALLOW_THREADS. They should be used whenever a call into Tcl is made
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	150 that could call an event handler, or otherwise affect the state of a Tcl
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	151 interpreter. These assume that the surrounding code has the Python
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	152 interpreter lock; inside the brackets, the Python interpreter lock has been
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	153 released and the lock for Tcl has been acquired.
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	154
8504 de11a88ac498 # Note: a previous checkin message was lost because I can now use CVS Guido van Rossum <guido@python.org> parents: 8500 diff changeset	155 Sometimes, it is necessary to have both the Python lock and the Tcl lock.
de11a88ac498 # Note: a previous checkin message was lost because I can now use CVS Guido van Rossum <guido@python.org> parents: 8500 diff changeset	156 (For example, when transferring data from the Tcl interpreter result to a
de11a88ac498 # Note: a previous checkin message was lost because I can now use CVS Guido van Rossum <guido@python.org> parents: 8500 diff changeset	157 Python string object.) This can be done by using different macros to close
de11a88ac498 # Note: a previous checkin message was lost because I can now use CVS Guido van Rossum <guido@python.org> parents: 8500 diff changeset	158 the ENTER_TCL block: ENTER_OVERLAP reacquires the Python lock (and restores
de11a88ac498 # Note: a previous checkin message was lost because I can now use CVS Guido van Rossum <guido@python.org> parents: 8500 diff changeset	159 the thread state) but doesn't release the Tcl lock; LEAVE_OVERLAP_TCL
de11a88ac498 # Note: a previous checkin message was lost because I can now use CVS Guido van Rossum <guido@python.org> parents: 8500 diff changeset	160 releases the Tcl lock.
de11a88ac498 # Note: a previous checkin message was lost because I can now use CVS Guido van Rossum <guido@python.org> parents: 8500 diff changeset	161
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	162 By contrast, ENTER_PYTHON and LEAVE_PYTHON are used in Tcl event
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	163 handlers when the handler needs to use Python. Such event handlers are
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	164 entered while the lock for Tcl is held; the event handler presumably needs
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	165 to use Python. ENTER_PYTHON releases the lock for Tcl and acquires
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	166 the Python interpreter lock, restoring the appropriate thread state, and
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	167 LEAVE_PYTHON releases the Python interpreter lock and re-acquires the lock
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	168 for Tcl. It is okay for ENTER_TCL/LEAVE_TCL pairs to be contained inside
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	169 the code between ENTER_PYTHON and LEAVE_PYTHON.
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	170
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	171 These locks expand to several statements and brackets; they should not be
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	172 used in branches of if statements and the like.
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	173
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	174 If Tcl is threaded, this approach won't work anymore. The Tcl interpreter is
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	175 only valid in the thread that created it, and all Tk activity must happen in this
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	176 thread, also. That means that the mainloop must be invoked in the thread that
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	177 created the interpreter. Invoking commands from other threads is possible;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	178 _tkinter will queue an event for the interpreter thread, which will then
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	179 execute the command and pass back the result. If the main thread is not in the
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	180 mainloop, and invoking commands causes an exception; if the main loop is running
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	181 but not processing events, the command invocation will block.
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	182
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	183 In addition, for a threaded Tcl, a single global tcl_tstate won't be sufficient
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	184 anymore, since multiple Tcl interpreters may simultaneously dispatch in different
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	185 threads. So we use the Tcl TLS API.
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	186
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	187 */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	188
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	189 static PyThread_type_lock tcl_lock = 0;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	190
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	191 #ifdef TCL_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	192 static Tcl_ThreadDataKey state_key;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	193 typedef PyThreadState *ThreadSpecificData;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	194 #define tcl_tstate ((PyThreadState)Tcl_GetThreadData(&state_key, sizeof(PyThreadState)))
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	195 #else
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	196 static PyThreadState *tcl_tstate = NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	197 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	198
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	199 #define ENTER_TCL \
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	200 { PyThreadState *tstate = PyThreadState_Get(); Py_BEGIN_ALLOW_THREADS \
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	201 if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); tcl_tstate = tstate;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	202
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	203 #define LEAVE_TCL \
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	204 tcl_tstate = NULL; if(tcl_lock)PyThread_release_lock(tcl_lock); Py_END_ALLOW_THREADS}
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	205
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	206 #define ENTER_OVERLAP \
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	207 Py_END_ALLOW_THREADS
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	208
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	209 #define LEAVE_OVERLAP_TCL \
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	210 tcl_tstate = NULL; if(tcl_lock)PyThread_release_lock(tcl_lock); }
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	211
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	212 #define ENTER_PYTHON \
8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	213 { PyThreadState *tstate = tcl_tstate; tcl_tstate = NULL; \
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	214 if(tcl_lock)PyThread_release_lock(tcl_lock); PyEval_RestoreThread((tstate)); }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	215
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	216 #define LEAVE_PYTHON \
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	217 { PyThreadState *tstate = PyEval_SaveThread(); \
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	218 if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); tcl_tstate = tstate; }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	219
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	220 #define CHECK_TCL_APPARTMENT \
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	221 if (((TkappObject *)self)->threaded && \
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	222 ((TkappObject *)self)->thread_id != Tcl_GetCurrentThread()) { \
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	223 PyErr_SetString(PyExc_RuntimeError, "Calling Tcl from different appartment"); \
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	224 return 0; \
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	225 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	226
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	227 #else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	228
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	229 #define ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	230 #define LEAVE_TCL
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	231 #define ENTER_OVERLAP
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	232 #define LEAVE_OVERLAP_TCL
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	233 #define ENTER_PYTHON
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	234 #define LEAVE_PYTHON
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	235 #define CHECK_TCL_APPARTMENT
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	236
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	237 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	238
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	239 #ifndef FREECAST
4005 7495322427c7 Changes for Windows NT -- this time it works, with Tcl4.1p1 (p1!!!) etc. Guido van Rossum <guido@python.org> parents: 3973 diff changeset	240 #define FREECAST (char *)
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	241 #endif
3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	242
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	243 /** Tkapp Object Declaration **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	244
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23662 diff changeset	245 static PyTypeObject Tkapp_Type;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	246
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	247 typedef struct {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	248 PyObject_HEAD
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	249 Tcl_Interp *interp;
26428 0103f0b75fe2 Rename want_objects to wantobjects throughout, for consistency. Martin v. Löwis <martin@v.loewis.de> parents: 26416 diff changeset	250 int wantobjects;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	251 int threaded; /* True if tcl_platform[threaded] */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	252 Tcl_ThreadId thread_id;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	253 int dispatching;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	254 /* We cannot include tclInt.h, as this is internal.
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	255 So we cache interesting types here. */
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	256 Tcl_ObjType *BooleanType;
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	257 Tcl_ObjType *ByteArrayType;
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	258 Tcl_ObjType *DoubleType;
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	259 Tcl_ObjType *IntType;
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	260 Tcl_ObjType *ListType;
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	261 Tcl_ObjType *ProcBodyType;
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	262 Tcl_ObjType *StringType;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	263 } TkappObject;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	264
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	265 #define Tkapp_Check(v) (Py_TYPE(v) == &Tkapp_Type)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	266 #define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
15177 52d2d36b8bf7 Fix for Bug #116453. Guido van Rossum <guido@python.org> parents: 15053 diff changeset	267 #define Tkapp_Result(v) Tcl_GetStringResult(Tkapp_Interp(v))
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	268
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	269 #define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	270 (void *) v, Py_REFCNT(v)))
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	271
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	272
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	273
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	274 /** Error Handling **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	275
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	276 static PyObject *Tkinter_TclError;
1713 bb566d28caa0 * tkintermodule.c Guido van Rossum <guido@python.org> parents: 1690 diff changeset	277 static int quitMainLoop = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	278 static int errorInCmd = 0;
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	279 static PyObject *excInCmd;
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	280 static PyObject *valInCmd;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 2009 diff changeset	281 static PyObject *trbInCmd;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	282
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	283
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	284
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	285 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	286 Tkinter_Error(PyObject *v)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	287 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	288 PyErr_SetString(Tkinter_TclError, Tkapp_Result(v));
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	289 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	290 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	291
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	292
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	293
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	294 /** Utils **/
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	295
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	296 static int Tkinter_busywaitinterval = 20;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	297
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	298 #ifdef WITH_THREAD
8446 59dfa9eb7c07 On Windows, need #include <windows.h>; and it's MS_WINDOWS, not MS_WIN32. Guido van Rossum <guido@python.org> parents: 8444 diff changeset	299 #ifndef MS_WINDOWS
8987 3e127bca84e7 Need mytime.h for Sleep(). Guido van Rossum <guido@python.org> parents: 8828 diff changeset	300
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	301 /* Millisecond sleep() for Unix platforms. */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	302
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	303 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	304 Sleep(int milli)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	305 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	306 /* XXX Too bad if you don't have select(). */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	307 struct timeval t;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	308 t.tv_sec = milli/1000;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	309 t.tv_usec = (milli%1000) * 1000;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	310 select(0, (fd_set )0, (fd_set )0, (fd_set *)0, &t);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	311 }
8446 59dfa9eb7c07 On Windows, need #include <windows.h>; and it's MS_WINDOWS, not MS_WIN32. Guido van Rossum <guido@python.org> parents: 8444 diff changeset	312 #endif /* MS_WINDOWS */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	313
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	314 /* Wait up to 1s for the mainloop to come up. */
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	315
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	316 static int
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	317 WaitForMainloop(TkappObject* self)
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	318 {
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	319 int i;
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	320 for (i = 0; i < 10; i++) {
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	321 if (self->dispatching)
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	322 return 1;
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	323 Py_BEGIN_ALLOW_THREADS
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	324 Sleep(100);
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	325 Py_END_ALLOW_THREADS
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	326 }
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	327 if (self->dispatching)
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	328 return 1;
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	329 PyErr_SetString(PyExc_RuntimeError, "main thread is not in main loop");
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	330 return 0;
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	331 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	332 #endif /* WITH_THREAD */
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	333
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	334
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	335 static char *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	336 AsString(PyObject value, PyObject tmp)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	337 {
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	338 if (PyBytes_Check(value))
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	339 return PyBytes_AsString(value);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	340 else if (PyUnicode_Check(value)) {
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	341 PyObject *v = PyUnicode_AsUTF8String(value);
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	342 if (v == NULL)
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	343 return NULL;
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	344 if (PyList_Append(tmp, v) != 0) {
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	345 Py_DECREF(v);
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	346 return NULL;
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	347 }
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	348 Py_DECREF(v);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	349 return PyBytes_AsString(v);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	350 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	351 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	352 PyObject *v = PyObject_Str(value);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	353 if (v == NULL)
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	354 return NULL;
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	355 if (PyList_Append(tmp, v) != 0) {
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	356 Py_DECREF(v);
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	357 return NULL;
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	358 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	359 Py_DECREF(v);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	360 return PyBytes_AsString(v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	361 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	362 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	363
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	364
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	365
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	366 #define ARGSZ 64
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	367
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	368 static char *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	369 Merge(PyObject *args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	370 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	371 PyObject *tmp = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	372 char *argvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	373 char **argv = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	374 int fvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	375 int *fv = NULL;
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	376 int argc = 0, fvc = 0, i;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	377 char *res = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	378
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	379 if (!(tmp = PyList_New(0)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	380 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	381
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	382 argv = argvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	383 fv = fvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	384
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	385 if (args == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	386 argc = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	387
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	388 else if (!PyTuple_Check(args)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	389 argc = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	390 fv[0] = 0;
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	391 if (!(argv[0] = AsString(args, tmp)))
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	392 goto finally;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	393 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	394 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	395 argc = PyTuple_Size(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	396
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	397 if (argc > ARGSZ) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	398 argv = (char *)ckalloc(argc sizeof(char *));
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	399 fv = (int )ckalloc(argc sizeof(int));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	400 if (argv == NULL \|\| fv == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	401 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	402 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	403 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	404 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	405
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	406 for (i = 0; i < argc; i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	407 PyObject *v = PyTuple_GetItem(args, i);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	408 if (PyTuple_Check(v)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	409 fv[i] = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	410 if (!(argv[i] = Merge(v)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	411 goto finally;
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	412 fvc++;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	413 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	414 else if (v == Py_None) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	415 argc = i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	416 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	417 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	418 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	419 fv[i] = 0;
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	420 if (!(argv[i] = AsString(v, tmp)))
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	421 goto finally;
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	422 fvc++;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	423 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	424 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	425 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	426 res = Tcl_Merge(argc, argv);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	427 if (res == NULL)
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	428 PyErr_SetString(Tkinter_TclError, "merge failed");
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	429
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	430 finally:
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	431 for (i = 0; i < fvc; i++)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	432 if (fv[i]) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	433 ckfree(argv[i]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	434 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	435 if (argv != argvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	436 ckfree(FREECAST argv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	437 if (fv != fvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	438 ckfree(FREECAST fv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	439
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	440 Py_DECREF(tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	441 return res;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	442 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	443
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	444
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	445
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	446 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	447 Split(char *list)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	448 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	449 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	450 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	451 PyObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	452
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	453 if (list == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	454 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	455 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	456 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	457
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	458 if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	459 /* Not a list.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	460 * Could be a quoted string containing funnies, e.g. {"}.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	461 * Return the string itself.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	462 */
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	463 return PyUnicode_FromString(list);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	464 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	465
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	466 if (argc == 0)
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	467 v = PyUnicode_FromString("");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	468 else if (argc == 1)
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	469 v = PyUnicode_FromString(argv[0]);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	470 else if ((v = PyTuple_New(argc)) != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	471 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	472 PyObject *w;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	473
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	474 for (i = 0; i < argc; i++) {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	475 if ((w = Split(argv[i])) == NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	476 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	477 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	478 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	479 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	480 PyTuple_SetItem(v, i, w);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	481 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	482 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	483 Tcl_Free(FREECAST argv);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	484 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	485 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	486
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	487 /* In some cases, Tcl will still return strings that are supposed to be
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	488 lists. SplitObj walks through a nested tuple, finding string objects that
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	489 need to be split. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	490
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	491 static PyObject *
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	492 SplitObj(PyObject *arg)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	493 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	494 if (PyTuple_Check(arg)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	495 int i, size;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	496 PyObject elem, newelem, *result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	497
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	498 size = PyTuple_Size(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	499 result = NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	500 /* Recursively invoke SplitObj for all tuple items.
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	501 If this does not return a new object, no action is
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	502 needed. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	503 for(i = 0; i < size; i++) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	504 elem = PyTuple_GetItem(arg, i);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	505 newelem = SplitObj(elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	506 if (!newelem) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	507 Py_XDECREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	508 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	509 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	510 if (!result) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	511 int k;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	512 if (newelem == elem) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	513 Py_DECREF(newelem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	514 continue;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	515 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	516 result = PyTuple_New(size);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	517 if (!result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	518 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	519 for(k = 0; k < i; k++) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	520 elem = PyTuple_GetItem(arg, k);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	521 Py_INCREF(elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	522 PyTuple_SetItem(result, k, elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	523 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	524 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	525 PyTuple_SetItem(result, i, newelem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	526 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	527 if (result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	528 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	529 /* Fall through, returning arg. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	530 }
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	531 else if (PyBytes_Check(arg)) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	532 int argc;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	533 char **argv;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	534 char *list = PyBytes_AsString(arg);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	535
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	536 if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	537 Py_INCREF(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	538 return arg;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	539 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	540 Tcl_Free(FREECAST argv);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	541 if (argc > 1)
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	542 return Split(PyBytes_AsString(arg));
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	543 /* Fall through, returning arg. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	544 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	545 Py_INCREF(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	546 return arg;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	547 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	548
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	549
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	550 /** Tkapp Object **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	551
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	552 #ifndef WITH_APPINIT
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	553 int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	554 Tcl_AppInit(Tcl_Interp *interp)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	555 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	556 Tk_Window main;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	557 const char * _tkinter_skip_tk_init;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	558
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	559 if (Tcl_Init(interp) == TCL_ERROR) {
15177 52d2d36b8bf7 Fix for Bug #116453. Guido van Rossum <guido@python.org> parents: 15053 diff changeset	560 PySys_WriteStderr("Tcl_Init error: %s\n", Tcl_GetStringResult(interp));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	561 return TCL_ERROR;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	562 }
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	563 _tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	564 if (_tkinter_skip_tk_init == NULL \|\| strcmp(_tkinter_skip_tk_init, "1") != 0) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	565 main = Tk_MainWindow(interp);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	566 if (Tk_Init(interp) == TCL_ERROR) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	567 PySys_WriteStderr("Tk_Init error: %s\n", Tcl_GetStringResult(interp));
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	568 return TCL_ERROR;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	569 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	570 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	571 return TCL_OK;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	572 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	573 #endif /* !WITH_APPINIT */
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	574
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	575
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	576
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	577
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	578 /* Initialize the Tk application; see the `main' function in
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	579 * `tkMain.c'.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	580 */
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	581
13690 c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	582 static void EnableEventHook(void); /* Forward */
c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	583 static void DisableEventHook(void); /* Forward */
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	584
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	585 static TkappObject *
46316 4352d41affb0 Remove baseName argument from Tkapp_New, as it apparently Martin v. Löwis <martin@v.loewis.de> parents: 44460 diff changeset	586 Tkapp_New(char screenName, char className,
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	587 int interactive, int wantobjects, int wantTk, int sync, char *use)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	588 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	589 TkappObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	590 char *argv0;
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	591
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	592 v = PyObject_New(TkappObject, &Tkapp_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	593 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	594 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	595
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	596 v->interp = Tcl_CreateInterp();
26428 0103f0b75fe2 Rename want_objects to wantobjects throughout, for consistency. Martin v. Löwis <martin@v.loewis.de> parents: 26416 diff changeset	597 v->wantobjects = wantobjects;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	598 v->threaded = Tcl_GetVar2Ex(v->interp, "tcl_platform", "threaded",
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	599 TCL_GLOBAL_ONLY) != NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	600 v->thread_id = Tcl_GetCurrentThread();
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	601 v->dispatching = 0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	602
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	603 #ifndef TCL_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	604 if (v->threaded) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	605 PyErr_SetString(PyExc_RuntimeError, "Tcl is threaded but _tkinter is not");
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	606 Py_DECREF(v);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	607 return 0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	608 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	609 #endif
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	610 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	611 if (v->threaded && tcl_lock) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	612 /* If Tcl is threaded, we don't need the lock. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	613 PyThread_free_lock(tcl_lock);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	614 tcl_lock = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	615 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	616 #endif
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	617
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	618 v->BooleanType = Tcl_GetObjType("boolean");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	619 v->ByteArrayType = Tcl_GetObjType("bytearray");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	620 v->DoubleType = Tcl_GetObjType("double");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	621 v->IntType = Tcl_GetObjType("int");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	622 v->ListType = Tcl_GetObjType("list");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	623 v->ProcBodyType = Tcl_GetObjType("procbody");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	624 v->StringType = Tcl_GetObjType("string");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	625
7416 13f29b62a209 Delete the 'exit' command from the Tcl interpreter -- it would allow Guido van Rossum <guido@python.org> parents: 7212 diff changeset	626 /* Delete the 'exit' command, which can screw things up */
13f29b62a209 Delete the 'exit' command from the Tcl interpreter -- it would allow Guido van Rossum <guido@python.org> parents: 7212 diff changeset	627 Tcl_DeleteCommand(v->interp, "exit");
13f29b62a209 Delete the 'exit' command from the Tcl interpreter -- it would allow Guido van Rossum <guido@python.org> parents: 7212 diff changeset	628
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	629 if (screenName != NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	630 Tcl_SetVar2(v->interp, "env", "DISPLAY",
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	631 screenName, TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	632
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	633 if (interactive)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	634 Tcl_SetVar(v->interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	635 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	636 Tcl_SetVar(v->interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	637
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	638 /* This is used to get the application class for Tk 4.1 and up */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	639 argv0 = (char*)ckalloc(strlen(className) + 1);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	640 if (!argv0) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	641 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	642 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	643 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	644 }
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	645
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	646 strcpy(argv0, className);
36092 b70b3e5b3cd1 Remove extra parens Neal Norwitz <nnorwitz@gmail.com> parents: 36090 diff changeset	647 if (isupper(Py_CHARMASK(argv0[0])))
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 37144 diff changeset	648 argv0[0] = tolower(Py_CHARMASK(argv0[0]));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	649 Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	650 ckfree(argv0);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	651
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	652 if (! wantTk) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	653 Tcl_SetVar(v->interp, "_tkinter_skip_tk_init", "1", TCL_GLOBAL_ONLY);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	654 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	655
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	656 /* some initial arguments need to be in argv */
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	657 if (sync \|\| use) {
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	658 char *args;
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	659 int len = 0;
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	660
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	661 if (sync)
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	662 len += sizeof "-sync";
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	663 if (use)
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	664 len += strlen(use) + sizeof "-use ";
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	665
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	666 args = (char*)ckalloc(len);
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	667 if (!args) {
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	668 PyErr_NoMemory();
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	669 Py_DECREF(v);
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	670 return NULL;
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	671 }
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	672
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	673 args[0] = '\0';
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	674 if (sync)
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	675 strcat(args, "-sync");
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	676 if (use) {
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	677 if (sync)
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	678 strcat(args, " ");
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	679 strcat(args, "-use ");
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	680 strcat(args, use);
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	681 }
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	682
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	683 Tcl_SetVar(v->interp, "argv", args, TCL_GLOBAL_ONLY);
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	684 ckfree(args);
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	685 }
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	686
36871 257ad89d92df Coverity found refleak: need to free 'v' after calling Tkinter_Error(). Thomas Wouters <thomas@python.org> parents: 36698 diff changeset	687 if (Tcl_AppInit(v->interp) != TCL_OK) {
257ad89d92df Coverity found refleak: need to free 'v' after calling Tkinter_Error(). Thomas Wouters <thomas@python.org> parents: 36698 diff changeset	688 PyObject result = Tkinter_Error((PyObject )v);
257ad89d92df Coverity found refleak: need to free 'v' after calling Tkinter_Error(). Thomas Wouters <thomas@python.org> parents: 36698 diff changeset	689 Py_DECREF((PyObject *)v);
257ad89d92df Coverity found refleak: need to free 'v' after calling Tkinter_Error(). Thomas Wouters <thomas@python.org> parents: 36698 diff changeset	690 return (TkappObject *)result;
257ad89d92df Coverity found refleak: need to free 'v' after calling Tkinter_Error(). Thomas Wouters <thomas@python.org> parents: 36698 diff changeset	691 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	692
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	693 EnableEventHook();
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	694
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	695 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	696 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	697
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	698
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	699 static void
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	700 Tkapp_ThreadSend(TkappObject self, Tcl_Event ev,
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	701 Tcl_Condition cond, Tcl_Mutex mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	702 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	703 Py_BEGIN_ALLOW_THREADS;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	704 Tcl_MutexLock(mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	705 Tcl_ThreadQueueEvent(self->thread_id, ev, TCL_QUEUE_TAIL);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	706 Tcl_ThreadAlert(self->thread_id);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	707 Tcl_ConditionWait(cond, mutex, NULL);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	708 Tcl_MutexUnlock(mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	709 Py_END_ALLOW_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	710 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	711
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	712
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	713 / Tcl Eval /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	714
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	715 typedef struct {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	716 PyObject_HEAD
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	717 Tcl_Obj *value;
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	718 PyObject string; / This cannot cause cycles. */
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	719 } PyTclObject;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	720
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36871 diff changeset	721 static PyTypeObject PyTclObject_Type;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	722 #define PyTclObject_Check(v) ((v)->ob_type == &PyTclObject_Type)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	723
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	724 static PyObject *
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	725 newPyTclObject(Tcl_Obj *arg)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	726 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	727 PyTclObject *self;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	728 self = PyObject_New(PyTclObject, &PyTclObject_Type);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	729 if (self == NULL)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	730 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	731 Tcl_IncrRefCount(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	732 self->value = arg;
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	733 self->string = NULL;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	734 return (PyObject*)self;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	735 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	736
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	737 static void
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	738 PyTclObject_dealloc(PyTclObject *self)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	739 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	740 Tcl_DecrRefCount(self->value);
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	741 Py_XDECREF(self->string);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	742 PyObject_Del(self);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	743 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	744
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	745 static char*
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	746 PyTclObject_TclString(PyObject *self)
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	747 {
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	748 return Tcl_GetString(((PyTclObject*)self)->value);
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	749 }
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	750
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	751 /* Like _str, but create Unicode if necessary. */
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	752 PyDoc_STRVAR(PyTclObject_string__doc__,
43963 14c4bb3c65a7 Removed some leftovers from the str8 days Christian Heimes <christian@cheimes.de> parents: 43950 diff changeset	753 "the string representation of this object, either as str or bytes");
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	754
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	755 static PyObject *
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	756 PyTclObject_string(PyTclObject self, void ignored)
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	757 {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	758 char *s;
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	759 int len;
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	760 if (!self->string) {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	761 s = Tcl_GetStringFromObj(self->value, &len);
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	762 self->string = PyUnicode_FromStringAndSize(s, len);
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	763 if (!self->string)
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	764 return NULL;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	765 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	766 Py_INCREF(self->string);
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	767 return self->string;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	768 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	769
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	770 static PyObject *
42232 e715e2081637 Rename PyTclObject_unicode to PyTclObject_str and use this Walter Dörwald <walter@livinglogic.de> parents: 42193 diff changeset	771 PyTclObject_str(PyTclObject self, void ignored)
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	772 {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	773 char *s;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	774 int len;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	775 if (self->string && PyUnicode_Check(self->string)) {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	776 Py_INCREF(self->string);
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	777 return self->string;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	778 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	779 /* XXX Could chache result if it is non-ASCII. */
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	780 s = Tcl_GetStringFromObj(self->value, &len);
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	781 return PyUnicode_DecodeUTF8(s, len, "strict");
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	782 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	783
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	784 static PyObject *
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	785 PyTclObject_repr(PyTclObject *self)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	786 {
41782 bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	787 return PyUnicode_FromFormat("<%s object at %p>",
bee8d01ef42c Add a format specifier %R to PyUnicode_FromFormat(), which embeds Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	788 self->value->typePtr->name, self->value);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	789 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	790
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	791 #define TEST_COND(cond) ((cond) ? Py_True : Py_False)
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	792
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	793 static PyObject *
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	794 PyTclObject_richcompare(PyObject self, PyObject other, int op)
28950 3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	795 {
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	796 int result;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	797 PyObject *v;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	798
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	799 /* neither argument should be NULL, unless something's gone wrong */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	800 if (self == NULL \|\| other == NULL) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	801 PyErr_BadInternalCall();
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	802 return NULL;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	803 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	804
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	805 /* both arguments should be instances of PyTclObject */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	806 if (!PyTclObject_Check(self) \|\| !PyTclObject_Check(other)) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	807 v = Py_NotImplemented;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	808 goto finished;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	809 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	810
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	811 if (self == other)
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	812 /* fast path when self and other are identical */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	813 result = 0;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	814 else
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	815 result = strcmp(Tcl_GetString(((PyTclObject *)self)->value),
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	816 Tcl_GetString(((PyTclObject *)other)->value));
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	817 /* Convert return value to a Boolean */
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	818 switch (op) {
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	819 case Py_EQ:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	820 v = TEST_COND(result == 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	821 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	822 case Py_NE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	823 v = TEST_COND(result != 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	824 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	825 case Py_LE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	826 v = TEST_COND(result <= 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	827 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	828 case Py_GE:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	829 v = TEST_COND(result >= 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	830 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	831 case Py_LT:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	832 v = TEST_COND(result < 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	833 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	834 case Py_GT:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	835 v = TEST_COND(result > 0);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	836 break;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	837 default:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	838 PyErr_BadArgument();
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	839 return NULL;
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	840 }
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	841 finished:
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	842 Py_INCREF(v);
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	843 return v;
28950 3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	844 }
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	845
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	846 PyDoc_STRVAR(get_typename__doc__, "name of the Tcl type");
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	847
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	848 static PyObject*
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	849 get_typename(PyTclObject* obj, void* ignored)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	850 {
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	851 return PyUnicode_FromString(obj->value->typePtr->name);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	852 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	853
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	854
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	855 static PyGetSetDef PyTclObject_getsetlist[] = {
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	856 {"typename", (getter)get_typename, NULL, get_typename__doc__},
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	857 {"string", (getter)PyTclObject_string, NULL,
27071 c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	858 PyTclObject_string__doc__},
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	859 {0},
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	860 };
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	861
37144 91dd4d44d3bc Finish getting rid of statichere/staticforward Neal Norwitz <nnorwitz@gmail.com> parents: 36871 diff changeset	862 static PyTypeObject PyTclObject_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42233 diff changeset	863 PyVarObject_HEAD_INIT(NULL, 0)
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	864 "_tkinter.Tcl_Obj", /tp_name/
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	865 sizeof(PyTclObject), /tp_basicsize/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	866 0, /tp_itemsize/
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	867 /* methods */
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	868 (destructor)PyTclObject_dealloc,/tp_dealloc/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	869 0, /tp_print/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	870 0, /tp_getattr/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	871 0, /tp_setattr/
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	872 0, /tp_reserved/
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	873 (reprfunc)PyTclObject_repr, /tp_repr/
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	874 0, /tp_as_number/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	875 0, /tp_as_sequence/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	876 0, /tp_as_mapping/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	877 0, /tp_hash/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	878 0, /tp_call/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	879 (reprfunc)PyTclObject_str, /tp_str/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	880 PyObject_GenericGetAttr, /tp_getattro/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	881 0, /tp_setattro/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	882 0, /tp_as_buffer/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	883 Py_TPFLAGS_DEFAULT, /tp_flags/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	884 0, /tp_doc/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	885 0, /tp_traverse/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	886 0, /tp_clear/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	887 PyTclObject_richcompare, /tp_richcompare/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	888 0, /tp_weaklistoffset/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	889 0, /tp_iter/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	890 0, /tp_iternext/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	891 0, /tp_methods/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	892 0, /tp_members/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	893 PyTclObject_getsetlist, /tp_getset/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	894 0, /tp_base/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	895 0, /tp_dict/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	896 0, /tp_descr_get/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	897 0, /tp_descr_set/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	898 0, /tp_dictoffset/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	899 0, /tp_init/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	900 0, /tp_alloc/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	901 0, /tp_new/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	902 0, /tp_free/
e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51194 diff changeset	903 0, /tp_is_gc/
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	904 };
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	905
12141 4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	906 static Tcl_Obj*
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	907 AsObj(PyObject *value)
12141 4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	908 {
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	909 Tcl_Obj *result;
44158 81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	910 long longVal;
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	911 int overflow;
12141 4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	912
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	913 if (PyBytes_Check(value))
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	914 return Tcl_NewStringObj(PyBytes_AS_STRING(value),
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	915 PyBytes_GET_SIZE(value));
27341 ba63d717c75f Convert booleans to integers in IntVar.set. Fixes #671741. Martin v. Löwis <martin@v.loewis.de> parents: 27333 diff changeset	916 else if (PyBool_Check(value))
ba63d717c75f Convert booleans to integers in IntVar.set. Fixes #671741. Martin v. Löwis <martin@v.loewis.de> parents: 27333 diff changeset	917 return Tcl_NewBooleanObj(PyObject_IsTrue(value));
44158 81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	918 else if (PyLong_CheckExact(value) &&
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	919 ((longVal = PyLong_AsLongAndOverflow(value, &overflow)),
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	920 !overflow)) {
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	921 /* If there is an overflow in the long conversion,
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	922 fall through to default object handling. */
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	923 return Tcl_NewLongObj(longVal);
81e0c0e2a8c1 Remove PyInt_CheckExact. Add PyLong_AsLongAndOverflow. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	924 }
12141 4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	925 else if (PyFloat_Check(value))
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	926 return Tcl_NewDoubleObj(PyFloat_AS_DOUBLE(value));
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	927 else if (PyTuple_Check(value)) {
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	928 Tcl_Obj argv = (Tcl_Obj)
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	929 ckalloc(PyTuple_Size(value)sizeof(Tcl_Obj));
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	930 int i;
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	931 if(!argv)
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	932 return 0;
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	933 for(i=0;i<PyTuple_Size(value);i++)
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	934 argv[i] = AsObj(PyTuple_GetItem(value,i));
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	935 result = Tcl_NewListObj(PyTuple_Size(value), argv);
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	936 ckfree(FREECAST argv);
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	937 return result;
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	938 }
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	939 else if (PyUnicode_Check(value)) {
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	940 Py_UNICODE *inbuf = PyUnicode_AS_UNICODE(value);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	941 Py_ssize_t size = PyUnicode_GET_SIZE(value);
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	942 /* This #ifdef assumes that Tcl uses UCS-2.
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	943 See TCL_UTF_MAX test above. */
28643 ca2482012b3c Support UCS-4 Tcl for UCS-4 Python builds. Fixes #719880. Martin v. Löwis <martin@v.loewis.de> parents: 28622 diff changeset	944 #if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX == 3
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44428 diff changeset	945 Tcl_UniChar *outbuf = NULL;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	946 Py_ssize_t i;
44460 13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44428 diff changeset	947 size_t allocsize = ((size_t)size) * sizeof(Tcl_UniChar);
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44428 diff changeset	948 if (allocsize >= size)
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44428 diff changeset	949 outbuf = (Tcl_UniChar*)ckalloc(allocsize);
13aabc23cf2e Merged revisions 59680-59695 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44428 diff changeset	950 /* Else overflow occurred, and we take the next exit */
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	951 if (!outbuf) {
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	952 PyErr_NoMemory();
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	953 return NULL;
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	954 }
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	955 for (i = 0; i < size; i++) {
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	956 if (inbuf[i] >= 0x10000) {
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	957 /* Tcl doesn't do UTF-16, yet. */
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	958 PyErr_SetString(PyExc_ValueError,
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	959 "unsupported character");
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	960 ckfree(FREECAST outbuf);
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	961 return NULL;
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	962 }
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	963 outbuf[i] = inbuf[i];
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	964 }
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	965 result = Tcl_NewUnicodeObj(outbuf, size);
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	966 ckfree(FREECAST outbuf);
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	967 return result;
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	968 #else
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	969 return Tcl_NewUnicodeObj(inbuf, size);
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	970 #endif
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	971
12141 4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	972 }
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	973 else if(PyTclObject_Check(value)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	974 Tcl_Obj v = ((PyTclObject)value)->value;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	975 Tcl_IncrRefCount(v);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	976 return v;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	977 }
12141 4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	978 else {
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	979 PyObject *v = PyObject_Str(value);
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	980 if (!v)
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	981 return 0;
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	982 result = AsObj(v);
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	983 Py_DECREF(v);
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	984 return result;
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	985 }
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	986 }
4a3fd2c1372f Don't use the object call interface in Tk 8.0 -- the EvalObj* API Guido van Rossum <guido@python.org> parents: 12087 diff changeset	987
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	988 static PyObject*
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	989 FromObj(PyObject* tkapp, Tcl_Obj *value)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	990 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	991 PyObject *result = NULL;
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	992 TkappObject app = (TkappObject)tkapp;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	993
26534 ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	994 if (value->typePtr == NULL) {
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	995 return PyUnicode_FromStringAndSize(value->bytes,
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	996 value->length);
26534 ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	997 }
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	998
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	999 if (value->typePtr == app->BooleanType) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1000 result = value->internalRep.longValue ? Py_True : Py_False;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1001 Py_INCREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1002 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1003 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1004
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1005 if (value->typePtr == app->ByteArrayType) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1006 int size;
26572 d755d4292f3f Remove C++ comment. Silence unsigned char* cast warning. Martin v. Löwis <martin@v.loewis.de> parents: 26534 diff changeset	1007 char data = (char)Tcl_GetByteArrayFromObj(value, &size);
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1008 return PyBytes_FromStringAndSize(data, size);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1009 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1010
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1011 if (value->typePtr == app->DoubleType) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1012 return PyFloat_FromDouble(value->internalRep.doubleValue);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1013 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1014
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1015 if (value->typePtr == app->IntType) {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43963 diff changeset	1016 return PyLong_FromLong(value->internalRep.longValue);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1017 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1018
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1019 if (value->typePtr == app->ListType) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1020 int size;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1021 int i, status;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1022 PyObject *elem;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1023 Tcl_Obj *tcl_elem;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1024
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1025 status = Tcl_ListObjLength(Tkapp_Interp(tkapp), value, &size);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1026 if (status == TCL_ERROR)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1027 return Tkinter_Error(tkapp);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1028 result = PyTuple_New(size);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1029 if (!result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1030 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1031 for (i = 0; i < size; i++) {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1032 status = Tcl_ListObjIndex(Tkapp_Interp(tkapp),
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1033 value, i, &tcl_elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1034 if (status == TCL_ERROR) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1035 Py_DECREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1036 return Tkinter_Error(tkapp);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1037 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1038 elem = FromObj(tkapp, tcl_elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1039 if (!elem) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1040 Py_DECREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1041 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1042 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1043 PyTuple_SetItem(result, i, elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1044 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1045 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1046 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1047
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1048 if (value->typePtr == app->ProcBodyType) {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1049 /* fall through: return tcl object. */
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1050 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1051
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1052 if (value->typePtr == app->StringType) {
28643 ca2482012b3c Support UCS-4 Tcl for UCS-4 Python builds. Fixes #719880. Martin v. Löwis <martin@v.loewis.de> parents: 28622 diff changeset	1053 #if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==3
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1054 PyObject *result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1055 int size;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1056 Tcl_UniChar *input;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1057 Py_UNICODE *output;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1058
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1059 size = Tcl_GetCharLength(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1060 result = PyUnicode_FromUnicode(NULL, size);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1061 if (!result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1062 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1063 input = Tcl_GetUnicode(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1064 output = PyUnicode_AS_UNICODE(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1065 while (size--)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1066 output++ = input++;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1067 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1068 #else
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1069 return PyUnicode_FromUnicode(Tcl_GetUnicode(value),
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1070 Tcl_GetCharLength(value));
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1071 #endif
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1072 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1073
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1074 return newPyTclObject(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1075 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1076
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1077 /* This mutex synchronizes inter-thread command calls. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1078
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1079 TCL_DECLARE_MUTEX(call_mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1080
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1081 typedef struct Tkapp_CallEvent {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1082 Tcl_Event ev; /* Must be first */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1083 TkappObject *self;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1084 PyObject *args;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1085 int flags;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1086 PyObject **res;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1087 PyObject exc_type, exc_value, **exc_tb;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1088 Tcl_Condition done;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1089 } Tkapp_CallEvent;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1090
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1091 void
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1092 Tkapp_CallDeallocArgs(Tcl_Obj objv, Tcl_Obj objStore, int objc)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1093 {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1094 int i;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1095 for (i = 0; i < objc; i++)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1096 Tcl_DecrRefCount(objv[i]);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1097 if (objv != objStore)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1098 ckfree(FREECAST objv);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1099 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1100
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1101 /* Convert Python objects to Tcl objects. This must happen in the
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1102 interpreter thread, which may or may not be the calling thread. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1103
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1104 static Tcl_Obj**
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1105 Tkapp_CallArgs(PyObject args, Tcl_Obj* objStore, int *pobjc)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1106 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1107 Tcl_Obj **objv = objStore;
26620 cb93d9287b4e Always initialize objc. Martin v. Löwis <martin@v.loewis.de> parents: 26613 diff changeset	1108 int objc = 0, i;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1109 if (args == NULL)
15356 6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1110 /* do nothing */;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1111
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1112 else if (!PyTuple_Check(args)) {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1113 objv[0] = AsObj(args);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1114 if (objv[0] == 0)
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1115 goto finally;
15356 6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1116 objc = 1;
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1117 Tcl_IncrRefCount(objv[0]);
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1118 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1119 else {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1120 objc = PyTuple_Size(args);
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1121
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1122 if (objc > ARGSZ) {
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1123 objv = (Tcl_Obj *)ckalloc(objc sizeof(char *));
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1124 if (objv == NULL) {
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1125 PyErr_NoMemory();
15356 6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1126 objc = 0;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1127 goto finally;
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1128 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1129 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1130
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1131 for (i = 0; i < objc; i++) {
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1132 PyObject *v = PyTuple_GetItem(args, i);
12162 98b09c40d97c Add back an obscure "feature" to the Obj version of Tkapp_Call(): a Guido van Rossum <guido@python.org> parents: 12141 diff changeset	1133 if (v == Py_None) {
98b09c40d97c Add back an obscure "feature" to the Obj version of Tkapp_Call(): a Guido van Rossum <guido@python.org> parents: 12141 diff changeset	1134 objc = i;
98b09c40d97c Add back an obscure "feature" to the Obj version of Tkapp_Call(): a Guido van Rossum <guido@python.org> parents: 12141 diff changeset	1135 break;
98b09c40d97c Add back an obscure "feature" to the Obj version of Tkapp_Call(): a Guido van Rossum <guido@python.org> parents: 12141 diff changeset	1136 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1137 objv[i] = AsObj(v);
15356 6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1138 if (!objv[i]) {
6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1139 /* Reset objc, so it attempts to clear
6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1140 objects only up to i. */
6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1141 objc = i;
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1142 goto finally;
15356 6e70baa487ed Do not release unallocated Tcl objects. Closes #117278 and #117167. Martin v. Löwis <martin@v.loewis.de> parents: 15177 diff changeset	1143 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1144 Tcl_IncrRefCount(objv[i]);
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1145 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1146 }
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1147 *pobjc = objc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1148 return objv;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1149 finally:
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1150 Tkapp_CallDeallocArgs(objv, objStore, objc);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1151 return NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1152 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1153
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1154 /* Convert the results of a command call into a Python objects. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1155
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1156 static PyObject*
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1157 Tkapp_CallResult(TkappObject *self)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1158 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1159 PyObject *res = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1160 if(self->wantobjects) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1161 Tcl_Obj *value = Tcl_GetObjResult(self->interp);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1162 /* Not sure whether the IncrRef is necessary, but something
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1163 may overwrite the interpreter result while we are
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1164 converting it. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1165 Tcl_IncrRefCount(value);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1166 res = FromObj((PyObject*)self, value);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1167 Tcl_DecrRefCount(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1168 } else {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1169 const char *s = Tcl_GetStringResult(self->interp);
25527 5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	1170 const char *p = s;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	1171
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1172 res = PyUnicode_FromStringAndSize(s, (int)(p-s));
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1173 }
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1174 return res;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1175 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1176
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1177 /* Tkapp_CallProc is the event procedure that is executed in the context of
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1178 the Tcl interpreter thread. Initially, it holds the Tcl lock, and doesn't
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1179 hold the Python lock. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1180
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1181 static int
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1182 Tkapp_CallProc(Tkapp_CallEvent *e, int flags)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1183 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1184 Tcl_Obj *objStore[ARGSZ];
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1185 Tcl_Obj **objv;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1186 int objc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1187 int i;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1188 ENTER_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1189 objv = Tkapp_CallArgs(e->args, objStore, &objc);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1190 if (!objv) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1191 PyErr_Fetch(e->exc_type, e->exc_value, e->exc_tb);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1192 *(e->res) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1193 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1194 LEAVE_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1195 if (!objv)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1196 goto done;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1197 i = Tcl_EvalObjv(e->self->interp, objc, objv, e->flags);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1198 ENTER_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1199 if (i == TCL_ERROR) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1200 *(e->res) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1201 *(e->exc_type) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1202 *(e->exc_tb) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1203 *(e->exc_value) = PyObject_CallFunction(
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1204 Tkinter_TclError, "s",
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1205 Tcl_GetStringResult(e->self->interp));
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1206 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1207 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1208 *(e->res) = Tkapp_CallResult(e->self);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1209 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1210 LEAVE_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1211 done:
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1212 /* Wake up calling thread. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1213 Tcl_MutexLock(&call_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1214 Tcl_ConditionNotify(&e->done);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1215 Tcl_MutexUnlock(&call_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1216 return 1;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1217 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1218
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1219 /* This is the main entry point for calling a Tcl command.
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1220 It supports three cases, with regard to threading:
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1221 1. Tcl is not threaded: Must have the Tcl lock, then can invoke command in
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1222 the context of the calling thread.
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1223 2. Tcl is threaded, caller of the command is in the interpreter thread:
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1224 Execute the command in the calling thread. Since the Tcl lock will
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1225 not be used, we can merge that with case 1.
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1226 3. Tcl is threaded, caller is in a different thread: Must queue an event to
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1227 the interpreter thread. Allocation of Tcl objects needs to occur in the
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1228 interpreter thread, so we ship the PyObject* args to the target thread,
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1229 and perform processing there. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1230
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1231 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1232 Tkapp_Call(PyObject selfptr, PyObject args)
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1233 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1234 Tcl_Obj *objStore[ARGSZ];
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1235 Tcl_Obj **objv = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1236 int objc, i;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1237 PyObject *res = NULL;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1238 TkappObject self = (TkappObject)selfptr;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1239 /* Could add TCL_EVAL_GLOBAL if wrapped by GlobalCall... */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1240 int flags = TCL_EVAL_DIRECT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1241
42193 090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1242 /* If args is a single tuple, replace with contents of tuple */
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1243 if (1 == PyTuple_Size(args)){
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1244 PyObject* item = PyTuple_GetItem(args, 0);
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1245 if (PyTuple_Check(item))
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1246 args = item;
090588a17490 Merged revisions 56154-56264 via svnmerge from Guido van Rossum <guido@python.org> parents: 41824 diff changeset	1247 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1248 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1249 if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1250 /* We cannot call the command directly. Instead, we must
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1251 marshal the parameters to the interpreter thread. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1252 Tkapp_CallEvent *ev;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1253 PyObject exc_type, exc_value, *exc_tb;
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	1254 if (!WaitForMainloop(self))
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1255 return NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1256 ev = (Tkapp_CallEvent*)ckalloc(sizeof(Tkapp_CallEvent));
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1257 ev->ev.proc = (Tcl_EventProc*)Tkapp_CallProc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1258 ev->self = self;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1259 ev->args = args;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1260 ev->res = &res;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1261 ev->exc_type = &exc_type;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1262 ev->exc_value = &exc_value;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1263 ev->exc_tb = &exc_tb;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1264 ev->done = (Tcl_Condition)0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1265
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1266 Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done, &call_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1267
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1268 if (res == NULL) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1269 if (exc_type)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1270 PyErr_Restore(exc_type, exc_value, exc_tb);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1271 else
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1272 PyErr_SetObject(Tkinter_TclError, exc_value);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1273 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1274 }
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1275 else
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1276 #endif
3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1277 {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1278
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1279 objv = Tkapp_CallArgs(args, objStore, &objc);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1280 if (!objv)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1281 return NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1282
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1283 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1284
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1285 i = Tcl_EvalObjv(self->interp, objc, objv, flags);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1286
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1287 ENTER_OVERLAP
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1288
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1289 if (i == TCL_ERROR)
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1290 Tkinter_Error(selfptr);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1291 else
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1292 res = Tkapp_CallResult(self);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1293
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1294 LEAVE_OVERLAP_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1295
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1296 Tkapp_CallDeallocArgs(objv, objStore, objc);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1297 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1298 return res;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1299 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1300
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1301
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1302 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1303 Tkapp_GlobalCall(PyObject self, PyObject args)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1304 {
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1305 /* Could do the same here as for Tkapp_Call(), but this is not used
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1306 much, so I can't be bothered. Unfortunately Tcl doesn't export a
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1307 way for the user to do what all its Global* variants do (save and
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1308 reset the scope pointer, call the local version, restore the saved
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1309 scope pointer). */
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1310
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1311 char *cmd;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1312 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1313
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1314 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1315
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1316 cmd = Merge(args);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1317 if (cmd) {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1318 int err;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1319 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1320 err = Tcl_GlobalEval(Tkapp_Interp(self), cmd);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1321 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1322 if (err == TCL_ERROR)
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1323 res = Tkinter_Error(self);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1324 else
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1325 res = PyUnicode_FromString(Tkapp_Result(self));
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1326 LEAVE_OVERLAP_TCL
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1327 ckfree(cmd);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1328 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1329
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1330 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1331 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1332
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1333 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1334 Tkapp_Eval(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1335 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1336 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1337 PyObject *res = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1338 int err;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1339
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1340 if (!PyArg_ParseTuple(args, "s:eval", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1341 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1342
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1343 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1344
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1345 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1346 err = Tcl_Eval(Tkapp_Interp(self), script);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1347 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1348 if (err == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1349 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1350 else
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1351 res = PyUnicode_FromString(Tkapp_Result(self));
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1352 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1353 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1354 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1355
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1356 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1357 Tkapp_GlobalEval(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1358 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1359 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1360 PyObject *res = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1361 int err;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1362
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1363 if (!PyArg_ParseTuple(args, "s:globaleval", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1364 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1365
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1366 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1367
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1368 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1369 err = Tcl_GlobalEval(Tkapp_Interp(self), script);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1370 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1371 if (err == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1372 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1373 else
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1374 res = PyUnicode_FromString(Tkapp_Result(self));
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1375 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1376 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1377 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1378
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1379 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1380 Tkapp_EvalFile(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1381 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1382 char *fileName;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1383 PyObject *res = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1384 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1385
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1386 if (!PyArg_ParseTuple(args, "s:evalfile", &fileName))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1387 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1388
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1389 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1390
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1391 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1392 err = Tcl_EvalFile(Tkapp_Interp(self), fileName);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1393 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1394 if (err == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1395 res = Tkinter_Error(self);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1396
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1397 else
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1398 res = PyUnicode_FromString(Tkapp_Result(self));
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1399 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1400 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1401 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1402
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1403 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1404 Tkapp_Record(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1405 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1406 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1407 PyObject *res = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1408 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1409
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1410 if (!PyArg_ParseTuple(args, "s", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1411 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1412
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1413 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1414
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1415 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1416 err = Tcl_RecordAndEval(Tkapp_Interp(self), script, TCL_NO_EVAL);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1417 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1418 if (err == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1419 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1420 else
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1421 res = PyUnicode_FromString(Tkapp_Result(self));
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1422 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1423 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1424 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1425
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1426 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1427 Tkapp_AddErrorInfo(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1428 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1429 char *msg;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1430
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1431 if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1432 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1433 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1434
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1435 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1436 Tcl_AddErrorInfo(Tkapp_Interp(self), msg);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1437 LEAVE_TCL
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1438
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1439 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1440 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1441 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1442
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1443
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1444
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1445 / Tcl Variable /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1446
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1447 TCL_DECLARE_MUTEX(var_mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1448
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1449 typedef PyObject* (EventFunc)(PyObject, PyObject *args, int flags);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1450 typedef struct VarEvent {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1451 Tcl_Event ev; /* must be first */
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1452 PyObject *self;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1453 PyObject *args;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1454 int flags;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1455 EventFunc func;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1456 PyObject **res;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1457 PyObject **exc_type;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1458 PyObject **exc_val;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1459 Tcl_Condition cond;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1460 } VarEvent;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1461
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1462 static int
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1463 varname_converter(PyObject in, void _out)
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1464 {
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1465 char out = (char)_out;
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1466 if (PyBytes_Check(in)) {
23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	1467 *out = PyBytes_AsString(in);
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1468 return 1;
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1469 }
42353 959e52ae2627 Make test_tcl.py pass, by accepting unicode strings as variable names. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1470 if (PyUnicode_Check(in)) {
48660 85b67fb5672b Rename PyUnicode_AsString -> _PyUnicode_AsString and Marc-André Lemburg <mal@egenix.com> parents: 48413 diff changeset	1471 *out = _PyUnicode_AsString(in);
42353 959e52ae2627 Make test_tcl.py pass, by accepting unicode strings as variable names. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1472 return 1;
959e52ae2627 Make test_tcl.py pass, by accepting unicode strings as variable names. Guido van Rossum <guido@python.org> parents: 42334 diff changeset	1473 }
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1474 if (PyTclObject_Check(in)) {
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1475 *out = PyTclObject_TclString(in);
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1476 return 1;
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1477 }
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1478 /* XXX: Should give diagnostics. */
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1479 return 0;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1480 }
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1481
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	1482 static void
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1483 var_perform(VarEvent *ev)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1484 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1485 *(ev->res) = ev->func(ev->self, ev->args, ev->flags);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1486 if (!*(ev->res)) {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1487 PyObject exc, val, *tb;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1488 PyErr_Fetch(&exc, &val, &tb);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1489 PyErr_NormalizeException(&exc, &val, &tb);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1490 *(ev->exc_type) = exc;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1491 *(ev->exc_val) = val;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1492 Py_DECREF(tb);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1493 }
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1494
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1495 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1496
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1497 static int
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1498 var_proc(VarEvent* ev, int flags)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1499 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1500 ENTER_PYTHON
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1501 var_perform(ev);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1502 Tcl_MutexLock(&var_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1503 Tcl_ConditionNotify(&ev->cond);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1504 Tcl_MutexUnlock(&var_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1505 LEAVE_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1506 return 1;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1507 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1508
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1509 static PyObject*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1510 var_invoke(EventFunc func, PyObject selfptr, PyObject args, int flags)
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1511 {
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1512 TkappObject self = (TkappObject)selfptr;
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1513 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1514 if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1515 TkappObject self = (TkappObject)selfptr;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1516 VarEvent *ev;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1517 PyObject res, exc_type, *exc_val;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1518
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1519 /* The current thread is not the interpreter thread. Marshal
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1520 the call to the interpreter thread, then wait for
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1521 completion. */
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	1522 if (!WaitForMainloop(self))
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1523 return NULL;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1524
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1525 ev = (VarEvent*)ckalloc(sizeof(VarEvent));
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1526
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1527 ev->self = selfptr;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1528 ev->args = args;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1529 ev->flags = flags;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1530 ev->func = func;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1531 ev->res = &res;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1532 ev->exc_type = &exc_type;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1533 ev->exc_val = &exc_val;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1534 ev->cond = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1535 ev->ev.proc = (Tcl_EventProc*)var_proc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1536 Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->cond, &var_mutex);
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1537 if (!res) {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1538 PyErr_SetObject(exc_type, exc_val);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1539 Py_DECREF(exc_type);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1540 Py_DECREF(exc_val);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1541 return NULL;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1542 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1543 return res;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1544 }
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1545 #endif
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1546 /* Tcl is not threaded, or this is the interpreter thread. */
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1547 return func(selfptr, args, flags);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1548 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1549
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1550 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1551 SetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1552 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1553 char name1, name2;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1554 PyObject *newValue;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1555 PyObject *res = NULL;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1556 Tcl_Obj newval, ok;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1557
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1558 if (PyArg_ParseTuple(args, "O&O:setvar",
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1559 varname_converter, &name1, &newValue)) {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1560 /* XXX Acquire tcl lock??? */
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1561 newval = AsObj(newValue);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1562 if (newval == NULL)
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1563 return NULL;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1564 ENTER_TCL
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1565 ok = Tcl_SetVar2Ex(Tkapp_Interp(self), name1, NULL,
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1566 newval, flags);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1567 ENTER_OVERLAP
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1568 if (!ok)
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1569 Tkinter_Error(self);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1570 else {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1571 res = Py_None;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1572 Py_INCREF(res);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1573 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1574 LEAVE_OVERLAP_TCL
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1575 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1576 else {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1577 PyErr_Clear();
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1578 if (PyArg_ParseTuple(args, "ssO:setvar",
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1579 &name1, &name2, &newValue)) {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1580 /* XXX must hold tcl lock already??? */
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1581 newval = AsObj(newValue);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1582 ENTER_TCL
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1583 ok = Tcl_SetVar2Ex(Tkapp_Interp(self), name1, name2, newval, flags);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1584 ENTER_OVERLAP
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1585 if (!ok)
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1586 Tkinter_Error(self);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1587 else {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1588 res = Py_None;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1589 Py_INCREF(res);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1590 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1591 LEAVE_OVERLAP_TCL
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1592 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1593 else {
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1594 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1595 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1596 }
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1597 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1598 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1599
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1600 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1601 Tkapp_SetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1602 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1603 return var_invoke(SetVar, self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1604 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1605
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1606 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1607 Tkapp_GlobalSetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1608 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1609 return var_invoke(SetVar, self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1610 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1611
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1612
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1613
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1614 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1615 GetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1616 {
25527 5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	1617 char name1, name2=NULL;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1618 PyObject *res = NULL;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1619 Tcl_Obj *tres;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1620
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1621 if (!PyArg_ParseTuple(args, "O&\|s:getvar",
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1622 varname_converter, &name1, &name2))
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1623 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1624
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1625 ENTER_TCL
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1626 tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1627 ENTER_OVERLAP
30638 39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1628 if (tres == NULL) {
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1629 PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self)));
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1630 } else {
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1631 if (((TkappObject*)self)->wantobjects) {
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1632 res = FromObj(self, tres);
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1633 }
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1634 else {
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1635 res = PyUnicode_FromString(Tcl_GetString(tres));
30638 39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1636 }
29170 f0b67731e545 Only return objects if wantobjects is set in GetVar. Martin v. Löwis <martin@v.loewis.de> parents: 29038 diff changeset	1637 }
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1638 LEAVE_OVERLAP_TCL
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1639 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1640 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1641
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1642 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1643 Tkapp_GetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1644 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1645 return var_invoke(GetVar, self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1646 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1647
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1648 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1649 Tkapp_GlobalGetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1650 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1651 return var_invoke(GetVar, self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1652 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1653
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1654
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1655
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1656 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1657 UnsetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1658 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1659 char name1, name2=NULL;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1660 int code;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1661 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1662
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1663 if (!PyArg_ParseTuple(args, "s\|s:unsetvar", &name1, &name2))
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1664 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1665
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1666 ENTER_TCL
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1667 code = Tcl_UnsetVar2(Tkapp_Interp(self), name1, name2, flags);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1668 ENTER_OVERLAP
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1669 if (code == TCL_ERROR)
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1670 res = Tkinter_Error(self);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1671 else {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1672 Py_INCREF(Py_None);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1673 res = Py_None;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1674 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1675 LEAVE_OVERLAP_TCL
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1676 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1677 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1678
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1679 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1680 Tkapp_UnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1681 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1682 return var_invoke(UnsetVar, self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1683 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1684
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1685 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1686 Tkapp_GlobalUnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1687 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1688 return var_invoke(UnsetVar, self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1689 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1690
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1691
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1692
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1693 / Tcl to Python /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1694
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1695 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1696 Tkapp_GetInt(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1697 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1698 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1699 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1700
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1701 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1702 PyObject* o = PyTuple_GetItem(args, 0);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43963 diff changeset	1703 if (PyLong_Check(o)) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1704 Py_INCREF(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1705 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1706 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1707 }
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1708 if (!PyArg_ParseTuple(args, "s:getint", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1709 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1710 if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1711 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1712 return Py_BuildValue("i", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1713 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1714
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1715 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1716 Tkapp_GetDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1717 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1718 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1719 double v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1720
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1721 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1722 PyObject *o = PyTuple_GetItem(args, 0);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1723 if (PyFloat_Check(o)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1724 Py_INCREF(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1725 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1726 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1727 }
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1728 if (!PyArg_ParseTuple(args, "s:getdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1729 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1730 if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1731 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1732 return Py_BuildValue("d", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1733 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1734
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1735 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1736 Tkapp_GetBoolean(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1737 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1738 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1739 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1740
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1741 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1742 PyObject *o = PyTuple_GetItem(args, 0);
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43963 diff changeset	1743 if (PyLong_Check(o)) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1744 Py_INCREF(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1745 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1746 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1747 }
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1748 if (!PyArg_ParseTuple(args, "s:getboolean", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1749 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1750 if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1751 return Tkinter_Error(self);
27341 ba63d717c75f Convert booleans to integers in IntVar.set. Fixes #671741. Martin v. Löwis <martin@v.loewis.de> parents: 27333 diff changeset	1752 return PyBool_FromLong(v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1753 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1754
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1755 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1756 Tkapp_ExprString(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1757 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1758 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1759 PyObject *res = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1760 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1761
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1762 if (!PyArg_ParseTuple(args, "s:exprstring", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1763 return NULL;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1764
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1765 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1766
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1767 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1768 retval = Tcl_ExprString(Tkapp_Interp(self), s);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1769 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1770 if (retval == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1771 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1772 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1773 res = Py_BuildValue("s", Tkapp_Result(self));
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1774 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1775 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1776 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1777
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1778 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1779 Tkapp_ExprLong(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1780 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1781 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1782 PyObject *res = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1783 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1784 long v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1785
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1786 if (!PyArg_ParseTuple(args, "s:exprlong", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1787 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1788
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1789 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1790
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1791 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1792 retval = Tcl_ExprLong(Tkapp_Interp(self), s, &v);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1793 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1794 if (retval == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1795 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1796 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1797 res = Py_BuildValue("l", v);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1798 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1799 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1800 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1801
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1802 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1803 Tkapp_ExprDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1804 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1805 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1806 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1807 double v;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1808 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1809
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1810 if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1811 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1812 CHECK_TCL_APPARTMENT;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1813 PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1814 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1815 retval = Tcl_ExprDouble(Tkapp_Interp(self), s, &v);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1816 ENTER_OVERLAP
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5120 diff changeset	1817 PyFPE_END_PROTECT(retval)
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1818 if (retval == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1819 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1820 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1821 res = Py_BuildValue("d", v);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1822 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1823 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1824 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1825
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1826 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1827 Tkapp_ExprBoolean(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1828 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1829 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1830 PyObject *res = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1831 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1832 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1833
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1834 if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1835 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1836 CHECK_TCL_APPARTMENT;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1837 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1838 retval = Tcl_ExprBoolean(Tkapp_Interp(self), s, &v);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1839 ENTER_OVERLAP
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1840 if (retval == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1841 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1842 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1843 res = Py_BuildValue("i", v);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1844 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1845 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1846 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1847
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1848
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1849
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1850 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1851 Tkapp_SplitList(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1852 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1853 char *list;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1854 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1855 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1856 PyObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1857 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1858
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1859 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1860 v = PyTuple_GetItem(args, 0);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1861 if (PyTuple_Check(v)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1862 Py_INCREF(v);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1863 return v;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1864 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1865 }
21813 f3b0e3cb340b Encode Unicode arguments to split/splitlist as UTF-8. Fixes #507962. Martin v. Löwis <martin@v.loewis.de> parents: 21757 diff changeset	1866 if (!PyArg_ParseTuple(args, "et:splitlist", "utf-8", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1867 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1868
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	1869 if (Tcl_SplitList(Tkapp_Interp(self), list,
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1870 &argc, &argv) == TCL_ERROR) {
d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1871 PyMem_Free(list);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1872 return Tkinter_Error(self);
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1873 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1874
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1875 if (!(v = PyTuple_New(argc)))
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1876 goto finally;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1877
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1878 for (i = 0; i < argc; i++) {
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1879 PyObject *s = PyUnicode_FromString(argv[i]);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1880 if (!s \|\| PyTuple_SetItem(v, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1881 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1882 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1883 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1884 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1885 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1886
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1887 finally:
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1888 ckfree(FREECAST argv);
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1889 PyMem_Free(list);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1890 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1891 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1892
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1893 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1894 Tkapp_Split(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1895 {
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1896 PyObject *v;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1897 char *list;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1898
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1899 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1900 PyObject* o = PyTuple_GetItem(args, 0);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1901 if (PyTuple_Check(o)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1902 o = SplitObj(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1903 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1904 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1905 }
21813 f3b0e3cb340b Encode Unicode arguments to split/splitlist as UTF-8. Fixes #507962. Martin v. Löwis <martin@v.loewis.de> parents: 21757 diff changeset	1906 if (!PyArg_ParseTuple(args, "et:split", "utf-8", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1907 return NULL;
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1908 v = Split(list);
d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1909 PyMem_Free(list);
d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1910 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1911 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1912
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1913 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1914 Tkapp_Merge(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1915 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1916 char *s = Merge(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1917 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1918
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1919 if (s) {
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	1920 res = PyUnicode_FromString(s);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1921 ckfree(s);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1922 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1923
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1924 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1925 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1926
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1927
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1928
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1929 / Tcl Command /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1930
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1931 /* Client data struct */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1932 typedef struct {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1933 PyObject *self;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1934 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1935 } PythonCmd_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1936
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1937 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1938 PythonCmd_Error(Tcl_Interp *interp)
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1939 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1940 errorInCmd = 1;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1941 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1942 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1943 return TCL_ERROR;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1944 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1945
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1946 /* This is the Tcl command that acts as a wrapper for Python
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1947 * function or method.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1948 */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1949 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1950 PythonCmd(ClientData clientData, Tcl_Interp interp, int argc, char argv[])
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1951 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1952 PythonCmd_ClientData data = (PythonCmd_ClientData )clientData;
49748 e2d2a7a6e831 Issue #4313: Fixed segfault on IDLE exit. Reverted r57540 and reopened Issue #1028. Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 48660 diff changeset	1953 PyObject self, func, arg, res;
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1954 int i, rv;
44428 6e93d2d6eb28 Merged revisions 59642-59665 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1955 Tcl_Obj *obj_res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1956
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	1957 ENTER_PYTHON
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1958
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1959 /* TBD: no error checking here since we know, via the
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1960 * Tkapp_CreateCommand() that the client data is a two-tuple
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1961 */
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1962 self = data->self;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1963 func = data->func;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1964
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1965 /* Create argument list (argv1, ..., argvN) */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1966 if (!(arg = PyTuple_New(argc - 1)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1967 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1968
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1969 for (i = 0; i < (argc - 1); i++) {
49748 e2d2a7a6e831 Issue #4313: Fixed segfault on IDLE exit. Reverted r57540 and reopened Issue #1028. Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 48660 diff changeset	1970 PyObject *s = PyUnicode_FromString(argv[i + 1]);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1971 if (!s \|\| PyTuple_SetItem(arg, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1972 Py_DECREF(arg);
8522 4e4fd954dda0 There was an error check in a loop in PythonCmd which called Guido van Rossum <guido@python.org> parents: 8504 diff changeset	1973 return PythonCmd_Error(interp);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1974 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1975 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1976 res = PyEval_CallObject(func, arg);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1977 Py_DECREF(arg);
1713 bb566d28caa0 * tkintermodule.c Guido van Rossum <guido@python.org> parents: 1690 diff changeset	1978
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1979 if (res == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1980 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1981
44428 6e93d2d6eb28 Merged revisions 59642-59665 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1982 obj_res = AsObj(res);
6e93d2d6eb28 Merged revisions 59642-59665 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1983 if (obj_res == NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1984 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1985 return PythonCmd_Error(interp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1986 }
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1987 else {
44428 6e93d2d6eb28 Merged revisions 59642-59665 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	1988 Tcl_SetObjResult(Tkapp_Interp(self), obj_res);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1989 rv = TCL_OK;
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1990 }
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1991
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1992 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1993
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1994 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1995
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	1996 return rv;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1997 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1998
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1999 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2000 PythonCmdDelete(ClientData clientData)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2001 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2002 PythonCmd_ClientData data = (PythonCmd_ClientData )clientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2003
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2004 ENTER_PYTHON
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2005 Py_XDECREF(data->self);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2006 Py_XDECREF(data->func);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2007 PyMem_DEL(data);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2008 LEAVE_PYTHON
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2009 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2010
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2011
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2012
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2013
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2014 TCL_DECLARE_MUTEX(command_mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2015
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2016 typedef struct CommandEvent{
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2017 Tcl_Event ev;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2018 Tcl_Interp* interp;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2019 char *name;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2020 int create;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2021 int *status;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2022 ClientData *data;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2023 Tcl_Condition done;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2024 } CommandEvent;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2025
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2026 static int
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2027 Tkapp_CommandProc(CommandEvent *ev, int flags)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2028 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2029 if (ev->create)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2030 *ev->status = Tcl_CreateCommand(
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2031 ev->interp, ev->name, PythonCmd,
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2032 ev->data, PythonCmdDelete) == NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2033 else
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2034 *ev->status = Tcl_DeleteCommand(ev->interp, ev->name);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2035 Tcl_MutexLock(&command_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2036 Tcl_ConditionNotify(&ev->done);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2037 Tcl_MutexUnlock(&command_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2038 return 1;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2039 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2040
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2041 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2042 Tkapp_CreateCommand(PyObject selfptr, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2043 {
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2044 TkappObject self = (TkappObject)selfptr;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2045 PythonCmd_ClientData *data;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2046 char *cmdName;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2047 PyObject *func;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2048 int err;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2049
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2050 if (!PyArg_ParseTuple(args, "sO:createcommand", &cmdName, &func))
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2051 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2052 if (!PyCallable_Check(func)) {
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2053 PyErr_SetString(PyExc_TypeError, "command not callable");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2054 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2055 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2056
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2057 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2058 if (self->threaded && self->thread_id != Tcl_GetCurrentThread() &&
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2059 !WaitForMainloop(self))
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2060 return NULL;
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2061 #endif
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2062
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2063 data = PyMem_NEW(PythonCmd_ClientData, 1);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2064 if (!data)
27826 7dffcc498c45 Add more missing PyErr_NoMemory() after failled memory allocs Neal Norwitz <nnorwitz@gmail.com> parents: 27341 diff changeset	2065 return PyErr_NoMemory();
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2066 Py_INCREF(self);
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2067 Py_INCREF(func);
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2068 data->self = selfptr;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2069 data->func = func;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2070
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2071 if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2072 CommandEvent ev = (CommandEvent)ckalloc(sizeof(CommandEvent));
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2073 ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2074 ev->interp = self->interp;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2075 ev->create = 1;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2076 ev->name = cmdName;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2077 ev->data = (ClientData)data;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2078 ev->status = &err;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2079 ev->done = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2080 Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done, &command_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2081 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2082 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2083 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2084 err = Tcl_CreateCommand(
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2085 Tkapp_Interp(self), cmdName, PythonCmd,
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2086 (ClientData)data, PythonCmdDelete) == NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2087 LEAVE_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2088 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2089 if (err) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2090 PyErr_SetString(Tkinter_TclError, "can't create Tcl command");
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2091 PyMem_DEL(data);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2092 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2093 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2094
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2095 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2096 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2097 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2098
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2099
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2100
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2101 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2102 Tkapp_DeleteCommand(PyObject selfptr, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2103 {
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2104 TkappObject self = (TkappObject)selfptr;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2105 char *cmdName;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2106 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2107
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2108 if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2109 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2110 if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2111 CommandEvent *ev;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2112 ev = (CommandEvent*)ckalloc(sizeof(CommandEvent));
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2113 ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2114 ev->interp = self->interp;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2115 ev->create = 0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2116 ev->name = cmdName;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2117 ev->status = &err;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2118 ev->done = NULL;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2119 Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done,
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2120 &command_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2121 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2122 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2123 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2124 err = Tcl_DeleteCommand(self->interp, cmdName);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2125 LEAVE_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2126 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2127 if (err == -1) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2128 PyErr_SetString(Tkinter_TclError, "can't delete Tcl command");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2129 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2130 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2131 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2132 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2133 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2134
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2135
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2136
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2137 #ifdef HAVE_CREATEFILEHANDLER
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2138 / File Handler /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2139
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2140 typedef struct _fhcdata {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2141 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2142 PyObject *file;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2143 int id;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2144 struct _fhcdata *next;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2145 } FileHandler_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2146
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2147 static FileHandler_ClientData *HeadFHCD;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2148
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2149 static FileHandler_ClientData *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2150 NewFHCD(PyObject func, PyObject file, int id)
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2151 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2152 FileHandler_ClientData *p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2153 p = PyMem_NEW(FileHandler_ClientData, 1);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2154 if (p != NULL) {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2155 Py_XINCREF(func);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2156 Py_XINCREF(file);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2157 p->func = func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2158 p->file = file;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2159 p->id = id;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2160 p->next = HeadFHCD;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2161 HeadFHCD = p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2162 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2163 return p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2164 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2165
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2166 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2167 DeleteFHCD(int id)
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2168 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2169 FileHandler_ClientData p, *pp;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2170
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2171 pp = &HeadFHCD;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2172 while ((p = *pp) != NULL) {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2173 if (p->id == id) {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2174 *pp = p->next;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2175 Py_XDECREF(p->func);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2176 Py_XDECREF(p->file);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2177 PyMem_DEL(p);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2178 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2179 else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2180 pp = &p->next;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2181 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2182 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2183
2123 fd5ab7e828fc cosmetic changes so these modules will work with the strict new naming scheme Guido van Rossum <guido@python.org> parents: 2121 diff changeset	2184 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2185 FileHandler(ClientData clientData, int mask)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2186 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2187 FileHandler_ClientData data = (FileHandler_ClientData )clientData;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2188 PyObject func, file, arg, res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2189
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2190 ENTER_PYTHON
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2191 func = data->func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2192 file = data->file;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2193
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2194 arg = Py_BuildValue("(Oi)", file, (long) mask);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2195 res = PyEval_CallObject(func, arg);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2196 Py_DECREF(arg);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2197
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2198 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2199 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2200 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2201 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2202 Py_XDECREF(res);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2203 LEAVE_PYTHON
1771 51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	2204 }
51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	2205
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2206 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2207 Tkapp_CreateFileHandler(PyObject self, PyObject args)
346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2208 /* args is (file, mask, func) */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2209 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2210 FileHandler_ClientData *data;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2211 PyObject file, func;
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2212 int mask, tfile;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2213
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2214 if (!PyArg_ParseTuple(args, "OiO:createfilehandler",
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2215 &file, &mask, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2216 return NULL;
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2217
50527 21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2218 CHECK_TCL_APPARTMENT;
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2219
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	2220 tfile = PyObject_AsFileDescriptor(file);
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2221 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2222 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2223 if (!PyCallable_Check(func)) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2224 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2225 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2226 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2227
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2228 data = NewFHCD(func, file, tfile);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2229 if (data == NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2230 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2231
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2232 /* Ought to check for null Tcl_File object... */
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2233 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2234 Tcl_CreateFileHandler(tfile, mask, FileHandler, (ClientData) data);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2235 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2236 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2237 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2238 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2239
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2240 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2241 Tkapp_DeleteFileHandler(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2242 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2243 PyObject *file;
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2244 int tfile;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2245
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2246 if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2247 return NULL;
28156 3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2248
50527 21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2249 CHECK_TCL_APPARTMENT;
28156 3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2250
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	2251 tfile = PyObject_AsFileDescriptor(file);
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2252 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2253 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2254
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2255 DeleteFHCD(tfile);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2256
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2257 /* Ought to check for null Tcl_File object... */
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2258 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2259 Tcl_DeleteFileHandler(tfile);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2260 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2261 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2262 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2263 }
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2264 #endif /* HAVE_CREATEFILEHANDLER */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2265
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2266
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2267 /** Tktt Object (timer token) **/
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2268
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23662 diff changeset	2269 static PyTypeObject Tktt_Type;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2270
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2271 typedef struct {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2272 PyObject_HEAD
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2273 Tcl_TimerToken token;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2274 PyObject *func;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2275 } TkttObject;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2276
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2277 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2278 Tktt_DeleteTimerHandler(PyObject self, PyObject args)
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2279 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2280 TkttObject v = (TkttObject )self;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2281 PyObject *func = v->func;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2282
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2283 if (!PyArg_ParseTuple(args, ":deletetimerhandler"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2284 return NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2285 if (v->token != NULL) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2286 Tcl_DeleteTimerHandler(v->token);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2287 v->token = NULL;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2288 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2289 if (func != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2290 v->func = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2291 Py_DECREF(func);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2292 Py_DECREF(v); /* See Tktt_New() */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2293 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2294 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2295 return Py_None;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2296 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2297
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2298 static PyMethodDef Tktt_methods[] =
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2299 {
22706 14ebd7610902 Use symbolic METH_VARARGS/METH_OLDARGS instead of 1/0 for ml_flags Neal Norwitz <nnorwitz@gmail.com> parents: 21813 diff changeset	2300 {"deletetimerhandler", Tktt_DeleteTimerHandler, METH_VARARGS},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2301 {NULL, NULL}
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2302 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2303
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2304 static TkttObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2305 Tktt_New(PyObject *func)
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2306 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2307 TkttObject *v;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2308
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	2309 v = PyObject_New(TkttObject, &Tktt_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2310 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2311 return NULL;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2312
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2313 Py_INCREF(func);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2314 v->token = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2315 v->func = func;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2316
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2317 /* Extra reference, deleted when called or when handler is deleted */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2318 Py_INCREF(v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2319 return v;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2320 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2321
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2322 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2323 Tktt_Dealloc(PyObject *self)
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2324 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2325 TkttObject v = (TkttObject )self;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2326 PyObject *func = v->func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2327
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2328 Py_XDECREF(func);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2329
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	2330 PyObject_Del(self);
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2331 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2332
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	2333 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2334 Tktt_Repr(PyObject *self)
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2335 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2336 TkttObject v = (TkttObject )self;
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	2337 char buf[100];
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2338
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	2339 PyOS_snprintf(buf, sizeof(buf), "<tktimertoken at %p%s>", v,
21322 1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	2340 v->func == NULL ? ", handler deleted" : "");
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 41587 diff changeset	2341 return PyUnicode_FromString(buf);
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2342 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2343
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2344 static PyTypeObject Tktt_Type =
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2345 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42233 diff changeset	2346 PyVarObject_HEAD_INIT(NULL, 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2347 "tktimertoken", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2348 sizeof(TkttObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2349 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2350 Tktt_Dealloc, /tp_dealloc /
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	2351 0, /tp_print /
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2352 0, /tp_getattr /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2353 0, /tp_setattr /
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	2354 0, /tp_reserved /
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	2355 Tktt_Repr, /tp_repr /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2356 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2357 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2358 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2359 0, /tp_hash /
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2360 0, /tp_call/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2361 0, /tp_str/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2362 0, /tp_getattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2363 0, /tp_setattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2364 0, /tp_as_buffer/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2365 Py_TPFLAGS_DEFAULT, /tp_flags/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2366 0, /tp_doc/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2367 0, /tp_traverse/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2368 0, /tp_clear/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2369 0, /tp_richcompare/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2370 0, /tp_weaklistoffset/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2371 0, /tp_iter/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2372 0, /tp_iternext/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2373 Tktt_methods, /tp_methods/
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2374 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2375
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2376
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2377
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2378 / Timer Handler /
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2379
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2380 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2381 TimerHandler(ClientData clientData)
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2382 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2383 TkttObject v = (TkttObject )clientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2384 PyObject *func = v->func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2385 PyObject *res;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2386
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2387 if (func == NULL)
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2388 return;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2389
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2390 v->func = NULL;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2391
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2392 ENTER_PYTHON
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2393
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2394 res = PyEval_CallObject(func, NULL);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2395 Py_DECREF(func);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2396 Py_DECREF(v); /* See Tktt_New() */
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2397
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2398 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2399 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2400 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2401 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2402 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2403 Py_DECREF(res);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2404
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2405 LEAVE_PYTHON
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2406 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2407
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2408 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2409 Tkapp_CreateTimerHandler(PyObject self, PyObject args)
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2410 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2411 int milliseconds;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2412 PyObject *func;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2413 TkttObject *v;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2414
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2415 if (!PyArg_ParseTuple(args, "iO:createtimerhandler",
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2416 &milliseconds, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2417 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2418 if (!PyCallable_Check(func)) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2419 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2420 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2421 }
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2422
50527 21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2423 CHECK_TCL_APPARTMENT;
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2424
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2425 v = Tktt_New(func);
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2426 if (v) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2427 v->token = Tcl_CreateTimerHandler(milliseconds, TimerHandler,
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2428 (ClientData)v);
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39442 diff changeset	2429 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2430
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2431 return (PyObject *) v;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2432 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2433
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2434
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2435 / Event Loop /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2436
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2437 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2438 Tkapp_MainLoop(PyObject selfptr, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2439 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2440 int threshold = 0;
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	2441 TkappObject self = (TkappObject)selfptr;
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2442 #ifdef WITH_THREAD
8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2443 PyThreadState *tstate = PyThreadState_Get();
8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2444 #endif
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2445
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2446 if (!PyArg_ParseTuple(args, "\|i:mainloop", &threshold))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2447 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2448
50527 21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2449 CHECK_TCL_APPARTMENT;
21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2450 self->dispatching = 1;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2451
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2452 quitMainLoop = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2453 while (Tk_GetNumMainWindows() > threshold &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2454 !quitMainLoop &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2455 !errorInCmd)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2456 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2457 int result;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2458
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2459 #ifdef WITH_THREAD
50527 21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2460 if (self->threaded) {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2461 /* Allow other Python threads to run. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2462 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2463 result = Tcl_DoOneEvent(0);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2464 LEAVE_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2465 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2466 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2467 Py_BEGIN_ALLOW_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2468 if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2469 tcl_tstate = tstate;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2470 result = Tcl_DoOneEvent(TCL_DONT_WAIT);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2471 tcl_tstate = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2472 if(tcl_lock)PyThread_release_lock(tcl_lock);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2473 if (result == 0)
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2474 Sleep(Tkinter_busywaitinterval);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2475 Py_END_ALLOW_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2476 }
6106 36b3b337c566 Alas, the thread support for Tk didn't work. Withdraw it, until I Guido van Rossum <guido@python.org> parents: 6093 diff changeset	2477 #else
36b3b337c566 Alas, the thread support for Tk didn't work. Withdraw it, until I Guido van Rossum <guido@python.org> parents: 6093 diff changeset	2478 result = Tcl_DoOneEvent(0);
36b3b337c566 Alas, the thread support for Tk didn't work. Withdraw it, until I Guido van Rossum <guido@python.org> parents: 6093 diff changeset	2479 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2480
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2481 if (PyErr_CheckSignals() != 0) {
50527 21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2482 self->dispatching = 0;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2483 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2484 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2485 if (result < 0)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2486 break;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2487 }
50527 21d7e9e87591 Merged revisions 68237 via svnmerge from Guilherme Polo <ggpolo@gmail.com> parents: 49748 diff changeset	2488 self->dispatching = 0;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2489 quitMainLoop = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2490
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2491 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2492 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2493 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2494 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2495 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2496 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2497 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2498 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2499 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2500
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2501 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2502 Tkapp_DoOneEvent(PyObject self, PyObject args)
2121 86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2503 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2504 int flags = 0;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2505 int rv;
2121 86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2506
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2507 if (!PyArg_ParseTuple(args, "\|i:dooneevent", &flags))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2508 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2509
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2510 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2511 rv = Tcl_DoOneEvent(flags);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2512 LEAVE_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2513 return Py_BuildValue("i", rv);
2121 86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2514 }
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2515
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2516 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2517 Tkapp_Quit(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2518 {
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2519
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2520 if (!PyArg_ParseTuple(args, ":quit"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2521 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2522
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2523 quitMainLoop = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2524 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2525 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2526 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2527
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2528 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2529 Tkapp_InterpAddr(PyObject self, PyObject args)
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2530 {
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2531
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2532 if (!PyArg_ParseTuple(args, ":interpaddr"))
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2533 return NULL;
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2534
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43963 diff changeset	2535 return PyLong_FromLong((long)Tkapp_Interp(self));
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2536 }
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2537
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2538 static PyObject *
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2539 Tkapp_TkInit(PyObject self, PyObject args)
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2540 {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2541 static int has_failed;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2542 Tcl_Interp *interp = Tkapp_Interp(self);
31549 3da6c2adad34 Remove gcc warning from using "main". Use METH_NOARGS instead of METH_VARARGS Neal Norwitz <nnorwitz@gmail.com> parents: 31547 diff changeset	2543 Tk_Window main_window;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2544 const char * _tk_exists = NULL;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2545 int err;
31549 3da6c2adad34 Remove gcc warning from using "main". Use METH_NOARGS instead of METH_VARARGS Neal Norwitz <nnorwitz@gmail.com> parents: 31547 diff changeset	2546 main_window = Tk_MainWindow(interp);
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2547
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2548 /* In all current versions of Tk (including 8.4.13), Tk_Init
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2549 deadlocks on the second call when the first call failed.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2550 To avoid the deadlock, we just refuse the second call through
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2551 a static variable. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2552 if (has_failed) {
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2553 PyErr_SetString(Tkinter_TclError,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2554 "Calling Tk_Init again after a previous call failed might deadlock");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2555 return NULL;
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2556 }
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2557
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2558 /* We want to guard against calling Tk_Init() multiple times */
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2559 CHECK_TCL_APPARTMENT;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2560 ENTER_TCL
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2561 err = Tcl_Eval(Tkapp_Interp(self), "info exists tk_version");
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2562 ENTER_OVERLAP
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2563 if (err == TCL_ERROR) {
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2564 /* This sets an exception, but we cannot return right
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2565 away because we need to exit the overlap first. */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2566 Tkinter_Error(self);
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2567 } else {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2568 _tk_exists = Tkapp_Result(self);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2569 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2570 LEAVE_OVERLAP_TCL
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2571 if (err == TCL_ERROR) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2572 return NULL;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2573 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2574 if (_tk_exists == NULL \|\| strcmp(_tk_exists, "1") != 0) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2575 if (Tk_Init(interp) == TCL_ERROR) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2576 PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self)));
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2577 has_failed = 1;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2578 return NULL;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2579 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2580 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2581 Py_INCREF(Py_None);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2582 return Py_None;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2583 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2584
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2585 static PyObject *
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2586 Tkapp_WantObjects(PyObject self, PyObject args)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2587 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2588
29472 1ab9978123be Properly deal with tuples in Open._fixresult. Fixes bug reported in Martin v. Löwis <martin@v.loewis.de> parents: 29295 diff changeset	2589 int wantobjects = -1;
1ab9978123be Properly deal with tuples in Open._fixresult. Fixes bug reported in Martin v. Löwis <martin@v.loewis.de> parents: 29295 diff changeset	2590 if (!PyArg_ParseTuple(args, "\|i:wantobjects", &wantobjects))
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2591 return NULL;
29472 1ab9978123be Properly deal with tuples in Open._fixresult. Fixes bug reported in Martin v. Löwis <martin@v.loewis.de> parents: 29295 diff changeset	2592 if (wantobjects == -1)
1ab9978123be Properly deal with tuples in Open._fixresult. Fixes bug reported in Martin v. Löwis <martin@v.loewis.de> parents: 29295 diff changeset	2593 return PyBool_FromLong(((TkappObject*)self)->wantobjects);
26428 0103f0b75fe2 Rename want_objects to wantobjects throughout, for consistency. Martin v. Löwis <martin@v.loewis.de> parents: 26416 diff changeset	2594 ((TkappObject*)self)->wantobjects = wantobjects;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2595
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2596 Py_INCREF(Py_None);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2597 return Py_None;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2598 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2599
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2600 static PyObject *
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2601 Tkapp_WillDispatch(PyObject self, PyObject args)
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2602 {
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2603
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2604 ((TkappObject*)self)->dispatching = 1;
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2605
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2606 Py_INCREF(Py_None);
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2607 return Py_None;
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2608 }
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2609
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2610
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2611 /** Tkapp Method List **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2612
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2613 static PyMethodDef Tkapp_methods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2614 {
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2615 {"willdispatch", Tkapp_WillDispatch, METH_NOARGS},
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2616 {"wantobjects", Tkapp_WantObjects, METH_VARARGS},
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41782 diff changeset	2617 {"call", Tkapp_Call, METH_VARARGS},
24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41782 diff changeset	2618 {"globalcall", Tkapp_GlobalCall, METH_VARARGS},
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2619 {"eval", Tkapp_Eval, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2620 {"globaleval", Tkapp_GlobalEval, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2621 {"evalfile", Tkapp_EvalFile, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2622 {"record", Tkapp_Record, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2623 {"adderrorinfo", Tkapp_AddErrorInfo, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2624 {"setvar", Tkapp_SetVar, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2625 {"globalsetvar", Tkapp_GlobalSetVar, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2626 {"getvar", Tkapp_GetVar, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2627 {"globalgetvar", Tkapp_GlobalGetVar, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2628 {"unsetvar", Tkapp_UnsetVar, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2629 {"globalunsetvar", Tkapp_GlobalUnsetVar, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2630 {"getint", Tkapp_GetInt, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2631 {"getdouble", Tkapp_GetDouble, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2632 {"getboolean", Tkapp_GetBoolean, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2633 {"exprstring", Tkapp_ExprString, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2634 {"exprlong", Tkapp_ExprLong, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2635 {"exprdouble", Tkapp_ExprDouble, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2636 {"exprboolean", Tkapp_ExprBoolean, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2637 {"splitlist", Tkapp_SplitList, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2638 {"split", Tkapp_Split, METH_VARARGS},
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41782 diff changeset	2639 {"merge", Tkapp_Merge, METH_VARARGS},
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2640 {"createcommand", Tkapp_CreateCommand, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2641 {"deletecommand", Tkapp_DeleteCommand, METH_VARARGS},
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2642 #ifdef HAVE_CREATEFILEHANDLER
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2643 {"createfilehandler", Tkapp_CreateFileHandler, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2644 {"deletefilehandler", Tkapp_DeleteFileHandler, METH_VARARGS},
5954 d3835a6a18c9 Rather unsatisfactory temporary hack to get it to run Guido van Rossum <guido@python.org> parents: 5947 diff changeset	2645 #endif
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2646 {"createtimerhandler", Tkapp_CreateTimerHandler, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2647 {"mainloop", Tkapp_MainLoop, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2648 {"dooneevent", Tkapp_DoOneEvent, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2649 {"quit", Tkapp_Quit, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2650 {"interpaddr", Tkapp_InterpAddr, METH_VARARGS},
31549 3da6c2adad34 Remove gcc warning from using "main". Use METH_NOARGS instead of METH_VARARGS Neal Norwitz <nnorwitz@gmail.com> parents: 31547 diff changeset	2651 {"loadtk", Tkapp_TkInit, METH_NOARGS},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2652 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2653 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2654
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2655
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2656
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2657 /** Tkapp Type Methods **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2658
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2659 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2660 Tkapp_Dealloc(PyObject *self)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2661 {
26971 4c03a4fad72e Eliminate C++ comment. Martin v. Löwis <martin@v.loewis.de> parents: 26858 diff changeset	2662 /CHECK_TCL_APPARTMENT;/
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2663 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2664 Tcl_DeleteInterp(Tkapp_Interp(self));
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2665 LEAVE_TCL
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	2666 PyObject_Del(self);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2667 DisableEventHook();
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2668 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2669
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2670 static PyTypeObject Tkapp_Type =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2671 {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 42233 diff changeset	2672 PyVarObject_HEAD_INIT(NULL, 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2673 "tkapp", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2674 sizeof(TkappObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2675 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2676 Tkapp_Dealloc, /tp_dealloc /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2677 0, /tp_print /
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2678 0, /tp_getattr /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2679 0, /tp_setattr /
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	2680 0, /tp_reserved /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2681 0, /tp_repr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2682 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2683 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2684 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2685 0, /tp_hash /
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2686 0, /tp_call/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2687 0, /tp_str/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2688 0, /tp_getattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2689 0, /tp_setattro/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2690 0, /tp_as_buffer/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2691 Py_TPFLAGS_DEFAULT, /tp_flags/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2692 0, /tp_doc/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2693 0, /tp_traverse/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2694 0, /tp_clear/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2695 0, /tp_richcompare/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2696 0, /tp_weaklistoffset/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2697 0, /tp_iter/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2698 0, /tp_iternext/
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	2699 Tkapp_methods, /tp_methods/
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2700 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2701
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2702
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2703
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2704 /** Tkinter Module **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2705
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2706 typedef struct {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2707 PyObject* tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2708 int size; /* current size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2709 int maxsize; /* allocated size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2710 } FlattenContext;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2711
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2712 static int
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2713 _bump(FlattenContext* context, int size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2714 {
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2715 /* expand tuple to hold (at least) size new items.
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2716 return true if successful, false if an exception was raised */
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2717
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2718 int maxsize = context->maxsize * 2;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2719
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2720 if (maxsize < context->size + size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2721 maxsize = context->size + size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2722
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2723 context->maxsize = maxsize;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2724
17976 d579a5d8b3fe Cruft cleanup: Removed the unused last_is_sticky argument from the internal Tim Peters <tim.peters@gmail.com> parents: 15356 diff changeset	2725 return _PyTuple_Resize(&context->tuple, maxsize) >= 0;
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2726 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2727
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2728 static int
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2729 _flatten1(FlattenContext* context, PyObject* item, int depth)
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2730 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2731 /* add tuple or list to argument tuple (recursively) */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2732
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2733 int i, size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2734
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2735 if (depth > 1000) {
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2736 PyErr_SetString(PyExc_ValueError,
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2737 "nesting too deep in _flatten");
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2738 return 0;
3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2739 } else if (PyList_Check(item)) {
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2740 size = PyList_GET_SIZE(item);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2741 /* preallocate (assume no nesting) */
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2742 if (context->size + size > context->maxsize &&
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2743 !_bump(context, size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2744 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2745 /* copy items to output tuple */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2746 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2747 PyObject *o = PyList_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2748 if (PyList_Check(o) \|\| PyTuple_Check(o)) {
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2749 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2750 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2751 } else if (o != Py_None) {
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2752 if (context->size + 1 > context->maxsize &&
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2753 !_bump(context, 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2754 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2755 Py_INCREF(o);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2756 PyTuple_SET_ITEM(context->tuple,
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2757 context->size++, o);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2758 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2759 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2760 } else if (PyTuple_Check(item)) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2761 /* same, for tuples */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2762 size = PyTuple_GET_SIZE(item);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2763 if (context->size + size > context->maxsize &&
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2764 !_bump(context, size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2765 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2766 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2767 PyObject *o = PyTuple_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2768 if (PyList_Check(o) \|\| PyTuple_Check(o)) {
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2769 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2770 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2771 } else if (o != Py_None) {
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2772 if (context->size + 1 > context->maxsize &&
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2773 !_bump(context, 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2774 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2775 Py_INCREF(o);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2776 PyTuple_SET_ITEM(context->tuple,
be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	2777 context->size++, o);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2778 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2779 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2780 } else {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2781 PyErr_SetString(PyExc_TypeError, "argument must be sequence");
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2782 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2783 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2784 return 1;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2785 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2786
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2787 static PyObject *
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2788 Tkinter_Flatten(PyObject* self, PyObject* args)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2789 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2790 FlattenContext context;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2791 PyObject* item;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2792
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2793 if (!PyArg_ParseTuple(args, "O:_flatten", &item))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2794 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2795
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13503 diff changeset	2796 context.maxsize = PySequence_Size(item);
51194 61787533395c Merged revisions 69118 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50527 diff changeset	2797 if (context.maxsize < 0)
61787533395c Merged revisions 69118 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50527 diff changeset	2798 return NULL;
61787533395c Merged revisions 69118 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 50527 diff changeset	2799 if (context.maxsize == 0)
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2800 return PyTuple_New(0);
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2801
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2802 context.tuple = PyTuple_New(context.maxsize);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2803 if (!context.tuple)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2804 return NULL;
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2805
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2806 context.size = 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2807
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2808 if (!_flatten1(&context, item,0))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2809 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2810
17976 d579a5d8b3fe Cruft cleanup: Removed the unused last_is_sticky argument from the internal Tim Peters <tim.peters@gmail.com> parents: 15356 diff changeset	2811 if (_PyTuple_Resize(&context.tuple, context.size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2812 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2813
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2814 return context.tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2815 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2816
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2817 static PyObject *
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2818 Tkinter_Create(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2819 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2820 char *screenName = NULL;
46316 4352d41affb0 Remove baseName argument from Tkapp_New, as it apparently Martin v. Löwis <martin@v.loewis.de> parents: 44460 diff changeset	2821 char baseName = NULL; / XXX this is not used anymore;
4352d41affb0 Remove baseName argument from Tkapp_New, as it apparently Martin v. Löwis <martin@v.loewis.de> parents: 44460 diff changeset	2822 try getting rid of it. */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2823 char *className = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2824 int interactive = 0;
26428 0103f0b75fe2 Rename want_objects to wantobjects throughout, for consistency. Martin v. Löwis <martin@v.loewis.de> parents: 26416 diff changeset	2825 int wantobjects = 0;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2826 int wantTk = 1; /* If false, then Tk_Init() doesn't get called */
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2827 int sync = 0; /* pass -sync to wish */
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2828 char use = NULL; / pass -use to wish */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2829
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2830 className = "Tk";
43950 2a3ca90008ff Return PyString, not PyBytes, for a bytes array. Guido van Rossum <guido@python.org> parents: 42887 diff changeset	2831
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2832 if (!PyArg_ParseTuple(args, "\|zssiiiiz:create",
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2833 &screenName, &baseName, &className,
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2834 &interactive, &wantobjects, &wantTk,
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2835 &sync, &use))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2836 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2837
46316 4352d41affb0 Remove baseName argument from Tkapp_New, as it apparently Martin v. Löwis <martin@v.loewis.de> parents: 44460 diff changeset	2838 return (PyObject *) Tkapp_New(screenName, className,
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2839 interactive, wantobjects, wantTk,
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2840 sync, use);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2841 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2842
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2843 static PyObject *
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2844 Tkinter_setbusywaitinterval(PyObject self, PyObject args)
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2845 {
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2846 int new_val;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2847 if (!PyArg_ParseTuple(args, "i:setbusywaitinterval", &new_val))
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2848 return NULL;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2849 if (new_val < 0) {
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2850 PyErr_SetString(PyExc_ValueError,
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2851 "busywaitinterval must be >= 0");
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2852 return NULL;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2853 }
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2854 Tkinter_busywaitinterval = new_val;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2855 Py_INCREF(Py_None);
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2856 return Py_None;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2857 }
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2858
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2859 static char setbusywaitinterval_doc[] =
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2860 "setbusywaitinterval(n) -> None\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2861 \n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2862 Set the busy-wait interval in milliseconds between successive\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2863 calls to Tcl_DoOneEvent in a threaded Python interpreter.\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2864 It should be set to a divisor of the maximum time between\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2865 frames in an animation.";
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2866
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2867 static PyObject *
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2868 Tkinter_getbusywaitinterval(PyObject self, PyObject args)
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2869 {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43963 diff changeset	2870 return PyLong_FromLong(Tkinter_busywaitinterval);
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2871 }
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2872
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2873 static char getbusywaitinterval_doc[] =
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2874 "getbusywaitinterval() -> int\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2875 \n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2876 Return the current busy-wait interval between successive\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2877 calls to Tcl_DoOneEvent in a threaded Python interpreter.";
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2878
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2879 static PyMethodDef moduleMethods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2880 {
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2881 {"_flatten", Tkinter_Flatten, METH_VARARGS},
40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2882 {"create", Tkinter_Create, METH_VARARGS},
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2883 {"setbusywaitinterval",Tkinter_setbusywaitinterval, METH_VARARGS,
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2884 setbusywaitinterval_doc},
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2885 {"getbusywaitinterval",(PyCFunction)Tkinter_getbusywaitinterval,
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2886 METH_NOARGS, getbusywaitinterval_doc},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2887 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2888 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2889
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2890 #ifdef WAIT_FOR_STDIN
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2891
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2892 static int stdin_ready = 0;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2893
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2894 #ifndef MS_WINDOWS
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2895 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2896 MyFileProc(void *clientData, int mask)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2897 {
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2898 stdin_ready = 1;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2899 }
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2900 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2901
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2902 #ifdef WITH_THREAD
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2903 static PyThreadState *event_tstate = NULL;
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2904 #endif
6438 9e46ecf03c3e Fix EventHook (the trick to make widgets appear when using GNU Guido van Rossum <guido@python.org> parents: 6343 diff changeset	2905
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2906 static int
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2907 EventHook(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2908 {
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2909 #ifndef MS_WINDOWS
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2910 int tfile;
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2911 #endif
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2912 #ifdef WITH_THREAD
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2913 PyEval_RestoreThread(event_tstate);
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2914 #endif
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2915 stdin_ready = 0;
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2916 errorInCmd = 0;
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2917 #ifndef MS_WINDOWS
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2918 tfile = fileno(stdin);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2919 Tcl_CreateFileHandler(tfile, TCL_READABLE, MyFileProc, NULL);
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2920 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2921 while (!errorInCmd && !stdin_ready) {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2922 int result;
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2923 #ifdef MS_WINDOWS
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2924 if (_kbhit()) {
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2925 stdin_ready = 1;
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2926 break;
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2927 }
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2928 #endif
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2929 #if defined(WITH_THREAD) \|\| defined(MS_WINDOWS)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	2930 Py_BEGIN_ALLOW_THREADS
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2931 if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1);
9327 c91e4d87f694 Looks like I didn't test this interactively. The EventHook() code was Guido van Rossum <guido@python.org> parents: 9319 diff changeset	2932 tcl_tstate = event_tstate;
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2933
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2934 result = Tcl_DoOneEvent(TCL_DONT_WAIT);
9319 8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2935
8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2936 tcl_tstate = NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2937 if(tcl_lock)PyThread_release_lock(tcl_lock);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2938 if (result == 0)
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2939 Sleep(Tkinter_busywaitinterval);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2940 Py_END_ALLOW_THREADS
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2941 #else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2942 result = Tcl_DoOneEvent(0);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2943 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2944
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2945 if (result < 0)
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2946 break;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2947 }
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2948 #ifndef MS_WINDOWS
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2949 Tcl_DeleteFileHandler(tfile);
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2950 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2951 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2952 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2953 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2954 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2955 PyErr_Print();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2956 }
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2957 #ifdef WITH_THREAD
8499 0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2958 PyEval_SaveThread();
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2959 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2960 return 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2961 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2962
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2963 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2964
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2965 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2966 EnableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2967 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2968 #ifdef WAIT_FOR_STDIN
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2969 if (PyOS_InputHook == NULL) {
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2970 #ifdef WITH_THREAD
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2971 event_tstate = PyThreadState_Get();
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2972 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2973 PyOS_InputHook = EventHook;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2974 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2975 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2976 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2977
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2978 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2979 DisableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2980 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2981 #ifdef WAIT_FOR_STDIN
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2982 if (Tk_GetNumMainWindows() == 0 && PyOS_InputHook == EventHook) {
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2983 PyOS_InputHook = NULL;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2984 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2985 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2986 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2987
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2988
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2989 /* all errors will be checked in one fell swoop in init_tkinter() */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2990 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2991 ins_long(PyObject d, char name, long val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2992 {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 43963 diff changeset	2993 PyObject *v = PyLong_FromLong(val);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2994 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2995 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2996 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2997 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2998 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2999 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	3000 ins_string(PyObject d, char name, char *val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3001 {
42568 d4ee54a88485 Create Unicode objects. Martin v. Löwis <martin@v.loewis.de> parents: 42567 diff changeset	3002 PyObject *v = PyUnicode_FromString(val);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3003 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3004 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3005 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3006 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3007 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3008
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3009
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3010 static struct PyModuleDef _tkintermodule = {
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3011 PyModuleDef_HEAD_INIT,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3012 "_tkinter",
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3013 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3014 -1,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3015 moduleMethods,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3016 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3017 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3018 NULL,
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3019 NULL
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3020 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3021
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24280 diff changeset	3022 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3023 PyInit__tkinter(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3024 {
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3025 PyObject m, d, uexe, cexe;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3026
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	3027 if (PyType_Ready(&Tkapp_Type) < 0)
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	3028 return NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3029
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3030 #ifdef WITH_THREAD
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	3031 tcl_lock = PyThread_allocate_lock();
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3032 #endif
4091 dc946cab7b9b Hacks to support being a Windows DLL Guido van Rossum <guido@python.org> parents: 4079 diff changeset	3033
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3034 m = PyModule_Create(&_tkintermodule);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 36233 diff changeset	3035 if (m == NULL)
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3036 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3037
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3038 d = PyModule_GetDict(m);
23662 27e2120cb476 Fix SF bug #557436, TclError is a str should be an Exception Neal Norwitz <nnorwitz@gmail.com> parents: 22706 diff changeset	3039 Tkinter_TclError = PyErr_NewException("_tkinter.TclError", NULL, NULL);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3040 PyDict_SetItemString(d, "TclError", Tkinter_TclError);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3041
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3042 ins_long(d, "READABLE", TCL_READABLE);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3043 ins_long(d, "WRITABLE", TCL_WRITABLE);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3044 ins_long(d, "EXCEPTION", TCL_EXCEPTION);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3045 ins_long(d, "WINDOW_EVENTS", TCL_WINDOW_EVENTS);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3046 ins_long(d, "FILE_EVENTS", TCL_FILE_EVENTS);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3047 ins_long(d, "TIMER_EVENTS", TCL_TIMER_EVENTS);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3048 ins_long(d, "IDLE_EVENTS", TCL_IDLE_EVENTS);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3049 ins_long(d, "ALL_EVENTS", TCL_ALL_EVENTS);
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3050 ins_long(d, "DONT_WAIT", TCL_DONT_WAIT);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3051 ins_string(d, "TK_VERSION", TK_VERSION);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3052 ins_string(d, "TCL_VERSION", TCL_VERSION);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3053
6311 13fbd98d81cc Export names for the types defined by this module: TkappType and TkttType. Guido van Rossum <guido@python.org> parents: 6265 diff changeset	3054 PyDict_SetItemString(d, "TkappType", (PyObject *)&Tkapp_Type);
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3055
48413 7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	3056 if (PyType_Ready(&Tktt_Type) < 0)
7e56016a6565 #3247 Get rid of Py_FindMethod; use tp_members instead. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47680 diff changeset	3057 return NULL;
6311 13fbd98d81cc Export names for the types defined by this module: TkappType and TkttType. Guido van Rossum <guido@python.org> parents: 6265 diff changeset	3058 PyDict_SetItemString(d, "TkttType", (PyObject *)&Tktt_Type);
13fbd98d81cc Export names for the types defined by this module: TkappType and TkttType. Guido van Rossum <guido@python.org> parents: 6265 diff changeset	3059
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	3060 Py_TYPE(&PyTclObject_Type) = &PyType_Type;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	3061 PyDict_SetItemString(d, "Tcl_Obj", (PyObject *)&PyTclObject_Type);
21322 1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3062
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3063 #ifdef TK_AQUA
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3064 /* Tk_MacOSXSetupTkNotifier must be called before Tcl's subsystems
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3065 * start waking up. Note that Tcl_FindExecutable will do this, this
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3066 * code must be above it! The original warning from
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3067 * tkMacOSXAppInit.c is copied below.
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3068 *
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3069 * NB - You have to swap in the Tk Notifier BEFORE you start up the
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3070 * Tcl interpreter for now. It probably should work to do this
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3071 * in the other order, but for now it doesn't seem to.
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3072 *
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3073 */
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3074 Tk_MacOSXSetupTkNotifier();
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3075 #endif
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3076
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3077
12063 ca8880cf3674 Add a call to Tcl_FindExecutable(). This was inspired by a patch by Guido van Rossum <guido@python.org> parents: 11882 diff changeset	3078 /* This helps the dynamic loader; in Unicode aware Tcl versions
ca8880cf3674 Add a call to Tcl_FindExecutable(). This was inspired by a patch by Guido van Rossum <guido@python.org> parents: 11882 diff changeset	3079 it also helps Tcl find its encodings. */
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3080 uexe = PyUnicode_FromWideChar(Py_GetProgramName(), -1);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3081 if (uexe) {
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3082 cexe = PyUnicode_AsEncodedString(uexe,
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3083 Py_FileSystemDefaultEncoding,
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3084 NULL);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3085 if (cexe)
47301 23ab586c427a Renamed PyString to PyBytes Christian Heimes <christian@cheimes.de> parents: 46318 diff changeset	3086 Tcl_FindExecutable(PyBytes_AsString(cexe));
46318 22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3087 Py_XDECREF(cexe);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3088 Py_DECREF(uexe);
22a74eaf6b22 Change command line processing API to use wchar_t. Martin v. Löwis <martin@v.loewis.de> parents: 46316 diff changeset	3089 }
12063 ca8880cf3674 Add a call to Tcl_FindExecutable(). This was inspired by a patch by Guido van Rossum <guido@python.org> parents: 11882 diff changeset	3090
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3091 if (PyErr_Occurred()) {
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3092 Py_DECREF(m);
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3093 return NULL;
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3094 }
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	3095
8670 07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	3096 #if 0
07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	3097 /* This was not a good idea; through <Destroy> bindings,
07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	3098 Tcl_Finalize() may invoke Python code but at that point the
07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	3099 interpreter and thread state have already been destroyed! */
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	3100 Py_AtExit(Tcl_Finalize);
8096 8c1f161c6c8c Add #ifdefs so Tcl_Finalize isn't referenced when it's not defined. Guido van Rossum <guido@python.org> parents: 7982 diff changeset	3101 #endif
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	3102 return m;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3103 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_tkinter.c @ 51271:87fbbf22adf3 3.0