cpython-lru_cache-weakref: Modules/

annotate Modules/_tkinter.c @ 14914:79cdeeeefafa legacy-trunk

Removed the implib_dir instance variable because it is unused. Removed get_ext_libname() because it is unused. Fixed get_libraries() to append an '_d' to the python debug import library. If MSVC is used, do not add 'pythonxx.lib' to the list of libraries, because this is handled better by a pragma in config.h. This should fix bug #115595, but it needs some more testing.

author	Thomas Heller <theller@ctypes.org>
date	Thu, 28 Sep 2000 19:28:35 +0000
parents	6f6f965c5e2d
children	6e9ff060a728

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
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	60 #if !defined(MS_WINDOWS)
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 \
9679 877d23bd5bdc Thanks to Chris Herborth, the thread primitives now have proper Py* Guido van Rossum <guido@python.org> parents: 9588 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);
346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	180 void Tcl_MacSetEventProc (TclMacConvertEventPtr procPtr);
346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 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
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 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);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	264 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	265 PyObject *v = PyObject_Str(value);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	266 PyList_Append(tmp, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	267 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	268 return PyString_AsString(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	269 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	270 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	271
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	272
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	273
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	274 #define ARGSZ 64
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	275
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	276 static char *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	277 Merge(PyObject *args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	278 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	279 PyObject *tmp = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	280 char *argvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	281 char **argv = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	282 int fvStore[ARGSZ];
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	283 int *fv = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	284 int argc = 0, i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	285 char *res = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	286
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	287 if (!(tmp = PyList_New(0)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	288 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	289
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	290 argv = argvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	291 fv = fvStore;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	292
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	293 if (args == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	294 argc = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	295
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	296 else if (!PyTuple_Check(args)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	297 argc = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	298 fv[0] = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	299 argv[0] = AsString(args, tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	300 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	301 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	302 argc = PyTuple_Size(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	303
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	304 if (argc > ARGSZ) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	305 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	306 fv = (int )ckalloc(argc sizeof(int));
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	307 if (argv == NULL \|\| fv == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	308 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	309 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	310 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	311 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	312
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	313 for (i = 0; i < argc; i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	314 PyObject *v = PyTuple_GetItem(args, i);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	315 if (PyTuple_Check(v)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	316 fv[i] = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	317 if (!(argv[i] = Merge(v)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	318 goto finally;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	319 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	320 else if (v == Py_None) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	321 argc = i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	322 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	323 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	324 else {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	325 fv[i] = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	326 argv[i] = AsString(v, tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	327 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	328 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	329 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	330 res = Tcl_Merge(argc, argv);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	331
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	332 finally:
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	333 for (i = 0; i < argc; i++)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	334 if (fv[i]) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	335 ckfree(argv[i]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	336 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	337 if (argv != argvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	338 ckfree(FREECAST argv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	339 if (fv != fvStore)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	340 ckfree(FREECAST fv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	341
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	342 Py_DECREF(tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	343 return res;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	344 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	345
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	346
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	347
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	348 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	349 Split(char *list)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	350 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	351 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	352 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	353 PyObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	354
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	355 if (list == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	356 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	357 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	358 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	359
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	360 if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	361 /* Not a list.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	362 * Could be a quoted string containing funnies, e.g. {"}.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	363 * Return the string itself.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	364 */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	365 return PyString_FromString(list);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	366 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	367
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	368 if (argc == 0)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	369 v = PyString_FromString("");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	370 else if (argc == 1)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	371 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	372 else if ((v = PyTuple_New(argc)) != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	373 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	374 PyObject *w;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	375
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	376 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	377 if ((w = Split(argv[i])) == NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	378 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	379 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	380 break;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	381 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	382 PyTuple_SetItem(v, i, w);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	383 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	384 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	385 Tcl_Free(FREECAST argv);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	386 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	387 }
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
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	391 /** Tkapp Object **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	392
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	393 #ifndef WITH_APPINIT
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	394 int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	395 Tcl_AppInit(Tcl_Interp *interp)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	396 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	397 Tk_Window main;
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	398
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	399 main = Tk_MainWindow(interp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	400 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	401 PySys_WriteStderr("Tcl_Init error: %s\n", interp->result);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	402 return TCL_ERROR;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	403 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	404 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	405 PySys_WriteStderr("Tk_Init error: %s\n", interp->result);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	406 return TCL_ERROR;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	407 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	408 return TCL_OK;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	409 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	410 #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	411
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	412
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	413
1664 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 /* Initialize the Tk application; see the `main' function in
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	416 * `tkMain.c'.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	417 */
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	418
13690 c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	419 static void EnableEventHook(void); /* Forward */
c09c0171474f ANSIfy some more forward declarations. Thomas Wouters <thomas@python.org> parents: 13651 diff changeset	420 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	421
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	422 static TkappObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	423 Tkapp_New(char screenName, char baseName, char *className, int interactive)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	424 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	425 TkappObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	426 char *argv0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	427
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	428 v = PyObject_New(TkappObject, &Tkapp_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	429 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	430 return NULL;
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 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	433
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	434 #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	435 /* 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	436 ClearMenuBar();
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	437 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	438 #endif
7416 13f29b62a209 Delete the 'exit' command from the Tcl interpreter -- it would allow Guido van Rossum <guido@python.org> parents: 7212 diff changeset	439 /* 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	440 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	441
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	442 if (screenName != NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	443 Tcl_SetVar2(v->interp, "env", "DISPLAY",
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	444 screenName, TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	445
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	446 if (interactive)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	447 Tcl_SetVar(v->interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	448 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	449 Tcl_SetVar(v->interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	450
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	451 /* 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	452 argv0 = (char*)ckalloc(strlen(className) + 1);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	453 if (!argv0) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	454 PyErr_NoMemory();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	455 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	456 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	457 }
3973 3d1e4b76f745 Add optional casts to free() calls. (Jack) Guido van Rossum <guido@python.org> parents: 3899 diff changeset	458
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	459 strcpy(argv0, className);
7982 a909a2869ac5 Make new gcc -Wall happy Guido van Rossum <guido@python.org> parents: 7416 diff changeset	460 if (isupper((int)(argv0[0])))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	461 argv0[0] = tolower(argv0[0]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	462 Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	463 ckfree(argv0);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	464
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	465 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	466 return (TkappObject )Tkinter_Error((PyObject )v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	467
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	468 EnableEventHook();
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	469
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	470 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	471 }
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
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	474
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	475 / Tcl Eval /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	476
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	477 #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	478 #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	479 #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	480
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	481 #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	482
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	483 static Tcl_Obj*
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	484 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	485 {
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	486 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	487
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	488 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	489 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	490 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	491 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	492 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	493 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	494 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	495 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	496 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	497 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	498 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	499 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	500 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	501 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	502 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	503 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	504 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	505 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	506 }
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 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	508 #if TKMAJORMINOR <= 8001
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	509 /* In Tcl 8.1 we must use UTF-8 */
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	510 PyObject* utf8 = PyUnicode_AsUTF8String (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 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	512 return 0;
12513 ca0e9d97d554 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12162 diff changeset	513 result = Tcl_NewStringObj (PyString_AS_STRING (utf8),
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	514 PyString_GET_SIZE (utf8));
12513 ca0e9d97d554 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12162 diff changeset	515 Py_DECREF(utf8);
ca0e9d97d554 Marc-Andre Lemburg: Guido van Rossum <guido@python.org> parents: 12162 diff changeset	516 return result;
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	517 #else /* TKMAJORMINOR > 8001 */
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	518 /* 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	519 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	520 /* 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	521 PyErr_SetString(PyExc_SystemError,
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	522 "Py_UNICODE and Tcl_UniChar differ in size");
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	523 return 0;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	524 }
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	525 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	526 PyUnicode_GET_SIZE(value));
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	527 #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	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 {
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	530 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	531 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	532 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	533 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	534 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	535 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	536 }
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	537 }
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	538
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	539 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	540 Tkapp_Call(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	541 {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	542 Tcl_Obj *objStore[ARGSZ];
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	543 Tcl_Obj **objv = NULL;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	544 int objc = 0, i;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	545 PyObject *res = NULL;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	546 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	547 /* 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	548 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	549
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	550 objv = objStore;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	551
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	552 if (args == NULL)
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	553 objc = 0;
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	554
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	555 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	556 objc = 1;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	557 objv[0] = AsObj(args);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	558 if (objv[0] == 0)
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	559 goto finally;
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	560 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	561 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	562 else {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	563 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	564
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	565 if (objc > ARGSZ) {
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	566 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	567 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	568 PyErr_NoMemory();
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	569 goto finally;
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	570 }
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	571 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	572
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	573 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	574 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	575 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	576 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	577 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	578 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	579 objv[i] = AsObj(v);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	580 if (!objv[i])
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[i]);
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 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	585
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	586 ENTER_TCL
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	587
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	588 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	589
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	590 ENTER_OVERLAP
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	591 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	592 Tkinter_Error(self);
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	593 else {
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	594 /* 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	595 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	596 char *s = Tcl_GetStringResult(interp);
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	597 char *p = s;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	598 /* 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	599 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	600 while (*p != '\0') {
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	601 if (*p & 0x80)
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	602 break;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	603 p++;
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	604 }
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	605 if (*p == '\0')
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	606 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	607 else {
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	608 /* 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	609 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	610 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	611 if (res == NULL) {
db9458c2b631 When the UTF-8 conversion to Unicode fails, return an 8-bit string Guido van Rossum <guido@python.org> parents: 12580 diff changeset	612 PyErr_Clear();
db9458c2b631 When the UTF-8 conversion to Unicode fails, return an 8-bit string Guido van Rossum <guido@python.org> parents: 12580 diff changeset	613 res = PyString_FromStringAndSize(s, (int)(p-s));
db9458c2b631 When the UTF-8 conversion to Unicode fails, return an 8-bit string Guido van Rossum <guido@python.org> parents: 12580 diff changeset	614 }
12580 e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	615 }
e0a12095fac2 Two changes to improve (I hope) Unicode support. Guido van Rossum <guido@python.org> parents: 12576 diff changeset	616 }
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	617
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	618 LEAVE_OVERLAP_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	619
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	620 finally:
12087 e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	621 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	622 Tcl_DecrRefCount(objv[i]);
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	623 if (objv != objStore)
e2db89a98cb2 The Tcl_Obj patch discussed on the patches list. Guido van Rossum <guido@python.org> parents: 12071 diff changeset	624 ckfree(FREECAST objv);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	625 return res;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	626 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	627
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	628 #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	629
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	630 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	631 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	632 {
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	633 /* 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	634 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	635 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	636 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	637 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	638 int *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	639 int argc = 0, 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	640 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	641 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	642 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	643
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	644 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	645 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	646
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	647 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	648 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	649
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 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	651 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	652
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	653 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	654 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	655 fv[0] = 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	656 argv[0] = AsString(args, 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	657 }
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 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	659 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	660
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	661 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	662 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	663 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	664 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	665 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	666 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	667 }
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
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 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	671 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	672 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	673 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	674 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	675 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	676 }
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 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	678 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	679 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	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 fv[i] = 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	683 argv[i] = AsString(v, 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	684 }
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 }
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 }
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 /* 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	688
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 /* 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	690 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	691 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	692 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	693 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	694 }
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 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	696 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	697 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	698 !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	699 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	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 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	702 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	703 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	704 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	705 }
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 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	707 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	708 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	709 }
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 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	711 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	712 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	713 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	714 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	715 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	716 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	717 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	718 }
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 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	720 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	721 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	722 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	723 }
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 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	725
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 /* 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	727 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	728 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	729 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	730 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	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 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	733 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	734 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	735 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	736
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 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	738 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	739 }
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
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 #endif /* !USING_OBJECTS */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	742
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	743 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	744 Tkapp_GlobalCall(PyObject self, PyObject args)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	745 {
8200 482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	746 /* 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	747 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	748 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	749 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	750 scope pointer). */
482e4ba33c08 Still somewhat experimental speedup. This appears to speed up the Guido van Rossum <guido@python.org> parents: 8199 diff changeset	751
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	752 char *cmd;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	753 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	754
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	755 cmd = Merge(args);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	756 if (!cmd)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	757 PyErr_SetString(Tkinter_TclError, "merge failed");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	758
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	759 else {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	760 int err;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	761 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	762 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	763 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	764 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	765 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	766 else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	767 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	768 LEAVE_OVERLAP_TCL
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	769 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	770
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	771 if (cmd)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	772 ckfree(cmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	773
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	774 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	775 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	776
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	777 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	778 Tkapp_Eval(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	779 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	780 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	781 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	782 int err;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	783
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	784 if (!PyArg_ParseTuple(args, "s:eval", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	785 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	786
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	787 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	788 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	789 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	790 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	791 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	792 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	793 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	794 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 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_GlobalEval(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;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 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:globaleval", &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_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	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_EvalFile(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 *fileName;
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;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: 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:evalfile", &fileName))
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_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	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);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	834
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	835 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	836 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	837 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	838 return res;
1664 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
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	841 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	842 Tkapp_Record(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	843 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	844 char *script;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	845 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	846 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	847
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	848 if (!PyArg_ParseTuple(args, "s", &script))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	849 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	850
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	851 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	852 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	853 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	854 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	855 res = Tkinter_Error(self);
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_AddErrorInfo(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 *msg;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	866
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	867 if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	868 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	869 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	870 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	871 LEAVE_TCL
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	872
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	873 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	874 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	875 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	876
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	877
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	878
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	879 / Tcl Variable /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	880
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	881 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	882 SetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	883 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	884 char name1, name2, ok, s;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	885 PyObject *newValue;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	886 PyObject *tmp;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	887
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	888 tmp = PyList_New(0);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	889 if (!tmp)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	890 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	891
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	892 if (PyArg_ParseTuple(args, "sO:setvar", &name1, &newValue)) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	893 /* 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	894 s = AsString(newValue, tmp);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	895 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	896 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	897 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	898 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	899 else {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	900 PyErr_Clear();
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	901 if (PyArg_ParseTuple(args, "ssO:setvar", &name1, &name2, &newValue)) {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	902 s = AsString (newValue, tmp);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	903 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	904 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	905 s, flags);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	906 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	907 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	908 else {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	909 Py_DECREF(tmp);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	910 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	911 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	912 }
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	913 Py_DECREF(tmp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	914
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	915 if (!ok)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	916 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	917
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	918 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	919 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	920 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	921
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	922 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	923 Tkapp_SetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	924 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	925 return SetVar(self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	926 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	927
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	928 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	929 Tkapp_GlobalSetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	930 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	931 return SetVar(self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	932 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	933
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	934
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	935
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	936 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	937 GetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: 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 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	940 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	941
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	942 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	943 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	944 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	945 if (name2 == NULL)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	946 s = Tcl_GetVar(Tkapp_Interp(self), name1, flags);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	947
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	948 else
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	949 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	950 ENTER_OVERLAP
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	951
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	952 if (s == NULL)
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	953 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	954 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	955 res = PyString_FromString(s);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	956 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	957 return res;
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
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	960 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	961 Tkapp_GetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	962 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	963 return GetVar(self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	964 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	965
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	966 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	967 Tkapp_GlobalGetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	968 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	969 return GetVar(self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	970 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	971
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	972
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	973
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	974 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	975 UnsetVar(PyObject self, PyObject args, int flags)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	976 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	977 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	978 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	979 int code;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	980
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	981 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	982 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	983 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	984 if (name2 == NULL)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	985 code = Tcl_UnsetVar(Tkapp_Interp(self), name1, flags);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	986
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	987 else
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	988 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	989 ENTER_OVERLAP
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	990
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	991 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	992 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	993 else {
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	994 Py_INCREF(Py_None);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	995 res = Py_None;
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	996 }
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	997 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	998 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	999 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1000
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1001 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1002 Tkapp_UnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1003 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1004 return UnsetVar(self, args, TCL_LEAVE_ERR_MSG);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1005 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1006
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1007 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1008 Tkapp_GlobalUnsetVar(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1009 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1010 return UnsetVar(self, args, TCL_LEAVE_ERR_MSG \| TCL_GLOBAL_ONLY);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1011 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1012
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1013
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1014
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1015 / Tcl to Python /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1016
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1017 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1018 Tkapp_GetInt(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1019 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1020 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1021 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1022
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1023 if (!PyArg_ParseTuple(args, "s:getint", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1024 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1025 if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1026 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1027 return Py_BuildValue("i", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1028 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1029
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1030 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1031 Tkapp_GetDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1032 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1033 char *s;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1034 double v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1035
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1036 if (!PyArg_ParseTuple(args, "s:getdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1037 return NULL;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1038 if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1039 return Tkinter_Error(self);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1040 return Py_BuildValue("d", v);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1041 }
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_GetBoolean(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:getboolean", &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_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	1052 return Tkinter_Error(self);
4968 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_ExprString(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;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1060 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	1061 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1062
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1063 if (!PyArg_ParseTuple(args, "s:exprstring", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1064 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	1065 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1066 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	1067 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	1068 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	1069 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1070 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1071 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	1072 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1073 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1074 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1075
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1076 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1077 Tkapp_ExprLong(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1078 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1079 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1080 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	1081 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1082 long v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1083
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1084 if (!PyArg_ParseTuple(args, "s:exprlong", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1085 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	1086 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1087 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	1088 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	1089 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	1090 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1091 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1092 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	1093 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1094 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1095 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1096
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1097 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1098 Tkapp_ExprDouble(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1099 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1100 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1101 PyObject *res = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1102 double v;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1103 int retval;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1104
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1105 if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1106 return NULL;
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1107 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	1108 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1109 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	1110 ENTER_OVERLAP
5197 74c12704a0bd New form of PyFPE_END_PROTECT macro. Guido van Rossum <guido@python.org> parents: 5120 diff changeset	1111 PyFPE_END_PROTECT(retval)
5120 a48f3678f9e1 Changes for Lee Busby's SIGFPE patch set. Guido van Rossum <guido@python.org> parents: 4968 diff changeset	1112 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	1113 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1114 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1115 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	1116 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1117 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1118 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1119
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1120 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1121 Tkapp_ExprBoolean(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1122 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1123 char *s;
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1124 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	1125 int retval;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1126 int v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1127
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1128 if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1129 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	1130 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1131 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	1132 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	1133 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	1134 res = Tkinter_Error(self);
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1135 else
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1136 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	1137 LEAVE_OVERLAP_TCL
92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1138 return res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1139 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1140
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1141
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1142
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1143 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1144 Tkapp_SplitList(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1145 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1146 char *list;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1147 int argc;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1148 char **argv;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1149 PyObject *v;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1150 int i;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1151
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1152 if (!PyArg_ParseTuple(args, "s:splitlist", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1153 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1154
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1155 if (Tcl_SplitList(Tkapp_Interp(self), list, &argc, &argv) == TCL_ERROR)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1156 return Tkinter_Error(self);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1157
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1158 if (!(v = PyTuple_New(argc)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1159 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1160
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1161 for (i = 0; i < argc; i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1162 PyObject *s = PyString_FromString(argv[i]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1163 if (!s \|\| PyTuple_SetItem(v, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1164 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1165 v = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1166 goto finally;
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
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1170 finally:
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1171 ckfree(FREECAST argv);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1172 return v;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1173 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1174
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1175 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1176 Tkapp_Split(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1177 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1178 char *list;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1179
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1180 if (!PyArg_ParseTuple(args, "s:split", &list))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1181 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	1182 return Split(list);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1183 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1184
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1185 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1186 Tkapp_Merge(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1187 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1188 char *s = Merge(args);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1189 PyObject *res = NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1190
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1191 if (s) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1192 res = PyString_FromString(s);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1193 ckfree(s);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1194 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1195 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1196 PyErr_SetString(Tkinter_TclError, "merge failed");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1197
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1198 return res;
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
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1201
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1202
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1203 / Tcl Command /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1204
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1205 /* 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	1206 typedef struct {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1207 PyObject *self;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1208 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1209 } PythonCmd_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1210
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1211 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1212 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	1213 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1214 errorInCmd = 1;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1215 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	1216 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1217 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	1218 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1219
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1220 /* This is the Tcl command that acts as a wrapper for Python
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1221 * function or method.
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1222 */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1223 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1224 PythonCmd(ClientData clientData, Tcl_Interp interp, int argc, char argv[])
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1225 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1226 PythonCmd_ClientData data = (PythonCmd_ClientData )clientData;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1227 PyObject self, func, arg, res, *tmp;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1228 int i;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1229
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	1230 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	1231
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1232 /* TBD: no error checking here since we know, via the
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1233 * Tkapp_CreateCommand() that the client data is a two-tuple
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1234 */
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1235 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	1236 func = data->func;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1237
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1238 /* Create argument list (argv1, ..., argvN) */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1239 if (!(arg = PyTuple_New(argc - 1)))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1240 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1241
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1242 for (i = 0; i < (argc - 1); i++) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1243 PyObject *s = PyString_FromString(argv[i + 1]);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1244 if (!s \|\| PyTuple_SetItem(arg, i, s)) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1245 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	1246 return PythonCmd_Error(interp);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1247 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1248 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1249 res = PyEval_CallObject(func, arg);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1250 Py_DECREF(arg);
1713 bb566d28caa0 * tkintermodule.c Guido van Rossum <guido@python.org> parents: 1690 diff changeset	1251
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1252 if (res == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1253 return PythonCmd_Error(interp);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1254
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1255 if (!(tmp = PyList_New(0))) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1256 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1257 return PythonCmd_Error(interp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1258 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1259
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1260 Tcl_SetResult(Tkapp_Interp(self), AsString(res, tmp), TCL_VOLATILE);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1261 Py_DECREF(res);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1262 Py_DECREF(tmp);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1263
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1264 LEAVE_PYTHON
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1265
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1266 return TCL_OK;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1267 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1268
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1269 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1270 PythonCmdDelete(ClientData clientData)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1271 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1272 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	1273
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	1274 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	1275 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	1276 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	1277 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	1278 LEAVE_PYTHON
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1279 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1280
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1281
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1282
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1283 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1284 Tkapp_CreateCommand(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1285 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1286 PythonCmd_ClientData *data;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1287 char *cmdName;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1288 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	1289 Tcl_Command err;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1290
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1291 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	1292 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1293 if (!PyCallable_Check(func)) {
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1294 PyErr_SetString(PyExc_TypeError, "command not callable");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1295 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1296 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1297
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1298 data = PyMem_NEW(PythonCmd_ClientData, 1);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1299 if (!data)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1300 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	1301 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	1302 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	1303 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	1304 data->func = func;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1305
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1306 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1307 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	1308 (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	1309 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1310 if (err == NULL) {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1311 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	1312 PyMem_DEL(data);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1313 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1314 }
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1315
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1316 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1317 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1318 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1319
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1320
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1321
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1322 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1323 Tkapp_DeleteCommand(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1324 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1325 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	1326 int err;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1327
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1328 if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1329 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	1330 ENTER_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1331 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	1332 LEAVE_TCL
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1333 if (err == -1) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1334 PyErr_SetString(Tkinter_TclError, "can't delete Tcl command");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1335 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1336 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1337 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1338 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1339 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1340
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1341
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1342
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1343 #ifdef HAVE_CREATEFILEHANDLER
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1344 / File Handler /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1345
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1346 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	1347 PyObject *func;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1348 PyObject *file;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1349 int id;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1350 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	1351 } FileHandler_ClientData;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1352
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1353 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	1354
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1355 static FileHandler_ClientData *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1356 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	1357 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1358 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	1359 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	1360 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	1361 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	1362 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	1363 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	1364 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	1365 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	1366 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	1367 HeadFHCD = p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1368 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1369 return p;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1370 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1371
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1372 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1373 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	1374 {
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1375 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	1376
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1377 pp = &HeadFHCD;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1378 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	1379 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	1380 *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	1381 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	1382 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	1383 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	1384 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1385 else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1386 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	1387 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1388 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1389
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	1390 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1391 FileHandler(ClientData clientData, int mask)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1392 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1393 FileHandler_ClientData data = (FileHandler_ClientData )clientData;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1394 PyObject func, file, arg, res;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1395
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	1396 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	1397 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	1398 file = data->file;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1399
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1400 arg = Py_BuildValue("(Oi)", file, (long) mask);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1401 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	1402 Py_DECREF(arg);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1403
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1404 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1405 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1406 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1407 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1408 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	1409 LEAVE_PYTHON
1771 51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	1410 }
51c2e5a9f39c * tkintermodule.c (FileHandler): generalize to arbitrary file ids Guido van Rossum <guido@python.org>* parents: 1756 diff changeset	1411
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1412 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1413 Tkapp_CreateFileHandler(PyObject self, PyObject args)
346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1414 /* args is (file, mask, func) */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1415 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1416 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	1417 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	1418 int mask, tfile;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1419
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1420 if (!PyArg_ParseTuple(args, "OiO:createfilehandler", &file, &mask, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1421 return NULL;
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	1422 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	1423 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1424 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1425 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	1426 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1427 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1428 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1429
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	1430 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	1431 if (data == NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1432 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1433
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1434 /* 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	1435 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1436 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	1437 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1438 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1439 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1440 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1441
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1442 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1443 Tkapp_DeleteFileHandler(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1444 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1445 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	1446 int tfile;
3554 24279bafa828 Patch from the net for 4.1 file handler changes. Guido van Rossum <guido@python.org> parents: 3553 diff changeset	1447
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1448 if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1449 return NULL;
13593 df64cc0e84e2 Use PyObject_AsFileDescriptor Andrew M. Kuchling <amk@amk.ca> parents: 13576 diff changeset	1450 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	1451 if (tfile < 0)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1452 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1453
12071 9750af5e71b0 Patch by Neil Schemenauer to remove support for Tcl/Tk versions before Guido van Rossum <guido@python.org> parents: 12063 diff changeset	1454 DeleteFHCD(tfile);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1455
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1456 /* 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	1457 ENTER_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1458 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	1459 LEAVE_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1460 Py_INCREF(Py_None);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1461 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1462 }
6026 b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	1463 #endif /* HAVE_CREATEFILEHANDLER */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1464
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1465
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1466 /** 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	1467
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1468 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	1469
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1470 typedef struct {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1471 PyObject_HEAD
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1472 Tcl_TimerToken token;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1473 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	1474 } TkttObject;
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1475
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1476 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1477 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	1478 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1479 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	1480 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	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, ":deletetimerhandler"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1483 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	1484 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	1485 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	1486 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	1487 }
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1488 if (func != NULL) {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1489 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	1490 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	1491 Py_DECREF(v); /* See Tktt_New() */
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1492 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1493 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1494 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	1495 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1496
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1497 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	1498 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1499 {"deletetimerhandler", Tktt_DeleteTimerHandler, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1500 {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	1501 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1502
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1503 static TkttObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1504 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	1505 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1506 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	1507
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	1508 v = PyObject_New(TkttObject, &Tktt_Type);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1509 if (v == NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1510 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	1511
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1512 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	1513 v->token = NULL;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1514 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	1515
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1516 /* 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	1517 Py_INCREF(v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1518 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	1519 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1520
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1521 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1522 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	1523 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1524 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	1525 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	1526
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1527 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	1528
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	1529 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	1530 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1531
8312 d67be13da3cc Trivial little change: timer tokens shouldn't have a Print() function, Guido van Rossum <guido@python.org> parents: 8200 diff changeset	1532 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1533 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	1534 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1535 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	1536 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	1537
13210 ff243b0f16ee Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12958 diff changeset	1538 sprintf(buf, "<tktimertoken at %p%s>", v,
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1539 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	1540 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	1541 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1542
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1543 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1544 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	1545 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1546 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	1547 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1548
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1549 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	1550 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1551 PyObject_HEAD_INIT(NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1552 0, /ob_size /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1553 "tktimertoken", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1554 sizeof(TkttObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1555 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1556 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	1557 0, /tp_print /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1558 Tktt_GetAttr, /tp_getattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1559 0, /tp_setattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1560 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	1561 Tktt_Repr, /tp_repr /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1562 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1563 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1564 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1565 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	1566 };
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1567
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1568
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1569
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1570 / Timer Handler /
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1571
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1572 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1573 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	1574 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1575 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	1576 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	1577 PyObject *res;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1578
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1579 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	1580 return;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1581
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1582 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	1583
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	1584 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	1585
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1586 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	1587 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	1588 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	1589
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1590 if (res == NULL) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1591 errorInCmd = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1592 PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1593 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1594 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1595 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	1596
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1597 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	1598 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1599
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1600 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1601 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	1602 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1603 int milliseconds;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1604 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	1605 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	1606
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1607 if (!PyArg_ParseTuple(args, "iO:createtimerhandler", &milliseconds, &func))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1608 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1609 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	1610 PyErr_SetString(PyExc_TypeError, "bad argument list");
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1611 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1612 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1613 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	1614 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	1615 (ClientData)v);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1616
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1617 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	1618 }
392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1619
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1620
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1621 / Event Loop /
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1622
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1623 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1624 Tkapp_MainLoop(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1625 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1626 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	1627 #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	1628 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	1629 #endif
2009 392db1881190 added timer and file callbacks and global mainloop and quit fns Guido van Rossum <guido@python.org> parents: 1888 diff changeset	1630
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1631 if (!PyArg_ParseTuple(args, "\|i:mainloop", &threshold))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1632 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1633
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1634 quitMainLoop = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1635 while (Tk_GetNumMainWindows() > threshold &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1636 !quitMainLoop &&
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1637 !errorInCmd)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1638 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1639 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	1640
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1641 #ifdef WITH_THREAD
8500 92cf7f427723 # (My first checkin from Windows NT using remote CVS!) Guido van Rossum <guido@python.org> parents: 8499 diff changeset	1642 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	1643 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	1644 tcl_tstate = tstate;
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1645 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	1646 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	1647 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	1648 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	1649 Sleep(20);
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1650 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	1651 #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	1652 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	1653 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1654
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1655 if (PyErr_CheckSignals() != 0)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1656 return NULL;
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1657 if (result < 0)
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1658 break;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1659 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1660 quitMainLoop = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1661
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1662 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1663 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1664 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1665 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1666 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1667 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1668 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1669 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1670 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1671
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1672 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1673 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	1674 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1675 int flags = 0;
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1676 int rv;
2121 86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	1677
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1678 if (!PyArg_ParseTuple(args, "\|i:dooneevent", &flags))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1679 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1680
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1681 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1682 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	1683 LEAVE_TCL
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1684 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	1685 }
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	1686
86d9e91405c8 added interface to Tk_DoOneEvent (R Lindsay Todd) Guido van Rossum <guido@python.org> parents: 2055 diff changeset	1687 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1688 Tkapp_Quit(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1689 {
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1690
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1691 if (!PyArg_ParseTuple(args, ":quit"))
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1692 return NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1693
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1694 quitMainLoop = 1;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1695 Py_INCREF(Py_None);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1696 return Py_None;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1697 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1698
8199 c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1699 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1700 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	1701 {
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1702
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1703 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	1704 return NULL;
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1705
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1706 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	1707 }
c31c59f192af Add a new method of interpreter objects, interpaddr(). This returns Guido van Rossum <guido@python.org> parents: 8185 diff changeset	1708
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1709
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1710
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1711 /** Tkapp Method List **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1712
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1713 static PyMethodDef Tkapp_methods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1714 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1715 {"call", Tkapp_Call, 0},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1716 {"globalcall", Tkapp_GlobalCall, 0},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1717 {"eval", Tkapp_Eval, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1718 {"globaleval", Tkapp_GlobalEval, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1719 {"evalfile", Tkapp_EvalFile, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1720 {"record", Tkapp_Record, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1721 {"adderrorinfo", Tkapp_AddErrorInfo, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1722 {"setvar", Tkapp_SetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1723 {"globalsetvar", Tkapp_GlobalSetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1724 {"getvar", Tkapp_GetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1725 {"globalgetvar", Tkapp_GlobalGetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1726 {"unsetvar", Tkapp_UnsetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1727 {"globalunsetvar", Tkapp_GlobalUnsetVar, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1728 {"getint", Tkapp_GetInt, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1729 {"getdouble", Tkapp_GetDouble, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1730 {"getboolean", Tkapp_GetBoolean, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1731 {"exprstring", Tkapp_ExprString, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1732 {"exprlong", Tkapp_ExprLong, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1733 {"exprdouble", Tkapp_ExprDouble, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1734 {"exprboolean", Tkapp_ExprBoolean, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1735 {"splitlist", Tkapp_SplitList, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1736 {"split", Tkapp_Split, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1737 {"merge", Tkapp_Merge, 0},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1738 {"createcommand", Tkapp_CreateCommand, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1739 {"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	1740 #ifdef HAVE_CREATEFILEHANDLER
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1741 {"createfilehandler", Tkapp_CreateFileHandler, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1742 {"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	1743 #endif
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1744 {"createtimerhandler", Tkapp_CreateTimerHandler, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1745 {"mainloop", Tkapp_MainLoop, 1},
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1746 {"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	1747 {"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	1748 {"interpaddr", Tkapp_InterpAddr, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1749 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1750 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1751
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1752
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1753
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1754 /** Tkapp Type Methods **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1755
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1756 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1757 Tkapp_Dealloc(PyObject *self)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1758 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1759 ENTER_TCL
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1760 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	1761 LEAVE_TCL
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12513 diff changeset	1762 PyObject_Del(self);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1763 DisableEventHook();
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1764 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1765
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1766 static PyObject *
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1767 Tkapp_GetAttr(PyObject self, char name)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1768 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1769 return Py_FindMethod(Tkapp_methods, self, name);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1770 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1771
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1772 static PyTypeObject Tkapp_Type =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1773 {
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1774 PyObject_HEAD_INIT(NULL)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1775 0, /ob_size /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1776 "tkapp", /tp_name /
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1777 sizeof(TkappObject), /tp_basicsize /
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1778 0, /tp_itemsize /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1779 Tkapp_Dealloc, /tp_dealloc /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1780 0, /tp_print /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1781 Tkapp_GetAttr, /tp_getattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1782 0, /tp_setattr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1783 0, /tp_compare /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1784 0, /tp_repr /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1785 0, /tp_as_number /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1786 0, /tp_as_sequence /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1787 0, /tp_as_mapping /
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1788 0, /tp_hash /
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1789 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1790
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1791
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1792
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1793 /** Tkinter Module **/
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1794
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1795 typedef struct {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1796 PyObject* tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1797 int size; /* current size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1798 int maxsize; /* allocated size */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1799 } FlattenContext;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1800
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1801 static int
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1802 _bump(FlattenContext* context, int size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1803 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1804 /* expand tuple to hold (at least) size new items. return true if
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1805 successful, false if an exception was raised*/
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1806
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1807 int maxsize = context->maxsize * 2;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1808
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1809 if (maxsize < context->size + size)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1810 maxsize = context->size + size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1811
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1812 context->maxsize = maxsize;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1813
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1814 return _PyTuple_Resize(&context->tuple, maxsize, 0) >= 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1815 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1816
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1817 static int
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1818 _flatten1(FlattenContext* context, PyObject* item, int depth)
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1819 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1820 /* add tuple or list to argument tuple (recursively) */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1821
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1822 int i, size;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1823
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1824 if (depth > 1000) {
3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1825 PyErr_SetString(PyExc_ValueError,"nesting too deep in _flatten");
3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1826 return 0;
3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1827 } else if (PyList_Check(item)) {
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1828 size = PyList_GET_SIZE(item);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1829 /* preallocate (assume no nesting) */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1830 if (context->size + size > context->maxsize && !_bump(context, size))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1831 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1832 /* copy items to output tuple */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1833 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1834 PyObject *o = PyList_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1835 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	1836 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1837 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1838 } else if (o != Py_None) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1839 if (context->size + 1 > context->maxsize && !_bump(context, 1))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1840 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1841 Py_INCREF(o);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1842 PyTuple_SET_ITEM(context->tuple, context->size++, o);
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 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1845 } else if (PyTuple_Check(item)) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1846 /* same, for tuples */
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1847 size = PyTuple_GET_SIZE(item);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1848 if (context->size + size > context->maxsize && !_bump(context, size))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1849 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1850 for (i = 0; i < size; i++) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1851 PyObject *o = PyTuple_GET_ITEM(item, i);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1852 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	1853 if (!_flatten1(context, o, depth + 1))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1854 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1855 } else if (o != Py_None) {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1856 if (context->size + 1 > context->maxsize && !_bump(context, 1))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1857 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1858 Py_INCREF(o);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1859 PyTuple_SET_ITEM(context->tuple, context->size++, o);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1860 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1861 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1862 } else {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1863 PyErr_SetString(PyExc_TypeError, "argument must be sequence");
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1864 return 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1865 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1866 return 1;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1867 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1868
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1869 static PyObject *
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1870 Tkinter_Flatten(PyObject* self, PyObject* args)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1871 {
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1872 FlattenContext context;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1873 PyObject* item;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1874
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1875 if (!PyArg_ParseTuple(args, "O:_flatten", &item))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1876 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1877
13576 61e4c29d53d8 replace PyXXX_Length calls with PyXXX_Size calls Jeremy Hylton <jeremy@alum.mit.edu> parents: 13503 diff changeset	1878 context.maxsize = PySequence_Size(item);
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1879 if (context.maxsize <= 0)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1880 return PyTuple_New(0);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1881
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1882 context.tuple = PyTuple_New(context.maxsize);
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1883 if (!context.tuple)
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1884 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1885
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1886 context.size = 0;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1887
12958 3c6641c810db Patch from Michael Hudson to fix flatten recursive data structures: Andrew M. Kuchling <amk@amk.ca> parents: 12953 diff changeset	1888 if (!_flatten1(&context, item,0))
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1889 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1890
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1891 if (_PyTuple_Resize(&context.tuple, context.size, 0))
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1892 return NULL;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1893
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1894 return context.tuple;
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1895 }
a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1896
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1897 static PyObject *
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	1898 Tkinter_Create(PyObject self, PyObject args)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1899 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1900 char *screenName = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1901 char *baseName = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1902 char *className = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1903 int interactive = 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1904
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1905 baseName = strrchr(Py_GetProgramName(), '/');
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1906 if (baseName != NULL)
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1907 baseName++;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1908 else
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1909 baseName = Py_GetProgramName();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1910 className = "Tk";
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1911
11882 dc65c5f6ad7c Massive patch by Skip Montanaro to add ":name" to as many Guido van Rossum <guido@python.org> parents: 11443 diff changeset	1912 if (!PyArg_ParseTuple(args, "\|zssi:create",
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1913 &screenName, &baseName, &className,
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1914 &interactive))
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1915 return NULL;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1916
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1917 return (PyObject *) Tkapp_New(screenName, baseName, className,
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1918 interactive);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1919 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1920
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1921 static PyMethodDef moduleMethods[] =
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1922 {
12953 a3e12881cc3c Patch from /F: Andrew M. Kuchling <amk@amk.ca> parents: 12583 diff changeset	1923 {"_flatten", Tkinter_Flatten, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1924 {"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	1925 #ifdef HAVE_CREATEFILEHANDLER
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1926 {"createfilehandler", Tkapp_CreateFileHandler, 1},
5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1927 {"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	1928 #endif
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	1929 {"createtimerhandler", Tkapp_CreateTimerHandler, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1930 {"mainloop", Tkapp_MainLoop, 1},
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1931 {"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	1932 {"quit", Tkapp_Quit, 1},
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1933 {NULL, NULL}
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1934 };
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1935
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1936 #ifdef WAIT_FOR_STDIN
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1937
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1938 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	1939
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	1940 #ifndef MS_WINDOWS
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1941 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	1942 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	1943 {
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1944 stdin_ready = 1;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1945 }
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	1946 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1947
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1948 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	1949
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1950 static int
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	1951 EventHook(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1952 {
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	1953 #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	1954 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	1955 #endif
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	1956 #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	1957 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	1958 #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	1959 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	1960 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	1961 #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	1962 tfile = fileno(stdin);
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	1963 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	1964 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1965 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	1966 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	1967 #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	1968 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	1969 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	1970 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	1971 }
0447ef8483c8 Fixed the EventHook() code so that it also works on Windows, sort of. Guido van Rossum <guido@python.org> parents: 8446 diff changeset	1972 #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	1973 #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	1974 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	1975 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	1976 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	1977
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1978 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	1979
8918e4f54eca Patch by Jonathan Giddy (with some cleanup by me) to always use the Guido van Rossum <guido@python.org> parents: 9308 diff changeset	1980 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	1981 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	1982 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	1983 Sleep(20);
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1984 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	1985 #else
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1986 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	1987 #endif
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1988
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1989 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	1990 break;
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	1991 }
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	1992 #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	1993 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	1994 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1995 if (errorInCmd) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1996 errorInCmd = 0;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1997 PyErr_Restore(excInCmd, valInCmd, trbInCmd);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1998 excInCmd = valInCmd = trbInCmd = NULL;
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	1999 PyErr_Print();
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2000 }
9488 b0ca2ca586b1 RajGopal Srinivasan noted that the latest code doesn't work when Guido van Rossum <guido@python.org> parents: 9327 diff changeset	2001 #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	2002 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	2003 #endif
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2004 return 0;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2005 }
a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2006
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2007 #endif
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2008
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2009 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2010 EnableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2011 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2012 #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	2013 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	2014 #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	2015 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	2016 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2017 PyOS_InputHook = EventHook;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2018 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2019 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2020 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2021
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2022 static void
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2023 DisableEventHook(void)
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2024 {
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2025 #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	2026 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	2027 PyOS_InputHook = NULL;
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2028 }
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2029 #endif
8417 f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2030 }
f398419d50f9 Use a different implementation of EventHook(). The new version Guido van Rossum <guido@python.org> parents: 8315 diff changeset	2031
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2032
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2033 /* all errors will be checked in one fell swoop in init_tkinter() */
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2034 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2035 ins_long(PyObject d, char name, long val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2036 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2037 PyObject *v = PyInt_FromLong(val);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2038 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2039 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2040 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2041 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2042 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2043 static void
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2044 ins_string(PyObject d, char name, char *val)
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2045 {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2046 PyObject *v = PyString_FromString(val);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2047 if (v) {
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2048 PyDict_SetItemString(d, name, v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2049 Py_DECREF(v);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2050 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2051 }
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2052
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2053
9588 38023a425e48 Add DL_EXPORT() to all modules that could possibly be used Guido van Rossum <guido@python.org> parents: 9488 diff changeset	2054 DL_EXPORT(void)
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2055 init_tkinter(void)
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2056 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2057 PyObject m, d;
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2058
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2059 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	2060
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2061 #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	2062 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	2063 #endif
4091 dc946cab7b9b Hacks to support being a Windows DLL Guido van Rossum <guido@python.org> parents: 4079 diff changeset	2064
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2065 m = Py_InitModule("_tkinter", moduleMethods);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2066
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2067 d = PyModule_GetDict(m);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2068 Tkinter_TclError = Py_BuildValue("s", "TclError");
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2069 PyDict_SetItemString(d, "TclError", Tkinter_TclError);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2070
5914 5155b2c35e15 Functionality enhancement: allow other threads to use Tk commands Guido van Rossum <guido@python.org> parents: 5913 diff changeset	2071 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	2072 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	2073 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	2074 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	2075 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	2076 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	2077 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	2078 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	2079 ins_long(d, "DONT_WAIT", TCL_DONT_WAIT);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2080 ins_string(d, "TK_VERSION", TK_VERSION);
3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2081 ins_string(d, "TCL_VERSION", TCL_VERSION);
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2082
6311 13fbd98d81cc Export names for the types defined by this module: TkappType and TkttType. Guido van Rossum <guido@python.org> parents: 6265 diff changeset	2083 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	2084
6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2085 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	2086 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	2087
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	2088 /* 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	2089 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	2090 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	2091
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2092 if (PyErr_Occurred())
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	2093 return;
b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	2094
8670 07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	2095 #if 0
07e47370fcb8 Temporarily get rid of the registration of Tcl_Finalize() as a Guido van Rossum <guido@python.org> parents: 8639 diff changeset	2096 /* 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	2097 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	2098 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	2099 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	2100 #endif
7212 b9bbfa169920 Register Tcl_Finalize as a Python exit handler. Guido van Rossum <guido@python.org> parents: 6478 diff changeset	2101
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2102 #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	2103 /*
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2104 ** 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	2105 ** 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	2106 ** 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	2107 */
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2108 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	2109
b5804154af4d Merge Mac and Windows mods (which mostly affect the same problem -- no Guido van Rossum <guido@python.org> parents: 5973 diff changeset	2110 Tcl_MacSetEventProc(PyMacConvertEvent);
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2111 #if GENERATINGCFM
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2112 mac_addlibresources();
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2113 #endif /* GENERATINGCFM */
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2114 #endif /* macintosh */
1664 a09efb135de5 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2115 }
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2116
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2117
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2118
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2119 #ifdef macintosh
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2120
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2121 /*
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2122 ** 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	2123 */
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2124
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2125 void
4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2126 panic(char * format, ...)
4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2127 {
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2128 va_list varg;
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2129
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2130 va_start(varg, format);
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2131
8828 8532141cff4c Undo a silly effect of a global substitution: the macintosh panic() Guido van Rossum <guido@python.org> parents: 8670 diff changeset	2132 vfprintf(stderr, format, varg);
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2133 (void) fflush(stderr);
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2134
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2135 va_end(varg);
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2136
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2137 Py_FatalError("Tcl/Tk panic");
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2138 }
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2139
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2140 /*
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2141 ** 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	2142 */
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2143
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2144 static int
13421 346df1920873 Removed Py_PROTO, ANSI-fied sources. Fred Drake <fdrake@acm.org> parents: 13255 diff changeset	2145 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	2146 {
8185 929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2147 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	2148 /*
8444 6f70ca7c84e6 Changes to make it possible to write multi-threaded programs using Guido van Rossum <guido@python.org> parents: 8417 diff changeset	2149 ** 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	2150 ** 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	2151 ** 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	2152 ** 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	2153 ** 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	2154 ** 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	2155 */
929b7e6e7520 On the Mac a call to TkMacInitMenus is needed. Also, we pass Guido van Rossum <guido@python.org> parents: 8096 diff changeset	2156 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	2157 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	2158 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	2159 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	2160 }
4968 3d32da37d627 reformatted Barry Warsaw <barry@python.org> parents: 4754 diff changeset	2161 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	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 #if GENERATINGCFM
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 /*
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2167 ** 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	2168 */
3262 bfb63b45ff0f Initialize GUSI on the mac. Jack Jansen <jack.jansen@cwi.nl> parents: 3240 diff changeset	2169
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2170 #include <Resources.h>
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2171 #include <CodeFragments.h>
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2172
2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2173 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	2174 static FSSpec library_fss;
3120 4a12a543175d Mac changes Guido van Rossum <guido@python.org> parents: 2858 diff changeset	2175
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2176 /*
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2177 ** 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	2178 ** 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	2179 ** 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	2180 ** resources.
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2181 */
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2182 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	2183 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	2184 {
4139 010344b4a616 Call __initialize(), not __sinit() on Mac dynamic loading entry. Guido van Rossum <guido@python.org> parents: 4091 diff changeset	2185 __initialize();
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2186 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	2187 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	2188 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	2189 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	2190 } 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	2191 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	2192 loaded_from_shlib = 1;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2193 }
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2194 return noErr;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2195 }
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2196
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2197 /*
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2198 ** 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	2199 ** 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	2200 */
3413 2fe7d489654e Changes to make it work with Tcl/Tk beta 1. Guido van Rossum <guido@python.org> parents: 3386 diff changeset	2201 static
13651 8a063423e0b7 Bunch of minor ANSIfications: 'void initfunc()' -> 'void initfunc(void)', Thomas Wouters <thomas@python.org> parents: 13593 diff changeset	2202 mac_addlibresources(void)
3240 f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2203 {
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2204 if ( !loaded_from_shlib )
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2205 return;
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2206 (void)FSpOpenResFile(&library_fss, fsRdPerm);
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2207 }
f7fd85b32a7d Fix to load needed resources on a mac Jack Jansen <jack.jansen@cwi.nl> parents: 3231 diff changeset	2208
3414 098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2209 #endif /* GENERATINGCFM */
098cbd6d196e Changes needed to build with Tcl/Tk beta 2! Guido van Rossum <guido@python.org> parents: 3413 diff changeset	2210 #endif /* macintosh */

Mercurial > cpython-lru_cache-weakref

annotate Modules/_tkinter.c @ 14914:79cdeeeefafa legacy-trunk