cpython-lru_cache-weakref: Modules/

annotate Modules/_tkinter.c @ 49955:878d40468c4e legacy-trunk

Issue #4384: Added logging integration with warnings module using captureWarnings(). This change includes a NullHandler which does nothing; it will be of use to library developers who want to avoid the "No handlers could be found for logger XXX" message which can appear if the library user doesn't configure logging.

author	Vinay Sajip <vinay_sajip@yahoo.co.uk>
date	Wed, 03 Dec 2008 23:22:58 +0000
parents	a35da94e05fc
children	fae1758a2346 cdd5fa05c14d

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
2405371be34c Fake bool API for Python 2.2. Martin v. Löwis <martin@v.loewis.de> parents: 28156 diff changeset	47 #define PyBool_FromLong PyInt_FromLong
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
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	86 either UTF-16 or 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	87 Redhat 8 sets TCL_UTF_MAX to 6, and uses wchar_t for
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
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42511 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", \
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42511 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 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	338 if (PyString_Check(value))
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	339 return PyString_AsString(value);
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	340 #ifdef Py_USING_UNICODE
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	341 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	342 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	343 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	344 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	345 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	346 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	347 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	348 }
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	349 Py_DECREF(v);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	350 return PyString_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	351 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	352 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	353 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	354 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	355 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	356 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	357 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	358 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	359 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	360 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	361 Py_DECREF(v);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	362 return PyString_AsString(v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	363 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	364 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	365
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	366
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	367
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	368 #define ARGSZ 64
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	369
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	370 static char *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	371 Merge(PyObject *args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	372 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	373 PyObject *tmp = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	374 char *argvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	375 char **argv = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	376 int fvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	377 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	378 int argc = 0, fvc = 0, i;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	379 char *res = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	380
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	381 if (!(tmp = PyList_New(0)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	382 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	383
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	384 argv = argvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	385 fv = fvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	386
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	387 if (args == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	388 argc = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	389
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	390 else if (!PyTuple_Check(args)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	391 argc = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	392 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	393 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	394 goto finally;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	395 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	396 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	397 argc = PyTuple_Size(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	398
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	399 if (argc > ARGSZ) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	400 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	401 fv = (int )ckalloc(argc sizeof(int));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	402 if (argv == NULL \|\| fv == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	403 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	404 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	405 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	406 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	407
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	408 for (i = 0; i < argc; i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	409 PyObject *v = PyTuple_GetItem(args, i);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	410 if (PyTuple_Check(v)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	411 fv[i] = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	412 if (!(argv[i] = Merge(v)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	413 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	414 fvc++;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	415 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	416 else if (v == Py_None) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	417 argc = i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	418 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	419 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	420 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	421 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	422 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	423 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	424 fvc++;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	425 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	426 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	427 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	428 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	429 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	430 PyErr_SetString(Tkinter_TclError, "merge failed");
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	431
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	432 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	433 for (i = 0; i < fvc; i++)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	434 if (fv[i]) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	435 ckfree(argv[i]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	436 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	437 if (argv != argvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	438 ckfree(FREECAST argv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	439 if (fv != fvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	440 ckfree(FREECAST fv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	441
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	442 Py_DECREF(tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	443 return res;
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
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	447
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	448 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	449 Split(char *list)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	450 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	451 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	452 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	453 PyObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	454
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	455 if (list == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	456 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	457 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	458 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	459
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	460 if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	461 /* Not a list.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	462 * Could be a quoted string containing funnies, e.g. {"}.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	463 * Return the string itself.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	464 */
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	465 return PyString_FromString(list);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	466 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	467
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	468 if (argc == 0)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	469 v = PyString_FromString("");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	470 else if (argc == 1)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	471 v = PyString_FromString(argv[0]);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	472 else if ((v = PyTuple_New(argc)) != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	473 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	474 PyObject *w;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	475
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	476 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	477 if ((w = Split(argv[i])) == NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	478 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	479 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	480 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	481 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	482 PyTuple_SetItem(v, i, w);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	483 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	484 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	485 Tcl_Free(FREECAST argv);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	486 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	487 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	488
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	489 /* 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	490 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	491 need to be split. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	492
47678 a35da94e05fc Make more symbols static. Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	493 static PyObject *
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	494 SplitObj(PyObject *arg)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	495 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	496 if (PyTuple_Check(arg)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	497 int i, size;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	498 PyObject elem, newelem, *result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	499
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	500 size = PyTuple_Size(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	501 result = NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	502 /* 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	503 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	504 needed. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	505 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	506 elem = PyTuple_GetItem(arg, i);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	507 newelem = SplitObj(elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	508 if (!newelem) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	509 Py_XDECREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	510 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	511 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	512 if (!result) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	513 int k;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	514 if (newelem == elem) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	515 Py_DECREF(newelem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	516 continue;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	517 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	518 result = PyTuple_New(size);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	519 if (!result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	520 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	521 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	522 elem = PyTuple_GetItem(arg, k);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	523 Py_INCREF(elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	524 PyTuple_SetItem(result, k, elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	525 }
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 PyTuple_SetItem(result, i, newelem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	528 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	529 if (result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	530 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	531 /* Fall through, returning arg. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	532 }
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	533 else if (PyString_Check(arg)) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	534 int argc;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	535 char **argv;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	536 char *list = PyString_AsString(arg);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	537
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	538 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	539 Py_INCREF(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	540 return arg;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	541 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	542 Tcl_Free(FREECAST argv);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	543 if (argc > 1)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	544 return Split(PyString_AsString(arg));
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	545 /* Fall through, returning arg. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	546 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	547 Py_INCREF(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	548 return arg;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	549 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	550
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	551
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	552 /** Tkapp Object **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	553
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	554 #ifndef WITH_APPINIT
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	555 int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	556 Tcl_AppInit(Tcl_Interp *interp)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	557 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	558 Tk_Window main;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	559 const char * _tkinter_skip_tk_init;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	560
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	561 if (Tcl_Init(interp) == TCL_ERROR) {
15177 52d2d36b8bf7 Fix for Bug #116453. Guido van Rossum <guido@python.org> parents: 15053 diff changeset	562 PySys_WriteStderr("Tcl_Init error: %s\n", Tcl_GetStringResult(interp));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	563 return TCL_ERROR;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	564 }
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	565 _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	566 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	567 main = Tk_MainWindow(interp);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	568 if (Tk_Init(interp) == TCL_ERROR) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	569 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	570 return TCL_ERROR;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	571 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	572 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	573 return TCL_OK;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	574 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	575 #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	576
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	577
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	578
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	579
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	580 /* Initialize the Tk application; see the `main' function in
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	581 * `tkMain.c'.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	582 */
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	583
13690 c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	584 static void EnableEventHook(void); /* Forward */
c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	585 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	586
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	587 static TkappObject *
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	588 Tkapp_New(char screenName, char baseName, 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	589 int interactive, int wantobjects, int wantTk, int sync, char *use)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	590 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	591 TkappObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	592 char *argv0;
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	593
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	594 v = PyObject_New(TkappObject, &Tkapp_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	595 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	596 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	597
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	598 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	599 v->wantobjects = wantobjects;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	600 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	601 TCL_GLOBAL_ONLY) != NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	602 v->thread_id = Tcl_GetCurrentThread();
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	603 v->dispatching = 0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	604
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	605 #ifndef TCL_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	606 if (v->threaded) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	607 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	608 Py_DECREF(v);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	609 return 0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	610 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	611 #endif
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	612 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	613 if (v->threaded && tcl_lock) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	614 /* 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	615 PyThread_free_lock(tcl_lock);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	616 tcl_lock = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	617 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	618 #endif
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	619
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	620 v->BooleanType = Tcl_GetObjType("boolean");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	621 v->ByteArrayType = Tcl_GetObjType("bytearray");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	622 v->DoubleType = Tcl_GetObjType("double");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	623 v->IntType = Tcl_GetObjType("int");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	624 v->ListType = Tcl_GetObjType("list");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	625 v->ProcBodyType = Tcl_GetObjType("procbody");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	626 v->StringType = Tcl_GetObjType("string");
ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	627
7416 13f29b62a209 Delete the 'exit' command from the Tcl interpreter -- it would allow Guido van Rossum <guido@python.org> parents: 7212 diff changeset	628 /* 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	629 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	630
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	631 if (screenName != NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	632 Tcl_SetVar2(v->interp, "env", "DISPLAY",
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	633 screenName, TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	634
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	635 if (interactive)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	636 Tcl_SetVar(v->interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	637 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	638 Tcl_SetVar(v->interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	639
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	640 /* 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	641 argv0 = (char*)ckalloc(strlen(className) + 1);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	642 if (!argv0) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	643 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	644 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	645 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	646 }
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	647
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	648 strcpy(argv0, className);
36092 b70b3e5b3cd1 Remove extra parens Neal Norwitz <nnorwitz@gmail.com> parents: 36090 diff changeset	649 if (isupper(Py_CHARMASK(argv0[0])))
37556 9bda5ba41677 Get rid of warnings about using chars as subscripts Neal Norwitz <nnorwitz@gmail.com> parents: 36871 diff changeset	650 argv0[0] = tolower(Py_CHARMASK(argv0[0]));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	651 Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	652 ckfree(argv0);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	653
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	654 if (! wantTk) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	655 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	656 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	657
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	658 /* 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	659 if (sync \|\| use) {
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	660 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	661 int len = 0;
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	662
32942 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 (sync)
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 += 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	665 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	666 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	667
32945 fbb5428ebf41 Tkapp_New(): Rewrite in C so it compiles again. Tim Peters <tim.peters@gmail.com> parents: 32942 diff changeset	668 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	669 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	670 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	671 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	672 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	673 }
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	674
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	675 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	676 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	677 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	678 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	679 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	680 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	681 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	682 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	683 }
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	684
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	685 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	686 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	687 }
63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	688
36871 257ad89d92df Coverity found refleak: need to free 'v' after calling Tkinter_Error(). Thomas Wouters <thomas@python.org> parents: 36698 diff changeset	689 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	690 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	691 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	692 return (TkappObject *)result;
257ad89d92df Coverity found refleak: need to free 'v' after calling Tkinter_Error(). Thomas Wouters <thomas@python.org> parents: 36698 diff changeset	693 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	694
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	695 EnableEventHook();
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	696
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	697 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	698 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	699
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	700
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	701 static void
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	702 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	703 Tcl_Condition cond, Tcl_Mutex mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	704 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	705 Py_BEGIN_ALLOW_THREADS;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	706 Tcl_MutexLock(mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	707 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	708 Tcl_ThreadAlert(self->thread_id);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	709 Tcl_ConditionWait(cond, mutex, NULL);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	710 Tcl_MutexUnlock(mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	711 Py_END_ALLOW_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	712 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	713
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	714
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	715 / Tcl Eval /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	716
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	717 typedef struct {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	718 PyObject_HEAD
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	719 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	720 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	721 } PyTclObject;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	722
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	723 staticforward PyTypeObject PyTclObject_Type;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	724 #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	725
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	726 static PyObject *
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	727 newPyTclObject(Tcl_Obj *arg)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	728 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	729 PyTclObject *self;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	730 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	731 if (self == NULL)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	732 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	733 Tcl_IncrRefCount(arg);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	734 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	735 self->string = NULL;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	736 return (PyObject*)self;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	737 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	738
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	739 static void
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	740 PyTclObject_dealloc(PyTclObject *self)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	741 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	742 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	743 Py_XDECREF(self->string);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	744 PyObject_Del(self);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	745 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	746
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	747 static PyObject *
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	748 PyTclObject_str(PyTclObject *self)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	749 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	750 if (self->string && PyString_Check(self->string)) {
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	751 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	752 return self->string;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	753 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	754 /* XXX Could cache value if it is an ASCII string. */
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	755 return PyString_FromString(Tcl_GetString(self->value));
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	756 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	757
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	758 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	759 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	760 {
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	761 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	762 }
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	763
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	764 /* Like _str, but create Unicode if necessary. */
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	765 PyDoc_STRVAR(PyTclObject_string__doc__,
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	766 "the string representation of this object, either as string or Unicode");
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	767
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	768 static PyObject *
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	769 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	770 {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	771 char *s;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	772 int i, len;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	773 if (!self->string) {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	774 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	775 for (i = 0; i < len; i++)
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	776 if (s[i] & 0x80)
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	777 break;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	778 #ifdef Py_USING_UNICODE
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	779 if (i == len)
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	780 /* It is an ASCII string. */
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	781 self->string = PyString_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	782 else {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	783 self->string = 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	784 if (!self->string) {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	785 PyErr_Clear();
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	786 self->string = PyString_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	787 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	788 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	789 #else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	790 self->string = PyString_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	791 #endif
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	792 if (!self->string)
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	793 return NULL;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	794 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	795 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	796 return self->string;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	797 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	798
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	799 #ifdef Py_USING_UNICODE
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	800 PyDoc_STRVAR(PyTclObject_unicode__doc__, "convert argument to unicode");
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	801
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	802 static PyObject *
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	803 PyTclObject_unicode(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	804 {
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	805 char *s;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	806 int len;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	807 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	808 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	809 return self->string;
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	810 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	811 /* 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	812 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	813 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	814 }
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	815 #endif
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	816
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	817 static PyObject *
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	818 PyTclObject_repr(PyTclObject *self)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	819 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	820 char buf[50];
33986 49b6e966e57f Patch #1050475: Fix various x86_64 build issues Martin v. Löwis <martin@v.loewis.de> parents: 32945 diff changeset	821 PyOS_snprintf(buf, 50, "<%s object at %p>",
49b6e966e57f Patch #1050475: Fix various x86_64 build issues Martin v. Löwis <martin@v.loewis.de> parents: 32945 diff changeset	822 self->value->typePtr->name, self->value);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	823 return PyString_FromString(buf);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	824 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	825
28950 3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	826 static int
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	827 PyTclObject_cmp(PyTclObject self, PyTclObject other)
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	828 {
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	829 int res;
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	830 res = strcmp(Tcl_GetString(self->value),
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	831 Tcl_GetString(other->value));
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	832 if (res < 0) return -1;
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	833 if (res > 0) return 1;
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	834 return 0;
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	835 }
3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	836
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	837 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	838
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	839 static PyObject*
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	840 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	841 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	842 return PyString_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	843 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	844
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	845
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	846 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	847 {"typename", (getter)get_typename, NULL, get_typename__doc__},
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	848 {"string", (getter)PyTclObject_string, NULL,
c30f97287602 Wrap doc strings in PyDoc_STRVAR. Fix .string docstring. Provide default Martin v. Löwis <martin@v.loewis.de> parents: 27069 diff changeset	849 PyTclObject_string__doc__},
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	850 {0},
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	851 };
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	852
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	853 static PyMethodDef PyTclObject_methods[] = {
34707 0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33986 diff changeset	854 #ifdef Py_USING_UNICODE
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	855 {"__unicode__", (PyCFunction)PyTclObject_unicode, METH_NOARGS,
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 PyTclObject_unicode__doc__},
34707 0d44d9071e97 Build with --disable-unicode again. Fixes #1158607. Martin v. Löwis <martin@v.loewis.de> parents: 33986 diff changeset	857 #endif
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	858 {0}
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	859 };
ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	860
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	861 statichere PyTypeObject PyTclObject_Type = {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	862 PyObject_HEAD_INIT(NULL)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	863 0, /ob_size/
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/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	865 sizeof(PyTclObject), /tp_basicsize/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	866 0, /tp_itemsize/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	867 /* methods */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	868 (destructor)PyTclObject_dealloc, /tp_dealloc/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	869 0, /tp_print/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	870 0, /tp_getattr/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	871 0, /tp_setattr/
28950 3a9f5f0c512e Implement tcl object __cmp__. Martin v. Löwis <martin@v.loewis.de> parents: 28915 diff changeset	872 (cmpfunc)PyTclObject_cmp, /tp_compare/
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/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	874 0, /tp_as_number/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	875 0, /tp_as_sequence/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	876 0, /tp_as_mapping/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	877 0, /tp_hash/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	878 0, /tp_call/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	879 (reprfunc)PyTclObject_str, /tp_str/
27104 2443c557cbc3 Patch #661760: Cygwin auto-import module patch Jason Tishler <jason@tishler.net> parents: 27084 diff changeset	880 PyObject_GenericGetAttr,/tp_getattro/
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	881 0, /tp_setattro/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	882 0, /tp_as_buffer/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	883 Py_TPFLAGS_DEFAULT, /tp_flags/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	884 0, /tp_doc/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	885 0, /tp_traverse/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	886 0, /tp_clear/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	887 0, /tp_richcompare/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	888 0, /tp_weaklistoffset/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	889 0, /tp_iter/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	890 0, /tp_iternext/
27069 ef531482bb37 Convert Tcl path objects to strings. Fixes #661357. Martin v. Löwis <martin@v.loewis.de> parents: 26989 diff changeset	891 PyTclObject_methods, /tp_methods/
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	892 0, /tp_members/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	893 PyTclObject_getsetlist, /tp_getset/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	894 0, /tp_base/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	895 0, /tp_dict/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	896 0, /tp_descr_get/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	897 0, /tp_descr_set/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	898 0, /tp_dictoffset/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	899 0, /tp_init/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	900 0, /tp_alloc/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	901 0, /tp_new/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	902 0, /tp_free/
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	903 0, /tp_is_gc/
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;
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	910
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	911 if (PyString_Check(value))
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	912 return Tcl_NewStringObj(PyString_AS_STRING(value),
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	913 PyString_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	914 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	915 return Tcl_NewBooleanObj(PyObject_IsTrue(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	916 else if (PyInt_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	917 return Tcl_NewLongObj(PyInt_AS_LONG(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	918 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	919 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	920 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	921 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	922 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	923 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	924 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	925 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	926 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	927 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	928 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	929 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	930 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	931 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	932 #ifdef Py_USING_UNICODE
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	933 else if (PyUnicode_Check(value)) {
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	934 Py_UNICODE *inbuf = PyUnicode_AS_UNICODE(value);
38760 3eee7bd9a0d0 Fix some Py_ssize_t issues Neal Norwitz <nnorwitz@gmail.com> parents: 38558 diff changeset	935 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	936 /* 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	937 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	938 #if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX == 3
44445 53ac3fc69b78 Bug #1301: fixed a bad assert in _tkinter. Guido van Rossum <guido@python.org> parents: 44415 diff changeset	939 Tcl_UniChar *outbuf = NULL;
38760 3eee7bd9a0d0 Fix some Py_ssize_t issues Neal Norwitz <nnorwitz@gmail.com> parents: 38558 diff changeset	940 Py_ssize_t i;
44445 53ac3fc69b78 Bug #1301: fixed a bad assert in _tkinter. Guido van Rossum <guido@python.org> parents: 44415 diff changeset	941 size_t allocsize = ((size_t)size) * sizeof(Tcl_UniChar);
53ac3fc69b78 Bug #1301: fixed a bad assert in _tkinter. Guido van Rossum <guido@python.org> parents: 44415 diff changeset	942 if (allocsize >= size)
53ac3fc69b78 Bug #1301: fixed a bad assert in _tkinter. Guido van Rossum <guido@python.org> parents: 44415 diff changeset	943 outbuf = (Tcl_UniChar*)ckalloc(allocsize);
53ac3fc69b78 Bug #1301: fixed a bad assert in _tkinter. Guido van Rossum <guido@python.org> parents: 44415 diff changeset	944 /* 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	945 if (!outbuf) {
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	946 PyErr_NoMemory();
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	947 return NULL;
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	948 }
25530 70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	949 for (i = 0; i < size; i++) {
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	950 if (inbuf[i] >= 0x10000) {
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	951 /* Tcl doesn't do UTF-16, yet. */
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	952 PyErr_SetString(PyExc_ValueError,
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	953 "unsupported character");
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	954 ckfree(FREECAST outbuf);
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	955 return NULL;
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	956 }
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	957 outbuf[i] = inbuf[i];
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	958 }
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	959 result = Tcl_NewUnicodeObj(outbuf, size);
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 result;
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	962 #else
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	963 return Tcl_NewUnicodeObj(inbuf, size);
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	964 #endif
70d93b62370b Support UCS-4 builds. Martin v. Löwis <martin@v.loewis.de> parents: 25527 diff changeset	965
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	966 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	967 #endif
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	968 else if(PyTclObject_Check(value)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	969 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	970 Tcl_IncrRefCount(v);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	971 return v;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	972 }
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	973 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	974 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	975 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	976 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	977 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	978 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	979 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	980 }
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 }
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
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	983 static PyObject*
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	984 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	985 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	986 PyObject *result = NULL;
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	987 TkappObject app = (TkappObject)tkapp;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	988
26534 ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	989 if (value->typePtr == NULL) {
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	990 /* If the result contains any bytes with the top bit set,
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	991 it's UTF-8 and we should decode it to Unicode */
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	992 #ifdef Py_USING_UNICODE
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	993 int i;
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	994 char *s = value->bytes;
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	995 int len = value->length;
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	996 for (i = 0; i < len; i++) {
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	997 if (value->bytes[i] & 0x80)
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	998 break;
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	999 }
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1000
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1001 if (i == value->length)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1002 result = PyString_FromStringAndSize(s, len);
26534 ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1003 else {
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1004 /* Convert UTF-8 to Unicode string */
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1005 result = PyUnicode_DecodeUTF8(s, len, "strict");
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1006 if (result == NULL) {
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1007 PyErr_Clear();
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1008 result = PyString_FromStringAndSize(s, len);
26534 ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1009 }
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1010 }
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1011 #else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1012 result = PyString_FromStringAndSize(value->bytes, value->length);
26534 ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1013 #endif
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1014 return result;
ca6fa69711bb Decode untyped strings from UTF-8. Martin v. Löwis <martin@v.loewis.de> parents: 26431 diff changeset	1015 }
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1016
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1017 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	1018 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	1019 Py_INCREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1020 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1021 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1022
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1023 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	1024 int size;
26572 d755d4292f3f Remove C++ comment. Silence unsigned char* cast warning. Martin v. Löwis <martin@v.loewis.de> parents: 26534 diff changeset	1025 char data = (char)Tcl_GetByteArrayFromObj(value, &size);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1026 return PyString_FromStringAndSize(data, size);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1027 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1028
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1029 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	1030 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	1031 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1032
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1033 if (value->typePtr == app->IntType) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1034 return PyInt_FromLong(value->internalRep.longValue);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1035 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1036
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1037 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	1038 int size;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1039 int i, status;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1040 PyObject *elem;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1041 Tcl_Obj *tcl_elem;
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 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	1044 if (status == TCL_ERROR)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1045 return Tkinter_Error(tkapp);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1046 result = PyTuple_New(size);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1047 if (!result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1048 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1049 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	1050 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	1051 value, i, &tcl_elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1052 if (status == TCL_ERROR) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1053 Py_DECREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1054 return Tkinter_Error(tkapp);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1055 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1056 elem = FromObj(tkapp, tcl_elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1057 if (!elem) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1058 Py_DECREF(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1059 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1060 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1061 PyTuple_SetItem(result, i, elem);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1062 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1063 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1064 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1065
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1066 if (value->typePtr == app->ProcBodyType) {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1067 /* 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	1068 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1069
26431 ad75efe2f0a6 Avoid including tclInt.h. Martin v. Löwis <martin@v.loewis.de> parents: 26428 diff changeset	1070 if (value->typePtr == app->StringType) {
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1071 #ifdef Py_USING_UNICODE
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	1072 #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	1073 PyObject *result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1074 int size;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1075 Tcl_UniChar *input;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1076 Py_UNICODE *output;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1077
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1078 size = Tcl_GetCharLength(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1079 result = PyUnicode_FromUnicode(NULL, size);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1080 if (!result)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1081 return NULL;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1082 input = Tcl_GetUnicode(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1083 output = PyUnicode_AS_UNICODE(result);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1084 while (size--)
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1085 output++ = input++;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1086 return result;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1087 #else
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1088 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	1089 Tcl_GetCharLength(value));
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1090 #endif
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1091 #else
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1092 int size;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1093 char *c;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1094 c = Tcl_GetStringFromObj(value, &size);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1095 return PyString_FromStringAndSize(c, size);
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1096 #endif
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1097 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1098
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1099 return newPyTclObject(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1100 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1101
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1102 /* 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	1103
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1104 TCL_DECLARE_MUTEX(call_mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1105
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1106 typedef struct Tkapp_CallEvent {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1107 Tcl_Event ev; /* Must be first */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1108 TkappObject *self;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1109 PyObject *args;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1110 int flags;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1111 PyObject **res;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1112 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	1113 Tcl_Condition done;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1114 } Tkapp_CallEvent;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1115
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1116 void
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1117 Tkapp_CallDeallocArgs(Tcl_Obj objv, Tcl_Obj objStore, int objc)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1118 {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1119 int i;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1120 for (i = 0; i < objc; i++)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1121 Tcl_DecrRefCount(objv[i]);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1122 if (objv != objStore)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1123 ckfree(FREECAST objv);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1124 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1125
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1126 /* 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	1127 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	1128
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1129 static Tcl_Obj**
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1130 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	1131 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1132 Tcl_Obj **objv = objStore;
26620 cb93d9287b4e Always initialize objc. Martin v. Löwis <martin@v.loewis.de> parents: 26613 diff changeset	1133 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	1134 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	1135 /* do nothing */;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1136
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1137 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	1138 objv[0] = AsObj(args);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1139 if (objv[0] == 0)
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1140 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	1141 objc = 1;
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1142 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	1143 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1144 else {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1145 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	1146
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1147 if (objc > ARGSZ) {
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1148 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	1149 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	1150 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	1151 objc = 0;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1152 goto finally;
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1153 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1154 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1155
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1156 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	1157 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	1158 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	1159 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	1160 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	1161 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1162 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	1163 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	1164 /* 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	1165 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	1166 objc = i;
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1167 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	1168 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	1169 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	1170 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1171 }
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1172 *pobjc = objc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1173 return objv;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1174 finally:
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1175 Tkapp_CallDeallocArgs(objv, objStore, objc);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1176 return NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1177 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1178
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1179 /* 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	1180
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1181 static PyObject*
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1182 Tkapp_CallResult(TkappObject *self)
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 PyObject *res = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1185 if(self->wantobjects) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1186 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	1187 /* 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	1188 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	1189 converting it. */
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1190 Tcl_IncrRefCount(value);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1191 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	1192 Tcl_DecrRefCount(value);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1193 } else {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1194 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	1195 const char *p = s;
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	1196
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1197 /* If the result contains any bytes with the top bit set,
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1198 it's UTF-8 and we should decode it to Unicode */
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	1199 #ifdef Py_USING_UNICODE
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1200 while (*p != '\0') {
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1201 if (*p & 0x80)
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1202 break;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1203 p++;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1204 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	1205
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1206 if (*p == '\0')
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1207 res = PyString_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	1208 else {
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1209 /* Convert UTF-8 to Unicode string */
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1210 p = strchr(p, '\0');
12583 db9458c2b631 When the UTF-8 conversion to Unicode fails, return an 8-bit string Guido van Rossum <guido@python.org> parents: 12580 diff changeset	1211 res = PyUnicode_DecodeUTF8(s, (int)(p-s), "strict");
db9458c2b631 When the UTF-8 conversion to Unicode fails, return an 8-bit string Guido van Rossum <guido@python.org> parents: 12580 diff changeset	1212 if (res == NULL) {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1213 PyErr_Clear();
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1214 res = PyString_FromStringAndSize(s, (int)(p-s));
12583 db9458c2b631 When the UTF-8 conversion to Unicode fails, return an 8-bit string Guido van Rossum <guido@python.org> parents: 12580 diff changeset	1215 }
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1216 }
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	1217 #else
7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	1218 p = strchr(p, '\0');
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1219 res = PyString_FromStringAndSize(s, (int)(p-s));
19343 7257e87e0720 Patch #445762: Support --disable-unicode Martin v. Löwis <martin@v.loewis.de> parents: 19033 diff changeset	1220 #endif
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	1221 }
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1222 return res;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1223 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1224
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1225 /* 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	1226 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	1227 hold the Python lock. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1228
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1229 static int
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1230 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	1231 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1232 Tcl_Obj *objStore[ARGSZ];
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1233 Tcl_Obj **objv;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1234 int objc;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1235 int i;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1236 ENTER_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1237 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	1238 if (!objv) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1239 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	1240 *(e->res) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1241 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1242 LEAVE_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1243 if (!objv)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1244 goto done;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1245 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	1246 ENTER_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1247 if (i == TCL_ERROR) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1248 *(e->res) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1249 *(e->exc_type) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1250 *(e->exc_tb) = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1251 *(e->exc_value) = PyObject_CallFunction(
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1252 Tkinter_TclError, "s",
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1253 Tcl_GetStringResult(e->self->interp));
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1254 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1255 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1256 *(e->res) = Tkapp_CallResult(e->self);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1257 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1258 LEAVE_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1259 done:
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1260 /* Wake up calling thread. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1261 Tcl_MutexLock(&call_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1262 Tcl_ConditionNotify(&e->done);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1263 Tcl_MutexUnlock(&call_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1264 return 1;
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
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1267 /* 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	1268 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	1269 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	1270 the context of the calling thread.
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1271 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	1272 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	1273 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	1274 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	1275 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	1276 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	1277 and perform processing there. */
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 static PyObject *
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1280 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	1281 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1282 Tcl_Obj *objStore[ARGSZ];
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1283 Tcl_Obj **objv = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1284 int objc, i;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1285 PyObject *res = NULL;
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1286 TkappObject self = (TkappObject)selfptr;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1287 /* 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	1288 int flags = TCL_EVAL_DIRECT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1289
42153 9e5a39609a20 Many calls to tk.call involve an arglist containing a single tuple. Kurt B. Kaiser <kbk@shore.net> parents: 41815 diff changeset	1290 /* If args is a single tuple, replace with contents of tuple */
9e5a39609a20 Many calls to tk.call involve an arglist containing a single tuple. Kurt B. Kaiser <kbk@shore.net> parents: 41815 diff changeset	1291 if (1 == PyTuple_Size(args)){
9e5a39609a20 Many calls to tk.call involve an arglist containing a single tuple. Kurt B. Kaiser <kbk@shore.net> parents: 41815 diff changeset	1292 PyObject* item = PyTuple_GetItem(args, 0);
9e5a39609a20 Many calls to tk.call involve an arglist containing a single tuple. Kurt B. Kaiser <kbk@shore.net> parents: 41815 diff changeset	1293 if (PyTuple_Check(item))
9e5a39609a20 Many calls to tk.call involve an arglist containing a single tuple. Kurt B. Kaiser <kbk@shore.net> parents: 41815 diff changeset	1294 args = item;
9e5a39609a20 Many calls to tk.call involve an arglist containing a single tuple. Kurt B. Kaiser <kbk@shore.net> parents: 41815 diff changeset	1295 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1296 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1297 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	1298 /* 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	1299 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	1300 Tkapp_CallEvent *ev;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1301 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	1302 if (!WaitForMainloop(self))
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1303 return NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1304 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	1305 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	1306 ev->self = self;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1307 ev->args = args;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1308 ev->res = &res;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1309 ev->exc_type = &exc_type;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1310 ev->exc_value = &exc_value;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1311 ev->exc_tb = &exc_tb;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1312 ev->done = (Tcl_Condition)0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1313
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1314 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	1315
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1316 if (res == NULL) {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1317 if (exc_type)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1318 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	1319 else
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1320 PyErr_SetObject(Tkinter_TclError, exc_value);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1321 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1322 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1323 else
3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1324 #endif
3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	1325 {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1326
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1327 objv = Tkapp_CallArgs(args, objStore, &objc);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1328 if (!objv)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1329 return NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1330
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1331 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1332
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1333 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	1334
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1335 ENTER_OVERLAP
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1336
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1337 if (i == TCL_ERROR)
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1338 Tkinter_Error(selfptr);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1339 else
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1340 res = Tkapp_CallResult(self);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1341
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1342 LEAVE_OVERLAP_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1343
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1344 Tkapp_CallDeallocArgs(objv, objStore, objc);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1345 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1346 return res;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1347 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1348
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1349
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1350 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1351 Tkapp_GlobalCall(PyObject self, PyObject args)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1352 {
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1353 /* 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	1354 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	1355 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	1356 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	1357 scope pointer). */
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	1358
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1359 char *cmd;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1360 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1361
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1362 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1363
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1364 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	1365 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	1366 int err;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1367 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1368 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	1369 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	1370 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	1371 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	1372 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1373 res = PyString_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	1374 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	1375 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	1376 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1377
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1378 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1379 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1380
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1381 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1382 Tkapp_Eval(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1383 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1384 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1385 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	1386 int err;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1387
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1388 if (!PyArg_ParseTuple(args, "s:eval", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1389 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1390
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1391 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1392
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1393 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1394 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	1395 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	1396 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	1397 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1398 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1399 res = PyString_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	1400 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1401 return res;
1664 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
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1404 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1405 Tkapp_GlobalEval(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1406 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1407 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1408 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	1409 int err;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1410
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1411 if (!PyArg_ParseTuple(args, "s:globaleval", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1412 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1413
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1414 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1415
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1416 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1417 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	1418 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	1419 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	1420 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1421 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1422 res = PyString_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	1423 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1424 return res;
1664 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
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1427 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1428 Tkapp_EvalFile(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1429 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1430 char *fileName;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1431 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	1432 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1433
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1434 if (!PyArg_ParseTuple(args, "s:evalfile", &fileName))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1435 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1436
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1437 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1438
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1439 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1440 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	1441 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	1442 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	1443 res = Tkinter_Error(self);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1444
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1445 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1446 res = PyString_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	1447 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1448 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1449 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1450
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1451 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1452 Tkapp_Record(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1453 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1454 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1455 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	1456 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1457
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1458 if (!PyArg_ParseTuple(args, "s", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1459 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1460
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1461 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1462
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1463 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1464 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	1465 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	1466 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	1467 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1468 else
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1469 res = PyString_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	1470 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1471 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1472 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1473
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1474 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1475 Tkapp_AddErrorInfo(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1476 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1477 char *msg;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1478
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1479 if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1480 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1481 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1482
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1483 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1484 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	1485 LEAVE_TCL
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1486
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1487 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1488 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1489 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1490
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1491
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1492
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1493 / Tcl Variable /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1494
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1495 TCL_DECLARE_MUTEX(var_mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1496
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1497 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	1498 typedef struct VarEvent {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1499 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	1500 PyObject *self;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1501 PyObject *args;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1502 int flags;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1503 EventFunc func;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1504 PyObject **res;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1505 PyObject **exc_type;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1506 PyObject **exc_val;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1507 Tcl_Condition cond;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1508 } VarEvent;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1509
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1510 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	1511 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	1512 {
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1513 char out = (char)_out;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1514 if (PyString_Check(in)) {
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1515 *out = PyString_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	1516 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	1517 }
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1518 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	1519 *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	1520 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	1521 }
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1522 /* 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	1523 return 0;
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1524 }
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1525
47678 a35da94e05fc Make more symbols static. Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1526 static void
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1527 var_perform(VarEvent *ev)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1528 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1529 *(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	1530 if (!*(ev->res)) {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1531 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	1532 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	1533 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	1534 *(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	1535 *(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	1536 Py_DECREF(tb);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1537 }
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1538
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1539 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1540
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1541 static int
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1542 var_proc(VarEvent* ev, int flags)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1543 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1544 ENTER_PYTHON
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1545 var_perform(ev);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1546 Tcl_MutexLock(&var_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1547 Tcl_ConditionNotify(&ev->cond);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1548 Tcl_MutexUnlock(&var_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1549 LEAVE_PYTHON
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1550 return 1;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1551 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1552
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1553 static PyObject*
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1554 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	1555 {
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1556 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	1557 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1558 if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1559 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	1560 VarEvent *ev;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1561 PyObject res, 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	1562
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1563 /* 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	1564 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	1565 completion. */
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	1566 if (!WaitForMainloop(self))
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1567 return NULL;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1568
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1569 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	1570
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1571 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	1572 ev->args = args;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1573 ev->flags = flags;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1574 ev->func = func;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1575 ev->res = &res;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1576 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	1577 ev->exc_val = &exc_val;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1578 ev->cond = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1579 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	1580 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	1581 if (!res) {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1582 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	1583 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	1584 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	1585 return NULL;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1586 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1587 return res;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1588 }
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1589 #endif
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1590 /* Tcl is not threaded, or this is the interpreter thread. */
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	1591 return func(selfptr, args, flags);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1592 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1593
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1594 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1595 SetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: 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 char name1, name2;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1598 PyObject *newValue;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1599 PyObject *res = NULL;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1600 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	1601
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1602 if (PyArg_ParseTuple(args, "O&O:setvar",
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1603 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	1604 /* 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	1605 newval = AsObj(newValue);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1606 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	1607 return NULL;
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1608 ENTER_TCL
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1609 ok = Tcl_SetVar2Ex(Tkapp_Interp(self), name1, NULL,
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1610 newval, flags);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1611 ENTER_OVERLAP
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1612 if (!ok)
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1613 Tkinter_Error(self);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1614 else {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1615 res = Py_None;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1616 Py_INCREF(res);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1617 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1618 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	1619 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1620 else {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1621 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	1622 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	1623 &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	1624 /* 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	1625 newval = AsObj(newValue);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1626 ENTER_TCL
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1627 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	1628 ENTER_OVERLAP
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1629 if (!ok)
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1630 Tkinter_Error(self);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1631 else {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1632 res = Py_None;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1633 Py_INCREF(res);
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1634 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1635 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	1636 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1637 else {
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1638 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1639 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1640 }
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1641 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1642 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1643
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1644 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1645 Tkapp_SetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1646 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1647 return var_invoke(SetVar, self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1648 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1649
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1650 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1651 Tkapp_GlobalSetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1652 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1653 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	1654 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1655
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1656
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1657
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1658 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1659 GetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1660 {
25527 5420969ddd70 Eliminate constness warnings with Tcl 8.4. Martin v. Löwis <martin@v.loewis.de> parents: 25525 diff changeset	1661 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	1662 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	1663 Tcl_Obj *tres;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1664
28915 fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1665 if (!PyArg_ParseTuple(args, "O&\|s:getvar",
fa0063928518 Convert tcl objects to strings in getvar/setvar. Fixes #730506. Martin v. Löwis <martin@v.loewis.de> parents: 28643 diff changeset	1666 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	1667 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1668
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1669 ENTER_TCL
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1670 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	1671 ENTER_OVERLAP
30638 39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1672 if (tres == NULL) {
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1673 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	1674 } else {
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1675 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	1676 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	1677 }
39e635da2326 Check for TclError when reading variables. Fixes #807314. Martin v. Löwis <martin@v.loewis.de> parents: 29472 diff changeset	1678 else {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1679 res = PyString_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	1680 }
29170 f0b67731e545 Only return objects if wantobjects is set in GetVar. Martin v. Löwis <martin@v.loewis.de> parents: 29038 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 LEAVE_OVERLAP_TCL
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1683 return res;
1664 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
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1686 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1687 Tkapp_GetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1688 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1689 return var_invoke(GetVar, self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1690 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1691
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1692 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1693 Tkapp_GlobalGetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1694 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1695 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	1696 }
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
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1699
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1700 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1701 UnsetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1702 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1703 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	1704 int code;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1705 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1706
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1707 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	1708 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1709
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1710 ENTER_TCL
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1711 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	1712 ENTER_OVERLAP
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1713 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	1714 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	1715 else {
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1716 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	1717 res = Py_None;
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1718 }
6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1719 LEAVE_OVERLAP_TCL
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1720 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1721 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1722
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1723 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1724 Tkapp_UnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1725 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1726 return var_invoke(UnsetVar, self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1727 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1728
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1729 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1730 Tkapp_GlobalUnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1731 {
28622 6c0004690941 Use object interface for global vars. Fixes #721171. Martin v. Löwis <martin@v.loewis.de> parents: 28445 diff changeset	1732 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	1733 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1734
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1735
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1736
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1737 / Tcl to Python /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1738
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1739 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1740 Tkapp_GetInt(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1741 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1742 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1743 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1744
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1745 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1746 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	1747 if (PyInt_Check(o)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1748 Py_INCREF(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1749 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1750 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1751 }
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1752 if (!PyArg_ParseTuple(args, "s:getint", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1753 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1754 if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1755 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1756 return Py_BuildValue("i", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1757 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1758
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1759 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1760 Tkapp_GetDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1761 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1762 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1763 double v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1764
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1765 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1766 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	1767 if (PyFloat_Check(o)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1768 Py_INCREF(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1769 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1770 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1771 }
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1772 if (!PyArg_ParseTuple(args, "s:getdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1773 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1774 if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1775 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1776 return Py_BuildValue("d", v);
1664 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
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1779 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1780 Tkapp_GetBoolean(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1781 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1782 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1783 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1784
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1785 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1786 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	1787 if (PyInt_Check(o)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1788 Py_INCREF(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1789 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1790 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1791 }
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1792 if (!PyArg_ParseTuple(args, "s:getboolean", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1793 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1794 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	1795 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	1796 return PyBool_FromLong(v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1797 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1798
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1799 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1800 Tkapp_ExprString(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1801 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1802 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1803 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	1804 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1805
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1806 if (!PyArg_ParseTuple(args, "s:exprstring", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1807 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1808
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1809 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1810
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1811 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1812 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	1813 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	1814 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	1815 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1816 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1817 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	1818 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1819 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1820 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1821
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1822 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1823 Tkapp_ExprLong(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1824 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1825 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1826 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	1827 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1828 long v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1829
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1830 if (!PyArg_ParseTuple(args, "s:exprlong", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1831 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1832
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1833 CHECK_TCL_APPARTMENT;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1834
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1835 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1836 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	1837 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	1838 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	1839 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1840 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1841 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	1842 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1843 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1844 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1845
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1846 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1847 Tkapp_ExprDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1848 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1849 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1850 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1851 double v;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1852 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1853
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1854 if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1855 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1856 CHECK_TCL_APPARTMENT;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1857 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	1858 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1859 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	1860 ENTER_OVERLAP
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5120 diff changeset	1861 PyFPE_END_PROTECT(retval)
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1862 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	1863 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1864 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1865 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	1866 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1867 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1868 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1869
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1870 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1871 Tkapp_ExprBoolean(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1872 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1873 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1874 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	1875 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1876 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1877
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1878 if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1879 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1880 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	1881 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1882 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	1883 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	1884 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	1885 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1886 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1887 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	1888 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1889 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1890 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1891
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1892
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1893
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1894 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1895 Tkapp_SplitList(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1896 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1897 char *list;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1898 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1899 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1900 PyObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1901 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1902
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1903 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1904 v = PyTuple_GetItem(args, 0);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1905 if (PyTuple_Check(v)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1906 Py_INCREF(v);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1907 return v;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1908 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1909 }
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	1910 if (!PyArg_ParseTuple(args, "et:splitlist", "utf-8", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1911 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1912
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1913 if (Tcl_SplitList(Tkapp_Interp(self), list,
d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1914 &argc, &argv) == TCL_ERROR) {
d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1915 PyMem_Free(list);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1916 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	1917 }
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 (!(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	1920 goto finally;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	1921
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1922 for (i = 0; i < argc; i++) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1923 PyObject *s = PyString_FromString(argv[i]);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1924 if (!s \|\| PyTuple_SetItem(v, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1925 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1926 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1927 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1928 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1929 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1930
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1931 finally:
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1932 ckfree(FREECAST argv);
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1933 PyMem_Free(list);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1934 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1935 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1936
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1937 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1938 Tkapp_Split(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1939 {
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1940 PyObject *v;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1941 char *list;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1942
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1943 if (PyTuple_Size(args) == 1) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1944 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	1945 if (PyTuple_Check(o)) {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1946 o = SplitObj(o);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1947 return o;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1948 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	1949 }
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	1950 if (!PyArg_ParseTuple(args, "et:split", "utf-8", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1951 return NULL;
29295 d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1952 v = Split(list);
d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1953 PyMem_Free(list);
d46459d82a79 Fix SF #745055, Memory leak in _tkinter.c/Tkapp_SplitList() Neal Norwitz <nnorwitz@gmail.com> parents: 29170 diff changeset	1954 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1955 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1956
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1957 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1958 Tkapp_Merge(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1959 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1960 char *s = Merge(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1961 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1962
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1963 if (s) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	1964 res = PyString_FromString(s);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1965 ckfree(s);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1966 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1967
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1968 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1969 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1970
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1971
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1972
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1973 / Tcl Command /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1974
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1975 /* 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	1976 typedef struct {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1977 PyObject *self;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1978 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1979 } PythonCmd_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1980
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1981 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1982 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	1983 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1984 errorInCmd = 1;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1985 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	1986 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1987 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	1988 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1989
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1990 /* This is the Tcl command that acts as a wrapper for Python
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1991 * function or method.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1992 */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1993 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1994 PythonCmd(ClientData clientData, Tcl_Interp interp, int argc, char argv[])
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1995 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1996 PythonCmd_ClientData data = (PythonCmd_ClientData )clientData;
44415 a1ff2faedc6b Return results from Python callbacks to Tcl as Tcl objects. Martin v. Löwis <martin@v.loewis.de> parents: 44350 diff changeset	1997 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	1998 int i, rv;
44415 a1ff2faedc6b Return results from Python callbacks to Tcl as Tcl objects. Martin v. Löwis <martin@v.loewis.de> parents: 44350 diff changeset	1999 Tcl_Obj *obj_res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2000
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	2001 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	2002
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2003 /* TBD: no error checking here since we know, via the
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2004 * Tkapp_CreateCommand() that the client data is a two-tuple
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2005 */
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2006 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	2007 func = data->func;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2008
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2009 /* Create argument list (argv1, ..., argvN) */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2010 if (!(arg = PyTuple_New(argc - 1)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2011 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2012
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2013 for (i = 0; i < (argc - 1); i++) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2014 PyObject *s = PyString_FromString(argv[i + 1]);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2015 if (!s \|\| PyTuple_SetItem(arg, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2016 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	2017 return PythonCmd_Error(interp);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2018 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2019 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2020 res = PyEval_CallObject(func, arg);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2021 Py_DECREF(arg);
1713 bb566d28caa0 * tkintermodule.c Guido van Rossum <guido@python.org> parents: 1690 diff changeset	2022
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2023 if (res == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2024 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2025
44415 a1ff2faedc6b Return results from Python callbacks to Tcl as Tcl objects. Martin v. Löwis <martin@v.loewis.de> parents: 44350 diff changeset	2026 obj_res = AsObj(res);
a1ff2faedc6b Return results from Python callbacks to Tcl as Tcl objects. Martin v. Löwis <martin@v.loewis.de> parents: 44350 diff changeset	2027 if (obj_res == NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2028 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2029 return PythonCmd_Error(interp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2030 }
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	2031 else {
44415 a1ff2faedc6b Return results from Python callbacks to Tcl as Tcl objects. Martin v. Löwis <martin@v.loewis.de> parents: 44350 diff changeset	2032 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	2033 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	2034 }
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	2035
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2036 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2037
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2038 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2039
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	2040 return rv;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2041 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2042
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2043 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2044 PythonCmdDelete(ClientData clientData)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2045 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2046 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	2047
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	2048 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	2049 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	2050 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	2051 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	2052 LEAVE_PYTHON
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2053 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2054
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2055
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2056
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2057
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2058 TCL_DECLARE_MUTEX(command_mutex)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2059
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2060 typedef struct CommandEvent{
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2061 Tcl_Event ev;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2062 Tcl_Interp* interp;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2063 char *name;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2064 int create;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2065 int *status;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2066 ClientData *data;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2067 Tcl_Condition done;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2068 } CommandEvent;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2069
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2070 static int
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2071 Tkapp_CommandProc(CommandEvent *ev, int flags)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2072 {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2073 if (ev->create)
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2074 *ev->status = Tcl_CreateCommand(
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2075 ev->interp, ev->name, PythonCmd,
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2076 ev->data, PythonCmdDelete) == NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2077 else
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2078 *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	2079 Tcl_MutexLock(&command_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2080 Tcl_ConditionNotify(&ev->done);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2081 Tcl_MutexUnlock(&command_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2082 return 1;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2083 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2084
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2085 static PyObject *
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	2086 Tkapp_CreateCommand(PyObject selfptr, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2087 {
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	2088 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	2089 PythonCmd_ClientData *data;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2090 char *cmdName;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2091 PyObject *func;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2092 int err;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2093
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2094 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	2095 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2096 if (!PyCallable_Check(func)) {
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2097 PyErr_SetString(PyExc_TypeError, "command not callable");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2098 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2099 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2100
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2101 #ifdef WITH_THREAD
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2102 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	2103 !WaitForMainloop(self))
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2104 return NULL;
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2105 #endif
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2106
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2107 data = PyMem_NEW(PythonCmd_ClientData, 1);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2108 if (!data)
27826 7dffcc498c45 Add more missing PyErr_NoMemory() after failled memory allocs Neal Norwitz <nnorwitz@gmail.com> parents: 27341 diff changeset	2109 return PyErr_NoMemory();
39096 3ddb59483f10 self is dereffed (and passed as first arg), so it's known to be good. Neal Norwitz <nnorwitz@gmail.com> parents: 38760 diff changeset	2110 Py_INCREF(self);
3ddb59483f10 self is dereffed (and passed as first arg), so it's known to be good. Neal Norwitz <nnorwitz@gmail.com> parents: 38760 diff changeset	2111 Py_INCREF(func);
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	2112 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	2113 data->func = func;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2114
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2115 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	2116 CommandEvent ev = (CommandEvent)ckalloc(sizeof(CommandEvent));
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2117 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	2118 ev->interp = self->interp;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2119 ev->create = 1;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2120 ev->name = cmdName;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2121 ev->data = (ClientData)data;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2122 ev->status = &err;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2123 ev->done = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2124 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	2125 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2126 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2127 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2128 err = Tcl_CreateCommand(
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2129 Tkapp_Interp(self), cmdName, PythonCmd,
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2130 (ClientData)data, PythonCmdDelete) == NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2131 LEAVE_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2132 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2133 if (err) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2134 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	2135 PyMem_DEL(data);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2136 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2137 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2138
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2139 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2140 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2141 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2142
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2143
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2144
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2145 static PyObject *
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	2146 Tkapp_DeleteCommand(PyObject selfptr, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2147 {
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	2148 TkappObject self = (TkappObject)selfptr;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2149 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	2150 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2151
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2152 if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2153 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2154 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	2155 CommandEvent *ev;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2156 ev = (CommandEvent*)ckalloc(sizeof(CommandEvent));
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2157 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	2158 ev->interp = self->interp;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2159 ev->create = 0;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2160 ev->name = cmdName;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2161 ev->status = &err;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2162 ev->done = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2163 Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done,
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2164 &command_mutex);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2165 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2166 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2167 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2168 err = Tcl_DeleteCommand(self->interp, cmdName);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2169 LEAVE_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2170 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2171 if (err == -1) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2172 PyErr_SetString(Tkinter_TclError, "can't delete Tcl command");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2173 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2174 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2175 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2176 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2177 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2178
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2179
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2180
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2181 #ifdef HAVE_CREATEFILEHANDLER
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2182 / File Handler /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2183
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2184 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	2185 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2186 PyObject *file;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2187 int id;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2188 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	2189 } FileHandler_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2190
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2191 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	2192
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2193 static FileHandler_ClientData *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2194 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	2195 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2196 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	2197 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	2198 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	2199 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	2200 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	2201 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	2202 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	2203 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	2204 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	2205 HeadFHCD = p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2206 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2207 return p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2208 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2209
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2210 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2211 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	2212 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2213 FileHandler_ClientData p, *pp;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2214
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2215 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	2216 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	2217 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	2218 *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	2219 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	2220 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	2221 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	2222 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2223 else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2224 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	2225 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2226 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2227
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	2228 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2229 FileHandler(ClientData clientData, int mask)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2230 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2231 FileHandler_ClientData data = (FileHandler_ClientData )clientData;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2232 PyObject func, file, arg, res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2233
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	2234 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	2235 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	2236 file = data->file;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2237
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2238 arg = Py_BuildValue("(Oi)", file, (long) mask);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2239 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	2240 Py_DECREF(arg);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2241
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2242 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2243 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2244 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2245 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2246 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	2247 LEAVE_PYTHON
1771 51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	2248 }
51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	2249
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2250 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2251 Tkapp_CreateFileHandler(PyObject self, PyObject args)
346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2252 /* args is (file, mask, func) */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2253 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2254 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	2255 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	2256 int mask, tfile;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2257
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	2258 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	2259 &file, &mask, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2260 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	2261
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2262 #ifdef WITH_THREAD
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2263 if (!self && !tcl_lock) {
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2264 /* We don't have the Tcl lock since Tcl is threaded. */
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2265 PyErr_SetString(PyExc_RuntimeError,
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2266 "_tkinter.createfilehandler not supported "
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2267 "for threaded Tcl");
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2268 return NULL;
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2269 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2270 #endif
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2271
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2272 if (self) {
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2273 CHECK_TCL_APPARTMENT;
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2274 }
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2275
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	2276 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	2277 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2278 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2279 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	2280 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2281 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2282 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2283
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2284 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	2285 if (data == NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2286 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2287
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2288 /* 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	2289 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2290 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	2291 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2292 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2293 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2294 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2295
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2296 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2297 Tkapp_DeleteFileHandler(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2298 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2299 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	2300 int tfile;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2301
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2302 if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2303 return NULL;
28156 3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2304
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2305 #ifdef WITH_THREAD
28156 3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2306 if (!self && !tcl_lock) {
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2307 /* We don't have the Tcl lock since Tcl is threaded. */
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2308 PyErr_SetString(PyExc_RuntimeError,
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2309 "_tkinter.deletefilehandler not supported "
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2310 "for threaded Tcl");
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2311 return NULL;
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2312 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2313 #endif
28156 3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2314
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2315 if (self) {
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2316 CHECK_TCL_APPARTMENT;
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2317 }
3fe72a994103 Fix SF #692416, don't crash interpreter for _tkinter.deletefilehandler Neal Norwitz <nnorwitz@gmail.com> parents: 28142 diff changeset	2318
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	2319 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	2320 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2321 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2322
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	2323 DeleteFHCD(tfile);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2324
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2325 /* 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	2326 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2327 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	2328 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2329 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2330 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2331 }
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2332 #endif /* HAVE_CREATEFILEHANDLER */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2333
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2334
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2335 /** 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	2336
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 23662 diff changeset	2337 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	2338
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2339 typedef struct {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2340 PyObject_HEAD
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2341 Tcl_TimerToken token;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2342 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	2343 } TkttObject;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2344
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2345 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2346 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	2347 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2348 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	2349 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	2350
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2351 if (!PyArg_ParseTuple(args, ":deletetimerhandler"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2352 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	2353 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	2354 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	2355 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	2356 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2357 if (func != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2358 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	2359 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	2360 Py_DECREF(v); /* See Tktt_New() */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2361 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2362 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2363 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	2364 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2365
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2366 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	2367 {
22706 14ebd7610902 Use symbolic METH_VARARGS/METH_OLDARGS instead of 1/0 for ml_flags Neal Norwitz <nnorwitz@gmail.com> parents: 21813 diff changeset	2368 {"deletetimerhandler", Tktt_DeleteTimerHandler, METH_VARARGS},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2369 {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	2370 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2371
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2372 static TkttObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2373 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	2374 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2375 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	2376
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	2377 v = PyObject_New(TkttObject, &Tktt_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2378 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2379 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	2380
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2381 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	2382 v->token = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2383 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	2384
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2385 /* 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	2386 Py_INCREF(v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2387 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	2388 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2389
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2390 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2391 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	2392 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2393 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	2394 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	2395
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2396 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	2397
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	2398 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	2399 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2400
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	2401 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2402 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	2403 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2404 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	2405 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	2406
21073 304b34023876 sprintf -> PyOS_snprintf in some "obviously safe" cases. Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	2407 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	2408 v->func == NULL ? ", handler deleted" : "");
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	2409 return PyString_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	2410 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2411
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2412 static PyObject *
36698 30567be90c85 unconst. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	2413 Tktt_GetAttr(PyObject self, char name)
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2414 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2415 return Py_FindMethod(Tktt_methods, self, name);
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2416 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2417
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2418 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	2419 {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 42153 diff changeset	2420 PyVarObject_HEAD_INIT(NULL, 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2421 "tktimertoken", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2422 sizeof(TkttObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2423 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2424 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	2425 0, /tp_print /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2426 Tktt_GetAttr, /tp_getattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2427 0, /tp_setattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2428 0, /tp_compare /
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	2429 Tktt_Repr, /tp_repr /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2430 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2431 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2432 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2433 0, /tp_hash /
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2434 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2435
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2436
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2437
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2438 / Timer Handler /
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2439
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2440 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2441 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	2442 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2443 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	2444 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	2445 PyObject *res;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2446
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2447 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	2448 return;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2449
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2450 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	2451
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	2452 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	2453
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2454 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	2455 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	2456 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	2457
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2458 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2459 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2460 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2461 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2462 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2463 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	2464
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2465 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	2466 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2467
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2468 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2469 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	2470 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2471 int milliseconds;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2472 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	2473 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	2474
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	2475 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	2476 &milliseconds, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2477 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2478 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	2479 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2480 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2481 }
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2482
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2483 #ifdef WITH_THREAD
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2484 if (!self && !tcl_lock) {
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2485 /* We don't have the Tcl lock since Tcl is threaded. */
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2486 PyErr_SetString(PyExc_RuntimeError,
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2487 "_tkinter.createtimerhandler not supported "
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2488 "for threaded Tcl");
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2489 return NULL;
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2490 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2491 #endif
28142 524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2492
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2493 if (self) {
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2494 CHECK_TCL_APPARTMENT;
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2495 }
524e5f9f85e6 Don't crash on _tkinter.createfilehandler in non-threaded Tcl; Martin v. Löwis <martin@v.loewis.de> parents: 27826 diff changeset	2496
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2497 v = Tktt_New(func);
39456 6a8f01660a3b Don't deref v if it's NULL. Neal Norwitz <nnorwitz@gmail.com> parents: 39096 diff changeset	2498 if (v) {
6a8f01660a3b Don't deref v if it's NULL. Neal Norwitz <nnorwitz@gmail.com> parents: 39096 diff changeset	2499 v->token = Tcl_CreateTimerHandler(milliseconds, TimerHandler,
6a8f01660a3b Don't deref v if it's NULL. Neal Norwitz <nnorwitz@gmail.com> parents: 39096 diff changeset	2500 (ClientData)v);
6a8f01660a3b Don't deref v if it's NULL. Neal Norwitz <nnorwitz@gmail.com> parents: 39096 diff changeset	2501 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2502
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2503 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	2504 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2505
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2506
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2507 / Event Loop /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2508
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2509 static PyObject *
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	2510 Tkapp_MainLoop(PyObject selfptr, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2511 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2512 int threshold = 0;
38558 970526c1a7e2 [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Andrew M. Kuchling <amk@amk.ca> parents: 38066 diff changeset	2513 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	2514 #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	2515 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	2516 #endif
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	2517
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2518 if (!PyArg_ParseTuple(args, "\|i:mainloop", &threshold))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2519 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2520
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2521 #ifdef WITH_THREAD
27083 d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2522 if (!self && !tcl_lock) {
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2523 /* We don't have the Tcl lock since Tcl is threaded. */
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2524 PyErr_SetString(PyExc_RuntimeError,
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2525 "_tkinter.mainloop not supported "
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2526 "for threaded Tcl");
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2527 return NULL;
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2528 }
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2529 #endif
27083 d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2530
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2531 if (self) {
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2532 CHECK_TCL_APPARTMENT;
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2533 self->dispatching = 1;
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2534 }
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2535
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2536 quitMainLoop = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2537 while (Tk_GetNumMainWindows() > threshold &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2538 !quitMainLoop &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2539 !errorInCmd)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2540 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2541 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	2542
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2543 #ifdef WITH_THREAD
27083 d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2544 if (self && self->threaded) {
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2545 /* Allow other Python threads to run. */
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2546 ENTER_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2547 result = Tcl_DoOneEvent(0);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2548 LEAVE_TCL
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2549 }
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2550 else {
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2551 Py_BEGIN_ALLOW_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2552 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	2553 tcl_tstate = tstate;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2554 result = Tcl_DoOneEvent(TCL_DONT_WAIT);
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2555 tcl_tstate = NULL;
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2556 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	2557 if (result == 0)
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2558 Sleep(Tkinter_busywaitinterval);
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2559 Py_END_ALLOW_THREADS
28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2560 }
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	2561 #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	2562 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	2563 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2564
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2565 if (PyErr_CheckSignals() != 0) {
27083 d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2566 if (self)
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2567 self->dispatching = 0;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2568 return NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	2569 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2570 if (result < 0)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2571 break;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2572 }
27083 d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2573 if (self)
d5e09d412b53 Remove appartment check from dooneevent. Fixes #660961. Martin v. Löwis <martin@v.loewis.de> parents: 27071 diff changeset	2574 self->dispatching = 0;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2575 quitMainLoop = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2576
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2577 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2578 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2579 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2580 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2581 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2582 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2583 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2584 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2585 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2586
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2587 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2588 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	2589 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2590 int flags = 0;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2591 int rv;
2121 86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2592
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2593 if (!PyArg_ParseTuple(args, "\|i:dooneevent", &flags))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2594 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2595
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2596 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2597 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	2598 LEAVE_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2599 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	2600 }
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2601
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	2602 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2603 Tkapp_Quit(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2604 {
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2605
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2606 if (!PyArg_ParseTuple(args, ":quit"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2607 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2608
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2609 quitMainLoop = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2610 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2611 return Py_None;
1664 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
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2614 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2615 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	2616 {
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2617
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	2618 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	2619 return NULL;
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2620
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2621 return PyInt_FromLong((long)Tkapp_Interp(self));
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2622 }
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	2623
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2624 static PyObject *
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2625 Tkapp_TkInit(PyObject self, PyObject args)
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2626 {
38066 b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2627 static int has_failed;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2628 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	2629 Tk_Window main_window;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2630 const char * _tk_exists = NULL;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2631 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	2632 main_window = Tk_MainWindow(interp);
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2633
38066 b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2634 /* In all current versions of Tk (including 8.4.13), Tk_Init
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2635 deadlocks on the second call when the first call failed.
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2636 To avoid the deadlock, we just refuse the second call through
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2637 a static variable. */
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2638 if (has_failed) {
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2639 PyErr_SetString(Tkinter_TclError,
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2640 "Calling Tk_Init again after a previous call failed might deadlock");
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2641 return NULL;
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2642 }
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2643
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2644 /* 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	2645 CHECK_TCL_APPARTMENT;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2646 ENTER_TCL
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2647 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	2648 ENTER_OVERLAP
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2649 if (err == TCL_ERROR) {
38066 b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2650 /* This sets an exception, but we cannot return right
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2651 away because we need to exit the overlap first. */
b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2652 Tkinter_Error(self);
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2653 } else {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2654 _tk_exists = Tkapp_Result(self);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2655 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2656 LEAVE_OVERLAP_TCL
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2657 if (err == TCL_ERROR) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2658 return NULL;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2659 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2660 if (_tk_exists == NULL \|\| strcmp(_tk_exists, "1") != 0) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2661 if (Tk_Init(interp) == TCL_ERROR) {
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2662 PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self)));
38066 b8507ded4d15 Work around deadlock risk. Will backport. Martin v. Löwis <martin@v.loewis.de> parents: 37556 diff changeset	2663 has_failed = 1;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2664 return NULL;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2665 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2666 }
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2667 Py_INCREF(Py_None);
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2668 return Py_None;
470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2669 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2670
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2671 static PyObject *
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2672 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	2673 {
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2674
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	2675 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	2676 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	2677 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	2678 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	2679 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	2680 ((TkappObject*)self)->wantobjects = wantobjects;
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2681
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2682 Py_INCREF(Py_None);
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2683 return Py_None;
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2684 }
bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2685
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2686 static PyObject *
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2687 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	2688 {
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2689
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2690 ((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	2691
7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2692 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	2693 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	2694 }
26416 bd09e3a2d536 Patch #518625: Return objects in Tkinter. Martin v. Löwis <martin@v.loewis.de> parents: 25530 diff changeset	2695
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2696
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2697 /** Tkapp Method List **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2698
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2699 static PyMethodDef Tkapp_methods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2700 {
26814 7c8af1979e78 Gracefully delay runtime error up to 1s. Add .willdispatch(). Martin v. Löwis <martin@v.loewis.de> parents: 26620 diff changeset	2701 {"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	2702 {"wantobjects", Tkapp_WantObjects, METH_VARARGS},
41815 a9227d7a34fa Stop using METH_OLDARGS Neal Norwitz <nnorwitz@gmail.com> parents: 39456 diff changeset	2703 {"call", Tkapp_Call, METH_VARARGS},
a9227d7a34fa Stop using METH_OLDARGS Neal Norwitz <nnorwitz@gmail.com> parents: 39456 diff changeset	2704 {"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	2705 {"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	2706 {"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	2707 {"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	2708 {"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	2709 {"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	2710 {"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	2711 {"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	2712 {"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	2713 {"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	2714 {"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	2715 {"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	2716 {"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	2717 {"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	2718 {"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	2719 {"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	2720 {"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	2721 {"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	2722 {"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	2723 {"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	2724 {"split", Tkapp_Split, METH_VARARGS},
41815 a9227d7a34fa Stop using METH_OLDARGS Neal Norwitz <nnorwitz@gmail.com> parents: 39456 diff changeset	2725 {"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	2726 {"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	2727 {"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	2728 #ifdef HAVE_CREATEFILEHANDLER
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2729 {"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	2730 {"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	2731 #endif
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2732 {"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	2733 {"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	2734 {"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	2735 {"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	2736 {"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	2737 {"loadtk", Tkapp_TkInit, METH_NOARGS},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2738 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2739 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2740
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2741
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2742
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2743 /** Tkapp Type Methods **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2744
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2745 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2746 Tkapp_Dealloc(PyObject *self)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2747 {
26971 4c03a4fad72e Eliminate C++ comment. Martin v. Löwis <martin@v.loewis.de> parents: 26858 diff changeset	2748 /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	2749 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2750 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	2751 LEAVE_TCL
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	2752 PyObject_Del(self);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2753 DisableEventHook();
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2754 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2755
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2756 static PyObject *
36698 30567be90c85 unconst. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	2757 Tkapp_GetAttr(PyObject self, char name)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2758 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2759 return Py_FindMethod(Tkapp_methods, self, name);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2760 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2761
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2762 static PyTypeObject Tkapp_Type =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2763 {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 42153 diff changeset	2764 PyVarObject_HEAD_INIT(NULL, 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2765 "tkapp", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2766 sizeof(TkappObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2767 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2768 Tkapp_Dealloc, /tp_dealloc /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2769 0, /tp_print /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2770 Tkapp_GetAttr, /tp_getattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2771 0, /tp_setattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2772 0, /tp_compare /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2773 0, /tp_repr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2774 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2775 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2776 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2777 0, /tp_hash /
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2778 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2779
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2780
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2781
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2782 /** Tkinter Module **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2783
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2784 typedef struct {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2785 PyObject* tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2786 int size; /* current size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2787 int maxsize; /* allocated size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2788 } FlattenContext;
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 static int
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2791 _bump(FlattenContext* context, int size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2792 {
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	2793 /* 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	2794 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	2795
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2796 int maxsize = context->maxsize * 2;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2797
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2798 if (maxsize < context->size + size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2799 maxsize = context->size + size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2800
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2801 context->maxsize = maxsize;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2802
17976 d579a5d8b3fe Cruft cleanup: Removed the unused last_is_sticky argument from the internal Tim Peters <tim.peters@gmail.com> parents: 15356 diff changeset	2803 return _PyTuple_Resize(&context->tuple, maxsize) >= 0;
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2804 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2805
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2806 static int
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2807 _flatten1(FlattenContext* context, PyObject* item, int depth)
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2808 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2809 /* add tuple or list to argument tuple (recursively) */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2810
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2811 int i, size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2812
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2813 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	2814 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	2815 "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	2816 return 0;
3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2817 } else if (PyList_Check(item)) {
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2818 size = PyList_GET_SIZE(item);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2819 /* 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	2820 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	2821 !_bump(context, size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2822 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2823 /* copy items to output tuple */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2824 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2825 PyObject *o = PyList_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2826 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	2827 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2828 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2829 } 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	2830 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	2831 !_bump(context, 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2832 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2833 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	2834 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	2835 context->size++, o);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2836 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2837 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2838 } else if (PyTuple_Check(item)) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2839 /* same, for tuples */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2840 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	2841 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	2842 !_bump(context, size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2843 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2844 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2845 PyObject *o = PyTuple_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2846 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	2847 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2848 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2849 } 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	2850 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	2851 !_bump(context, 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2852 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2853 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	2854 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	2855 context->size++, o);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2856 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2857 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2858 } else {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2859 PyErr_SetString(PyExc_TypeError, "argument must be sequence");
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2860 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2861 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2862 return 1;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2863 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2864
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2865 static PyObject *
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2866 Tkinter_Flatten(PyObject* self, PyObject* args)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2867 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2868 FlattenContext context;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2869 PyObject* item;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2870
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2871 if (!PyArg_ParseTuple(args, "O:_flatten", &item))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2872 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2873
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13503 diff changeset	2874 context.maxsize = PySequence_Size(item);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2875 if (context.maxsize <= 0)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2876 return PyTuple_New(0);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2877
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2878 context.tuple = PyTuple_New(context.maxsize);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2879 if (!context.tuple)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2880 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2881
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2882 context.size = 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2883
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	2884 if (!_flatten1(&context, item,0))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2885 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2886
17976 d579a5d8b3fe Cruft cleanup: Removed the unused last_is_sticky argument from the internal Tim Peters <tim.peters@gmail.com> parents: 15356 diff changeset	2887 if (_PyTuple_Resize(&context.tuple, context.size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2888 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2889
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2890 return context.tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2891 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	2892
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2893 static PyObject *
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2894 Tkinter_Create(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2895 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2896 char *screenName = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2897 char *baseName = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2898 char *className = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2899 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	2900 int wantobjects = 0;
31547 470f95ad6750 Implementation of patch 869468 David Ascher <david.ascher@gmail.com> parents: 30979 diff changeset	2901 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	2902 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	2903 char use = NULL; / pass -use to wish */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2904
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2905 baseName = strrchr(Py_GetProgramName(), '/');
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2906 if (baseName != NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2907 baseName++;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2908 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2909 baseName = Py_GetProgramName();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2910 className = "Tk";
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2911
32942 63df4cb492a1 Patch #986929: Add support for wish -sync and -use options. Martin v. Löwis <martin@v.loewis.de> parents: 31549 diff changeset	2912 if (!PyArg_ParseTuple(args, "\|zssiiiiz:create",
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2913 &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	2914 &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	2915 &sync, &use))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2916 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2917
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2918 return (PyObject *) Tkapp_New(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	2919 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	2920 sync, use);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2921 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2922
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2923 static PyObject *
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2924 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	2925 {
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2926 int new_val;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2927 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	2928 return NULL;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2929 if (new_val < 0) {
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2930 PyErr_SetString(PyExc_ValueError,
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2931 "busywaitinterval must be >= 0");
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2932 return NULL;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2933 }
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2934 Tkinter_busywaitinterval = new_val;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2935 Py_INCREF(Py_None);
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2936 return Py_None;
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2937 }
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2938
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2939 static char setbusywaitinterval_doc[] =
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2940 "setbusywaitinterval(n) -> None\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2941 \n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2942 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	2943 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	2944 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	2945 frames in an animation.";
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2946
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2947 static PyObject *
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2948 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	2949 {
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2950 return PyInt_FromLong(Tkinter_busywaitinterval);
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2951 }
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2952
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2953 static char getbusywaitinterval_doc[] =
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2954 "getbusywaitinterval() -> int\n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2955 \n\
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2956 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	2957 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	2958
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2959 static PyMethodDef moduleMethods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2960 {
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2961 {"_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	2962 {"create", Tkinter_Create, 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	2963 #ifdef HAVE_CREATEFILEHANDLER
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2964 {"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	2965 {"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	2966 #endif
21757 40631ae74b17 Patch #477750: Use METH_ constants in Modules. Martin v. Löwis <martin@v.loewis.de> parents: 21322 diff changeset	2967 {"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	2968 {"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	2969 {"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	2970 {"quit", Tkapp_Quit, METH_VARARGS},
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2971 {"setbusywaitinterval",Tkinter_setbusywaitinterval, METH_VARARGS,
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2972 setbusywaitinterval_doc},
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2973 {"getbusywaitinterval",(PyCFunction)Tkinter_getbusywaitinterval,
d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	2974 METH_NOARGS, getbusywaitinterval_doc},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2975 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2976 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2977
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2978 #ifdef WAIT_FOR_STDIN
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2979
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2980 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	2981
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	2982 #ifndef MS_WINDOWS
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2983 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2984 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	2985 {
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2986 stdin_ready = 1;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2987 }
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	2988 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2989
28445 3fc5764273d9 Wrap thread stuff in WITH_THREAD. Fixes #704641. Martin v. Löwis <martin@v.loewis.de> parents: 28444 diff changeset	2990 #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	2991 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	2992 #endif
6438 9e46ecf03c3e Fix EventHook (the trick to make widgets appear when using GNU Guido van Rossum <guido@python.org> parents: 6343 diff changeset	2993
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2994 static int
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2995 EventHook(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2996 {
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	2997 #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	2998 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	2999 #endif
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	3000 #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	3001 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	3002 #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	3003 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	3004 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	3005 #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	3006 tfile = fileno(stdin);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3007 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	3008 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3009 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	3010 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	3011 #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	3012 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	3013 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	3014 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	3015 }
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	3016 #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	3017 #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	3018 Py_BEGIN_ALLOW_THREADS
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	3019 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	3020 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	3021
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3022 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	3023
8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	3024 tcl_tstate = NULL;
26613 28bc2d3af91d Support threads-enabled Tcl installations. Martin v. Löwis <martin@v.loewis.de> parents: 26572 diff changeset	3025 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	3026 if (result == 0)
29038 d3c1a03a5130 Patch #734118: Add {get\|set}busywaitinterval. Martin v. Löwis <martin@v.loewis.de> parents: 28950 diff changeset	3027 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	3028 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	3029 #else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3030 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	3031 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3032
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3033 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	3034 break;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3035 }
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	3036 #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	3037 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	3038 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3039 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3040 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3041 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3042 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3043 PyErr_Print();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3044 }
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	3045 #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	3046 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	3047 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3048 return 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3049 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3050
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3051 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3052
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3053 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	3054 EnableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3055 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3056 #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	3057 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	3058 #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	3059 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	3060 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3061 PyOS_InputHook = EventHook;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3062 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3063 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3064 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3065
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3066 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	3067 DisableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3068 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3069 #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	3070 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	3071 PyOS_InputHook = NULL;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3072 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3073 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3074 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	3075
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3076
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3077 /* all errors will be checked in one fell swoop in init_tkinter() */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3078 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	3079 ins_long(PyObject d, char name, long val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3080 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3081 PyObject *v = PyInt_FromLong(val);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3082 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3083 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3084 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3085 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3086 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3087 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	3088 ins_string(PyObject d, char name, char *val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3089 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	3090 PyObject *v = PyString_FromString(val);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3091 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3092 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3093 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3094 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3095 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3096
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3097
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24280 diff changeset	3098 PyMODINIT_FUNC
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	3099 init_tkinter(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3100 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3101 PyObject m, d;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3102
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42511 diff changeset	3103 Py_TYPE(&Tkapp_Type) = &PyType_Type;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3104
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	3105 #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	3106 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	3107 #endif
4091 dc946cab7b9b Hacks to support being a Windows DLL Guido van Rossum <guido@python.org> parents: 4079 diff changeset	3108
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3109 m = Py_InitModule("_tkinter", moduleMethods);
36324 1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 36233 diff changeset	3110 if (m == NULL)
1af7f719ed28 Check return result from Py_InitModule(). This API can fail. Neal Norwitz <nnorwitz@gmail.com>* parents: 36233 diff changeset	3111 return;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3112
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3113 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	3114 Tkinter_TclError = PyErr_NewException("_tkinter.TclError", NULL, NULL);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3115 PyDict_SetItemString(d, "TclError", Tkinter_TclError);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3116
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	3117 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	3118 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	3119 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	3120 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	3121 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	3122 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	3123 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	3124 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	3125 ins_long(d, "DONT_WAIT", TCL_DONT_WAIT);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3126 ins_string(d, "TK_VERSION", TK_VERSION);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3127 ins_string(d, "TCL_VERSION", TCL_VERSION);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3128
6311 13fbd98d81cc Export names for the types defined by this module: TkappType and TkttType. Guido van Rossum <guido@python.org> parents: 6265 diff changeset	3129 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	3130
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42511 diff changeset	3131 Py_TYPE(&Tktt_Type) = &PyType_Type;
6311 13fbd98d81cc Export names for the types defined by this module: TkappType and TkttType. Guido van Rossum <guido@python.org> parents: 6265 diff changeset	3132 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	3133
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42511 diff changeset	3134 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	3135 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	3136
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3137 #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	3138 /* 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	3139 * 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	3140 * 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	3141 * 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	3142 *
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3143 * 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	3144 * 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	3145 * 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	3146 *
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3147 */
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3148 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	3149 #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	3150
1852caba7014 Mods by Tony Lownds (patch 490100, slightly massaged by me) to make Tkinter Jack Jansen <jack.jansen@cwi.nl> parents: 21073 diff changeset	3151
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	3152 /* 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	3153 it also helps Tcl find its encodings. */
ca8880cf3674 Add a call to Tcl_FindExecutable(). This was inspired by a patch by Guido van Rossum <guido@python.org> parents: 11882 diff changeset	3154 Tcl_FindExecutable(Py_GetProgramName());
ca8880cf3674 Add a call to Tcl_FindExecutable(). This was inspired by a patch by Guido van Rossum <guido@python.org> parents: 11882 diff changeset	3155
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	3156 if (PyErr_Occurred())
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	3157 return;
b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	3158
8670 07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	3159 #if 0
07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	3160 /* 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	3161 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	3162 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	3163 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	3164 #endif
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	3165
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3166 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_tkinter.c @ 49955:878d40468c4e legacy-trunk