mirror of
https://github.com/python/cpython.git
synced 2024-12-03 14:55:56 +08:00
00ee7baf49
which unfortunately means the errors from the bytes type change somewhat: bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a TypeError (either that, or bytes(1.0) also raises a ValueError -- PyNumber_AsSsize_t() can only raise one type of exception.) Merged revisions 51188-51433 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines Retrieval of previous shell command was not always preserving indentation since 1.2a1) Patch 1528468 Tal Einat. ........ r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines Chris McDonough's patch to defend against certain DoS attacks on FieldStorage. SF bug #1112549. ........ r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines News item for SF bug 1112549. ........ r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines Fix title -- it's rc1, not beta3. ........ r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines Update dangling references to the 3.2 database to mention that this is UCD 4.1 now. ........ r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines Followup to bug #1069160. PyThreadState_SetAsyncExc(): internal correctness changes wrt refcount safety and deadlock avoidance. Also added a basic test case (relying on ctypes) and repaired the docs. ........ r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines Whitespace normalization. ........ r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines Whitespace normalization broke test_cgi, because a line of quoted test data relied on preserving a single trailing blank. Changed the string from raw to regular, and forced in the trailing blank via an explicit \x20 escape. ........ r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines test_PyThreadState_SetAsyncExc(): This is failing on some 64-bit boxes. I have no idea what the ctypes docs mean by "integers", and blind-guessing here that it intended to mean the signed C "int" type, in which case perhaps I can repair this by feeding the thread id argument to type ctypes.c_long(). Also made the worker thread daemonic, so it doesn't hang Python shutdown if the test continues to fail. ........ r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines force_test_exit(): This has been completely ineffective at stopping test_signal from hanging forever on the Tru64 buildbot. That could be because there's no such thing as signal.SIGALARM. Changed to the idiotic (but standard) signal.SIGALRM instead, and added some more debug output. ........ r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines Fix the failures on cygwin (2006-08-10 fixed the actual locking issue). The first hunk changes the colon to an ! like other Windows variants. We need to always wait on the child so the lock gets released and no other tests fail. This is the try/finally in the second hunk. ........ r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines Add Chris McDonough (latest cgi.py patch) ........ r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines logging's atexit hook now runs even if the rest of the module has already been cleaned up. ........ r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines Add ignore of *.pyc and *.pyo to Lib/xml/etree/. ........ r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines When a ctypes C callback function is called, zero out the result storage before converting the result to C data. See the comment in the code for details. Provide a better context for errors when the conversion of a callback function's result cannot be converted. ........ r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines Klocwork made another run and found a bunch more problems. This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). ........ r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines Even though _Py_Mangle() isn't truly public anyone can call it and there was no verification that privateobj was a PyString. If it wasn't a string, this could have allowed a NULL pointer to creep in below and crash. I wonder if this should be PyString_CheckExact? Must identifiers be strings or can they be subclasses? Klocwork #275 ........ r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines It's highly unlikely, though possible for PyEval_Get*() to return NULLs. So be safe and do an XINCREF. Klocwork # 221-222. ........ r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines This code is actually not used unless WITHOUT_COMPLEX is defined. However, there was no error checking that PyFloat_FromDouble returned a valid pointer. I believe this change is correct as it seemed to follow other code in the area. Klocwork # 292. ........ r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines Handle NULL nodes while parsing. I'm not entirely sure this is correct. There might be something else that needs to be done to setup the error. Klocwork #295. ........ r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines If _stat_float_times is false, we will try to INCREF ival which could be NULL. Return early in that case. The caller checks for PyErr_Occurred so this should be ok. Klocwork #297 ........ r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines Move the assert which checks for a NULL pointer first. Klocwork #274. ........ r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines Try to handle a malloc failure. I'm not entirely sure this is correct. There might be something else we need to do to handle the exception. Klocwork # 212-213 ........ r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines I'm not sure why this code allocates this string for the error message. I think it would be better to always use snprintf and have the format limit the size of the name appropriately (like %.200s). Klocwork #340 ........ r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines Check returned pointer is valid. Klocwork #233 ........ r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed ........ r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines Don't deref v if it's NULL. Klocwork #214 ........ r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines Check return of PyMem_MALLOC (garbage) is non-NULL. Check seq in both portions of if/else. Klocwork #289-290. ........ r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines PyModule_GetDict() can fail, produce fatal errors if this happens on startup. Klocwork #298-299. ........ r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines Verify verdat which is returned from malloc is not NULL. Ensure we don't pass NULL to free. Klocwork #306 (at least the first part, checking malloc) ........ r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines test_signal: Signal handling on the Tru64 buildbot appears to be utterly insane. Plug some theoretical insecurities in the test script: - Verify that the SIGALRM handler was actually installed. - Don't call alarm() before the handler is installed. - Move everything that can fail inside the try/finally, so the test cleans up after itself more often. - Try sending all the expected signals in force_test_exit(), not just SIGALRM. Since that was fixed to actually send SIGALRM (instead of invisibly dying with an AttributeError), we've seen that sending SIGALRM alone does not stop this from hanging. - Move the "kill the child" business into the finally clause, so the child doesn't survive test failure to send SIGALRM to other tests later (there are also baffling SIGALRM-related failures in test_socket). - Cancel the alarm in the finally clause -- if the test dies early, we again don't want SIGALRM showing up to confuse a later test. Alas, this still relies on timing luck wrt the spawned script that sends the test signals, but it's hard to see how waiting for seconds can so often be so unlucky. test_threadedsignals: curiously, this test never fails on Tru64, but doesn't normally signal SIGALRM. Anyway, fixed an obvious (but probably inconsequential) logic error. ........ r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines Ah, fudge. One of the prints here actually "shouldn't be" protected by "if verbose:", which caused the test to fail on all non-Windows boxes. Note that I deliberately didn't convert this to unittest yet, because I expect it would be even harder to debug this on Tru64 after conversion. ........ r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines Repair logging test spew caused by rev. 51206. ........ r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines Patch #1538606, Patch to fix __index__() clipping. I modified this patch some by fixing style, some error checking, and adding XXX comments. This patch requires review and some changes are to be expected. I'm checking in now to get the greatest possible review and establish a baseline for moving forward. I don't want this to hold up release if possible. ........ r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots were failing due to inappropriate clipping of numbers larger than 2**31 with new-style classes. (typeobject.c) In reviewing the code for classic classes, there were 2 problems. Any negative value return could be returned. Always return -1 if there was an error. Also make the checks similar with the new-style classes. I believe this is correct for 32 and 64 bit boxes, including Windows64. Add a test of classic classes too. ........ r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line SF bug #1539336, distutils example code missing ........ r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines Move/copy assert for tstate != NULL before first use. Verify that PyEval_Get{Globals,Locals} returned valid pointers. Klocwork 231-232 ........ r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines Handle a whole lot of failures from PyString_FromInternedString(). Should fix most of Klocwork 234-272. ........ r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines cpathname could be NULL if it was longer than MAXPATHLEN. Don't try to write the .pyc to NULL. Check results of PyList_GetItem() and PyModule_GetDict() are not NULL. Klocwork 282, 283, 285 ........ r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines Fix segfault when doing string formatting on subclasses of long if __oct__, __hex__ don't return a string. Klocwork 308 ........ r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines Check return result of PyModule_GetDict(). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines Handle malloc and fopen failures more gracefully. Klocwork 180-181 ........ r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines It's very unlikely, though possible that source is not a string. Verify that PyString_AsString() returns a valid pointer. (The problem can arise when zlib.decompress doesn't return a string.) Klocwork 346 ........ r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines Handle failures from lookup. Klocwork 341-342 ........ r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines Handle failure from PyModule_GetDict() (Klocwork 208). Fix a bunch of refleaks in the init of the module. This would only be found when running python -v. ........ r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines Really address the issue of where to place the assert for leftblock. (Followup of Klocwork 274) ........ r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines Handle malloc failure. Klocwork 281 ........ r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines Handle alloca failures. Klocwork 225-228 ........ r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line Get rid of compiler warning ........ r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line Ignore pgen.exe and kill_python.exe for cygwin ........ r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines Can't return NULL from a void function. If there is a memory error, about the best we can do is call PyErr_WriteUnraisable and go on. We won't be able to do the call below either, so verify delstr is valid. ........ r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line Update purify doc some. ........ r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines Remove unused, buggy test function. Fixes klockwork issue #207. ........ r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value from new_CArgObject(). Fixes klockwork issues #183, #184, #185. ........ r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines Check for NULL return value of GenericCData_new(). Fixes klockwork issues #188, #189. ........ r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines Revert the change that tries to zero out a closure's result storage area because the size if unknown in source/callproc.c. ........ r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines Slightly revised version of patch #1538956: Replace UnicodeDecodeErrors raised during == and != compares of Unicode and other objects with a new UnicodeWarning. All other comparisons continue to raise exceptions. Exceptions other than UnicodeDecodeErrors are also left untouched. ........ r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines Apply the patch #1532975 plus ideas from the patch #1533481. ctypes instances no longer have the internal and undocumented '_as_parameter_' attribute which was used to adapt them to foreign function calls; this mechanism is replaced by a function pointer in the type's stgdict. In the 'from_param' class methods, try the _as_parameter_ attribute if other conversions are not possible. This makes the documented _as_parameter_ mechanism work as intended. Change the ctypes version number to 1.0.1. ........ r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines Readd NEWS items that were accidentally removed by r51276. ........ r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines Improve markup in PyUnicode_RichCompare. ........ r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines Correct an accidentally removed previous patch. ........ r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536908: Add support for AMD64 / OpenBSD. Remove the -no-stack-protector compiler flag for OpenBSD as it has been reported to be unneeded. ........ r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line News item for rev 51281. ........ r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines Fix refleak introduced in rev. 51248. ........ r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines Make tabnanny recognize IndentationErrors raised by tokenize. Add a test to test_inspect to make sure indented source is recognized correctly. (fixes #1224621) ........ r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions. ........ r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines Add an additional test: BZ2File write methods should raise IOError when file is read-only. ........ r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines Patch #1536071: trace.py should now find the full module name of a file correctly even on Windows. ........ r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines Cookie.py shouldn't "bogusly" use string._idmap. ........ r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines Patch #1511317: don't crash on invalid hostname info ........ r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines Whitespace normalization. ........ r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries. Now we're even. :-) ........ r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines Fix the test for SocketServer so it should pass on cygwin and not fail sporadically on other platforms. This is really a band-aid that doesn't fix the underlying issue in SocketServer. It's not clear if it's worth it to fix SocketServer, however, I opened a bug to track it: http://python.org/sf/1540386 ........ r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines Update the docstring to use a version a little newer than 1999. This was taken from a Debian patch. Should we update the version for each release? ........ r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines Subclasses of int/long are allowed to define an __index__. ........ r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line Check for NULL return value from new_CArgObject calls. ........ r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines The 'with' statement is now a Code Context block opener ........ r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 ........ r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line preparing for 2.5c1 - no, really this time ........ r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines Patch #1540892: site.py Quitter() class attempts to close sys.stdin before raising SystemExit, allowing IDLE to honor quit() and exit(). M Lib/site.py M Lib/idlelib/PyShell.py M Lib/idlelib/CREDITS.txt M Lib/idlelib/NEWS.txt M Misc/NEWS ........ r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines Update code and tests to support the 'bytes_le' attribute (for little-endian byte order on Windows), and to work around clocks with low resolution yielding duplicate UUIDs. Anthony Baxter has approved this change. ........ r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines Get quit() and exit() to work cleanly when not using subprocess. ........ r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines Revert to having static version numbers again. ........ r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines Build _hashlib on Windows. Build OpenSSL with masm assembler code. Fixes #1535502. ........ r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines Add commented assert statements to check that the result of PyObject_stgdict() and PyType_stgdict() calls are non-NULL before dereferencing the result. Hopefully this fixes what klocwork is complaining about. Fix a few other nits as well. ........ r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line news entry for 51307 ........ r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line Add UnicodeWarning ........ r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line Bump document version to 1.0; remove pystone paragraph ........ r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line Link to docs; remove an XXX comment ........ r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line Make cl build step compile-only (/c). Remove libs from source list. ........ r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines The __repr__ method of a NULL py_object does no longer raise an exception. Remove a stray '?' character from the exception text when the value is retrieved of such an object. Includes tests. ........ r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line Update bug/patch counts ........ r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line Wording/typo fixes ........ r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines Remove the special casing of Py_None when converting the return value of the Python part of a callback function to C. If it cannot be converted, call PyErr_WriteUnraisable with the exception we got. Before, arbitrary data has been passed to the calling C code in this case. (I'm not really sure the NEWS entry is understandable, but I cannot find better words) ........ r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines Add NEWS item mentioning the reverted distutils version number patch. ........ r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines SF#1534630 ignore data that arrives before the opening start tag ........ r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line Grammar fix ........ r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines Tutorial: Clarify somewhat how parameters are passed to functions (especially explain what integer means). Correct the table - Python integers and longs can both be used. Further clarification to the table comparing ctypes types, Python types, and C types. Reference: Replace integer by C ``int`` where it makes sense. ........ r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines File menu hotkeys: there were three 'p' assignments. Reassign the 'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the Shell menu hotkey from 's' to 'l'. M Bindings.py M PyShell.py M NEWS.txt ........ r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines Fix a bug in the ``compiler`` package that caused invalid code to be generated for generator expressions. ........ r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines Merge 51340 and 51341 from 2.5 branch: Leave tk build directory to restore original path. Invoke debug mk1mf.pl after running Configure. ........ r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines Bug #1541863: uuid.uuid1 failed to generate unique identifiers on systems with low clock resolution. ........ r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line Add template for 2.6 on HEAD ........ r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line More post-release wibble ........ r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again ........ r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Windows bots working again. Take 2 ........ r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line Try to get Unix bots install working again. ........ r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line Set version to 2.6a0, seems more consistent. ........ r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line More version wibble ........ r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines Bug #1541682: Fix example in the "Refcount details" API docs. Additionally, remove a faulty example showing PySequence_SetItem applied to a newly created list object and add notes that this isn't a good idea. ........ r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines Updating IDLE's version number to match Python's (as per python-dev discussion). ........ r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line RPM specfile updates ........ r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines Typo in tp_clear docs. ........ r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line Minor edits ........ r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines Add asserts to check for 'impossible' NULL values, with comments. In one place where I'n not 1000% sure about the non-NULL, raise a RuntimeError for safety. This should fix the klocwork issues that Neal sent me. If so, it should be applied to the release25-maint branch also. ........ r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines Move initialization of interned strings to before allocating the object so we don't leak op. (Fixes an earlier patch to this code) Klockwork #350 ........ r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines Move assert to after NULL check, otherwise we deref NULL in the assert. Klocwork #307 ........ r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro ........ r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines Move initialization to after the asserts for non-NULL values. Klocwork 286-287. (I'm not backporting this, but if someone wants to, feel free.) ........ r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines Handle PyString_FromInternedString() failing (unlikely, but possible). Klocwork #325 (I'm not backporting this, but if someone wants to, feel free.) ........ r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines Patch #1542948: fix urllib2 header casing issue. With new test. ........ r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines Move peephole optimizer to separate file. ........ r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines Move peephole optimizer to separate file. (Forgot .h in previous checkin.) ........ r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines Fix bug #1543303, tarfile adds padding that breaks gunzip. Patch # 1543897. Will backport to 2.5 ........ r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines Add assert to make Klocwork happy (#276) ........
3166 lines
71 KiB
C
3166 lines
71 KiB
C
/***********************************************************
|
||
Copyright (C) 1994 Steen Lumholt.
|
||
|
||
All Rights Reserved
|
||
|
||
******************************************************************/
|
||
|
||
/* _tkinter.c -- Interface to libtk.a and libtcl.a. */
|
||
|
||
/* TCL/TK VERSION INFO:
|
||
|
||
Only Tcl/Tk 8.2 and later are supported. Older versions are not
|
||
supported. (Use Python 2.2 if you cannot upgrade your Tcl/Tk
|
||
libraries.)
|
||
*/
|
||
|
||
/* XXX Further speed-up ideas, involving Tcl 8.0 features:
|
||
|
||
- Register a new Tcl type, "Python callable", which can be called more
|
||
efficiently and passed to Tcl_EvalObj() directly (if this is possible).
|
||
|
||
*/
|
||
|
||
|
||
#include "Python.h"
|
||
#include <ctype.h>
|
||
|
||
#ifdef WITH_THREAD
|
||
#include "pythread.h"
|
||
#endif
|
||
|
||
#ifdef MS_WINDOWS
|
||
#include <windows.h>
|
||
#endif
|
||
|
||
/* Allow using this code in Python 2.[12] */
|
||
#ifndef PyDoc_STRVAR
|
||
#define PyDoc_STRVAR(name,str) static char name[] = str
|
||
#endif
|
||
|
||
#ifndef PyMODINIT_FUNC
|
||
#define PyMODINIT_FUNC void
|
||
#endif
|
||
|
||
#ifndef PyBool_Check
|
||
#define PyBool_Check(o) 0
|
||
#define PyBool_FromLong PyInt_FromLong
|
||
#endif
|
||
|
||
/* Starting with Tcl 8.4, many APIs offer const-correctness. Unfortunately,
|
||
making _tkinter correct for this API means to break earlier
|
||
versions. USE_COMPAT_CONST allows to make _tkinter work with both 8.4 and
|
||
earlier versions. Once Tcl releases before 8.4 don't need to be supported
|
||
anymore, this should go. */
|
||
#define USE_COMPAT_CONST
|
||
|
||
/* If Tcl is compiled for threads, we must also define TCL_THREAD. We define
|
||
it always; if Tcl is not threaded, the thread functions in
|
||
Tcl are empty. */
|
||
#define TCL_THREADS
|
||
|
||
#ifdef TK_FRAMEWORK
|
||
#include <Tcl/tcl.h>
|
||
#include <Tk/tk.h>
|
||
#else
|
||
#include <tcl.h>
|
||
#include <tk.h>
|
||
#endif
|
||
|
||
/* For Tcl 8.2 and 8.3, CONST* is not defined (except on Cygwin). */
|
||
#ifndef CONST84_RETURN
|
||
#define CONST84_RETURN
|
||
#undef CONST
|
||
#define CONST
|
||
#endif
|
||
|
||
#define TKMAJORMINOR (TK_MAJOR_VERSION*1000 + TK_MINOR_VERSION)
|
||
|
||
#if TKMAJORMINOR < 8002
|
||
#error "Tk older than 8.2 not supported"
|
||
#endif
|
||
|
||
/* Unicode conversion assumes that Tcl_UniChar is two bytes.
|
||
We cannot test this directly, so we test UTF-8 size instead,
|
||
expecting that TCL_UTF_MAX is changed if Tcl ever supports
|
||
either UTF-16 or UCS-4.
|
||
Redhat 8 sets TCL_UTF_MAX to 6, and uses wchar_t for
|
||
Tcl_Unichar. This is also ok as long as Python uses UCS-4,
|
||
as well.
|
||
*/
|
||
#if TCL_UTF_MAX != 3 && !(defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==6)
|
||
#error "unsupported Tcl configuration"
|
||
#endif
|
||
|
||
#if !(defined(MS_WINDOWS) || defined(__CYGWIN__))
|
||
#define HAVE_CREATEFILEHANDLER
|
||
#endif
|
||
|
||
#ifdef HAVE_CREATEFILEHANDLER
|
||
|
||
/* This bit is to ensure that TCL_UNIX_FD is defined and doesn't interfere
|
||
with the proper calculation of FHANDLETYPE == TCL_UNIX_FD below. */
|
||
#ifndef TCL_UNIX_FD
|
||
# ifdef TCL_WIN_SOCKET
|
||
# define TCL_UNIX_FD (! TCL_WIN_SOCKET)
|
||
# else
|
||
# define TCL_UNIX_FD 1
|
||
# endif
|
||
#endif
|
||
|
||
/* Tcl_CreateFileHandler() changed several times; these macros deal with the
|
||
messiness. In Tcl 8.0 and later, it is not available on Windows (and on
|
||
Unix, only because Jack added it back); when available on Windows, it only
|
||
applies to sockets. */
|
||
|
||
#ifdef MS_WINDOWS
|
||
#define FHANDLETYPE TCL_WIN_SOCKET
|
||
#else
|
||
#define FHANDLETYPE TCL_UNIX_FD
|
||
#endif
|
||
|
||
/* If Tcl can wait for a Unix file descriptor, define the EventHook() routine
|
||
which uses this to handle Tcl events while the user is typing commands. */
|
||
|
||
#if FHANDLETYPE == TCL_UNIX_FD
|
||
#define WAIT_FOR_STDIN
|
||
#endif
|
||
|
||
#endif /* HAVE_CREATEFILEHANDLER */
|
||
|
||
#ifdef MS_WINDOWS
|
||
#include <conio.h>
|
||
#define WAIT_FOR_STDIN
|
||
#endif
|
||
|
||
#ifdef WITH_THREAD
|
||
|
||
/* The threading situation is complicated. Tcl is not thread-safe, except
|
||
when configured with --enable-threads.
|
||
So we need to use a lock around all uses of Tcl. Previously, the Python
|
||
interpreter lock was used for this. However, this causes problems when
|
||
other Python threads need to run while Tcl is blocked waiting for events.
|
||
|
||
To solve this problem, a separate lock for Tcl is introduced. Holding it
|
||
is incompatible with holding Python's interpreter lock. The following four
|
||
macros manipulate both locks together.
|
||
|
||
ENTER_TCL and LEAVE_TCL are brackets, just like Py_BEGIN_ALLOW_THREADS and
|
||
Py_END_ALLOW_THREADS. They should be used whenever a call into Tcl is made
|
||
that could call an event handler, or otherwise affect the state of a Tcl
|
||
interpreter. These assume that the surrounding code has the Python
|
||
interpreter lock; inside the brackets, the Python interpreter lock has been
|
||
released and the lock for Tcl has been acquired.
|
||
|
||
Sometimes, it is necessary to have both the Python lock and the Tcl lock.
|
||
(For example, when transferring data from the Tcl interpreter result to a
|
||
Python string object.) This can be done by using different macros to close
|
||
the ENTER_TCL block: ENTER_OVERLAP reacquires the Python lock (and restores
|
||
the thread state) but doesn't release the Tcl lock; LEAVE_OVERLAP_TCL
|
||
releases the Tcl lock.
|
||
|
||
By contrast, ENTER_PYTHON and LEAVE_PYTHON are used in Tcl event
|
||
handlers when the handler needs to use Python. Such event handlers are
|
||
entered while the lock for Tcl is held; the event handler presumably needs
|
||
to use Python. ENTER_PYTHON releases the lock for Tcl and acquires
|
||
the Python interpreter lock, restoring the appropriate thread state, and
|
||
LEAVE_PYTHON releases the Python interpreter lock and re-acquires the lock
|
||
for Tcl. It is okay for ENTER_TCL/LEAVE_TCL pairs to be contained inside
|
||
the code between ENTER_PYTHON and LEAVE_PYTHON.
|
||
|
||
These locks expand to several statements and brackets; they should not be
|
||
used in branches of if statements and the like.
|
||
|
||
If Tcl is threaded, this approach won't work anymore. The Tcl interpreter is
|
||
only valid in the thread that created it, and all Tk activity must happen in this
|
||
thread, also. That means that the mainloop must be invoked in the thread that
|
||
created the interpreter. Invoking commands from other threads is possible;
|
||
_tkinter will queue an event for the interpreter thread, which will then
|
||
execute the command and pass back the result. If the main thread is not in the
|
||
mainloop, and invoking commands causes an exception; if the main loop is running
|
||
but not processing events, the command invocation will block.
|
||
|
||
In addition, for a threaded Tcl, a single global tcl_tstate won't be sufficient
|
||
anymore, since multiple Tcl interpreters may simultaneously dispatch in different
|
||
threads. So we use the Tcl TLS API.
|
||
|
||
*/
|
||
|
||
static PyThread_type_lock tcl_lock = 0;
|
||
|
||
#ifdef TCL_THREADS
|
||
static Tcl_ThreadDataKey state_key;
|
||
typedef PyThreadState *ThreadSpecificData;
|
||
#define tcl_tstate (*(PyThreadState**)Tcl_GetThreadData(&state_key, sizeof(PyThreadState*)))
|
||
#else
|
||
static PyThreadState *tcl_tstate = NULL;
|
||
#endif
|
||
|
||
#define ENTER_TCL \
|
||
{ PyThreadState *tstate = PyThreadState_Get(); Py_BEGIN_ALLOW_THREADS \
|
||
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); tcl_tstate = tstate;
|
||
|
||
#define LEAVE_TCL \
|
||
tcl_tstate = NULL; if(tcl_lock)PyThread_release_lock(tcl_lock); Py_END_ALLOW_THREADS}
|
||
|
||
#define ENTER_OVERLAP \
|
||
Py_END_ALLOW_THREADS
|
||
|
||
#define LEAVE_OVERLAP_TCL \
|
||
tcl_tstate = NULL; if(tcl_lock)PyThread_release_lock(tcl_lock); }
|
||
|
||
#define ENTER_PYTHON \
|
||
{ PyThreadState *tstate = tcl_tstate; tcl_tstate = NULL; \
|
||
if(tcl_lock)PyThread_release_lock(tcl_lock); PyEval_RestoreThread((tstate)); }
|
||
|
||
#define LEAVE_PYTHON \
|
||
{ PyThreadState *tstate = PyEval_SaveThread(); \
|
||
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1); tcl_tstate = tstate; }
|
||
|
||
#define CHECK_TCL_APPARTMENT \
|
||
if (((TkappObject *)self)->threaded && \
|
||
((TkappObject *)self)->thread_id != Tcl_GetCurrentThread()) { \
|
||
PyErr_SetString(PyExc_RuntimeError, "Calling Tcl from different appartment"); \
|
||
return 0; \
|
||
}
|
||
|
||
#else
|
||
|
||
#define ENTER_TCL
|
||
#define LEAVE_TCL
|
||
#define ENTER_OVERLAP
|
||
#define LEAVE_OVERLAP_TCL
|
||
#define ENTER_PYTHON
|
||
#define LEAVE_PYTHON
|
||
#define CHECK_TCL_APPARTMENT
|
||
|
||
#endif
|
||
|
||
#ifndef FREECAST
|
||
#define FREECAST (char *)
|
||
#endif
|
||
|
||
/**** Tkapp Object Declaration ****/
|
||
|
||
static PyTypeObject Tkapp_Type;
|
||
|
||
typedef struct {
|
||
PyObject_HEAD
|
||
Tcl_Interp *interp;
|
||
int wantobjects;
|
||
int threaded; /* True if tcl_platform[threaded] */
|
||
Tcl_ThreadId thread_id;
|
||
int dispatching;
|
||
/* We cannot include tclInt.h, as this is internal.
|
||
So we cache interesting types here. */
|
||
Tcl_ObjType *BooleanType;
|
||
Tcl_ObjType *ByteArrayType;
|
||
Tcl_ObjType *DoubleType;
|
||
Tcl_ObjType *IntType;
|
||
Tcl_ObjType *ListType;
|
||
Tcl_ObjType *ProcBodyType;
|
||
Tcl_ObjType *StringType;
|
||
} TkappObject;
|
||
|
||
#define Tkapp_Check(v) ((v)->ob_type == &Tkapp_Type)
|
||
#define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
|
||
#define Tkapp_Result(v) Tcl_GetStringResult(Tkapp_Interp(v))
|
||
|
||
#define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \
|
||
(void *) v, ((PyObject *) v)->ob_refcnt))
|
||
|
||
|
||
|
||
/**** Error Handling ****/
|
||
|
||
static PyObject *Tkinter_TclError;
|
||
static int quitMainLoop = 0;
|
||
static int errorInCmd = 0;
|
||
static PyObject *excInCmd;
|
||
static PyObject *valInCmd;
|
||
static PyObject *trbInCmd;
|
||
|
||
|
||
|
||
static PyObject *
|
||
Tkinter_Error(PyObject *v)
|
||
{
|
||
PyErr_SetString(Tkinter_TclError, Tkapp_Result(v));
|
||
return NULL;
|
||
}
|
||
|
||
|
||
|
||
/**** Utils ****/
|
||
|
||
static int Tkinter_busywaitinterval = 20;
|
||
|
||
#ifdef WITH_THREAD
|
||
#ifndef MS_WINDOWS
|
||
|
||
/* Millisecond sleep() for Unix platforms. */
|
||
|
||
static void
|
||
Sleep(int milli)
|
||
{
|
||
/* XXX Too bad if you don't have select(). */
|
||
struct timeval t;
|
||
t.tv_sec = milli/1000;
|
||
t.tv_usec = (milli%1000) * 1000;
|
||
select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &t);
|
||
}
|
||
#endif /* MS_WINDOWS */
|
||
|
||
/* Wait up to 1s for the mainloop to come up. */
|
||
|
||
static int
|
||
WaitForMainloop(TkappObject* self)
|
||
{
|
||
int i;
|
||
for (i = 0; i < 10; i++) {
|
||
if (self->dispatching)
|
||
return 1;
|
||
Py_BEGIN_ALLOW_THREADS
|
||
Sleep(100);
|
||
Py_END_ALLOW_THREADS
|
||
}
|
||
if (self->dispatching)
|
||
return 1;
|
||
PyErr_SetString(PyExc_RuntimeError, "main thread is not in main loop");
|
||
return 0;
|
||
}
|
||
#endif /* WITH_THREAD */
|
||
|
||
|
||
static char *
|
||
AsString(PyObject *value, PyObject *tmp)
|
||
{
|
||
if (PyString_Check(value))
|
||
return PyString_AsString(value);
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(value)) {
|
||
PyObject *v = PyUnicode_AsUTF8String(value);
|
||
if (v == NULL)
|
||
return NULL;
|
||
if (PyList_Append(tmp, v) != 0) {
|
||
Py_DECREF(v);
|
||
return NULL;
|
||
}
|
||
Py_DECREF(v);
|
||
return PyString_AsString(v);
|
||
}
|
||
#endif
|
||
else {
|
||
PyObject *v = PyObject_Str(value);
|
||
if (v == NULL)
|
||
return NULL;
|
||
if (PyList_Append(tmp, v) != 0) {
|
||
Py_DECREF(v);
|
||
return NULL;
|
||
}
|
||
Py_DECREF(v);
|
||
return PyString_AsString(v);
|
||
}
|
||
}
|
||
|
||
|
||
|
||
#define ARGSZ 64
|
||
|
||
static char *
|
||
Merge(PyObject *args)
|
||
{
|
||
PyObject *tmp = NULL;
|
||
char *argvStore[ARGSZ];
|
||
char **argv = NULL;
|
||
int fvStore[ARGSZ];
|
||
int *fv = NULL;
|
||
int argc = 0, fvc = 0, i;
|
||
char *res = NULL;
|
||
|
||
if (!(tmp = PyList_New(0)))
|
||
return NULL;
|
||
|
||
argv = argvStore;
|
||
fv = fvStore;
|
||
|
||
if (args == NULL)
|
||
argc = 0;
|
||
|
||
else if (!PyTuple_Check(args)) {
|
||
argc = 1;
|
||
fv[0] = 0;
|
||
if (!(argv[0] = AsString(args, tmp)))
|
||
goto finally;
|
||
}
|
||
else {
|
||
argc = PyTuple_Size(args);
|
||
|
||
if (argc > ARGSZ) {
|
||
argv = (char **)ckalloc(argc * sizeof(char *));
|
||
fv = (int *)ckalloc(argc * sizeof(int));
|
||
if (argv == NULL || fv == NULL) {
|
||
PyErr_NoMemory();
|
||
goto finally;
|
||
}
|
||
}
|
||
|
||
for (i = 0; i < argc; i++) {
|
||
PyObject *v = PyTuple_GetItem(args, i);
|
||
if (PyTuple_Check(v)) {
|
||
fv[i] = 1;
|
||
if (!(argv[i] = Merge(v)))
|
||
goto finally;
|
||
fvc++;
|
||
}
|
||
else if (v == Py_None) {
|
||
argc = i;
|
||
break;
|
||
}
|
||
else {
|
||
fv[i] = 0;
|
||
if (!(argv[i] = AsString(v, tmp)))
|
||
goto finally;
|
||
fvc++;
|
||
}
|
||
}
|
||
}
|
||
res = Tcl_Merge(argc, argv);
|
||
if (res == NULL)
|
||
PyErr_SetString(Tkinter_TclError, "merge failed");
|
||
|
||
finally:
|
||
for (i = 0; i < fvc; i++)
|
||
if (fv[i]) {
|
||
ckfree(argv[i]);
|
||
}
|
||
if (argv != argvStore)
|
||
ckfree(FREECAST argv);
|
||
if (fv != fvStore)
|
||
ckfree(FREECAST fv);
|
||
|
||
Py_DECREF(tmp);
|
||
return res;
|
||
}
|
||
|
||
|
||
|
||
static PyObject *
|
||
Split(char *list)
|
||
{
|
||
int argc;
|
||
char **argv;
|
||
PyObject *v;
|
||
|
||
if (list == NULL) {
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
|
||
/* Not a list.
|
||
* Could be a quoted string containing funnies, e.g. {"}.
|
||
* Return the string itself.
|
||
*/
|
||
return PyString_FromString(list);
|
||
}
|
||
|
||
if (argc == 0)
|
||
v = PyString_FromString("");
|
||
else if (argc == 1)
|
||
v = PyString_FromString(argv[0]);
|
||
else if ((v = PyTuple_New(argc)) != NULL) {
|
||
int i;
|
||
PyObject *w;
|
||
|
||
for (i = 0; i < argc; i++) {
|
||
if ((w = Split(argv[i])) == NULL) {
|
||
Py_DECREF(v);
|
||
v = NULL;
|
||
break;
|
||
}
|
||
PyTuple_SetItem(v, i, w);
|
||
}
|
||
}
|
||
Tcl_Free(FREECAST argv);
|
||
return v;
|
||
}
|
||
|
||
/* In some cases, Tcl will still return strings that are supposed to be
|
||
lists. SplitObj walks through a nested tuple, finding string objects that
|
||
need to be split. */
|
||
|
||
PyObject *
|
||
SplitObj(PyObject *arg)
|
||
{
|
||
if (PyTuple_Check(arg)) {
|
||
int i, size;
|
||
PyObject *elem, *newelem, *result;
|
||
|
||
size = PyTuple_Size(arg);
|
||
result = NULL;
|
||
/* Recursively invoke SplitObj for all tuple items.
|
||
If this does not return a new object, no action is
|
||
needed. */
|
||
for(i = 0; i < size; i++) {
|
||
elem = PyTuple_GetItem(arg, i);
|
||
newelem = SplitObj(elem);
|
||
if (!newelem) {
|
||
Py_XDECREF(result);
|
||
return NULL;
|
||
}
|
||
if (!result) {
|
||
int k;
|
||
if (newelem == elem) {
|
||
Py_DECREF(newelem);
|
||
continue;
|
||
}
|
||
result = PyTuple_New(size);
|
||
if (!result)
|
||
return NULL;
|
||
for(k = 0; k < i; k++) {
|
||
elem = PyTuple_GetItem(arg, k);
|
||
Py_INCREF(elem);
|
||
PyTuple_SetItem(result, k, elem);
|
||
}
|
||
}
|
||
PyTuple_SetItem(result, i, newelem);
|
||
}
|
||
if (result)
|
||
return result;
|
||
/* Fall through, returning arg. */
|
||
}
|
||
else if (PyString_Check(arg)) {
|
||
int argc;
|
||
char **argv;
|
||
char *list = PyString_AsString(arg);
|
||
|
||
if (Tcl_SplitList((Tcl_Interp *)NULL, list, &argc, &argv) != TCL_OK) {
|
||
Py_INCREF(arg);
|
||
return arg;
|
||
}
|
||
Tcl_Free(FREECAST argv);
|
||
if (argc > 1)
|
||
return Split(PyString_AsString(arg));
|
||
/* Fall through, returning arg. */
|
||
}
|
||
Py_INCREF(arg);
|
||
return arg;
|
||
}
|
||
|
||
|
||
/**** Tkapp Object ****/
|
||
|
||
#ifndef WITH_APPINIT
|
||
int
|
||
Tcl_AppInit(Tcl_Interp *interp)
|
||
{
|
||
Tk_Window main;
|
||
const char * _tkinter_skip_tk_init;
|
||
|
||
if (Tcl_Init(interp) == TCL_ERROR) {
|
||
PySys_WriteStderr("Tcl_Init error: %s\n", Tcl_GetStringResult(interp));
|
||
return TCL_ERROR;
|
||
}
|
||
_tkinter_skip_tk_init = Tcl_GetVar(interp, "_tkinter_skip_tk_init", TCL_GLOBAL_ONLY);
|
||
if (_tkinter_skip_tk_init == NULL || strcmp(_tkinter_skip_tk_init, "1") != 0) {
|
||
main = Tk_MainWindow(interp);
|
||
if (Tk_Init(interp) == TCL_ERROR) {
|
||
PySys_WriteStderr("Tk_Init error: %s\n", Tcl_GetStringResult(interp));
|
||
return TCL_ERROR;
|
||
}
|
||
}
|
||
return TCL_OK;
|
||
}
|
||
#endif /* !WITH_APPINIT */
|
||
|
||
|
||
|
||
|
||
/* Initialize the Tk application; see the `main' function in
|
||
* `tkMain.c'.
|
||
*/
|
||
|
||
static void EnableEventHook(void); /* Forward */
|
||
static void DisableEventHook(void); /* Forward */
|
||
|
||
static TkappObject *
|
||
Tkapp_New(char *screenName, char *baseName, char *className,
|
||
int interactive, int wantobjects, int wantTk, int sync, char *use)
|
||
{
|
||
TkappObject *v;
|
||
char *argv0;
|
||
|
||
v = PyObject_New(TkappObject, &Tkapp_Type);
|
||
if (v == NULL)
|
||
return NULL;
|
||
|
||
v->interp = Tcl_CreateInterp();
|
||
v->wantobjects = wantobjects;
|
||
v->threaded = Tcl_GetVar2Ex(v->interp, "tcl_platform", "threaded",
|
||
TCL_GLOBAL_ONLY) != NULL;
|
||
v->thread_id = Tcl_GetCurrentThread();
|
||
v->dispatching = 0;
|
||
|
||
#ifndef TCL_THREADS
|
||
if (v->threaded) {
|
||
PyErr_SetString(PyExc_RuntimeError, "Tcl is threaded but _tkinter is not");
|
||
Py_DECREF(v);
|
||
return 0;
|
||
}
|
||
#endif
|
||
#ifdef WITH_THREAD
|
||
if (v->threaded && tcl_lock) {
|
||
/* If Tcl is threaded, we don't need the lock. */
|
||
PyThread_free_lock(tcl_lock);
|
||
tcl_lock = NULL;
|
||
}
|
||
#endif
|
||
|
||
v->BooleanType = Tcl_GetObjType("boolean");
|
||
v->ByteArrayType = Tcl_GetObjType("bytearray");
|
||
v->DoubleType = Tcl_GetObjType("double");
|
||
v->IntType = Tcl_GetObjType("int");
|
||
v->ListType = Tcl_GetObjType("list");
|
||
v->ProcBodyType = Tcl_GetObjType("procbody");
|
||
v->StringType = Tcl_GetObjType("string");
|
||
|
||
/* Delete the 'exit' command, which can screw things up */
|
||
Tcl_DeleteCommand(v->interp, "exit");
|
||
|
||
if (screenName != NULL)
|
||
Tcl_SetVar2(v->interp, "env", "DISPLAY",
|
||
screenName, TCL_GLOBAL_ONLY);
|
||
|
||
if (interactive)
|
||
Tcl_SetVar(v->interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY);
|
||
else
|
||
Tcl_SetVar(v->interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY);
|
||
|
||
/* This is used to get the application class for Tk 4.1 and up */
|
||
argv0 = (char*)ckalloc(strlen(className) + 1);
|
||
if (!argv0) {
|
||
PyErr_NoMemory();
|
||
Py_DECREF(v);
|
||
return NULL;
|
||
}
|
||
|
||
strcpy(argv0, className);
|
||
if (isupper(Py_CHARMASK(argv0[0])))
|
||
argv0[0] = tolower(Py_CHARMASK(argv0[0]));
|
||
Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY);
|
||
ckfree(argv0);
|
||
|
||
if (! wantTk) {
|
||
Tcl_SetVar(v->interp, "_tkinter_skip_tk_init", "1", TCL_GLOBAL_ONLY);
|
||
}
|
||
|
||
/* some initial arguments need to be in argv */
|
||
if (sync || use) {
|
||
char *args;
|
||
int len = 0;
|
||
|
||
if (sync)
|
||
len += sizeof "-sync";
|
||
if (use)
|
||
len += strlen(use) + sizeof "-use ";
|
||
|
||
args = (char*)ckalloc(len);
|
||
if (!args) {
|
||
PyErr_NoMemory();
|
||
Py_DECREF(v);
|
||
return NULL;
|
||
}
|
||
|
||
args[0] = '\0';
|
||
if (sync)
|
||
strcat(args, "-sync");
|
||
if (use) {
|
||
if (sync)
|
||
strcat(args, " ");
|
||
strcat(args, "-use ");
|
||
strcat(args, use);
|
||
}
|
||
|
||
Tcl_SetVar(v->interp, "argv", args, TCL_GLOBAL_ONLY);
|
||
ckfree(args);
|
||
}
|
||
|
||
if (Tcl_AppInit(v->interp) != TCL_OK) {
|
||
PyObject *result = Tkinter_Error((PyObject *)v);
|
||
Py_DECREF((PyObject *)v);
|
||
return (TkappObject *)result;
|
||
}
|
||
|
||
EnableEventHook();
|
||
|
||
return v;
|
||
}
|
||
|
||
|
||
static void
|
||
Tkapp_ThreadSend(TkappObject *self, Tcl_Event *ev,
|
||
Tcl_Condition *cond, Tcl_Mutex *mutex)
|
||
{
|
||
Py_BEGIN_ALLOW_THREADS;
|
||
Tcl_MutexLock(mutex);
|
||
Tcl_ThreadQueueEvent(self->thread_id, ev, TCL_QUEUE_TAIL);
|
||
Tcl_ThreadAlert(self->thread_id);
|
||
Tcl_ConditionWait(cond, mutex, NULL);
|
||
Tcl_MutexUnlock(mutex);
|
||
Py_END_ALLOW_THREADS
|
||
}
|
||
|
||
|
||
/** Tcl Eval **/
|
||
|
||
typedef struct {
|
||
PyObject_HEAD
|
||
Tcl_Obj *value;
|
||
PyObject *string; /* This cannot cause cycles. */
|
||
} PyTclObject;
|
||
|
||
static PyTypeObject PyTclObject_Type;
|
||
#define PyTclObject_Check(v) ((v)->ob_type == &PyTclObject_Type)
|
||
|
||
static PyObject *
|
||
newPyTclObject(Tcl_Obj *arg)
|
||
{
|
||
PyTclObject *self;
|
||
self = PyObject_New(PyTclObject, &PyTclObject_Type);
|
||
if (self == NULL)
|
||
return NULL;
|
||
Tcl_IncrRefCount(arg);
|
||
self->value = arg;
|
||
self->string = NULL;
|
||
return (PyObject*)self;
|
||
}
|
||
|
||
static void
|
||
PyTclObject_dealloc(PyTclObject *self)
|
||
{
|
||
Tcl_DecrRefCount(self->value);
|
||
Py_XDECREF(self->string);
|
||
PyObject_Del(self);
|
||
}
|
||
|
||
static PyObject *
|
||
PyTclObject_str(PyTclObject *self)
|
||
{
|
||
if (self->string && PyString_Check(self->string)) {
|
||
Py_INCREF(self->string);
|
||
return self->string;
|
||
}
|
||
/* XXX Could cache value if it is an ASCII string. */
|
||
return PyString_FromString(Tcl_GetString(self->value));
|
||
}
|
||
|
||
static char*
|
||
PyTclObject_TclString(PyObject *self)
|
||
{
|
||
return Tcl_GetString(((PyTclObject*)self)->value);
|
||
}
|
||
|
||
/* Like _str, but create Unicode if necessary. */
|
||
PyDoc_STRVAR(PyTclObject_string__doc__,
|
||
"the string representation of this object, either as string or Unicode");
|
||
|
||
static PyObject *
|
||
PyTclObject_string(PyTclObject *self, void *ignored)
|
||
{
|
||
char *s;
|
||
int i, len;
|
||
if (!self->string) {
|
||
s = Tcl_GetStringFromObj(self->value, &len);
|
||
for (i = 0; i < len; i++)
|
||
if (s[i] & 0x80)
|
||
break;
|
||
#ifdef Py_USING_UNICODE
|
||
if (i == len)
|
||
/* It is an ASCII string. */
|
||
self->string = PyString_FromStringAndSize(s, len);
|
||
else {
|
||
self->string = PyUnicode_DecodeUTF8(s, len, "strict");
|
||
if (!self->string) {
|
||
PyErr_Clear();
|
||
self->string = PyString_FromStringAndSize(s, len);
|
||
}
|
||
}
|
||
#else
|
||
self->string = PyString_FromStringAndSize(s, len);
|
||
#endif
|
||
if (!self->string)
|
||
return NULL;
|
||
}
|
||
Py_INCREF(self->string);
|
||
return self->string;
|
||
}
|
||
|
||
#ifdef Py_USING_UNICODE
|
||
PyDoc_STRVAR(PyTclObject_unicode__doc__, "convert argument to unicode");
|
||
|
||
static PyObject *
|
||
PyTclObject_unicode(PyTclObject *self, void *ignored)
|
||
{
|
||
char *s;
|
||
int len;
|
||
if (self->string && PyUnicode_Check(self->string)) {
|
||
Py_INCREF(self->string);
|
||
return self->string;
|
||
}
|
||
/* XXX Could chache result if it is non-ASCII. */
|
||
s = Tcl_GetStringFromObj(self->value, &len);
|
||
return PyUnicode_DecodeUTF8(s, len, "strict");
|
||
}
|
||
#endif
|
||
|
||
static PyObject *
|
||
PyTclObject_repr(PyTclObject *self)
|
||
{
|
||
char buf[50];
|
||
PyOS_snprintf(buf, 50, "<%s object at %p>",
|
||
self->value->typePtr->name, self->value);
|
||
return PyString_FromString(buf);
|
||
}
|
||
|
||
static int
|
||
PyTclObject_cmp(PyTclObject *self, PyTclObject *other)
|
||
{
|
||
int res;
|
||
res = strcmp(Tcl_GetString(self->value),
|
||
Tcl_GetString(other->value));
|
||
if (res < 0) return -1;
|
||
if (res > 0) return 1;
|
||
return 0;
|
||
}
|
||
|
||
PyDoc_STRVAR(get_typename__doc__, "name of the Tcl type");
|
||
|
||
static PyObject*
|
||
get_typename(PyTclObject* obj, void* ignored)
|
||
{
|
||
return PyString_FromString(obj->value->typePtr->name);
|
||
}
|
||
|
||
|
||
static PyGetSetDef PyTclObject_getsetlist[] = {
|
||
{"typename", (getter)get_typename, NULL, get_typename__doc__},
|
||
{"string", (getter)PyTclObject_string, NULL,
|
||
PyTclObject_string__doc__},
|
||
{0},
|
||
};
|
||
|
||
static PyMethodDef PyTclObject_methods[] = {
|
||
#ifdef Py_USING_UNICODE
|
||
{"__unicode__", (PyCFunction)PyTclObject_unicode, METH_NOARGS,
|
||
PyTclObject_unicode__doc__},
|
||
#endif
|
||
{0}
|
||
};
|
||
|
||
static PyTypeObject PyTclObject_Type = {
|
||
PyObject_HEAD_INIT(NULL)
|
||
0, /*ob_size*/
|
||
"_tkinter.Tcl_Obj", /*tp_name*/
|
||
sizeof(PyTclObject), /*tp_basicsize*/
|
||
0, /*tp_itemsize*/
|
||
/* methods */
|
||
(destructor)PyTclObject_dealloc, /*tp_dealloc*/
|
||
0, /*tp_print*/
|
||
0, /*tp_getattr*/
|
||
0, /*tp_setattr*/
|
||
(cmpfunc)PyTclObject_cmp, /*tp_compare*/
|
||
(reprfunc)PyTclObject_repr, /*tp_repr*/
|
||
0, /*tp_as_number*/
|
||
0, /*tp_as_sequence*/
|
||
0, /*tp_as_mapping*/
|
||
0, /*tp_hash*/
|
||
0, /*tp_call*/
|
||
(reprfunc)PyTclObject_str, /*tp_str*/
|
||
PyObject_GenericGetAttr,/*tp_getattro*/
|
||
0, /*tp_setattro*/
|
||
0, /*tp_as_buffer*/
|
||
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
||
0, /*tp_doc*/
|
||
0, /*tp_traverse*/
|
||
0, /*tp_clear*/
|
||
0, /*tp_richcompare*/
|
||
0, /*tp_weaklistoffset*/
|
||
0, /*tp_iter*/
|
||
0, /*tp_iternext*/
|
||
PyTclObject_methods, /*tp_methods*/
|
||
0, /*tp_members*/
|
||
PyTclObject_getsetlist, /*tp_getset*/
|
||
0, /*tp_base*/
|
||
0, /*tp_dict*/
|
||
0, /*tp_descr_get*/
|
||
0, /*tp_descr_set*/
|
||
0, /*tp_dictoffset*/
|
||
0, /*tp_init*/
|
||
0, /*tp_alloc*/
|
||
0, /*tp_new*/
|
||
0, /*tp_free*/
|
||
0, /*tp_is_gc*/
|
||
};
|
||
|
||
static Tcl_Obj*
|
||
AsObj(PyObject *value)
|
||
{
|
||
Tcl_Obj *result;
|
||
|
||
if (PyString_Check(value))
|
||
return Tcl_NewStringObj(PyString_AS_STRING(value),
|
||
PyString_GET_SIZE(value));
|
||
else if (PyBool_Check(value))
|
||
return Tcl_NewBooleanObj(PyObject_IsTrue(value));
|
||
else if (PyInt_Check(value))
|
||
return Tcl_NewLongObj(PyInt_AS_LONG(value));
|
||
else if (PyFloat_Check(value))
|
||
return Tcl_NewDoubleObj(PyFloat_AS_DOUBLE(value));
|
||
else if (PyTuple_Check(value)) {
|
||
Tcl_Obj **argv = (Tcl_Obj**)
|
||
ckalloc(PyTuple_Size(value)*sizeof(Tcl_Obj*));
|
||
int i;
|
||
if(!argv)
|
||
return 0;
|
||
for(i=0;i<PyTuple_Size(value);i++)
|
||
argv[i] = AsObj(PyTuple_GetItem(value,i));
|
||
result = Tcl_NewListObj(PyTuple_Size(value), argv);
|
||
ckfree(FREECAST argv);
|
||
return result;
|
||
}
|
||
#ifdef Py_USING_UNICODE
|
||
else if (PyUnicode_Check(value)) {
|
||
Py_UNICODE *inbuf = PyUnicode_AS_UNICODE(value);
|
||
Py_ssize_t size = PyUnicode_GET_SIZE(value);
|
||
/* This #ifdef assumes that Tcl uses UCS-2.
|
||
See TCL_UTF_MAX test above. */
|
||
#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX == 3
|
||
Tcl_UniChar *outbuf;
|
||
Py_ssize_t i;
|
||
assert(size < size * sizeof(Tcl_UniChar));
|
||
outbuf = (Tcl_UniChar*)ckalloc(size * sizeof(Tcl_UniChar));
|
||
if (!outbuf) {
|
||
PyErr_NoMemory();
|
||
return NULL;
|
||
}
|
||
for (i = 0; i < size; i++) {
|
||
if (inbuf[i] >= 0x10000) {
|
||
/* Tcl doesn't do UTF-16, yet. */
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"unsupported character");
|
||
ckfree(FREECAST outbuf);
|
||
return NULL;
|
||
}
|
||
outbuf[i] = inbuf[i];
|
||
}
|
||
result = Tcl_NewUnicodeObj(outbuf, size);
|
||
ckfree(FREECAST outbuf);
|
||
return result;
|
||
#else
|
||
return Tcl_NewUnicodeObj(inbuf, size);
|
||
#endif
|
||
|
||
}
|
||
#endif
|
||
else if(PyTclObject_Check(value)) {
|
||
Tcl_Obj *v = ((PyTclObject*)value)->value;
|
||
Tcl_IncrRefCount(v);
|
||
return v;
|
||
}
|
||
else {
|
||
PyObject *v = PyObject_Str(value);
|
||
if (!v)
|
||
return 0;
|
||
result = AsObj(v);
|
||
Py_DECREF(v);
|
||
return result;
|
||
}
|
||
}
|
||
|
||
static PyObject*
|
||
FromObj(PyObject* tkapp, Tcl_Obj *value)
|
||
{
|
||
PyObject *result = NULL;
|
||
TkappObject *app = (TkappObject*)tkapp;
|
||
|
||
if (value->typePtr == NULL) {
|
||
/* If the result contains any bytes with the top bit set,
|
||
it's UTF-8 and we should decode it to Unicode */
|
||
#ifdef Py_USING_UNICODE
|
||
int i;
|
||
char *s = value->bytes;
|
||
int len = value->length;
|
||
for (i = 0; i < len; i++) {
|
||
if (value->bytes[i] & 0x80)
|
||
break;
|
||
}
|
||
|
||
if (i == value->length)
|
||
result = PyString_FromStringAndSize(s, len);
|
||
else {
|
||
/* Convert UTF-8 to Unicode string */
|
||
result = PyUnicode_DecodeUTF8(s, len, "strict");
|
||
if (result == NULL) {
|
||
PyErr_Clear();
|
||
result = PyString_FromStringAndSize(s, len);
|
||
}
|
||
}
|
||
#else
|
||
result = PyString_FromStringAndSize(value->bytes, value->length);
|
||
#endif
|
||
return result;
|
||
}
|
||
|
||
if (value->typePtr == app->BooleanType) {
|
||
result = value->internalRep.longValue ? Py_True : Py_False;
|
||
Py_INCREF(result);
|
||
return result;
|
||
}
|
||
|
||
if (value->typePtr == app->ByteArrayType) {
|
||
int size;
|
||
char *data = (char*)Tcl_GetByteArrayFromObj(value, &size);
|
||
return PyString_FromStringAndSize(data, size);
|
||
}
|
||
|
||
if (value->typePtr == app->DoubleType) {
|
||
return PyFloat_FromDouble(value->internalRep.doubleValue);
|
||
}
|
||
|
||
if (value->typePtr == app->IntType) {
|
||
return PyInt_FromLong(value->internalRep.longValue);
|
||
}
|
||
|
||
if (value->typePtr == app->ListType) {
|
||
int size;
|
||
int i, status;
|
||
PyObject *elem;
|
||
Tcl_Obj *tcl_elem;
|
||
|
||
status = Tcl_ListObjLength(Tkapp_Interp(tkapp), value, &size);
|
||
if (status == TCL_ERROR)
|
||
return Tkinter_Error(tkapp);
|
||
result = PyTuple_New(size);
|
||
if (!result)
|
||
return NULL;
|
||
for (i = 0; i < size; i++) {
|
||
status = Tcl_ListObjIndex(Tkapp_Interp(tkapp),
|
||
value, i, &tcl_elem);
|
||
if (status == TCL_ERROR) {
|
||
Py_DECREF(result);
|
||
return Tkinter_Error(tkapp);
|
||
}
|
||
elem = FromObj(tkapp, tcl_elem);
|
||
if (!elem) {
|
||
Py_DECREF(result);
|
||
return NULL;
|
||
}
|
||
PyTuple_SetItem(result, i, elem);
|
||
}
|
||
return result;
|
||
}
|
||
|
||
if (value->typePtr == app->ProcBodyType) {
|
||
/* fall through: return tcl object. */
|
||
}
|
||
|
||
if (value->typePtr == app->StringType) {
|
||
#ifdef Py_USING_UNICODE
|
||
#if defined(Py_UNICODE_WIDE) && TCL_UTF_MAX==3
|
||
PyObject *result;
|
||
int size;
|
||
Tcl_UniChar *input;
|
||
Py_UNICODE *output;
|
||
|
||
size = Tcl_GetCharLength(value);
|
||
result = PyUnicode_FromUnicode(NULL, size);
|
||
if (!result)
|
||
return NULL;
|
||
input = Tcl_GetUnicode(value);
|
||
output = PyUnicode_AS_UNICODE(result);
|
||
while (size--)
|
||
*output++ = *input++;
|
||
return result;
|
||
#else
|
||
return PyUnicode_FromUnicode(Tcl_GetUnicode(value),
|
||
Tcl_GetCharLength(value));
|
||
#endif
|
||
#else
|
||
int size;
|
||
char *c;
|
||
c = Tcl_GetStringFromObj(value, &size);
|
||
return PyString_FromStringAndSize(c, size);
|
||
#endif
|
||
}
|
||
|
||
return newPyTclObject(value);
|
||
}
|
||
|
||
/* This mutex synchronizes inter-thread command calls. */
|
||
|
||
TCL_DECLARE_MUTEX(call_mutex)
|
||
|
||
typedef struct Tkapp_CallEvent {
|
||
Tcl_Event ev; /* Must be first */
|
||
TkappObject *self;
|
||
PyObject *args;
|
||
int flags;
|
||
PyObject **res;
|
||
PyObject **exc_type, **exc_value, **exc_tb;
|
||
Tcl_Condition done;
|
||
} Tkapp_CallEvent;
|
||
|
||
void
|
||
Tkapp_CallDeallocArgs(Tcl_Obj** objv, Tcl_Obj** objStore, int objc)
|
||
{
|
||
int i;
|
||
for (i = 0; i < objc; i++)
|
||
Tcl_DecrRefCount(objv[i]);
|
||
if (objv != objStore)
|
||
ckfree(FREECAST objv);
|
||
}
|
||
|
||
/* Convert Python objects to Tcl objects. This must happen in the
|
||
interpreter thread, which may or may not be the calling thread. */
|
||
|
||
static Tcl_Obj**
|
||
Tkapp_CallArgs(PyObject *args, Tcl_Obj** objStore, int *pobjc)
|
||
{
|
||
Tcl_Obj **objv = objStore;
|
||
int objc = 0, i;
|
||
if (args == NULL)
|
||
/* do nothing */;
|
||
|
||
else if (!PyTuple_Check(args)) {
|
||
objv[0] = AsObj(args);
|
||
if (objv[0] == 0)
|
||
goto finally;
|
||
objc = 1;
|
||
Tcl_IncrRefCount(objv[0]);
|
||
}
|
||
else {
|
||
objc = PyTuple_Size(args);
|
||
|
||
if (objc > ARGSZ) {
|
||
objv = (Tcl_Obj **)ckalloc(objc * sizeof(char *));
|
||
if (objv == NULL) {
|
||
PyErr_NoMemory();
|
||
objc = 0;
|
||
goto finally;
|
||
}
|
||
}
|
||
|
||
for (i = 0; i < objc; i++) {
|
||
PyObject *v = PyTuple_GetItem(args, i);
|
||
if (v == Py_None) {
|
||
objc = i;
|
||
break;
|
||
}
|
||
objv[i] = AsObj(v);
|
||
if (!objv[i]) {
|
||
/* Reset objc, so it attempts to clear
|
||
objects only up to i. */
|
||
objc = i;
|
||
goto finally;
|
||
}
|
||
Tcl_IncrRefCount(objv[i]);
|
||
}
|
||
}
|
||
*pobjc = objc;
|
||
return objv;
|
||
finally:
|
||
Tkapp_CallDeallocArgs(objv, objStore, objc);
|
||
return NULL;
|
||
}
|
||
|
||
/* Convert the results of a command call into a Python objects. */
|
||
|
||
static PyObject*
|
||
Tkapp_CallResult(TkappObject *self)
|
||
{
|
||
PyObject *res = NULL;
|
||
if(self->wantobjects) {
|
||
Tcl_Obj *value = Tcl_GetObjResult(self->interp);
|
||
/* Not sure whether the IncrRef is necessary, but something
|
||
may overwrite the interpreter result while we are
|
||
converting it. */
|
||
Tcl_IncrRefCount(value);
|
||
res = FromObj((PyObject*)self, value);
|
||
Tcl_DecrRefCount(value);
|
||
} else {
|
||
const char *s = Tcl_GetStringResult(self->interp);
|
||
const char *p = s;
|
||
|
||
/* If the result contains any bytes with the top bit set,
|
||
it's UTF-8 and we should decode it to Unicode */
|
||
#ifdef Py_USING_UNICODE
|
||
while (*p != '\0') {
|
||
if (*p & 0x80)
|
||
break;
|
||
p++;
|
||
}
|
||
|
||
if (*p == '\0')
|
||
res = PyString_FromStringAndSize(s, (int)(p-s));
|
||
else {
|
||
/* Convert UTF-8 to Unicode string */
|
||
p = strchr(p, '\0');
|
||
res = PyUnicode_DecodeUTF8(s, (int)(p-s), "strict");
|
||
if (res == NULL) {
|
||
PyErr_Clear();
|
||
res = PyString_FromStringAndSize(s, (int)(p-s));
|
||
}
|
||
}
|
||
#else
|
||
p = strchr(p, '\0');
|
||
res = PyString_FromStringAndSize(s, (int)(p-s));
|
||
#endif
|
||
}
|
||
return res;
|
||
}
|
||
|
||
/* Tkapp_CallProc is the event procedure that is executed in the context of
|
||
the Tcl interpreter thread. Initially, it holds the Tcl lock, and doesn't
|
||
hold the Python lock. */
|
||
|
||
static int
|
||
Tkapp_CallProc(Tkapp_CallEvent *e, int flags)
|
||
{
|
||
Tcl_Obj *objStore[ARGSZ];
|
||
Tcl_Obj **objv;
|
||
int objc;
|
||
int i;
|
||
ENTER_PYTHON
|
||
objv = Tkapp_CallArgs(e->args, objStore, &objc);
|
||
if (!objv) {
|
||
PyErr_Fetch(e->exc_type, e->exc_value, e->exc_tb);
|
||
*(e->res) = NULL;
|
||
}
|
||
LEAVE_PYTHON
|
||
if (!objv)
|
||
goto done;
|
||
i = Tcl_EvalObjv(e->self->interp, objc, objv, e->flags);
|
||
ENTER_PYTHON
|
||
if (i == TCL_ERROR) {
|
||
*(e->res) = NULL;
|
||
*(e->exc_type) = NULL;
|
||
*(e->exc_tb) = NULL;
|
||
*(e->exc_value) = PyObject_CallFunction(
|
||
Tkinter_TclError, "s",
|
||
Tcl_GetStringResult(e->self->interp));
|
||
}
|
||
else {
|
||
*(e->res) = Tkapp_CallResult(e->self);
|
||
}
|
||
LEAVE_PYTHON
|
||
done:
|
||
/* Wake up calling thread. */
|
||
Tcl_MutexLock(&call_mutex);
|
||
Tcl_ConditionNotify(&e->done);
|
||
Tcl_MutexUnlock(&call_mutex);
|
||
return 1;
|
||
}
|
||
|
||
/* This is the main entry point for calling a Tcl command.
|
||
It supports three cases, with regard to threading:
|
||
1. Tcl is not threaded: Must have the Tcl lock, then can invoke command in
|
||
the context of the calling thread.
|
||
2. Tcl is threaded, caller of the command is in the interpreter thread:
|
||
Execute the command in the calling thread. Since the Tcl lock will
|
||
not be used, we can merge that with case 1.
|
||
3. Tcl is threaded, caller is in a different thread: Must queue an event to
|
||
the interpreter thread. Allocation of Tcl objects needs to occur in the
|
||
interpreter thread, so we ship the PyObject* args to the target thread,
|
||
and perform processing there. */
|
||
|
||
static PyObject *
|
||
Tkapp_Call(PyObject *selfptr, PyObject *args)
|
||
{
|
||
Tcl_Obj *objStore[ARGSZ];
|
||
Tcl_Obj **objv = NULL;
|
||
int objc, i;
|
||
PyObject *res = NULL;
|
||
TkappObject *self = (TkappObject*)selfptr;
|
||
/* Could add TCL_EVAL_GLOBAL if wrapped by GlobalCall... */
|
||
int flags = TCL_EVAL_DIRECT;
|
||
|
||
#ifdef WITH_THREAD
|
||
if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
|
||
/* We cannot call the command directly. Instead, we must
|
||
marshal the parameters to the interpreter thread. */
|
||
Tkapp_CallEvent *ev;
|
||
PyObject *exc_type, *exc_value, *exc_tb;
|
||
if (!WaitForMainloop(self))
|
||
return NULL;
|
||
ev = (Tkapp_CallEvent*)ckalloc(sizeof(Tkapp_CallEvent));
|
||
ev->ev.proc = (Tcl_EventProc*)Tkapp_CallProc;
|
||
ev->self = self;
|
||
ev->args = args;
|
||
ev->res = &res;
|
||
ev->exc_type = &exc_type;
|
||
ev->exc_value = &exc_value;
|
||
ev->exc_tb = &exc_tb;
|
||
ev->done = (Tcl_Condition)0;
|
||
|
||
Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done, &call_mutex);
|
||
|
||
if (res == NULL) {
|
||
if (exc_type)
|
||
PyErr_Restore(exc_type, exc_value, exc_tb);
|
||
else
|
||
PyErr_SetObject(Tkinter_TclError, exc_value);
|
||
}
|
||
}
|
||
else
|
||
#endif
|
||
{
|
||
|
||
objv = Tkapp_CallArgs(args, objStore, &objc);
|
||
if (!objv)
|
||
return NULL;
|
||
|
||
ENTER_TCL
|
||
|
||
i = Tcl_EvalObjv(self->interp, objc, objv, flags);
|
||
|
||
ENTER_OVERLAP
|
||
|
||
if (i == TCL_ERROR)
|
||
Tkinter_Error(selfptr);
|
||
else
|
||
res = Tkapp_CallResult(self);
|
||
|
||
LEAVE_OVERLAP_TCL
|
||
|
||
Tkapp_CallDeallocArgs(objv, objStore, objc);
|
||
}
|
||
return res;
|
||
}
|
||
|
||
|
||
static PyObject *
|
||
Tkapp_GlobalCall(PyObject *self, PyObject *args)
|
||
{
|
||
/* Could do the same here as for Tkapp_Call(), but this is not used
|
||
much, so I can't be bothered. Unfortunately Tcl doesn't export a
|
||
way for the user to do what all its Global* variants do (save and
|
||
reset the scope pointer, call the local version, restore the saved
|
||
scope pointer). */
|
||
|
||
char *cmd;
|
||
PyObject *res = NULL;
|
||
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
cmd = Merge(args);
|
||
if (cmd) {
|
||
int err;
|
||
ENTER_TCL
|
||
err = Tcl_GlobalEval(Tkapp_Interp(self), cmd);
|
||
ENTER_OVERLAP
|
||
if (err == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = PyString_FromString(Tkapp_Result(self));
|
||
LEAVE_OVERLAP_TCL
|
||
ckfree(cmd);
|
||
}
|
||
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_Eval(PyObject *self, PyObject *args)
|
||
{
|
||
char *script;
|
||
PyObject *res = NULL;
|
||
int err;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:eval", &script))
|
||
return NULL;
|
||
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
ENTER_TCL
|
||
err = Tcl_Eval(Tkapp_Interp(self), script);
|
||
ENTER_OVERLAP
|
||
if (err == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = PyString_FromString(Tkapp_Result(self));
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GlobalEval(PyObject *self, PyObject *args)
|
||
{
|
||
char *script;
|
||
PyObject *res = NULL;
|
||
int err;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:globaleval", &script))
|
||
return NULL;
|
||
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
ENTER_TCL
|
||
err = Tcl_GlobalEval(Tkapp_Interp(self), script);
|
||
ENTER_OVERLAP
|
||
if (err == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = PyString_FromString(Tkapp_Result(self));
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_EvalFile(PyObject *self, PyObject *args)
|
||
{
|
||
char *fileName;
|
||
PyObject *res = NULL;
|
||
int err;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:evalfile", &fileName))
|
||
return NULL;
|
||
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
ENTER_TCL
|
||
err = Tcl_EvalFile(Tkapp_Interp(self), fileName);
|
||
ENTER_OVERLAP
|
||
if (err == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
|
||
else
|
||
res = PyString_FromString(Tkapp_Result(self));
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_Record(PyObject *self, PyObject *args)
|
||
{
|
||
char *script;
|
||
PyObject *res = NULL;
|
||
int err;
|
||
|
||
if (!PyArg_ParseTuple(args, "s", &script))
|
||
return NULL;
|
||
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
ENTER_TCL
|
||
err = Tcl_RecordAndEval(Tkapp_Interp(self), script, TCL_NO_EVAL);
|
||
ENTER_OVERLAP
|
||
if (err == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = PyString_FromString(Tkapp_Result(self));
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_AddErrorInfo(PyObject *self, PyObject *args)
|
||
{
|
||
char *msg;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
|
||
return NULL;
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
ENTER_TCL
|
||
Tcl_AddErrorInfo(Tkapp_Interp(self), msg);
|
||
LEAVE_TCL
|
||
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
|
||
|
||
/** Tcl Variable **/
|
||
|
||
TCL_DECLARE_MUTEX(var_mutex)
|
||
|
||
typedef PyObject* (*EventFunc)(PyObject*, PyObject *args, int flags);
|
||
typedef struct VarEvent {
|
||
Tcl_Event ev; /* must be first */
|
||
PyObject *self;
|
||
PyObject *args;
|
||
int flags;
|
||
EventFunc func;
|
||
PyObject **res;
|
||
PyObject **exc_type;
|
||
PyObject **exc_val;
|
||
Tcl_Condition cond;
|
||
} VarEvent;
|
||
|
||
static int
|
||
varname_converter(PyObject *in, void *_out)
|
||
{
|
||
char **out = (char**)_out;
|
||
if (PyString_Check(in)) {
|
||
*out = PyString_AsString(in);
|
||
return 1;
|
||
}
|
||
if (PyTclObject_Check(in)) {
|
||
*out = PyTclObject_TclString(in);
|
||
return 1;
|
||
}
|
||
/* XXX: Should give diagnostics. */
|
||
return 0;
|
||
}
|
||
|
||
void
|
||
var_perform(VarEvent *ev)
|
||
{
|
||
*(ev->res) = ev->func(ev->self, ev->args, ev->flags);
|
||
if (!*(ev->res)) {
|
||
PyObject *exc, *val, *tb;
|
||
PyErr_Fetch(&exc, &val, &tb);
|
||
PyErr_NormalizeException(&exc, &val, &tb);
|
||
*(ev->exc_type) = exc;
|
||
*(ev->exc_val) = val;
|
||
Py_DECREF(tb);
|
||
}
|
||
|
||
}
|
||
|
||
static int
|
||
var_proc(VarEvent* ev, int flags)
|
||
{
|
||
ENTER_PYTHON
|
||
var_perform(ev);
|
||
Tcl_MutexLock(&var_mutex);
|
||
Tcl_ConditionNotify(&ev->cond);
|
||
Tcl_MutexUnlock(&var_mutex);
|
||
LEAVE_PYTHON
|
||
return 1;
|
||
}
|
||
|
||
static PyObject*
|
||
var_invoke(EventFunc func, PyObject *selfptr, PyObject *args, int flags)
|
||
{
|
||
TkappObject *self = (TkappObject*)selfptr;
|
||
#ifdef WITH_THREAD
|
||
if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
|
||
TkappObject *self = (TkappObject*)selfptr;
|
||
VarEvent *ev;
|
||
PyObject *res, *exc_type, *exc_val;
|
||
|
||
/* The current thread is not the interpreter thread. Marshal
|
||
the call to the interpreter thread, then wait for
|
||
completion. */
|
||
if (!WaitForMainloop(self))
|
||
return NULL;
|
||
|
||
ev = (VarEvent*)ckalloc(sizeof(VarEvent));
|
||
|
||
ev->self = selfptr;
|
||
ev->args = args;
|
||
ev->flags = flags;
|
||
ev->func = func;
|
||
ev->res = &res;
|
||
ev->exc_type = &exc_type;
|
||
ev->exc_val = &exc_val;
|
||
ev->cond = NULL;
|
||
ev->ev.proc = (Tcl_EventProc*)var_proc;
|
||
Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->cond, &var_mutex);
|
||
if (!res) {
|
||
PyErr_SetObject(exc_type, exc_val);
|
||
Py_DECREF(exc_type);
|
||
Py_DECREF(exc_val);
|
||
return NULL;
|
||
}
|
||
return res;
|
||
}
|
||
#endif
|
||
/* Tcl is not threaded, or this is the interpreter thread. */
|
||
return func(selfptr, args, flags);
|
||
}
|
||
|
||
static PyObject *
|
||
SetVar(PyObject *self, PyObject *args, int flags)
|
||
{
|
||
char *name1, *name2;
|
||
PyObject *newValue;
|
||
PyObject *res = NULL;
|
||
Tcl_Obj *newval, *ok;
|
||
|
||
if (PyArg_ParseTuple(args, "O&O:setvar",
|
||
varname_converter, &name1, &newValue)) {
|
||
/* XXX Acquire tcl lock??? */
|
||
newval = AsObj(newValue);
|
||
if (newval == NULL)
|
||
return NULL;
|
||
ENTER_TCL
|
||
ok = Tcl_SetVar2Ex(Tkapp_Interp(self), name1, NULL,
|
||
newval, flags);
|
||
ENTER_OVERLAP
|
||
if (!ok)
|
||
Tkinter_Error(self);
|
||
else {
|
||
res = Py_None;
|
||
Py_INCREF(res);
|
||
}
|
||
LEAVE_OVERLAP_TCL
|
||
}
|
||
else {
|
||
PyErr_Clear();
|
||
if (PyArg_ParseTuple(args, "ssO:setvar",
|
||
&name1, &name2, &newValue)) {
|
||
/* XXX must hold tcl lock already??? */
|
||
newval = AsObj(newValue);
|
||
ENTER_TCL
|
||
ok = Tcl_SetVar2Ex(Tkapp_Interp(self), name1, name2, newval, flags);
|
||
ENTER_OVERLAP
|
||
if (!ok)
|
||
Tkinter_Error(self);
|
||
else {
|
||
res = Py_None;
|
||
Py_INCREF(res);
|
||
}
|
||
LEAVE_OVERLAP_TCL
|
||
}
|
||
else {
|
||
return NULL;
|
||
}
|
||
}
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_SetVar(PyObject *self, PyObject *args)
|
||
{
|
||
return var_invoke(SetVar, self, args, TCL_LEAVE_ERR_MSG);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GlobalSetVar(PyObject *self, PyObject *args)
|
||
{
|
||
return var_invoke(SetVar, self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
|
||
}
|
||
|
||
|
||
|
||
static PyObject *
|
||
GetVar(PyObject *self, PyObject *args, int flags)
|
||
{
|
||
char *name1, *name2=NULL;
|
||
PyObject *res = NULL;
|
||
Tcl_Obj *tres;
|
||
|
||
if (!PyArg_ParseTuple(args, "O&|s:getvar",
|
||
varname_converter, &name1, &name2))
|
||
return NULL;
|
||
|
||
ENTER_TCL
|
||
tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags);
|
||
ENTER_OVERLAP
|
||
if (tres == NULL) {
|
||
PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self)));
|
||
} else {
|
||
if (((TkappObject*)self)->wantobjects) {
|
||
res = FromObj(self, tres);
|
||
}
|
||
else {
|
||
res = PyString_FromString(Tcl_GetString(tres));
|
||
}
|
||
}
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GetVar(PyObject *self, PyObject *args)
|
||
{
|
||
return var_invoke(GetVar, self, args, TCL_LEAVE_ERR_MSG);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GlobalGetVar(PyObject *self, PyObject *args)
|
||
{
|
||
return var_invoke(GetVar, self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
|
||
}
|
||
|
||
|
||
|
||
static PyObject *
|
||
UnsetVar(PyObject *self, PyObject *args, int flags)
|
||
{
|
||
char *name1, *name2=NULL;
|
||
int code;
|
||
PyObject *res = NULL;
|
||
|
||
if (!PyArg_ParseTuple(args, "s|s:unsetvar", &name1, &name2))
|
||
return NULL;
|
||
|
||
ENTER_TCL
|
||
code = Tcl_UnsetVar2(Tkapp_Interp(self), name1, name2, flags);
|
||
ENTER_OVERLAP
|
||
if (code == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else {
|
||
Py_INCREF(Py_None);
|
||
res = Py_None;
|
||
}
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_UnsetVar(PyObject *self, PyObject *args)
|
||
{
|
||
return var_invoke(UnsetVar, self, args, TCL_LEAVE_ERR_MSG);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GlobalUnsetVar(PyObject *self, PyObject *args)
|
||
{
|
||
return var_invoke(UnsetVar, self, args, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
|
||
}
|
||
|
||
|
||
|
||
/** Tcl to Python **/
|
||
|
||
static PyObject *
|
||
Tkapp_GetInt(PyObject *self, PyObject *args)
|
||
{
|
||
char *s;
|
||
int v;
|
||
|
||
if (PyTuple_Size(args) == 1) {
|
||
PyObject* o = PyTuple_GetItem(args, 0);
|
||
if (PyInt_Check(o)) {
|
||
Py_INCREF(o);
|
||
return o;
|
||
}
|
||
}
|
||
if (!PyArg_ParseTuple(args, "s:getint", &s))
|
||
return NULL;
|
||
if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
|
||
return Tkinter_Error(self);
|
||
return Py_BuildValue("i", v);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GetDouble(PyObject *self, PyObject *args)
|
||
{
|
||
char *s;
|
||
double v;
|
||
|
||
if (PyTuple_Size(args) == 1) {
|
||
PyObject *o = PyTuple_GetItem(args, 0);
|
||
if (PyFloat_Check(o)) {
|
||
Py_INCREF(o);
|
||
return o;
|
||
}
|
||
}
|
||
if (!PyArg_ParseTuple(args, "s:getdouble", &s))
|
||
return NULL;
|
||
if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
|
||
return Tkinter_Error(self);
|
||
return Py_BuildValue("d", v);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GetBoolean(PyObject *self, PyObject *args)
|
||
{
|
||
char *s;
|
||
int v;
|
||
|
||
if (PyTuple_Size(args) == 1) {
|
||
PyObject *o = PyTuple_GetItem(args, 0);
|
||
if (PyInt_Check(o)) {
|
||
Py_INCREF(o);
|
||
return o;
|
||
}
|
||
}
|
||
if (!PyArg_ParseTuple(args, "s:getboolean", &s))
|
||
return NULL;
|
||
if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
|
||
return Tkinter_Error(self);
|
||
return PyBool_FromLong(v);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_ExprString(PyObject *self, PyObject *args)
|
||
{
|
||
char *s;
|
||
PyObject *res = NULL;
|
||
int retval;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:exprstring", &s))
|
||
return NULL;
|
||
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
ENTER_TCL
|
||
retval = Tcl_ExprString(Tkapp_Interp(self), s);
|
||
ENTER_OVERLAP
|
||
if (retval == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = Py_BuildValue("s", Tkapp_Result(self));
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_ExprLong(PyObject *self, PyObject *args)
|
||
{
|
||
char *s;
|
||
PyObject *res = NULL;
|
||
int retval;
|
||
long v;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:exprlong", &s))
|
||
return NULL;
|
||
|
||
CHECK_TCL_APPARTMENT;
|
||
|
||
ENTER_TCL
|
||
retval = Tcl_ExprLong(Tkapp_Interp(self), s, &v);
|
||
ENTER_OVERLAP
|
||
if (retval == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = Py_BuildValue("l", v);
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_ExprDouble(PyObject *self, PyObject *args)
|
||
{
|
||
char *s;
|
||
PyObject *res = NULL;
|
||
double v;
|
||
int retval;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
|
||
return NULL;
|
||
CHECK_TCL_APPARTMENT;
|
||
PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
|
||
ENTER_TCL
|
||
retval = Tcl_ExprDouble(Tkapp_Interp(self), s, &v);
|
||
ENTER_OVERLAP
|
||
PyFPE_END_PROTECT(retval)
|
||
if (retval == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = Py_BuildValue("d", v);
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_ExprBoolean(PyObject *self, PyObject *args)
|
||
{
|
||
char *s;
|
||
PyObject *res = NULL;
|
||
int retval;
|
||
int v;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
|
||
return NULL;
|
||
CHECK_TCL_APPARTMENT;
|
||
ENTER_TCL
|
||
retval = Tcl_ExprBoolean(Tkapp_Interp(self), s, &v);
|
||
ENTER_OVERLAP
|
||
if (retval == TCL_ERROR)
|
||
res = Tkinter_Error(self);
|
||
else
|
||
res = Py_BuildValue("i", v);
|
||
LEAVE_OVERLAP_TCL
|
||
return res;
|
||
}
|
||
|
||
|
||
|
||
static PyObject *
|
||
Tkapp_SplitList(PyObject *self, PyObject *args)
|
||
{
|
||
char *list;
|
||
int argc;
|
||
char **argv;
|
||
PyObject *v;
|
||
int i;
|
||
|
||
if (PyTuple_Size(args) == 1) {
|
||
v = PyTuple_GetItem(args, 0);
|
||
if (PyTuple_Check(v)) {
|
||
Py_INCREF(v);
|
||
return v;
|
||
}
|
||
}
|
||
if (!PyArg_ParseTuple(args, "et:splitlist", "utf-8", &list))
|
||
return NULL;
|
||
|
||
if (Tcl_SplitList(Tkapp_Interp(self), list,
|
||
&argc, &argv) == TCL_ERROR) {
|
||
PyMem_Free(list);
|
||
return Tkinter_Error(self);
|
||
}
|
||
|
||
if (!(v = PyTuple_New(argc)))
|
||
goto finally;
|
||
|
||
for (i = 0; i < argc; i++) {
|
||
PyObject *s = PyString_FromString(argv[i]);
|
||
if (!s || PyTuple_SetItem(v, i, s)) {
|
||
Py_DECREF(v);
|
||
v = NULL;
|
||
goto finally;
|
||
}
|
||
}
|
||
|
||
finally:
|
||
ckfree(FREECAST argv);
|
||
PyMem_Free(list);
|
||
return v;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_Split(PyObject *self, PyObject *args)
|
||
{
|
||
PyObject *v;
|
||
char *list;
|
||
|
||
if (PyTuple_Size(args) == 1) {
|
||
PyObject* o = PyTuple_GetItem(args, 0);
|
||
if (PyTuple_Check(o)) {
|
||
o = SplitObj(o);
|
||
return o;
|
||
}
|
||
}
|
||
if (!PyArg_ParseTuple(args, "et:split", "utf-8", &list))
|
||
return NULL;
|
||
v = Split(list);
|
||
PyMem_Free(list);
|
||
return v;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_Merge(PyObject *self, PyObject *args)
|
||
{
|
||
char *s = Merge(args);
|
||
PyObject *res = NULL;
|
||
|
||
if (s) {
|
||
res = PyString_FromString(s);
|
||
ckfree(s);
|
||
}
|
||
|
||
return res;
|
||
}
|
||
|
||
|
||
|
||
/** Tcl Command **/
|
||
|
||
/* Client data struct */
|
||
typedef struct {
|
||
PyObject *self;
|
||
PyObject *func;
|
||
} PythonCmd_ClientData;
|
||
|
||
static int
|
||
PythonCmd_Error(Tcl_Interp *interp)
|
||
{
|
||
errorInCmd = 1;
|
||
PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
|
||
LEAVE_PYTHON
|
||
return TCL_ERROR;
|
||
}
|
||
|
||
/* This is the Tcl command that acts as a wrapper for Python
|
||
* function or method.
|
||
*/
|
||
static int
|
||
PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
|
||
{
|
||
PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
|
||
PyObject *self, *func, *arg, *res, *tmp;
|
||
int i, rv;
|
||
char *s;
|
||
|
||
ENTER_PYTHON
|
||
|
||
/* TBD: no error checking here since we know, via the
|
||
* Tkapp_CreateCommand() that the client data is a two-tuple
|
||
*/
|
||
self = data->self;
|
||
func = data->func;
|
||
|
||
/* Create argument list (argv1, ..., argvN) */
|
||
if (!(arg = PyTuple_New(argc - 1)))
|
||
return PythonCmd_Error(interp);
|
||
|
||
for (i = 0; i < (argc - 1); i++) {
|
||
PyObject *s = PyString_FromString(argv[i + 1]);
|
||
if (!s || PyTuple_SetItem(arg, i, s)) {
|
||
Py_DECREF(arg);
|
||
return PythonCmd_Error(interp);
|
||
}
|
||
}
|
||
res = PyEval_CallObject(func, arg);
|
||
Py_DECREF(arg);
|
||
|
||
if (res == NULL)
|
||
return PythonCmd_Error(interp);
|
||
|
||
if (!(tmp = PyList_New(0))) {
|
||
Py_DECREF(res);
|
||
return PythonCmd_Error(interp);
|
||
}
|
||
|
||
s = AsString(res, tmp);
|
||
if (s == NULL) {
|
||
rv = PythonCmd_Error(interp);
|
||
}
|
||
else {
|
||
Tcl_SetResult(Tkapp_Interp(self), s, TCL_VOLATILE);
|
||
rv = TCL_OK;
|
||
}
|
||
|
||
Py_DECREF(res);
|
||
Py_DECREF(tmp);
|
||
|
||
LEAVE_PYTHON
|
||
|
||
return rv;
|
||
}
|
||
|
||
static void
|
||
PythonCmdDelete(ClientData clientData)
|
||
{
|
||
PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
|
||
|
||
ENTER_PYTHON
|
||
Py_XDECREF(data->self);
|
||
Py_XDECREF(data->func);
|
||
PyMem_DEL(data);
|
||
LEAVE_PYTHON
|
||
}
|
||
|
||
|
||
|
||
|
||
TCL_DECLARE_MUTEX(command_mutex)
|
||
|
||
typedef struct CommandEvent{
|
||
Tcl_Event ev;
|
||
Tcl_Interp* interp;
|
||
char *name;
|
||
int create;
|
||
int *status;
|
||
ClientData *data;
|
||
Tcl_Condition done;
|
||
} CommandEvent;
|
||
|
||
static int
|
||
Tkapp_CommandProc(CommandEvent *ev, int flags)
|
||
{
|
||
if (ev->create)
|
||
*ev->status = Tcl_CreateCommand(
|
||
ev->interp, ev->name, PythonCmd,
|
||
ev->data, PythonCmdDelete) == NULL;
|
||
else
|
||
*ev->status = Tcl_DeleteCommand(ev->interp, ev->name);
|
||
Tcl_MutexLock(&command_mutex);
|
||
Tcl_ConditionNotify(&ev->done);
|
||
Tcl_MutexUnlock(&command_mutex);
|
||
return 1;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_CreateCommand(PyObject *selfptr, PyObject *args)
|
||
{
|
||
TkappObject *self = (TkappObject*)selfptr;
|
||
PythonCmd_ClientData *data;
|
||
char *cmdName;
|
||
PyObject *func;
|
||
int err;
|
||
|
||
if (!PyArg_ParseTuple(args, "sO:createcommand", &cmdName, &func))
|
||
return NULL;
|
||
if (!PyCallable_Check(func)) {
|
||
PyErr_SetString(PyExc_TypeError, "command not callable");
|
||
return NULL;
|
||
}
|
||
|
||
#ifdef WITH_THREAD
|
||
if (self->threaded && self->thread_id != Tcl_GetCurrentThread() &&
|
||
!WaitForMainloop(self))
|
||
return NULL;
|
||
#endif
|
||
|
||
data = PyMem_NEW(PythonCmd_ClientData, 1);
|
||
if (!data)
|
||
return PyErr_NoMemory();
|
||
Py_INCREF(self);
|
||
Py_INCREF(func);
|
||
data->self = selfptr;
|
||
data->func = func;
|
||
|
||
if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
|
||
CommandEvent *ev = (CommandEvent*)ckalloc(sizeof(CommandEvent));
|
||
ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc;
|
||
ev->interp = self->interp;
|
||
ev->create = 1;
|
||
ev->name = cmdName;
|
||
ev->data = (ClientData)data;
|
||
ev->status = &err;
|
||
ev->done = NULL;
|
||
Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done, &command_mutex);
|
||
}
|
||
else {
|
||
ENTER_TCL
|
||
err = Tcl_CreateCommand(
|
||
Tkapp_Interp(self), cmdName, PythonCmd,
|
||
(ClientData)data, PythonCmdDelete) == NULL;
|
||
LEAVE_TCL
|
||
}
|
||
if (err) {
|
||
PyErr_SetString(Tkinter_TclError, "can't create Tcl command");
|
||
PyMem_DEL(data);
|
||
return NULL;
|
||
}
|
||
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
|
||
|
||
static PyObject *
|
||
Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args)
|
||
{
|
||
TkappObject *self = (TkappObject*)selfptr;
|
||
char *cmdName;
|
||
int err;
|
||
|
||
if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
|
||
return NULL;
|
||
if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
|
||
CommandEvent *ev;
|
||
ev = (CommandEvent*)ckalloc(sizeof(CommandEvent));
|
||
ev->ev.proc = (Tcl_EventProc*)Tkapp_CommandProc;
|
||
ev->interp = self->interp;
|
||
ev->create = 0;
|
||
ev->name = cmdName;
|
||
ev->status = &err;
|
||
ev->done = NULL;
|
||
Tkapp_ThreadSend(self, (Tcl_Event*)ev, &ev->done,
|
||
&command_mutex);
|
||
}
|
||
else {
|
||
ENTER_TCL
|
||
err = Tcl_DeleteCommand(self->interp, cmdName);
|
||
LEAVE_TCL
|
||
}
|
||
if (err == -1) {
|
||
PyErr_SetString(Tkinter_TclError, "can't delete Tcl command");
|
||
return NULL;
|
||
}
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
|
||
|
||
#ifdef HAVE_CREATEFILEHANDLER
|
||
/** File Handler **/
|
||
|
||
typedef struct _fhcdata {
|
||
PyObject *func;
|
||
PyObject *file;
|
||
int id;
|
||
struct _fhcdata *next;
|
||
} FileHandler_ClientData;
|
||
|
||
static FileHandler_ClientData *HeadFHCD;
|
||
|
||
static FileHandler_ClientData *
|
||
NewFHCD(PyObject *func, PyObject *file, int id)
|
||
{
|
||
FileHandler_ClientData *p;
|
||
p = PyMem_NEW(FileHandler_ClientData, 1);
|
||
if (p != NULL) {
|
||
Py_XINCREF(func);
|
||
Py_XINCREF(file);
|
||
p->func = func;
|
||
p->file = file;
|
||
p->id = id;
|
||
p->next = HeadFHCD;
|
||
HeadFHCD = p;
|
||
}
|
||
return p;
|
||
}
|
||
|
||
static void
|
||
DeleteFHCD(int id)
|
||
{
|
||
FileHandler_ClientData *p, **pp;
|
||
|
||
pp = &HeadFHCD;
|
||
while ((p = *pp) != NULL) {
|
||
if (p->id == id) {
|
||
*pp = p->next;
|
||
Py_XDECREF(p->func);
|
||
Py_XDECREF(p->file);
|
||
PyMem_DEL(p);
|
||
}
|
||
else
|
||
pp = &p->next;
|
||
}
|
||
}
|
||
|
||
static void
|
||
FileHandler(ClientData clientData, int mask)
|
||
{
|
||
FileHandler_ClientData *data = (FileHandler_ClientData *)clientData;
|
||
PyObject *func, *file, *arg, *res;
|
||
|
||
ENTER_PYTHON
|
||
func = data->func;
|
||
file = data->file;
|
||
|
||
arg = Py_BuildValue("(Oi)", file, (long) mask);
|
||
res = PyEval_CallObject(func, arg);
|
||
Py_DECREF(arg);
|
||
|
||
if (res == NULL) {
|
||
errorInCmd = 1;
|
||
PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
|
||
}
|
||
Py_XDECREF(res);
|
||
LEAVE_PYTHON
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_CreateFileHandler(PyObject *self, PyObject *args)
|
||
/* args is (file, mask, func) */
|
||
{
|
||
FileHandler_ClientData *data;
|
||
PyObject *file, *func;
|
||
int mask, tfile;
|
||
|
||
if (!PyArg_ParseTuple(args, "OiO:createfilehandler",
|
||
&file, &mask, &func))
|
||
return NULL;
|
||
|
||
#ifdef WITH_THREAD
|
||
if (!self && !tcl_lock) {
|
||
/* We don't have the Tcl lock since Tcl is threaded. */
|
||
PyErr_SetString(PyExc_RuntimeError,
|
||
"_tkinter.createfilehandler not supported "
|
||
"for threaded Tcl");
|
||
return NULL;
|
||
}
|
||
#endif
|
||
|
||
if (self) {
|
||
CHECK_TCL_APPARTMENT;
|
||
}
|
||
|
||
tfile = PyObject_AsFileDescriptor(file);
|
||
if (tfile < 0)
|
||
return NULL;
|
||
if (!PyCallable_Check(func)) {
|
||
PyErr_SetString(PyExc_TypeError, "bad argument list");
|
||
return NULL;
|
||
}
|
||
|
||
data = NewFHCD(func, file, tfile);
|
||
if (data == NULL)
|
||
return NULL;
|
||
|
||
/* Ought to check for null Tcl_File object... */
|
||
ENTER_TCL
|
||
Tcl_CreateFileHandler(tfile, mask, FileHandler, (ClientData) data);
|
||
LEAVE_TCL
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_DeleteFileHandler(PyObject *self, PyObject *args)
|
||
{
|
||
PyObject *file;
|
||
int tfile;
|
||
|
||
if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
|
||
return NULL;
|
||
|
||
#ifdef WITH_THREAD
|
||
if (!self && !tcl_lock) {
|
||
/* We don't have the Tcl lock since Tcl is threaded. */
|
||
PyErr_SetString(PyExc_RuntimeError,
|
||
"_tkinter.deletefilehandler not supported "
|
||
"for threaded Tcl");
|
||
return NULL;
|
||
}
|
||
#endif
|
||
|
||
if (self) {
|
||
CHECK_TCL_APPARTMENT;
|
||
}
|
||
|
||
tfile = PyObject_AsFileDescriptor(file);
|
||
if (tfile < 0)
|
||
return NULL;
|
||
|
||
DeleteFHCD(tfile);
|
||
|
||
/* Ought to check for null Tcl_File object... */
|
||
ENTER_TCL
|
||
Tcl_DeleteFileHandler(tfile);
|
||
LEAVE_TCL
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
#endif /* HAVE_CREATEFILEHANDLER */
|
||
|
||
|
||
/**** Tktt Object (timer token) ****/
|
||
|
||
static PyTypeObject Tktt_Type;
|
||
|
||
typedef struct {
|
||
PyObject_HEAD
|
||
Tcl_TimerToken token;
|
||
PyObject *func;
|
||
} TkttObject;
|
||
|
||
static PyObject *
|
||
Tktt_DeleteTimerHandler(PyObject *self, PyObject *args)
|
||
{
|
||
TkttObject *v = (TkttObject *)self;
|
||
PyObject *func = v->func;
|
||
|
||
if (!PyArg_ParseTuple(args, ":deletetimerhandler"))
|
||
return NULL;
|
||
if (v->token != NULL) {
|
||
Tcl_DeleteTimerHandler(v->token);
|
||
v->token = NULL;
|
||
}
|
||
if (func != NULL) {
|
||
v->func = NULL;
|
||
Py_DECREF(func);
|
||
Py_DECREF(v); /* See Tktt_New() */
|
||
}
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
static PyMethodDef Tktt_methods[] =
|
||
{
|
||
{"deletetimerhandler", Tktt_DeleteTimerHandler, METH_VARARGS},
|
||
{NULL, NULL}
|
||
};
|
||
|
||
static TkttObject *
|
||
Tktt_New(PyObject *func)
|
||
{
|
||
TkttObject *v;
|
||
|
||
v = PyObject_New(TkttObject, &Tktt_Type);
|
||
if (v == NULL)
|
||
return NULL;
|
||
|
||
Py_INCREF(func);
|
||
v->token = NULL;
|
||
v->func = func;
|
||
|
||
/* Extra reference, deleted when called or when handler is deleted */
|
||
Py_INCREF(v);
|
||
return v;
|
||
}
|
||
|
||
static void
|
||
Tktt_Dealloc(PyObject *self)
|
||
{
|
||
TkttObject *v = (TkttObject *)self;
|
||
PyObject *func = v->func;
|
||
|
||
Py_XDECREF(func);
|
||
|
||
PyObject_Del(self);
|
||
}
|
||
|
||
static PyObject *
|
||
Tktt_Repr(PyObject *self)
|
||
{
|
||
TkttObject *v = (TkttObject *)self;
|
||
char buf[100];
|
||
|
||
PyOS_snprintf(buf, sizeof(buf), "<tktimertoken at %p%s>", v,
|
||
v->func == NULL ? ", handler deleted" : "");
|
||
return PyString_FromString(buf);
|
||
}
|
||
|
||
static PyObject *
|
||
Tktt_GetAttr(PyObject *self, char *name)
|
||
{
|
||
return Py_FindMethod(Tktt_methods, self, name);
|
||
}
|
||
|
||
static PyTypeObject Tktt_Type =
|
||
{
|
||
PyObject_HEAD_INIT(NULL)
|
||
0, /*ob_size */
|
||
"tktimertoken", /*tp_name */
|
||
sizeof(TkttObject), /*tp_basicsize */
|
||
0, /*tp_itemsize */
|
||
Tktt_Dealloc, /*tp_dealloc */
|
||
0, /*tp_print */
|
||
Tktt_GetAttr, /*tp_getattr */
|
||
0, /*tp_setattr */
|
||
0, /*tp_compare */
|
||
Tktt_Repr, /*tp_repr */
|
||
0, /*tp_as_number */
|
||
0, /*tp_as_sequence */
|
||
0, /*tp_as_mapping */
|
||
0, /*tp_hash */
|
||
};
|
||
|
||
|
||
|
||
/** Timer Handler **/
|
||
|
||
static void
|
||
TimerHandler(ClientData clientData)
|
||
{
|
||
TkttObject *v = (TkttObject *)clientData;
|
||
PyObject *func = v->func;
|
||
PyObject *res;
|
||
|
||
if (func == NULL)
|
||
return;
|
||
|
||
v->func = NULL;
|
||
|
||
ENTER_PYTHON
|
||
|
||
res = PyEval_CallObject(func, NULL);
|
||
Py_DECREF(func);
|
||
Py_DECREF(v); /* See Tktt_New() */
|
||
|
||
if (res == NULL) {
|
||
errorInCmd = 1;
|
||
PyErr_Fetch(&excInCmd, &valInCmd, &trbInCmd);
|
||
}
|
||
else
|
||
Py_DECREF(res);
|
||
|
||
LEAVE_PYTHON
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_CreateTimerHandler(PyObject *self, PyObject *args)
|
||
{
|
||
int milliseconds;
|
||
PyObject *func;
|
||
TkttObject *v;
|
||
|
||
if (!PyArg_ParseTuple(args, "iO:createtimerhandler",
|
||
&milliseconds, &func))
|
||
return NULL;
|
||
if (!PyCallable_Check(func)) {
|
||
PyErr_SetString(PyExc_TypeError, "bad argument list");
|
||
return NULL;
|
||
}
|
||
|
||
#ifdef WITH_THREAD
|
||
if (!self && !tcl_lock) {
|
||
/* We don't have the Tcl lock since Tcl is threaded. */
|
||
PyErr_SetString(PyExc_RuntimeError,
|
||
"_tkinter.createtimerhandler not supported "
|
||
"for threaded Tcl");
|
||
return NULL;
|
||
}
|
||
#endif
|
||
|
||
if (self) {
|
||
CHECK_TCL_APPARTMENT;
|
||
}
|
||
|
||
v = Tktt_New(func);
|
||
if (v) {
|
||
v->token = Tcl_CreateTimerHandler(milliseconds, TimerHandler,
|
||
(ClientData)v);
|
||
}
|
||
|
||
return (PyObject *) v;
|
||
}
|
||
|
||
|
||
/** Event Loop **/
|
||
|
||
static PyObject *
|
||
Tkapp_MainLoop(PyObject *selfptr, PyObject *args)
|
||
{
|
||
int threshold = 0;
|
||
TkappObject *self = (TkappObject*)selfptr;
|
||
#ifdef WITH_THREAD
|
||
PyThreadState *tstate = PyThreadState_Get();
|
||
#endif
|
||
|
||
if (!PyArg_ParseTuple(args, "|i:mainloop", &threshold))
|
||
return NULL;
|
||
|
||
#ifdef WITH_THREAD
|
||
if (!self && !tcl_lock) {
|
||
/* We don't have the Tcl lock since Tcl is threaded. */
|
||
PyErr_SetString(PyExc_RuntimeError,
|
||
"_tkinter.mainloop not supported "
|
||
"for threaded Tcl");
|
||
return NULL;
|
||
}
|
||
#endif
|
||
|
||
if (self) {
|
||
CHECK_TCL_APPARTMENT;
|
||
self->dispatching = 1;
|
||
}
|
||
|
||
quitMainLoop = 0;
|
||
while (Tk_GetNumMainWindows() > threshold &&
|
||
!quitMainLoop &&
|
||
!errorInCmd)
|
||
{
|
||
int result;
|
||
|
||
#ifdef WITH_THREAD
|
||
if (self && self->threaded) {
|
||
/* Allow other Python threads to run. */
|
||
ENTER_TCL
|
||
result = Tcl_DoOneEvent(0);
|
||
LEAVE_TCL
|
||
}
|
||
else {
|
||
Py_BEGIN_ALLOW_THREADS
|
||
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1);
|
||
tcl_tstate = tstate;
|
||
result = Tcl_DoOneEvent(TCL_DONT_WAIT);
|
||
tcl_tstate = NULL;
|
||
if(tcl_lock)PyThread_release_lock(tcl_lock);
|
||
if (result == 0)
|
||
Sleep(Tkinter_busywaitinterval);
|
||
Py_END_ALLOW_THREADS
|
||
}
|
||
#else
|
||
result = Tcl_DoOneEvent(0);
|
||
#endif
|
||
|
||
if (PyErr_CheckSignals() != 0) {
|
||
if (self)
|
||
self->dispatching = 0;
|
||
return NULL;
|
||
}
|
||
if (result < 0)
|
||
break;
|
||
}
|
||
if (self)
|
||
self->dispatching = 0;
|
||
quitMainLoop = 0;
|
||
|
||
if (errorInCmd) {
|
||
errorInCmd = 0;
|
||
PyErr_Restore(excInCmd, valInCmd, trbInCmd);
|
||
excInCmd = valInCmd = trbInCmd = NULL;
|
||
return NULL;
|
||
}
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_DoOneEvent(PyObject *self, PyObject *args)
|
||
{
|
||
int flags = 0;
|
||
int rv;
|
||
|
||
if (!PyArg_ParseTuple(args, "|i:dooneevent", &flags))
|
||
return NULL;
|
||
|
||
ENTER_TCL
|
||
rv = Tcl_DoOneEvent(flags);
|
||
LEAVE_TCL
|
||
return Py_BuildValue("i", rv);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_Quit(PyObject *self, PyObject *args)
|
||
{
|
||
|
||
if (!PyArg_ParseTuple(args, ":quit"))
|
||
return NULL;
|
||
|
||
quitMainLoop = 1;
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_InterpAddr(PyObject *self, PyObject *args)
|
||
{
|
||
|
||
if (!PyArg_ParseTuple(args, ":interpaddr"))
|
||
return NULL;
|
||
|
||
return PyInt_FromLong((long)Tkapp_Interp(self));
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_TkInit(PyObject *self, PyObject *args)
|
||
{
|
||
static int has_failed;
|
||
Tcl_Interp *interp = Tkapp_Interp(self);
|
||
Tk_Window main_window;
|
||
const char * _tk_exists = NULL;
|
||
int err;
|
||
main_window = Tk_MainWindow(interp);
|
||
|
||
/* In all current versions of Tk (including 8.4.13), Tk_Init
|
||
deadlocks on the second call when the first call failed.
|
||
To avoid the deadlock, we just refuse the second call through
|
||
a static variable. */
|
||
if (has_failed) {
|
||
PyErr_SetString(Tkinter_TclError,
|
||
"Calling Tk_Init again after a previous call failed might deadlock");
|
||
return NULL;
|
||
}
|
||
|
||
/* We want to guard against calling Tk_Init() multiple times */
|
||
CHECK_TCL_APPARTMENT;
|
||
ENTER_TCL
|
||
err = Tcl_Eval(Tkapp_Interp(self), "info exists tk_version");
|
||
ENTER_OVERLAP
|
||
if (err == TCL_ERROR) {
|
||
/* This sets an exception, but we cannot return right
|
||
away because we need to exit the overlap first. */
|
||
Tkinter_Error(self);
|
||
} else {
|
||
_tk_exists = Tkapp_Result(self);
|
||
}
|
||
LEAVE_OVERLAP_TCL
|
||
if (err == TCL_ERROR) {
|
||
return NULL;
|
||
}
|
||
if (_tk_exists == NULL || strcmp(_tk_exists, "1") != 0) {
|
||
if (Tk_Init(interp) == TCL_ERROR) {
|
||
PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self)));
|
||
has_failed = 1;
|
||
return NULL;
|
||
}
|
||
}
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_WantObjects(PyObject *self, PyObject *args)
|
||
{
|
||
|
||
int wantobjects = -1;
|
||
if (!PyArg_ParseTuple(args, "|i:wantobjects", &wantobjects))
|
||
return NULL;
|
||
if (wantobjects == -1)
|
||
return PyBool_FromLong(((TkappObject*)self)->wantobjects);
|
||
((TkappObject*)self)->wantobjects = wantobjects;
|
||
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_WillDispatch(PyObject *self, PyObject *args)
|
||
{
|
||
|
||
((TkappObject*)self)->dispatching = 1;
|
||
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
|
||
/**** Tkapp Method List ****/
|
||
|
||
static PyMethodDef Tkapp_methods[] =
|
||
{
|
||
{"willdispatch", Tkapp_WillDispatch, METH_NOARGS},
|
||
{"wantobjects", Tkapp_WantObjects, METH_VARARGS},
|
||
{"call", Tkapp_Call, METH_OLDARGS},
|
||
{"globalcall", Tkapp_GlobalCall, METH_OLDARGS},
|
||
{"eval", Tkapp_Eval, METH_VARARGS},
|
||
{"globaleval", Tkapp_GlobalEval, METH_VARARGS},
|
||
{"evalfile", Tkapp_EvalFile, METH_VARARGS},
|
||
{"record", Tkapp_Record, METH_VARARGS},
|
||
{"adderrorinfo", Tkapp_AddErrorInfo, METH_VARARGS},
|
||
{"setvar", Tkapp_SetVar, METH_VARARGS},
|
||
{"globalsetvar", Tkapp_GlobalSetVar, METH_VARARGS},
|
||
{"getvar", Tkapp_GetVar, METH_VARARGS},
|
||
{"globalgetvar", Tkapp_GlobalGetVar, METH_VARARGS},
|
||
{"unsetvar", Tkapp_UnsetVar, METH_VARARGS},
|
||
{"globalunsetvar", Tkapp_GlobalUnsetVar, METH_VARARGS},
|
||
{"getint", Tkapp_GetInt, METH_VARARGS},
|
||
{"getdouble", Tkapp_GetDouble, METH_VARARGS},
|
||
{"getboolean", Tkapp_GetBoolean, METH_VARARGS},
|
||
{"exprstring", Tkapp_ExprString, METH_VARARGS},
|
||
{"exprlong", Tkapp_ExprLong, METH_VARARGS},
|
||
{"exprdouble", Tkapp_ExprDouble, METH_VARARGS},
|
||
{"exprboolean", Tkapp_ExprBoolean, METH_VARARGS},
|
||
{"splitlist", Tkapp_SplitList, METH_VARARGS},
|
||
{"split", Tkapp_Split, METH_VARARGS},
|
||
{"merge", Tkapp_Merge, METH_OLDARGS},
|
||
{"createcommand", Tkapp_CreateCommand, METH_VARARGS},
|
||
{"deletecommand", Tkapp_DeleteCommand, METH_VARARGS},
|
||
#ifdef HAVE_CREATEFILEHANDLER
|
||
{"createfilehandler", Tkapp_CreateFileHandler, METH_VARARGS},
|
||
{"deletefilehandler", Tkapp_DeleteFileHandler, METH_VARARGS},
|
||
#endif
|
||
{"createtimerhandler", Tkapp_CreateTimerHandler, METH_VARARGS},
|
||
{"mainloop", Tkapp_MainLoop, METH_VARARGS},
|
||
{"dooneevent", Tkapp_DoOneEvent, METH_VARARGS},
|
||
{"quit", Tkapp_Quit, METH_VARARGS},
|
||
{"interpaddr", Tkapp_InterpAddr, METH_VARARGS},
|
||
{"loadtk", Tkapp_TkInit, METH_NOARGS},
|
||
{NULL, NULL}
|
||
};
|
||
|
||
|
||
|
||
/**** Tkapp Type Methods ****/
|
||
|
||
static void
|
||
Tkapp_Dealloc(PyObject *self)
|
||
{
|
||
/*CHECK_TCL_APPARTMENT;*/
|
||
ENTER_TCL
|
||
Tcl_DeleteInterp(Tkapp_Interp(self));
|
||
LEAVE_TCL
|
||
PyObject_Del(self);
|
||
DisableEventHook();
|
||
}
|
||
|
||
static PyObject *
|
||
Tkapp_GetAttr(PyObject *self, char *name)
|
||
{
|
||
return Py_FindMethod(Tkapp_methods, self, name);
|
||
}
|
||
|
||
static PyTypeObject Tkapp_Type =
|
||
{
|
||
PyObject_HEAD_INIT(NULL)
|
||
0, /*ob_size */
|
||
"tkapp", /*tp_name */
|
||
sizeof(TkappObject), /*tp_basicsize */
|
||
0, /*tp_itemsize */
|
||
Tkapp_Dealloc, /*tp_dealloc */
|
||
0, /*tp_print */
|
||
Tkapp_GetAttr, /*tp_getattr */
|
||
0, /*tp_setattr */
|
||
0, /*tp_compare */
|
||
0, /*tp_repr */
|
||
0, /*tp_as_number */
|
||
0, /*tp_as_sequence */
|
||
0, /*tp_as_mapping */
|
||
0, /*tp_hash */
|
||
};
|
||
|
||
|
||
|
||
/**** Tkinter Module ****/
|
||
|
||
typedef struct {
|
||
PyObject* tuple;
|
||
int size; /* current size */
|
||
int maxsize; /* allocated size */
|
||
} FlattenContext;
|
||
|
||
static int
|
||
_bump(FlattenContext* context, int size)
|
||
{
|
||
/* expand tuple to hold (at least) size new items.
|
||
return true if successful, false if an exception was raised */
|
||
|
||
int maxsize = context->maxsize * 2;
|
||
|
||
if (maxsize < context->size + size)
|
||
maxsize = context->size + size;
|
||
|
||
context->maxsize = maxsize;
|
||
|
||
return _PyTuple_Resize(&context->tuple, maxsize) >= 0;
|
||
}
|
||
|
||
static int
|
||
_flatten1(FlattenContext* context, PyObject* item, int depth)
|
||
{
|
||
/* add tuple or list to argument tuple (recursively) */
|
||
|
||
int i, size;
|
||
|
||
if (depth > 1000) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"nesting too deep in _flatten");
|
||
return 0;
|
||
} else if (PyList_Check(item)) {
|
||
size = PyList_GET_SIZE(item);
|
||
/* preallocate (assume no nesting) */
|
||
if (context->size + size > context->maxsize &&
|
||
!_bump(context, size))
|
||
return 0;
|
||
/* copy items to output tuple */
|
||
for (i = 0; i < size; i++) {
|
||
PyObject *o = PyList_GET_ITEM(item, i);
|
||
if (PyList_Check(o) || PyTuple_Check(o)) {
|
||
if (!_flatten1(context, o, depth + 1))
|
||
return 0;
|
||
} else if (o != Py_None) {
|
||
if (context->size + 1 > context->maxsize &&
|
||
!_bump(context, 1))
|
||
return 0;
|
||
Py_INCREF(o);
|
||
PyTuple_SET_ITEM(context->tuple,
|
||
context->size++, o);
|
||
}
|
||
}
|
||
} else if (PyTuple_Check(item)) {
|
||
/* same, for tuples */
|
||
size = PyTuple_GET_SIZE(item);
|
||
if (context->size + size > context->maxsize &&
|
||
!_bump(context, size))
|
||
return 0;
|
||
for (i = 0; i < size; i++) {
|
||
PyObject *o = PyTuple_GET_ITEM(item, i);
|
||
if (PyList_Check(o) || PyTuple_Check(o)) {
|
||
if (!_flatten1(context, o, depth + 1))
|
||
return 0;
|
||
} else if (o != Py_None) {
|
||
if (context->size + 1 > context->maxsize &&
|
||
!_bump(context, 1))
|
||
return 0;
|
||
Py_INCREF(o);
|
||
PyTuple_SET_ITEM(context->tuple,
|
||
context->size++, o);
|
||
}
|
||
}
|
||
} else {
|
||
PyErr_SetString(PyExc_TypeError, "argument must be sequence");
|
||
return 0;
|
||
}
|
||
return 1;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkinter_Flatten(PyObject* self, PyObject* args)
|
||
{
|
||
FlattenContext context;
|
||
PyObject* item;
|
||
|
||
if (!PyArg_ParseTuple(args, "O:_flatten", &item))
|
||
return NULL;
|
||
|
||
context.maxsize = PySequence_Size(item);
|
||
if (context.maxsize <= 0)
|
||
return PyTuple_New(0);
|
||
|
||
context.tuple = PyTuple_New(context.maxsize);
|
||
if (!context.tuple)
|
||
return NULL;
|
||
|
||
context.size = 0;
|
||
|
||
if (!_flatten1(&context, item,0))
|
||
return NULL;
|
||
|
||
if (_PyTuple_Resize(&context.tuple, context.size))
|
||
return NULL;
|
||
|
||
return context.tuple;
|
||
}
|
||
|
||
static PyObject *
|
||
Tkinter_Create(PyObject *self, PyObject *args)
|
||
{
|
||
char *screenName = NULL;
|
||
char *baseName = NULL;
|
||
char *className = NULL;
|
||
int interactive = 0;
|
||
int wantobjects = 0;
|
||
int wantTk = 1; /* If false, then Tk_Init() doesn't get called */
|
||
int sync = 0; /* pass -sync to wish */
|
||
char *use = NULL; /* pass -use to wish */
|
||
|
||
baseName = strrchr(Py_GetProgramName(), '/');
|
||
if (baseName != NULL)
|
||
baseName++;
|
||
else
|
||
baseName = Py_GetProgramName();
|
||
className = "Tk";
|
||
|
||
if (!PyArg_ParseTuple(args, "|zssiiiiz:create",
|
||
&screenName, &baseName, &className,
|
||
&interactive, &wantobjects, &wantTk,
|
||
&sync, &use))
|
||
return NULL;
|
||
|
||
return (PyObject *) Tkapp_New(screenName, baseName, className,
|
||
interactive, wantobjects, wantTk,
|
||
sync, use);
|
||
}
|
||
|
||
static PyObject *
|
||
Tkinter_setbusywaitinterval(PyObject *self, PyObject *args)
|
||
{
|
||
int new_val;
|
||
if (!PyArg_ParseTuple(args, "i:setbusywaitinterval", &new_val))
|
||
return NULL;
|
||
if (new_val < 0) {
|
||
PyErr_SetString(PyExc_ValueError,
|
||
"busywaitinterval must be >= 0");
|
||
return NULL;
|
||
}
|
||
Tkinter_busywaitinterval = new_val;
|
||
Py_INCREF(Py_None);
|
||
return Py_None;
|
||
}
|
||
|
||
static char setbusywaitinterval_doc[] =
|
||
"setbusywaitinterval(n) -> None\n\
|
||
\n\
|
||
Set the busy-wait interval in milliseconds between successive\n\
|
||
calls to Tcl_DoOneEvent in a threaded Python interpreter.\n\
|
||
It should be set to a divisor of the maximum time between\n\
|
||
frames in an animation.";
|
||
|
||
static PyObject *
|
||
Tkinter_getbusywaitinterval(PyObject *self, PyObject *args)
|
||
{
|
||
return PyInt_FromLong(Tkinter_busywaitinterval);
|
||
}
|
||
|
||
static char getbusywaitinterval_doc[] =
|
||
"getbusywaitinterval() -> int\n\
|
||
\n\
|
||
Return the current busy-wait interval between successive\n\
|
||
calls to Tcl_DoOneEvent in a threaded Python interpreter.";
|
||
|
||
static PyMethodDef moduleMethods[] =
|
||
{
|
||
{"_flatten", Tkinter_Flatten, METH_VARARGS},
|
||
{"create", Tkinter_Create, METH_VARARGS},
|
||
#ifdef HAVE_CREATEFILEHANDLER
|
||
{"createfilehandler", Tkapp_CreateFileHandler, METH_VARARGS},
|
||
{"deletefilehandler", Tkapp_DeleteFileHandler, METH_VARARGS},
|
||
#endif
|
||
{"createtimerhandler", Tkapp_CreateTimerHandler, METH_VARARGS},
|
||
{"mainloop", Tkapp_MainLoop, METH_VARARGS},
|
||
{"dooneevent", Tkapp_DoOneEvent, METH_VARARGS},
|
||
{"quit", Tkapp_Quit, METH_VARARGS},
|
||
{"setbusywaitinterval",Tkinter_setbusywaitinterval, METH_VARARGS,
|
||
setbusywaitinterval_doc},
|
||
{"getbusywaitinterval",(PyCFunction)Tkinter_getbusywaitinterval,
|
||
METH_NOARGS, getbusywaitinterval_doc},
|
||
{NULL, NULL}
|
||
};
|
||
|
||
#ifdef WAIT_FOR_STDIN
|
||
|
||
static int stdin_ready = 0;
|
||
|
||
#ifndef MS_WINDOWS
|
||
static void
|
||
MyFileProc(void *clientData, int mask)
|
||
{
|
||
stdin_ready = 1;
|
||
}
|
||
#endif
|
||
|
||
#ifdef WITH_THREAD
|
||
static PyThreadState *event_tstate = NULL;
|
||
#endif
|
||
|
||
static int
|
||
EventHook(void)
|
||
{
|
||
#ifndef MS_WINDOWS
|
||
int tfile;
|
||
#endif
|
||
#ifdef WITH_THREAD
|
||
PyEval_RestoreThread(event_tstate);
|
||
#endif
|
||
stdin_ready = 0;
|
||
errorInCmd = 0;
|
||
#ifndef MS_WINDOWS
|
||
tfile = fileno(stdin);
|
||
Tcl_CreateFileHandler(tfile, TCL_READABLE, MyFileProc, NULL);
|
||
#endif
|
||
while (!errorInCmd && !stdin_ready) {
|
||
int result;
|
||
#ifdef MS_WINDOWS
|
||
if (_kbhit()) {
|
||
stdin_ready = 1;
|
||
break;
|
||
}
|
||
#endif
|
||
#if defined(WITH_THREAD) || defined(MS_WINDOWS)
|
||
Py_BEGIN_ALLOW_THREADS
|
||
if(tcl_lock)PyThread_acquire_lock(tcl_lock, 1);
|
||
tcl_tstate = event_tstate;
|
||
|
||
result = Tcl_DoOneEvent(TCL_DONT_WAIT);
|
||
|
||
tcl_tstate = NULL;
|
||
if(tcl_lock)PyThread_release_lock(tcl_lock);
|
||
if (result == 0)
|
||
Sleep(Tkinter_busywaitinterval);
|
||
Py_END_ALLOW_THREADS
|
||
#else
|
||
result = Tcl_DoOneEvent(0);
|
||
#endif
|
||
|
||
if (result < 0)
|
||
break;
|
||
}
|
||
#ifndef MS_WINDOWS
|
||
Tcl_DeleteFileHandler(tfile);
|
||
#endif
|
||
if (errorInCmd) {
|
||
errorInCmd = 0;
|
||
PyErr_Restore(excInCmd, valInCmd, trbInCmd);
|
||
excInCmd = valInCmd = trbInCmd = NULL;
|
||
PyErr_Print();
|
||
}
|
||
#ifdef WITH_THREAD
|
||
PyEval_SaveThread();
|
||
#endif
|
||
return 0;
|
||
}
|
||
|
||
#endif
|
||
|
||
static void
|
||
EnableEventHook(void)
|
||
{
|
||
#ifdef WAIT_FOR_STDIN
|
||
if (PyOS_InputHook == NULL) {
|
||
#ifdef WITH_THREAD
|
||
event_tstate = PyThreadState_Get();
|
||
#endif
|
||
PyOS_InputHook = EventHook;
|
||
}
|
||
#endif
|
||
}
|
||
|
||
static void
|
||
DisableEventHook(void)
|
||
{
|
||
#ifdef WAIT_FOR_STDIN
|
||
if (Tk_GetNumMainWindows() == 0 && PyOS_InputHook == EventHook) {
|
||
PyOS_InputHook = NULL;
|
||
}
|
||
#endif
|
||
}
|
||
|
||
|
||
/* all errors will be checked in one fell swoop in init_tkinter() */
|
||
static void
|
||
ins_long(PyObject *d, char *name, long val)
|
||
{
|
||
PyObject *v = PyInt_FromLong(val);
|
||
if (v) {
|
||
PyDict_SetItemString(d, name, v);
|
||
Py_DECREF(v);
|
||
}
|
||
}
|
||
static void
|
||
ins_string(PyObject *d, char *name, char *val)
|
||
{
|
||
PyObject *v = PyString_FromString(val);
|
||
if (v) {
|
||
PyDict_SetItemString(d, name, v);
|
||
Py_DECREF(v);
|
||
}
|
||
}
|
||
|
||
|
||
PyMODINIT_FUNC
|
||
init_tkinter(void)
|
||
{
|
||
PyObject *m, *d;
|
||
|
||
Tkapp_Type.ob_type = &PyType_Type;
|
||
|
||
#ifdef WITH_THREAD
|
||
tcl_lock = PyThread_allocate_lock();
|
||
#endif
|
||
|
||
m = Py_InitModule("_tkinter", moduleMethods);
|
||
if (m == NULL)
|
||
return;
|
||
|
||
d = PyModule_GetDict(m);
|
||
Tkinter_TclError = PyErr_NewException("_tkinter.TclError", NULL, NULL);
|
||
PyDict_SetItemString(d, "TclError", Tkinter_TclError);
|
||
|
||
ins_long(d, "READABLE", TCL_READABLE);
|
||
ins_long(d, "WRITABLE", TCL_WRITABLE);
|
||
ins_long(d, "EXCEPTION", TCL_EXCEPTION);
|
||
ins_long(d, "WINDOW_EVENTS", TCL_WINDOW_EVENTS);
|
||
ins_long(d, "FILE_EVENTS", TCL_FILE_EVENTS);
|
||
ins_long(d, "TIMER_EVENTS", TCL_TIMER_EVENTS);
|
||
ins_long(d, "IDLE_EVENTS", TCL_IDLE_EVENTS);
|
||
ins_long(d, "ALL_EVENTS", TCL_ALL_EVENTS);
|
||
ins_long(d, "DONT_WAIT", TCL_DONT_WAIT);
|
||
ins_string(d, "TK_VERSION", TK_VERSION);
|
||
ins_string(d, "TCL_VERSION", TCL_VERSION);
|
||
|
||
PyDict_SetItemString(d, "TkappType", (PyObject *)&Tkapp_Type);
|
||
|
||
Tktt_Type.ob_type = &PyType_Type;
|
||
PyDict_SetItemString(d, "TkttType", (PyObject *)&Tktt_Type);
|
||
|
||
PyTclObject_Type.ob_type = &PyType_Type;
|
||
PyDict_SetItemString(d, "Tcl_Obj", (PyObject *)&PyTclObject_Type);
|
||
|
||
#ifdef TK_AQUA
|
||
/* Tk_MacOSXSetupTkNotifier must be called before Tcl's subsystems
|
||
* start waking up. Note that Tcl_FindExecutable will do this, this
|
||
* code must be above it! The original warning from
|
||
* tkMacOSXAppInit.c is copied below.
|
||
*
|
||
* NB - You have to swap in the Tk Notifier BEFORE you start up the
|
||
* Tcl interpreter for now. It probably should work to do this
|
||
* in the other order, but for now it doesn't seem to.
|
||
*
|
||
*/
|
||
Tk_MacOSXSetupTkNotifier();
|
||
#endif
|
||
|
||
|
||
/* This helps the dynamic loader; in Unicode aware Tcl versions
|
||
it also helps Tcl find its encodings. */
|
||
Tcl_FindExecutable(Py_GetProgramName());
|
||
|
||
if (PyErr_Occurred())
|
||
return;
|
||
|
||
#if 0
|
||
/* This was not a good idea; through <Destroy> bindings,
|
||
Tcl_Finalize() may invoke Python code but at that point the
|
||
interpreter and thread state have already been destroyed! */
|
||
Py_AtExit(Tcl_Finalize);
|
||
#endif
|
||
|
||
}
|