cpython-lru_cache-weakref: Modules/

annotate Modules/_tkinter.c @ 15164:8930ec3bc00a legacy-trunk

Added additional test cases for pulldom modifications.

author	Lars Gustäbel <lars@gustaebel.de>
date	Wed, 11 Oct 2000 22:36:00 +0000
parents	be4fc8b6e1cb
children	52d2d36b8bf7

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
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	12 Only Tcl/Tk 8.0 and later are supported. Older versions are not
9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	13 supported. (Use Python 1.5.2 if you cannot upgrade your Tcl/Tk
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 - In Tcl_Call(), create Tcl objects from the arguments, possibly using
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	20 intelligent mappings between Python objects and Tcl objects (e.g. ints,
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	21 floats and Tcl window pointers could be handled specially).
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	22
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	23 - 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	24 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	25
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	26 */
7495322427c7 Changes for Windows NT -- this time it works, with Tcl4.1p1 (p1!!!) etc. Guido van Rossum <guido@python.org> parents: 3973 diff changeset	27
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	28
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	29 #include "Python.h"
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	30 #include <ctype.h>
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	31
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	32 #ifdef WITH_THREAD
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9128 diff changeset	33 #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	34 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	35
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	36 #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	37 #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	38 #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	39
4079 a6e62c21b0e3 Add #define MAC_TCL for Mac. Guido van Rossum <guido@python.org> parents: 4005 diff changeset	40 #ifdef macintosh
a6e62c21b0e3 Add #define MAC_TCL for Mac. Guido van Rossum <guido@python.org> parents: 4005 diff changeset	41 #define MAC_TCL
9203 07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9128 diff changeset	42 #endif
07dae6fdae79 Renamed thread.h to pythread.h. Guido van Rossum <guido@python.org> parents: 9128 diff changeset	43
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	44 #include <tcl.h>
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	45 #include <tk.h>
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46
5913 6b39f8633ca5 Compatibility with Tcl/Tk 8.0b. Guido van Rossum <guido@python.org>* parents: 5866 diff changeset	47 #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	48
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	49 #if TKMAJORMINOR < 8000
9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	50 #error "Tk older than 8.0 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	51 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	52
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	53 #if defined(macintosh)
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	54 /* Sigh, we have to include this to get at the tcl qd pointer */
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	55 #include <tkMac.h>
8185 929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	56 /* And this one we need to clear the menu bar */
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	57 #include <Menus.h>
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	58 #endif
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	59
15036 6e9ff060a728 SF "bug" 115973: patches from Norman Vine so that shared libraries and Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	60 #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	61 #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	62 #endif
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	63
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	64 #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	65
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	66 /* 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	67 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	68 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	69 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	70
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	71 #ifdef MS_WINDOWS
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	72 #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	73 #else
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	74 #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	75 #endif
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	76
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	77 /* 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	78 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	79
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	80 #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	81 #define WAIT_FOR_STDIN
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	82 #endif
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	83
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	84 #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	85
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	86 #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	87 #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	88 #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	89 #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	90
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	91 #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	92
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	93 /* The threading situation is complicated. Tcl is not thread-safe, except for
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	94 Tcl 8.1, which will probably remain in alpha status for another 6 months
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	95 (and the README says that Tk will probably remain thread-unsafe forever).
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	96 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	97 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	98 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	99
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	100 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	101 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	102 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	103
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	104 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	105 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	106 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	107 interpreter. These assume that the surrounding code has the Python
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	108 interpreter lock; inside the brackets, the Python interpreter lock has been
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	109 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	110
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	111 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	112 (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	113 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	114 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	115 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	116 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	117
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	118 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	119 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	120 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	121 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	122 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	123 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	124 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	125 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	126
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	127 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	128 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	129
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	130 */
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	131
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	132 static PyThread_type_lock tcl_lock = 0;
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	133 static PyThreadState *tcl_tstate = NULL;
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	134
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	135 #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	136 { PyThreadState *tstate = PyThreadState_Get(); Py_BEGIN_ALLOW_THREADS \
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	137 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	138
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	139 #define LEAVE_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	140 tcl_tstate = NULL; 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	141
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	142 #define ENTER_OVERLAP \
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	143 Py_END_ALLOW_THREADS
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	144
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	145 #define LEAVE_OVERLAP_TCL \
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	146 tcl_tstate = NULL; 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	147
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	148 #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	149 { PyThreadState *tstate = tcl_tstate; tcl_tstate = NULL; \
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	150 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	151
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	152 #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	153 { PyThreadState *tstate = PyEval_SaveThread(); \
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	154 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	155
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	156 #else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	157
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	158 #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	159 #define LEAVE_TCL
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	160 #define ENTER_OVERLAP
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	161 #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	162 #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	163 #define LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	164
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	165 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	166
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	167 #ifdef macintosh
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	168
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	169 /*
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	170 ** Additional cruft needed by Tcl/Tk on the Mac.
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	171 ** This is for Tcl 7.5 and Tk 4.1 (patch release 1).
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	172 */
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	173
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	174 /* ckfree() expects a char* */
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	175 #define FREECAST (char *)
3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	176
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	177 #include <Events.h> /* For EventRecord */
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	178
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	179 typedef int (TclMacConvertEventPtr) (EventRecord eventPtr);
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	180 void Tcl_MacSetEventProc(TclMacConvertEventPtr procPtr);
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	181 int TkMacConvertEvent(EventRecord *eventPtr);
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	182
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	183 staticforward int PyMacConvertEvent(EventRecord *eventPtr);
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	184
8185 929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	185 #if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	186 #pragma import on
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	187 #endif
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	188
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	189 #include <SIOUX.h>
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	190 extern int SIOUXIsAppWindow(WindowPtr);
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	191
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	192 #if defined(__CFM68K__) && !defined(__USING_STATIC_LIBS__)
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	193 #pragma import reset
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	194 #endif
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	195 #endif /* macintosh */
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	196
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	197 #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	198 #define FREECAST (char *)
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	199 #endif
3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	200
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	201 /** Tkapp Object Declaration **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	202
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	203 staticforward PyTypeObject Tkapp_Type;
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	204
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	205 typedef struct {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	206 PyObject_HEAD
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	207 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	208 } TkappObject;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	209
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	210 #define Tkapp_Check(v) ((v)->ob_type == &Tkapp_Type)
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	211 #define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	212 #define Tkapp_Result(v) (((TkappObject *) (v))->interp->result)
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	213
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	214 #define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	215 (void ) v, ((PyObject ) v)->ob_refcnt))
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	216
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	217
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	218
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	219 /** Error Handling **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	220
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	221 static PyObject *Tkinter_TclError;
1713 bb566d28caa0 * tkintermodule.c Guido van Rossum <guido@python.org> parents: 1690 diff changeset	222 static int quitMainLoop = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	223 static int errorInCmd = 0;
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	224 static PyObject *excInCmd;
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	225 static PyObject *valInCmd;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 2009 diff changeset	226 static PyObject *trbInCmd;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	227
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	228
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	229
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	230 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	231 Tkinter_Error(PyObject *v)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	232 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	233 PyErr_SetString(Tkinter_TclError, Tkapp_Result(v));
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	234 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	235 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	236
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	237
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	238
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	239 /** Utils **/
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	240
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	241 #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	242 #ifndef MS_WINDOWS
8987 3e127bca84e7 Need mytime.h for Sleep(). Guido van Rossum <guido@python.org> parents: 8828 diff changeset	243
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	244 /* 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	245
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	246 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	247 Sleep(int milli)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	248 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	249 /* 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	250 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	251 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	252 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	253 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	254 }
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	255 #endif /* 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	256 #endif /* WITH_THREAD */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	257
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	258
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	259 static char *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	260 AsString(PyObject value, PyObject tmp)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	261 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	262 if (PyString_Check(value))
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	263 return PyString_AsString(value);
15053 be4fc8b6e1cb [ Bug #113803 ] [2.0b1 NT4.0] printing non asci char causes idle to abort Guido van Rossum <guido@python.org> parents: 15036 diff changeset	264 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	265 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	266 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	267 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	268 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	269 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	270 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	271 }
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	272 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	273 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	274 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	275 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	276 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	277 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	278 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	279 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	280 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	281 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	282 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	283 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	284 return PyString_AsString(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	285 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	286 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	287
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	288
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	289
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	290 #define ARGSZ 64
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	291
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	292 static char *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	293 Merge(PyObject *args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	294 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	295 PyObject *tmp = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	296 char *argvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	297 char **argv = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	298 int fvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	299 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	300 int argc = 0, fvc = 0, i;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	301 char *res = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	302
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	303 if (!(tmp = PyList_New(0)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	304 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	305
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	306 argv = argvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	307 fv = fvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	308
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	309 if (args == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	310 argc = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	311
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	312 else if (!PyTuple_Check(args)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	313 argc = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	314 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	315 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	316 goto finally;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	317 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	318 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	319 argc = PyTuple_Size(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	320
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	321 if (argc > ARGSZ) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	322 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	323 fv = (int )ckalloc(argc sizeof(int));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	324 if (argv == NULL \|\| fv == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	325 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	326 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	327 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	328 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	329
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	330 for (i = 0; i < argc; i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	331 PyObject *v = PyTuple_GetItem(args, i);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	332 if (PyTuple_Check(v)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	333 fv[i] = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	334 if (!(argv[i] = Merge(v)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	335 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	336 fvc++;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	337 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	338 else if (v == Py_None) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	339 argc = i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	340 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	341 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	342 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	343 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	344 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	345 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	346 fvc++;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	347 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	348 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	349 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	350 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	351 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	352 PyErr_SetString(Tkinter_TclError, "merge failed");
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	353
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	354 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	355 for (i = 0; i < fvc; i++)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	356 if (fv[i]) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	357 ckfree(argv[i]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	358 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	359 if (argv != argvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	360 ckfree(FREECAST argv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	361 if (fv != fvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	362 ckfree(FREECAST fv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	363
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	364 Py_DECREF(tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	365 return res;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	366 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	367
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	368
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	369
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	370 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	371 Split(char *list)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	372 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	373 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	374 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	375 PyObject *v;
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 (list == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	378 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	379 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	380 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	381
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	382 if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	383 /* Not a list.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	384 * Could be a quoted string containing funnies, e.g. {"}.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	385 * Return the string itself.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	386 */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	387 return PyString_FromString(list);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	388 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	389
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	390 if (argc == 0)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	391 v = PyString_FromString("");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	392 else if (argc == 1)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	393 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	394 else if ((v = PyTuple_New(argc)) != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	395 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	396 PyObject *w;
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++) {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	399 if ((w = Split(argv[i])) == NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	400 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	401 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	402 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	403 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	404 PyTuple_SetItem(v, i, w);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	405 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	406 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	407 Tcl_Free(FREECAST argv);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	408 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	409 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	410
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	411
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	412
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	413 /** Tkapp Object **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	414
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	415 #ifndef WITH_APPINIT
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	416 int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	417 Tcl_AppInit(Tcl_Interp *interp)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	418 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	419 Tk_Window main;
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	420
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	421 main = Tk_MainWindow(interp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	422 if (Tcl_Init(interp) == TCL_ERROR) {
8315 e42b94275652 Replace all calls to fprintf(stderr, ...) with calls to PySys_WriteStderr(...). Guido van Rossum <guido@python.org> parents: 8312 diff changeset	423 PySys_WriteStderr("Tcl_Init error: %s\n", interp->result);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	424 return TCL_ERROR;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	425 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	426 if (Tk_Init(interp) == TCL_ERROR) {
8315 e42b94275652 Replace all calls to fprintf(stderr, ...) with calls to PySys_WriteStderr(...). Guido van Rossum <guido@python.org> parents: 8312 diff changeset	427 PySys_WriteStderr("Tk_Init error: %s\n", interp->result);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	428 return TCL_ERROR;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	429 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	430 return TCL_OK;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	431 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	432 #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	433
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	434
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	435
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	436
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	437 /* Initialize the Tk application; see the `main' function in
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	438 * `tkMain.c'.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	439 */
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	440
13690 c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	441 static void EnableEventHook(void); /* Forward */
c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	442 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	443
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	444 static TkappObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	445 Tkapp_New(char screenName, char baseName, char *className, int interactive)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	446 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	447 TkappObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	448 char *argv0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	449
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	450 v = PyObject_New(TkappObject, &Tkapp_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	451 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	452 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	453
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	454 v->interp = Tcl_CreateInterp();
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	455
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	456 #if defined(macintosh)
9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	457 /* This seems to be needed */
8185 929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	458 ClearMenuBar();
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	459 TkMacInitMenus(v->interp);
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	460 #endif
7416 13f29b62a209 Delete the 'exit' command from the Tcl interpreter -- it would allow Guido van Rossum <guido@python.org> parents: 7212 diff changeset	461 /* 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	462 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	463
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	464 if (screenName != NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	465 Tcl_SetVar2(v->interp, "env", "DISPLAY",
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	466 screenName, TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	467
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	468 if (interactive)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	469 Tcl_SetVar(v->interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	470 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	471 Tcl_SetVar(v->interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	472
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	473 /* 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	474 argv0 = (char*)ckalloc(strlen(className) + 1);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	475 if (!argv0) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	476 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	477 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	478 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	479 }
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	480
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	481 strcpy(argv0, className);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 7416 diff changeset	482 if (isupper((int)(argv0[0])))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	483 argv0[0] = tolower(argv0[0]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	484 Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	485 ckfree(argv0);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	486
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	487 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	488 return (TkappObject )Tkinter_Error((PyObject )v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	489
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	490 EnableEventHook();
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	491
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	492 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	493 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	494
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	495
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	496
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	497 / Tcl Eval /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	498
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	499 #if TKMAJORMINOR >= 8001
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	500 #define USING_OBJECTS
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	501 #endif
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	502
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	503 #ifdef USING_OBJECTS
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	504
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	505 static Tcl_Obj*
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	506 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	507 {
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	508 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	509
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	510 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	511 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	512 PyString_GET_SIZE(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	513 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	514 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	515 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	516 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	517 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	518 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	519 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	520 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	521 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	522 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	523 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	524 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	525 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	526 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	527 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	528 }
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	529 else if (PyUnicode_Check(value)) {
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	530 #if TKMAJORMINOR <= 8001
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	531 /* In Tcl 8.1 we must use UTF-8 */
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	532 PyObject* utf8 = PyUnicode_AsUTF8String(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	533 if (!utf8)
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	534 return 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	535 result = Tcl_NewStringObj(PyString_AS_STRING(utf8),
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	536 PyString_GET_SIZE(utf8));
12513 ca0e9d97d554 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12162 diff changeset	537 Py_DECREF(utf8);
ca0e9d97d554 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12162 diff changeset	538 return result;
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	539 #else /* TKMAJORMINOR > 8001 */
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	540 /* In Tcl 8.2 and later, use Tcl_NewUnicodeObj() */
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	541 if (sizeof(Py_UNICODE) != sizeof(Tcl_UniChar)) {
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	542 /* XXX Should really test this at compile time */
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	543 PyErr_SetString(PyExc_SystemError,
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	544 "Py_UNICODE and Tcl_UniChar differ in size");
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	545 return 0;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	546 }
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	547 return Tcl_NewUnicodeObj(PyUnicode_AS_UNICODE(value),
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	548 PyUnicode_GET_SIZE(value));
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	549 #endif /* TKMAJORMINOR > 8001 */
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	550 }
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	551 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	552 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	553 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	554 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	555 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	556 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	557 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	558 }
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	559 }
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	560
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	561 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	562 Tkapp_Call(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	563 {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	564 Tcl_Obj *objStore[ARGSZ];
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	565 Tcl_Obj **objv = NULL;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	566 int objc = 0, i;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	567 PyObject *res = NULL;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	568 Tcl_Interp *interp = Tkapp_Interp(self);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	569 /* Could add TCL_EVAL_GLOBAL if wrapped by GlobalCall... */
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	570 int flags = TCL_EVAL_DIRECT;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	571
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	572 objv = objStore;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	573
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	574 if (args == NULL)
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	575 objc = 0;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	576
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	577 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	578 objc = 1;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	579 objv[0] = AsObj(args);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	580 if (objv[0] == 0)
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	581 goto finally;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	582 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	583 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	584 else {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	585 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	586
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	587 if (objc > ARGSZ) {
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	588 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	589 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	590 PyErr_NoMemory();
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	591 goto finally;
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	592 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	593 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	594
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	595 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	596 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	597 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	598 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	599 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	600 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	601 objv[i] = AsObj(v);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	602 if (!objv[i])
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	603 goto finally;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	604 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	605 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	606 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	607
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	608 ENTER_TCL
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	609
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	610 i = Tcl_EvalObjv(interp, objc, objv, flags);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	611
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	612 ENTER_OVERLAP
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	613 if (i == TCL_ERROR)
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	614 Tkinter_Error(self);
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	615 else {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	616 /* We could request the object result here, but doing
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	617 so would confuse applications that expect a string. */
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	618 char *s = Tcl_GetStringResult(interp);
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	619 char *p = s;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	620 /* 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	621 it's UTF-8 and we should decode it to Unicode */
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	622 while (*p != '\0') {
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	623 if (*p & 0x80)
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	624 break;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	625 p++;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	626 }
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	627 if (*p == '\0')
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	628 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	629 else {
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	630 /* 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	631 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	632 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	633 if (res == 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	634 PyErr_Clear();
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	635 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	636 }
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	637 }
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	638 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	639
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	640 LEAVE_OVERLAP_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	641
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	642 finally:
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	643 for (i = 0; i < objc; i++)
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	644 Tcl_DecrRefCount(objv[i]);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	645 if (objv != objStore)
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	646 ckfree(FREECAST objv);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	647 return res;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	648 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	649
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	650 #else /* !USING_OBJECTS */
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	651
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	652 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	653 Tkapp_Call(PyObject self, PyObject args)
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	654 {
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	655 /* This is copied from Merge() */
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	656 PyObject *tmp = NULL;
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	657 char *argvStore[ARGSZ];
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	658 char **argv = NULL;
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	659 int fvStore[ARGSZ];
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	660 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	661 int argc = 0, fvc = 0, i;
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	662 PyObject res = NULL; / except this has a different type */
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	663 Tcl_CmdInfo info; /* and this is added */
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	664 Tcl_Interp interp = Tkapp_Interp(self); / and this too */
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	665
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	666 if (!(tmp = PyList_New(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	667 return NULL;
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	668
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	669 argv = argvStore;
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	670 fv = fvStore;
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	671
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	672 if (args == NULL)
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	673 argc = 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	674
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	675 else if (!PyTuple_Check(args)) {
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	676 argc = 1;
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	677 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	678 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	679 goto finally;
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	680 }
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	681 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	682 argc = PyTuple_Size(args);
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	683
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	684 if (argc > ARGSZ) {
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	685 argv = (char *)ckalloc(argc sizeof(char *));
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	686 fv = (int )ckalloc(argc sizeof(int));
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	687 if (argv == NULL \|\| fv == NULL) {
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	688 PyErr_NoMemory();
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	689 goto finally;
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	690 }
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	691 }
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	692
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	693 for (i = 0; i < argc; 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	694 PyObject *v = PyTuple_GetItem(args, 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	695 if (PyTuple_Check(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	696 fv[i] = 1;
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	697 if (!(argv[i] = Merge(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	698 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	699 fvc++;
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	700 }
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	701 else if (v == Py_None) {
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	702 argc = 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	703 break;
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	704 }
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	705 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	706 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	707 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	708 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	709 fvc++;
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	710 }
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	711 }
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	712 }
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	713 /* End code copied from Merge() */
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	714
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	715 /* All this to avoid a call to Tcl_Merge() and the corresponding call
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	716 to Tcl_SplitList() inside Tcl_Eval()... It can save a bundle! */
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	717 if (Py_VerboseFlag >= 2) {
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	718 for (i = 0; i < argc; 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	719 PySys_WriteStderr("%s ", argv[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	720 }
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	721 ENTER_TCL
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	722 info.proc = NULL;
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	723 if (argc < 1 \|\|
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	724 !Tcl_GetCommandInfo(interp, argv[0], &info) \|\|
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	725 info.proc == NULL)
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	726 {
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	727 char *cmd;
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	728 cmd = Tcl_Merge(argc, 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	729 i = Tcl_Eval(interp, cmd);
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	730 ckfree(cmd);
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	731 }
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	732 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	733 Tcl_ResetResult(interp);
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	734 i = (*info.proc)(info.clientData, interp, argc, 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	735 }
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	736 ENTER_OVERLAP
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	737 if (info.proc == NULL && Py_VerboseFlag >= 2)
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	738 PySys_WriteStderr("... use TclEval ");
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	739 if (i == TCL_ERROR) {
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	740 if (Py_VerboseFlag >= 2)
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	741 PySys_WriteStderr("... error: '%s'\n",
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	742 interp->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	743 Tkinter_Error(self);
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	744 }
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	745 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	746 if (Py_VerboseFlag >= 2)
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	747 PySys_WriteStderr("-> '%s'\n", interp->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	748 res = PyString_FromString(interp->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	749 }
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	750 LEAVE_OVERLAP_TCL
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	751
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	752 /* Copied from Merge() again */
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	753 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	754 for (i = 0; i < fvc; i++)
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	755 if (fv[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	756 ckfree(argv[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	757 }
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	758 if (argv != argvStore)
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	759 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	760 if (fv != fvStore)
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	761 ckfree(FREECAST fv);
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	762
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	763 Py_DECREF(tmp);
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	764 return res;
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	765 }
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	766
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	767 #endif /* !USING_OBJECTS */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	768
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	769 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	770 Tkapp_GlobalCall(PyObject self, PyObject args)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	771 {
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	772 /* 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	773 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	774 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	775 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	776 scope pointer). */
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	777
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	778 char *cmd;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	779 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	780
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	781 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	782 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	783 int err;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	784 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	785 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	786 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	787 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	788 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	789 else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	790 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	791 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	792 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	793 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	794
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	795 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	796 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	797
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	798 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	799 Tkapp_Eval(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	800 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	801 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	802 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	803 int err;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	804
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	805 if (!PyArg_ParseTuple(args, "s:eval", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	806 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	807
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	808 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	809 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	810 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	811 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	812 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	813 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	814 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	815 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	816 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	817 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	818
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	819 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	820 Tkapp_GlobalEval(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	821 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	822 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	823 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	824 int err;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	825
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	826 if (!PyArg_ParseTuple(args, "s:globaleval", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	827 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	828
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	829 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	830 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	831 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	832 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	833 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	834 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	835 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	836 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	837 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	838 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	839
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	840 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	841 Tkapp_EvalFile(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	842 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	843 char *fileName;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	844 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	845 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	846
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	847 if (!PyArg_ParseTuple(args, "s:evalfile", &fileName))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	848 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	849
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	850 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	851 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	852 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	853 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	854 res = Tkinter_Error(self);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	855
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	856 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	857 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	858 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	859 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	860 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	861
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	862 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	863 Tkapp_Record(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	864 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	865 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	866 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	867 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	868
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	869 if (!PyArg_ParseTuple(args, "s", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	870 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	871
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	872 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	873 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	874 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	875 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	876 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	877 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	878 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	879 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	880 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	881 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	882
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	883 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	884 Tkapp_AddErrorInfo(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	885 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	886 char *msg;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	887
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	888 if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	889 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	890 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	891 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	892 LEAVE_TCL
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	893
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	894 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	895 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	896 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	897
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	898
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	899
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	900 / Tcl Variable /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	901
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	902 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	903 SetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	904 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	905 char name1, name2, ok, s;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	906 PyObject *newValue;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	907 PyObject *tmp;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	908
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	909 tmp = PyList_New(0);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	910 if (!tmp)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	911 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	912
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	913 if (PyArg_ParseTuple(args, "sO:setvar", &name1, &newValue)) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	914 /* XXX Merge? */
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	915 s = AsString(newValue, 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	916 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	917 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	918 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	919 ok = Tcl_SetVar(Tkapp_Interp(self), name1, s, flags);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	920 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	921 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	922 else {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	923 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	924 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	925 &name1, &name2, &newValue)) {
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	926 s = AsString(newValue, 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	927 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	928 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	929 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	930 ok = Tcl_SetVar2(Tkapp_Interp(self), name1, name2,
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	931 s, flags);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	932 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	933 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	934 else {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	935 Py_DECREF(tmp);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	936 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	937 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	938 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	939 Py_DECREF(tmp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	940
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	941 if (!ok)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	942 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	943
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	944 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	945 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	946 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	947
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	948 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	949 Tkapp_SetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	950 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	951 return SetVar(self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	952 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	953
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	954 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	955 Tkapp_GlobalSetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	956 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	957 return SetVar(self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	958 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	959
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	960
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	961
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	962 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	963 GetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	964 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	965 char name1, name2=NULL, *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	966 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	967
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	968 if (!PyArg_ParseTuple(args, "s\|s:getvar", &name1, &name2))
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	969 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	970 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	971 if (name2 == NULL)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	972 s = Tcl_GetVar(Tkapp_Interp(self), name1, flags);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	973
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	974 else
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	975 s = Tcl_GetVar2(Tkapp_Interp(self), name1, name2, flags);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	976 ENTER_OVERLAP
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	977
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	978 if (s == NULL)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	979 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	980 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	981 res = PyString_FromString(s);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	982 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	983 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	984 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	985
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	986 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	987 Tkapp_GetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	988 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	989 return GetVar(self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	990 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	991
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	992 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	993 Tkapp_GlobalGetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	994 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	995 return GetVar(self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	996 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	997
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	998
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	999
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1000 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1001 UnsetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1002 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1003 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	1004 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1005 int code;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1006
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1007 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	1008 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	1009 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1010 if (name2 == NULL)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1011 code = Tcl_UnsetVar(Tkapp_Interp(self), name1, flags);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1012
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1013 else
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1014 code = Tcl_UnsetVar2(Tkapp_Interp(self), name1, name2, flags);
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1015 ENTER_OVERLAP
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1016
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1017 if (code == TCL_ERROR)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1018 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1019 else {
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1020 Py_INCREF(Py_None);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1021 res = Py_None;
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1022 }
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1023 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1024 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1025 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1026
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1027 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1028 Tkapp_UnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1029 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1030 return UnsetVar(self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1031 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1032
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1033 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1034 Tkapp_GlobalUnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1035 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1036 return UnsetVar(self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1037 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1038
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1039
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1040
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1041 / Tcl to Python /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1042
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1043 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1044 Tkapp_GetInt(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1045 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1046 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1047 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1048
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1049 if (!PyArg_ParseTuple(args, "s:getint", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1050 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1051 if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1052 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1053 return Py_BuildValue("i", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1054 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1055
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1056 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1057 Tkapp_GetDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1058 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1059 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1060 double v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1061
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1062 if (!PyArg_ParseTuple(args, "s:getdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1063 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1064 if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1065 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1066 return Py_BuildValue("d", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1067 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1068
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1069 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1070 Tkapp_GetBoolean(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1071 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1072 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1073 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1074
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1075 if (!PyArg_ParseTuple(args, "s:getboolean", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1076 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1077 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	1078 return Tkinter_Error(self);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1079 return Py_BuildValue("i", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1080 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1081
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1082 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1083 Tkapp_ExprString(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1084 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1085 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1086 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	1087 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1088
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1089 if (!PyArg_ParseTuple(args, "s:exprstring", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1090 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	1091 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1092 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	1093 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	1094 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	1095 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1096 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1097 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	1098 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1099 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1100 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1101
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1102 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1103 Tkapp_ExprLong(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1104 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1105 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1106 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	1107 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1108 long v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1109
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1110 if (!PyArg_ParseTuple(args, "s:exprlong", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1111 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	1112 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1113 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	1114 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	1115 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	1116 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1117 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1118 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	1119 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1120 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1121 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1122
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1123 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1124 Tkapp_ExprDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1125 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1126 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1127 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1128 double v;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1129 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1130
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1131 if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1132 return NULL;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1133 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	1134 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1135 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	1136 ENTER_OVERLAP
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5120 diff changeset	1137 PyFPE_END_PROTECT(retval)
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1138 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	1139 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1140 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1141 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	1142 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1143 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1144 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1145
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1146 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1147 Tkapp_ExprBoolean(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1148 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1149 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1150 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	1151 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1152 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1153
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1154 if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1155 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	1156 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1157 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	1158 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	1159 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	1160 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1161 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1162 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	1163 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1164 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1165 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1166
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1167
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1168
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1169 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1170 Tkapp_SplitList(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1171 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1172 char *list;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1173 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1174 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1175 PyObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1176 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1177
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1178 if (!PyArg_ParseTuple(args, "s:splitlist", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1179 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1180
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1181 if (Tcl_SplitList(Tkapp_Interp(self), list, &argc, &argv) == TCL_ERROR)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1182 return Tkinter_Error(self);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1183
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1184 if (!(v = PyTuple_New(argc)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1185 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1186
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1187 for (i = 0; i < argc; i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1188 PyObject *s = PyString_FromString(argv[i]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1189 if (!s \|\| PyTuple_SetItem(v, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1190 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1191 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1192 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1193 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1194 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1195
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1196 finally:
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1197 ckfree(FREECAST argv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1198 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1199 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1200
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1201 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1202 Tkapp_Split(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1203 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1204 char *list;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1205
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1206 if (!PyArg_ParseTuple(args, "s:split", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1207 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	1208 return Split(list);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1209 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1210
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1211 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1212 Tkapp_Merge(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1213 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1214 char *s = Merge(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1215 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1216
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1217 if (s) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1218 res = PyString_FromString(s);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1219 ckfree(s);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1220 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1221
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1222 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1223 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1224
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1225
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1226
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1227 / Tcl Command /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1228
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1229 /* 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	1230 typedef struct {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1231 PyObject *self;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1232 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1233 } PythonCmd_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1234
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1235 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1236 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	1237 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1238 errorInCmd = 1;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1239 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	1240 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1241 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	1242 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1243
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1244 /* This is the Tcl command that acts as a wrapper for Python
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1245 * function or method.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1246 */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1247 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1248 PythonCmd(ClientData clientData, Tcl_Interp interp, int argc, char argv[])
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1249 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1250 PythonCmd_ClientData data = (PythonCmd_ClientData )clientData;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1251 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	1252 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	1253 char *s;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1254
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	1255 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	1256
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1257 /* TBD: no error checking here since we know, via the
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1258 * Tkapp_CreateCommand() that the client data is a two-tuple
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1259 */
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1260 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	1261 func = data->func;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1262
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1263 /* Create argument list (argv1, ..., argvN) */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1264 if (!(arg = PyTuple_New(argc - 1)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1265 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1266
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1267 for (i = 0; i < (argc - 1); i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1268 PyObject *s = PyString_FromString(argv[i + 1]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1269 if (!s \|\| PyTuple_SetItem(arg, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1270 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	1271 return PythonCmd_Error(interp);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1272 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1273 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1274 res = PyEval_CallObject(func, arg);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1275 Py_DECREF(arg);
1713 bb566d28caa0 * tkintermodule.c Guido van Rossum <guido@python.org> parents: 1690 diff changeset	1276
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1277 if (res == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1278 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1279
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1280 if (!(tmp = PyList_New(0))) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1281 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1282 return PythonCmd_Error(interp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1283 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1284
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	1285 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	1286 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	1287 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	1288 }
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	1289 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	1290 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	1291 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	1292 }
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	1293
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1294 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1295 Py_DECREF(tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1296
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1297 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1298
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	1299 return rv;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1300 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1301
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1302 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1303 PythonCmdDelete(ClientData clientData)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1304 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1305 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	1306
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	1307 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	1308 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	1309 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	1310 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	1311 LEAVE_PYTHON
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1312 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1313
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1314
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1315
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1316 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1317 Tkapp_CreateCommand(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1318 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1319 PythonCmd_ClientData *data;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1320 char *cmdName;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1321 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	1322 Tcl_Command err;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1323
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1324 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	1325 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1326 if (!PyCallable_Check(func)) {
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1327 PyErr_SetString(PyExc_TypeError, "command not callable");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1328 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1329 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1330
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1331 data = PyMem_NEW(PythonCmd_ClientData, 1);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1332 if (!data)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1333 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	1334 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	1335 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	1336 data->self = self;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1337 data->func = func;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1338
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1339 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1340 err = Tcl_CreateCommand(Tkapp_Interp(self), cmdName, PythonCmd,
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1341 (ClientData)data, PythonCmdDelete);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1342 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1343 if (err == NULL) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1344 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	1345 PyMem_DEL(data);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1346 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1347 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1348
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1349 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1350 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1351 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: 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
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1355 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1356 Tkapp_DeleteCommand(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1357 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1358 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	1359 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1360
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1361 if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1362 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	1363 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1364 err = Tcl_DeleteCommand(Tkapp_Interp(self), cmdName);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1365 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1366 if (err == -1) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1367 PyErr_SetString(Tkinter_TclError, "can't delete Tcl command");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1368 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1369 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1370 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1371 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1372 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1373
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1374
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1375
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1376 #ifdef HAVE_CREATEFILEHANDLER
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1377 / File Handler /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1378
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1379 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	1380 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1381 PyObject *file;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1382 int id;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1383 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	1384 } FileHandler_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1385
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1386 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	1387
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1388 static FileHandler_ClientData *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1389 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	1390 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1391 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	1392 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	1393 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	1394 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	1395 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	1396 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	1397 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	1398 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	1399 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	1400 HeadFHCD = p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1401 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1402 return p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1403 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1404
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1405 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1406 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	1407 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1408 FileHandler_ClientData p, *pp;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1409
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1410 pp = &HeadFHCD;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1411 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	1412 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	1413 *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	1414 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	1415 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	1416 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	1417 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1418 else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1419 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	1420 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1421 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1422
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	1423 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1424 FileHandler(ClientData clientData, int mask)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1425 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1426 FileHandler_ClientData data = (FileHandler_ClientData )clientData;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1427 PyObject func, file, arg, res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1428
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	1429 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	1430 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	1431 file = data->file;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1432
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1433 arg = Py_BuildValue("(Oi)", file, (long) mask);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1434 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	1435 Py_DECREF(arg);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1436
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1437 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1438 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1439 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1440 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1441 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	1442 LEAVE_PYTHON
1771 51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	1443 }
51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	1444
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1445 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1446 Tkapp_CreateFileHandler(PyObject self, PyObject args)
346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1447 /* args is (file, mask, func) */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1448 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1449 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	1450 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	1451 int mask, tfile;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1452
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	1453 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	1454 &file, &mask, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1455 return NULL;
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	1456 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	1457 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1458 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1459 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	1460 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1461 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1462 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1463
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	1464 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	1465 if (data == NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1466 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1467
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1468 /* 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	1469 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1470 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	1471 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1472 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1473 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1474 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1475
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1476 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1477 Tkapp_DeleteFileHandler(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1478 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1479 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	1480 int tfile;
3554 24279bafa828 Patch from the net for 4.1 file handler changes. Guido van Rossum <guido@python.org> parents: 3553 diff changeset	1481
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1482 if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1483 return NULL;
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	1484 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	1485 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1486 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1487
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	1488 DeleteFHCD(tfile);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1489
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1490 /* 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	1491 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1492 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	1493 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1494 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1495 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1496 }
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	1497 #endif /* HAVE_CREATEFILEHANDLER */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1498
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1499
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1500 /** 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	1501
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1502 staticforward 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	1503
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1504 typedef struct {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1505 PyObject_HEAD
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1506 Tcl_TimerToken token;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1507 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	1508 } TkttObject;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1509
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1510 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1511 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	1512 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1513 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	1514 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	1515
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1516 if (!PyArg_ParseTuple(args, ":deletetimerhandler"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1517 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	1518 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	1519 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	1520 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	1521 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1522 if (func != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1523 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	1524 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	1525 Py_DECREF(v); /* See Tktt_New() */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1526 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1527 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1528 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	1529 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1530
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1531 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	1532 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1533 {"deletetimerhandler", Tktt_DeleteTimerHandler, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1534 {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	1535 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1536
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1537 static TkttObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1538 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	1539 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1540 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	1541
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	1542 v = PyObject_New(TkttObject, &Tktt_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1543 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1544 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	1545
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1546 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	1547 v->token = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1548 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	1549
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1550 /* 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	1551 Py_INCREF(v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1552 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	1553 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1554
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1555 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1556 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	1557 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1558 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	1559 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	1560
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1561 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	1562
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	1563 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	1564 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1565
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	1566 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1567 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	1568 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1569 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	1570 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	1571
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12958 diff changeset	1572 sprintf(buf, "<tktimertoken at %p%s>", v,
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1573 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	1574 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	1575 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1576
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1577 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1578 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	1579 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1580 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	1581 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1582
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1583 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	1584 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1585 PyObject_HEAD_INIT(NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1586 0, /ob_size /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1587 "tktimertoken", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1588 sizeof(TkttObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1589 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1590 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	1591 0, /tp_print /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1592 Tktt_GetAttr, /tp_getattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1593 0, /tp_setattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1594 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	1595 Tktt_Repr, /tp_repr /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1596 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1597 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1598 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1599 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	1600 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1601
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1602
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1603
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1604 / Timer Handler /
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1605
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1606 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1607 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	1608 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1609 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	1610 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	1611 PyObject *res;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1612
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1613 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	1614 return;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1615
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1616 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	1617
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	1618 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	1619
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1620 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	1621 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	1622 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	1623
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1624 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1625 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1626 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1627 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1628 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1629 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	1630
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1631 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	1632 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1633
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1634 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1635 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	1636 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1637 int milliseconds;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1638 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	1639 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	1640
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	1641 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	1642 &milliseconds, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1643 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1644 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	1645 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1646 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1647 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1648 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	1649 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	1650 (ClientData)v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1651
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1652 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	1653 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1654
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1655
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1656 / Event Loop /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1657
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1658 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1659 Tkapp_MainLoop(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1660 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1661 int threshold = 0;
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	1662 #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	1663 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	1664 #endif
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1665
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1666 if (!PyArg_ParseTuple(args, "\|i:mainloop", &threshold))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1667 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1668
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1669 quitMainLoop = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1670 while (Tk_GetNumMainWindows() > threshold &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1671 !quitMainLoop &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1672 !errorInCmd)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1673 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1674 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	1675
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1676 #ifdef WITH_THREAD
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1677 Py_BEGIN_ALLOW_THREADS
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	1678 PyThread_acquire_lock(tcl_lock, 1);
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	1679 tcl_tstate = tstate;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1680 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	1681 tcl_tstate = NULL;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	1682 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	1683 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	1684 Sleep(20);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1685 Py_END_ALLOW_THREADS
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	1686 #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	1687 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	1688 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1689
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1690 if (PyErr_CheckSignals() != 0)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1691 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1692 if (result < 0)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1693 break;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1694 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1695 quitMainLoop = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1696
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1697 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1698 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1699 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1700 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1701 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1702 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1703 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1704 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1705 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1706
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1707 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1708 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	1709 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1710 int flags = 0;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1711 int rv;
2121 86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	1712
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1713 if (!PyArg_ParseTuple(args, "\|i:dooneevent", &flags))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1714 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1715
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1716 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1717 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	1718 LEAVE_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1719 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	1720 }
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	1721
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	1722 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1723 Tkapp_Quit(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1724 {
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1725
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1726 if (!PyArg_ParseTuple(args, ":quit"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1727 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1728
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1729 quitMainLoop = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1730 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1731 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1732 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1733
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1734 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1735 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	1736 {
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1737
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1738 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	1739 return NULL;
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1740
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1741 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	1742 }
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1743
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1744
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1745
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1746 /** Tkapp Method List **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1747
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1748 static PyMethodDef Tkapp_methods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1749 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1750 {"call", Tkapp_Call, 0},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1751 {"globalcall", Tkapp_GlobalCall, 0},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1752 {"eval", Tkapp_Eval, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1753 {"globaleval", Tkapp_GlobalEval, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1754 {"evalfile", Tkapp_EvalFile, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1755 {"record", Tkapp_Record, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1756 {"adderrorinfo", Tkapp_AddErrorInfo, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1757 {"setvar", Tkapp_SetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1758 {"globalsetvar", Tkapp_GlobalSetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1759 {"getvar", Tkapp_GetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1760 {"globalgetvar", Tkapp_GlobalGetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1761 {"unsetvar", Tkapp_UnsetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1762 {"globalunsetvar", Tkapp_GlobalUnsetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1763 {"getint", Tkapp_GetInt, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1764 {"getdouble", Tkapp_GetDouble, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1765 {"getboolean", Tkapp_GetBoolean, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1766 {"exprstring", Tkapp_ExprString, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1767 {"exprlong", Tkapp_ExprLong, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1768 {"exprdouble", Tkapp_ExprDouble, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1769 {"exprboolean", Tkapp_ExprBoolean, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1770 {"splitlist", Tkapp_SplitList, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1771 {"split", Tkapp_Split, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1772 {"merge", Tkapp_Merge, 0},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1773 {"createcommand", Tkapp_CreateCommand, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1774 {"deletecommand", Tkapp_DeleteCommand, 1},
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	1775 #ifdef HAVE_CREATEFILEHANDLER
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1776 {"createfilehandler", Tkapp_CreateFileHandler, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1777 {"deletefilehandler", Tkapp_DeleteFileHandler, 1},
5954 d3835a6a18c9 Rather unsatisfactory temporary hack to get it to run Guido van Rossum <guido@python.org> parents: 5947 diff changeset	1778 #endif
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1779 {"createtimerhandler", Tkapp_CreateTimerHandler, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1780 {"mainloop", Tkapp_MainLoop, 1},
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1781 {"dooneevent", Tkapp_DoOneEvent, 1},
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1782 {"quit", Tkapp_Quit, 1},
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1783 {"interpaddr", Tkapp_InterpAddr, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1784 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1785 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1786
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1787
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1788
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1789 /** Tkapp Type Methods **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1790
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1791 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1792 Tkapp_Dealloc(PyObject *self)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1793 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1794 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1795 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	1796 LEAVE_TCL
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	1797 PyObject_Del(self);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1798 DisableEventHook();
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1799 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1800
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1801 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1802 Tkapp_GetAttr(PyObject self, char name)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1803 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1804 return Py_FindMethod(Tkapp_methods, self, name);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1805 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1806
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1807 static PyTypeObject Tkapp_Type =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1808 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1809 PyObject_HEAD_INIT(NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1810 0, /ob_size /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1811 "tkapp", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1812 sizeof(TkappObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1813 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1814 Tkapp_Dealloc, /tp_dealloc /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1815 0, /tp_print /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1816 Tkapp_GetAttr, /tp_getattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1817 0, /tp_setattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1818 0, /tp_compare /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1819 0, /tp_repr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1820 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1821 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1822 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1823 0, /tp_hash /
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1824 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1825
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1826
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1827
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1828 /** Tkinter Module **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1829
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1830 typedef struct {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1831 PyObject* tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1832 int size; /* current size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1833 int maxsize; /* allocated size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1834 } FlattenContext;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1835
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1836 static int
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1837 _bump(FlattenContext* context, int size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1838 {
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	1839 /* 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	1840 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	1841
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1842 int maxsize = context->maxsize * 2;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1843
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1844 if (maxsize < context->size + size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1845 maxsize = context->size + size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1846
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1847 context->maxsize = maxsize;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1848
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1849 return _PyTuple_Resize(&context->tuple, maxsize, 0) >= 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1850 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1851
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1852 static int
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1853 _flatten1(FlattenContext* context, PyObject* item, int depth)
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1854 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1855 /* add tuple or list to argument tuple (recursively) */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1856
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1857 int i, size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1858
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1859 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	1860 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	1861 "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	1862 return 0;
3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1863 } else if (PyList_Check(item)) {
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1864 size = PyList_GET_SIZE(item);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1865 /* 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	1866 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	1867 !_bump(context, size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1868 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1869 /* copy items to output tuple */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1870 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1871 PyObject *o = PyList_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1872 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	1873 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1874 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1875 } 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	1876 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	1877 !_bump(context, 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1878 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1879 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	1880 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	1881 context->size++, o);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1882 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1883 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1884 } else if (PyTuple_Check(item)) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1885 /* same, for tuples */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1886 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	1887 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	1888 !_bump(context, size))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1889 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1890 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1891 PyObject *o = PyTuple_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1892 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	1893 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1894 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1895 } 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	1896 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	1897 !_bump(context, 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1898 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1899 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	1900 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	1901 context->size++, o);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1902 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1903 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1904 } else {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1905 PyErr_SetString(PyExc_TypeError, "argument must be sequence");
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1906 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1907 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1908 return 1;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1909 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1910
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1911 static PyObject *
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1912 Tkinter_Flatten(PyObject* self, PyObject* args)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1913 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1914 FlattenContext context;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1915 PyObject* item;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1916
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1917 if (!PyArg_ParseTuple(args, "O:_flatten", &item))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1918 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1919
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13503 diff changeset	1920 context.maxsize = PySequence_Size(item);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1921 if (context.maxsize <= 0)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1922 return PyTuple_New(0);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1923
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1924 context.tuple = PyTuple_New(context.maxsize);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1925 if (!context.tuple)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1926 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1927
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1928 context.size = 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1929
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1930 if (!_flatten1(&context, item,0))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1931 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1932
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1933 if (_PyTuple_Resize(&context.tuple, context.size, 0))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1934 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1935
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1936 return context.tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1937 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1938
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1939 static PyObject *
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	1940 Tkinter_Create(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1941 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1942 char *screenName = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1943 char *baseName = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1944 char *className = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1945 int interactive = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1946
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1947 baseName = strrchr(Py_GetProgramName(), '/');
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1948 if (baseName != NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1949 baseName++;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1950 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1951 baseName = Py_GetProgramName();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1952 className = "Tk";
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1953
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1954 if (!PyArg_ParseTuple(args, "\|zssi:create",
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1955 &screenName, &baseName, &className,
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1956 &interactive))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1957 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1958
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1959 return (PyObject *) Tkapp_New(screenName, baseName, className,
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1960 interactive);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1961 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1962
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1963 static PyMethodDef moduleMethods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1964 {
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1965 {"_flatten", Tkinter_Flatten, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1966 {"create", Tkinter_Create, 1},
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	1967 #ifdef HAVE_CREATEFILEHANDLER
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1968 {"createfilehandler", Tkapp_CreateFileHandler, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1969 {"deletefilehandler", Tkapp_DeleteFileHandler, 1},
5954 d3835a6a18c9 Rather unsatisfactory temporary hack to get it to run Guido van Rossum <guido@python.org> parents: 5947 diff changeset	1970 #endif
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1971 {"createtimerhandler", Tkapp_CreateTimerHandler, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1972 {"mainloop", Tkapp_MainLoop, 1},
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1973 {"dooneevent", Tkapp_DoOneEvent, 1},
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1974 {"quit", Tkapp_Quit, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1975 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1976 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1977
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1978 #ifdef WAIT_FOR_STDIN
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1979
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1980 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	1981
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	1982 #ifndef MS_WINDOWS
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1983 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1984 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	1985 {
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1986 stdin_ready = 1;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1987 }
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	1988 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1989
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1990 static PyThreadState *event_tstate = NULL;
6438 9e46ecf03c3e Fix EventHook (the trick to make widgets appear when using GNU Guido van Rossum <guido@python.org> parents: 6343 diff changeset	1991
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1992 static int
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	1993 EventHook(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1994 {
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	1995 #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	1996 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	1997 #endif
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	1998 #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	1999 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	2000 #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	2001 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	2002 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	2003 #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	2004 tfile = fileno(stdin);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2005 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	2006 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2007 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	2008 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	2009 #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	2010 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	2011 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	2012 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	2013 }
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	2014 #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	2015 #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	2016 Py_BEGIN_ALLOW_THREADS
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	2017 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	2018 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	2019
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2020 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	2021
8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	2022 tcl_tstate = NULL;
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 diff changeset	2023 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	2024 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	2025 Sleep(20);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2026 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	2027 #else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2028 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	2029 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2030
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2031 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	2032 break;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2033 }
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	2034 #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	2035 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	2036 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2037 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2038 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2039 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2040 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2041 PyErr_Print();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2042 }
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2043 #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	2044 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	2045 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2046 return 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2047 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2048
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2049 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2050
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2051 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2052 EnableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2053 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2054 #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	2055 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	2056 #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	2057 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	2058 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2059 PyOS_InputHook = EventHook;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2060 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2061 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2062 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2063
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2064 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2065 DisableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2066 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2067 #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	2068 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	2069 PyOS_InputHook = NULL;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2070 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2071 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2072 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2073
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2074
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2075 /* all errors will be checked in one fell swoop in init_tkinter() */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2076 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2077 ins_long(PyObject d, char name, long val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2078 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2079 PyObject *v = PyInt_FromLong(val);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2080 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2081 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2082 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2083 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2084 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2085 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2086 ins_string(PyObject d, char name, char *val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2087 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2088 PyObject *v = PyString_FromString(val);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2089 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2090 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2091 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2092 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2093 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2094
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2095
9588 38023a425e48 Add DL_EXPORT() to all modules that could possibly be used Guido van Rossum <guido@python.org> parents: 9488 diff changeset	2096 DL_EXPORT(void)
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2097 init_tkinter(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2098 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2099 PyObject m, d;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2100
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2101 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	2102
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2103 #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	2104 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	2105 #endif
4091 dc946cab7b9b Hacks to support being a Windows DLL Guido van Rossum <guido@python.org> parents: 4079 diff changeset	2106
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2107 m = Py_InitModule("_tkinter", moduleMethods);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2108
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2109 d = PyModule_GetDict(m);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2110 Tkinter_TclError = Py_BuildValue("s", "TclError");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2111 PyDict_SetItemString(d, "TclError", Tkinter_TclError);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2112
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2113 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	2114 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	2115 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	2116 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	2117 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	2118 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	2119 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	2120 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	2121 ins_long(d, "DONT_WAIT", TCL_DONT_WAIT);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2122 ins_string(d, "TK_VERSION", TK_VERSION);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2123 ins_string(d, "TCL_VERSION", TCL_VERSION);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2124
6311 13fbd98d81cc Export names for the types defined by this module: TkappType and TkttType. Guido van Rossum <guido@python.org> parents: 6265 diff changeset	2125 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	2126
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2127 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	2128 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	2129
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	2130 /* 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	2131 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	2132 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	2133
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2134 if (PyErr_Occurred())
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	2135 return;
b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	2136
8670 07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	2137 #if 0
07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	2138 /* 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	2139 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	2140 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	2141 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	2142 #endif
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	2143
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2144 #ifdef macintosh
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2145 /*
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2146 ** Part of this code is stolen from MacintoshInit in tkMacAppInit.
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2147 ** Most of the initializations in that routine (toolbox init calls and
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2148 ** such) have already been done for us, so we only need these.
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2149 */
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2150 tcl_macQdPtr = &qd;
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2151
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2152 Tcl_MacSetEventProc(PyMacConvertEvent);
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2153 #if GENERATINGCFM
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2154 mac_addlibresources();
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2155 #endif /* GENERATINGCFM */
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2156 #endif /* macintosh */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2157 }
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2158
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2159
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2160
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2161 #ifdef macintosh
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2162
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2163 /*
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2164 ** Anyone who embeds Tcl/Tk on the Mac must define panic().
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2165 */
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2166
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2167 void
4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2168 panic(char * format, ...)
4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2169 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2170 va_list varg;
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2171
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2172 va_start(varg, format);
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2173
8828 8532141cff4c Undo a silly effect of a global substitution: the macintosh panic() Guido van Rossum <guido@python.org> parents: 8670 diff changeset	2174 vfprintf(stderr, format, varg);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2175 (void) fflush(stderr);
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2176
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2177 va_end(varg);
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2178
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2179 Py_FatalError("Tcl/Tk panic");
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2180 }
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2181
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2182 /*
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2183 ** Pass events to SIOUX before passing them to Tk.
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2184 */
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2185
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2186 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2187 PyMacConvertEvent(EventRecord *eventPtr)
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2188 {
8185 929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2189 WindowPtr frontwin;
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2190 /*
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2191 ** Sioux eats too many events, so we don't pass it everything. We
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2192 ** always pass update events to Sioux, and we only pass other events if
8185 929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2193 ** the Sioux window is frontmost. This means that Tk menus don't work
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2194 ** in that case, but at least we can scroll the sioux window.
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2195 ** Note that the SIOUXIsAppWindow() routine we use here is not really
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2196 ** part of the external interface of Sioux...
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2197 */
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2198 frontwin = FrontWindow();
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2199 if ( eventPtr->what == updateEvt \|\| SIOUXIsAppWindow(frontwin) ) {
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2200 if (SIOUXHandleOneEvent(eventPtr))
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2201 return 0; /* Nothing happened to the Tcl event queue */
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2202 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2203 return TkMacConvertEvent(eventPtr);
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2204 }
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2205
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2206 #if GENERATINGCFM
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2207
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2208 /*
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2209 ** Additional Mac specific code for dealing with shared libraries.
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2210 */
3262 bfb63b45ff0f Initialize GUSI on the mac. Jack Jansen <jack.jansen@cwi.nl> parents: 3240 diff changeset	2211
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2212 #include <Resources.h>
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2213 #include <CodeFragments.h>
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2214
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2215 static int loaded_from_shlib = 0;
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2216 static FSSpec library_fss;
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2217
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2218 /*
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2219 ** If this module is dynamically loaded the following routine should
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2220 ** be the init routine. It takes care of adding the shared library to
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2221 ** the resource-file chain, so that the tk routines can find their
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2222 ** resources.
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2223 */
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2224 OSErr pascal
5360 f858038b64c2 Adapt Mac specific code to new universal headers (I think -- this is Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2225 init_tkinter_shlib(CFragInitBlockPtr data)
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2226 {
4139 010344b4a616 Call __initialize(), not __sinit() on Mac dynamic loading entry. Guido van Rossum <guido@python.org> parents: 4091 diff changeset	2227 __initialize();
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2228 if ( data == nil ) return noErr;
5360 f858038b64c2 Adapt Mac specific code to new universal headers (I think -- this is Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2229 if ( data->fragLocator.where == kDataForkCFragLocator ) {
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2230 library_fss = *data->fragLocator.u.onDisk.fileSpec;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2231 loaded_from_shlib = 1;
5360 f858038b64c2 Adapt Mac specific code to new universal headers (I think -- this is Guido van Rossum <guido@python.org> parents: 5197 diff changeset	2232 } else if ( data->fragLocator.where == kResourceCFragLocator ) {
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2233 library_fss = *data->fragLocator.u.inSegs.fileSpec;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2234 loaded_from_shlib = 1;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2235 }
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2236 return noErr;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2237 }
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2238
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2239 /*
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2240 ** Insert the library resources into the search path. Put them after
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2241 ** the resources from the application. Again, we ignore errors.
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2242 */
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2243 static
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2244 mac_addlibresources(void)
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2245 {
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2246 if ( !loaded_from_shlib )
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2247 return;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2248 (void)FSpOpenResFile(&library_fss, fsRdPerm);
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2249 }
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2250
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2251 #endif /* GENERATINGCFM */
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2252 #endif /* macintosh */

Mercurial > cpython-lru_cache-weakref

annotate Modules/_tkinter.c @ 15164:8930ec3bc00a legacy-trunk