cpython-lru_cache-weakref: Modules/

annotate Modules/_tkinter.c @ 33526:175eee09cb98 legacy-trunk

Raymond reminded me to use DSU key

author	Skip Montanaro <skip@pobox.com>
date	Mon, 20 Sep 2004 16:43:30 +0000
parents	fbb5428ebf41
children	49b6e966e57f

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

Mercurial > cpython-lru_cache-weakref

annotate Modules/_tkinter.c @ 33526:175eee09cb98 legacy-trunk