mirror of
https://github.com/python/cpython.git
synced 2025-10-25 10:44:55 +00:00
Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines Updated version (win32-icons2.zip) from #1490384. ........ r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1472084] Fix description of do_tag ........ r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1475554] Strengthen text to say 'must' instead of 'should' ........ r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1441864] Clarify description of 'data' argument ........ r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line Minor rewording ........ r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Fix by renaming the variable. In a different module, Neal fixed it by renaming _self to self. There's already a variable named 'self' here, so I used selfptr. (I'm committing this on a Mac without Tk, but it's a simple search-and-replace. <crosses fingers>, so I'll watch the buildbots and see what happens.) ........ r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines "_self" is a said to be a reserved word in Watcom C 10.6. I'm not sure that's really standard compliant behaviour, but I guess we have to fix that anyway... ........ r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line Update readme ........ r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line Drop 0 parameter ........ r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line Some code tidying; use curses.wrapper ........ r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line Use True; value returned from main is unused ........ r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line Use true division, and the True value ........ r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line Docstring fix; use True ........ r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line Put code in a main() function; loosen up the spacing to match current code style ........ r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line Use functions; modernize code ........ r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line This demo requires Medusa (not just asyncore); remove it ........ r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module. ........ r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line Remove xmlrpc/ directory ........ r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line Remove dangling reference ........ r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line Add more whitespace; use a better socket name ........ r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines Whitespace normalization. ........ r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines In a PYMALLOC_DEBUG build obmalloc adds extra debugging info to each allocated block. This was using 4 bytes for each such piece of info regardless of platform. This didn't really matter before (proof: no bug reports, and the debug-build obmalloc would have assert-failed if it was ever asked for a chunk of memory >= 2**32 bytes), since container indices were plain ints. But after the Py_ssize_t changes, it's at least theoretically possible to allocate a list or string whose guts exceed 2**32 bytes, and the PYMALLOC_DEBUG routines would fail then (having only 4 bytes to record the originally requested size). Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG build's extra debugging fields. This won't make any difference on 32-bit boxes, but will add 16 bytes to each allocation in a debug build on a 64-bit box. ........ r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines _PyObject_DebugMalloc(): The return value should add 2*sizeof(size_t) now, not 8. This probably accounts for current disasters on the 64-bit buildbot slaves. ........ r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line SF #1499797, Fix for memory leak in WindowsError_str ........ r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1454481: Make thread stack size runtime tunable. ........ r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines clean up function declarations to conform to PEP-7 style. ........ r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines Fixes in struct and socket from merge reviews. - Following Guido's comments, renamed * pack_to -> pack_into * recv_buf -> recv_into * recvfrom_buf -> recvfrom_into - Made fixes to _struct.c according to Neal Norwitz comments on the checkins list. - Converted some ints into the appropriate -- I hope -- ssize_t and size_t. ........ r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines "Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with the right compiler flags. ........ r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines Drop Mac wrappers for the WASTE library. ........ r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines s_methods[]: Stop compiler warnings by casting s_unpack_from to PyCFunction. ........ r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines Remove a redundant word ........ r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines Markup fix ........ r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1359618: Speed-up charmap encoder. ........ r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines Repair refleaks in unicodeobject. ........ r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines Patch #1346214: correctly optimize away "if 0"-style stmts (thanks to Neal for review) ........ r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines Bug #1500293: fix memory leaks in _subprocess module. ........ r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines Revert revisions: 46640 Patch #1454481: Make thread stack size runtime tunable. 46647 Markup fix The first is causing many buildbots to fail test runs, and there are multiple causes with seemingly no immediate prospects for repairing them. See python-dev discussion. Note that a branch can (and should) be created for resolving these problems, like svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH followed by merging rev 46647 to the new branch. ........ r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line Mention second encoding speedup ........ r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized char **log_list. feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2. ........ r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines fix a bug in the previous commit. don't leak empty list on error return and fix the additional rare (out of memory only) bug that it was supposed to fix of not freeing log_list when the python allocator failed. ........ r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines "Flat is better than nested." Move the long-winded, multiply-nested -R support out of runtest() and into some module-level helper functions. This makes runtest() and the -R code easier to follow. That in turn allowed seeing some opportunities for code simplification, and made it obvious that reglog.txt never got closed. ........ r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines Fix a potentially invalid memory access of CJKCodecs' shift-jis decoder. (found by Neal Norwitz) ........ r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885] ........ r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines Remove doctest.testmod's deprecated (in 2.4) `isprivate` argument. A lot of hair went into supporting that! ........ r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines Make doctest news more accurate. ........ r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902] ........ r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines mention the just committed bsddb changes ........ r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines * add support for DBSequence objects [patch #1466734] ........ r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines forgot to add this file in previous commit ........ r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines * fix DBCursor.pget() bug with keyword argument names when no data= is supplied [SF pybsddb bug #1477863] ........ r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line Remove use of Trove name, which isn't very helpful to users ........ r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line [Bug #1470026] Include link to list of classifiers ........ r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines Access _struct attributes directly instead of mucking with getattr. string_reverse(): Simplify. assertRaises(): Raise TestFailed on failure. test_unpack_from(), test_pack_into(), test_pack_into_fn(): never use `assert` to test for an expected result (it doesn't test anything when Python is run with -O). ........ r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines add depends = ['md5.h'] to the _md5 module extension for correctness sake. ........ r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int. Closes bug #1501223. ........ r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines - bsddb: the __len__ method of a DB object has been fixed to return correct results. It could previously incorrectly return 0 in some cases. Fixes SF bug 1493322 (pybsddb bug 1184012). ........ r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines _PySys_Init(): It's rarely a good idea to size a buffer to the exact maximum size someone guesses is needed. In this case, if we're really worried about extreme integers, then "cp%d" can actually need 14 bytes (2 for "cp" + 1 for \0 at the end + 11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is actually saved by making a stack-local buffer tiny. ........ r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line Remove unused variable (and stop compiler warning) ........ r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line Fix a bunch of parameter strings ........ r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines Convert CFieldObject tp_members to tp_getset, since there is no structmember typecode for Py_ssize_t fields. This should fix some of the errors on the PPC64 debian machine (64-bit, big endian). Assigning to readonly fields now raises AttributeError instead of TypeError, so the testcase has to be changed as well. ........ r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line Damn - the sentinel was missing. And fix another silly mistake. ........ r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines Normalized a few cases of whitespace in function declarations. Found them using:: find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done (I was doing this all over my own code anyway, because I'd been using spaces in all defs, so I thought I'd make a run on the Python code as well. If you need to do such fixes in your own code, you can use xx-rename or parenregu.el within emacs.) ........ r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures ........ r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines BSequence_set_range(): Rev 46688 ("Fix a bunch of parameter strings") changed this function's signature seemingly by mistake, which is causing buildbots to fail test_bsddb3. Restored the pre-46688 signature. ........ r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines On python-dev Thomas Heller said these were committed by mistake in rev 46693, so reverting this part of rev 46693. ........ r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line Fix comment typo ........ r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines Fix coding style guide bug. ........ r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines Add a hack so that foreign functions returning float now do work on 64-bit big endian platforms. ........ r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines Use the same big-endian hack as in _ctypes/callproc.c for callback functions. This fixes the callback function tests that return float. ........ r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines * Ensure that "make altinstall" works when the tree was configured with --enable-framework * Also for --enable-framework: allow users to use --prefix to specify the location of the compatibility symlinks (such as /usr/local/bin/python) ........ r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines A quick hack to ensure the right key-bindings for IDLE on osx: install patched configuration files during a framework install. ........ r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines dash_R_cleanup(): Clear filecmp._cache. This accounts for different results across -R runs (at least on Windows) of test_filecmp. ........ r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines SF patch 1501987: Remove randomness from test_exceptions, from ?iga Seilnacht (sorry about the name, but Firefox on my box can't display the first character of the name -- the SF "Unix name" is zseil). This appears to cure the oddball intermittent leaks across runs when running test_exceptions under -R. I'm not sure why, but I'm too sleepy to care ;-) The thrust of the SF patch was to remove randomness in the pickle protocol used. I changed the patch to use range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and cPickle, and randomly mucked with other test lines to put statements on their own lines. Not a bugfix candidate (this is fiddling new-in-2.5 code). ........ r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line Add an SQLite introduction, taken from the 'What's New' text ........ r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line Add an item; also, escape % ........ r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/Tools one level up ........ r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/PythonLauncher one level up ........ r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines mv Mac/OSX/BuildScript one level up ........ r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/* one level up ........ r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines And the last bit: move IDLE one level up and adjust makefiles ........ r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines - Patch the correct version of python in the Info.plists at build time, instead of relying on a maintainer to update them before releases. - Remove the now empty Mac/OSX directory ........ r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines * If BuildApplet.py is used as an applet it starts with a version of sys.exutable that isn't usuable on an #!-line. That results in generated applets that don't actually work. Work around this problem by resetting sys.executable. * argvemulator.py didn't work on intel macs. This patch fixes this (bug #1491468) ........ r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines Whitespace normalization. ........ r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines Fix for foreign functions returning small structures on 64-bit big endian machines. Should fix the remaininf failure in the PPC64 Debian buildbot. Thanks to Matthias Klose for providing access to a machine to debug and test this. ........ r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines Clarify documentation for bf_getcharbuffer. ........ r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line Fix a refleak in recvfrom_into ........ r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines - bsddb: the bsddb.dbtables Modify method now raises the proper error and aborts the db transaction safely when a modifier callback fails. Fixes SF python patch/bug #1408584. Also cleans up the bsddb.dbtables docstrings since thats the only documentation that exists for that unadvertised module. (people really should really just use sqlite3) ........ r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines * Turn the deadlock situation described in SF bug #775414 into a DBDeadLockError exception. * add the test case for my previous dbtables commit. ........ r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time. ........ r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines (arre, arigo) SF bug #1350060 Give a consistent behavior for comparison and hashing of method objects (both user- and built-in methods). Now compares the 'self' recursively. The hash was already asking for the hash of 'self'. ........ r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line Typo fix ........ r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking. ........ r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502728: Correctly link against librt library on HP-UX. ........ r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines Add news for recent bugfix. ........ r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines Argh. "integer" is a very confusing word ;) Actually, checking for INT_MAX and INT_MIN is correct since the format code explicitly handles a C "int". ........ r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line Add functools.update_wrapper() and functools.wraps() as described in PEP 356 ........ r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines Bug #1502805: don't alias file.__exit__ to file.close since the latter can return something that's true. ........ r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines Convert test_file to unittest. ........
3162 lines
71 KiB
C
3162 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);
|
||
int 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;
|
||
int i;
|
||
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_XINCREF(self);
|
||
Py_XINCREF(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);
|
||
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
|
||
|
||
}
|