cpython-lru_cache-weakref: Mac/Python/macmain.c annotate

annotate Mac/Python/macmain.c @ 27158:eb6b36b26e8d legacy-trunk

Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk.

author	Jack Jansen <jack.jansen@cwi.nl>
date	Wed, 08 Jan 2003 16:27:44 +0000
parents	96b8c8ae7262
children

rev	line source
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	1 /***********************************************************
5079 d6b292a33cfe Added/updated copyright notices Jack Jansen <jack.jansen@cwi.nl> parents: 4962 diff changeset	2 Copyright 1991-1997 by Stichting Mathematisch Centrum, Amsterdam,
2091 b4d982c648bb 1995 copyright Guido van Rossum <guido@python.org> parents: 2031 diff changeset	3 The Netherlands.
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	4
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	5 All Rights Reserved
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	6
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	7 Permission to use, copy, modify, and distribute this software and its
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	8 documentation for any purpose and without fee is hereby granted,
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	9 provided that the above copyright notice appear in all copies and that
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	10 both that copyright notice and this permission notice appear in
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	11 supporting documentation, and that the names of Stichting Mathematisch
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	12 Centrum or CWI not be used in advertising or publicity pertaining to
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	13 distribution of the software without specific, written prior permission.
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	14
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	15 STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	16 THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	17 FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	18 FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	19 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	20 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	21 OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	22
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	23 ******************************************************************/
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	24
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	25 /* Python interpreter main program */
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	26
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	27 #include "Python.h"
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	28 #include "pythonresources.h"
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	29 #include "import.h"
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	30 #include "marshal.h"
4197 b70baba1c789 - Fixed PyMac_DoYield: Jack Jansen <jack.jansen@cwi.nl> parents: 4017 diff changeset	31 #include "macglue.h"
2144 0e60cd207adb must include rename2.h Guido van Rossum <guido@python.org> parents: 2091 diff changeset	32
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	33 #ifdef WITHOUT_FRAMEWORKS
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	34 #include <Memory.h>
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	35 #include <Resources.h>
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	36 #include <stdio.h>
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	37 #include <Events.h>
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	38 #include <Windows.h>
3442 066a8ae4d406 Added missing include of Fonts.h Jack Jansen <jack.jansen@cwi.nl> parents: 3433 diff changeset	39 #include <Fonts.h>
6293 6c0a2658a156 Added old-exception and no-site-python options and balloon help Jack Jansen <jack.jansen@cwi.nl> parents: 6277 diff changeset	40 #include <Balloons.h>
20779 61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	41 #include <CFBundle.h>
61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	42 #include <CFURL.h>
61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	43 #include <CFString.h>
61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	44 #include <CFBase.h>
61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	45 #include <CFArray.h>
11529 f83b74273da2 First bits and pieces of appearance support: an init routine, a global flag PyMac_AppearanceCompliant (exported thru MacOS). If USE_APPEARANCE Jack Jansen <jack.jansen@cwi.nl> parents: 11350 diff changeset	46 #include <Gestalt.h>
f83b74273da2 First bits and pieces of appearance support: an init routine, a global flag PyMac_AppearanceCompliant (exported thru MacOS). If USE_APPEARANCE Jack Jansen <jack.jansen@cwi.nl> parents: 11350 diff changeset	47 #include <Appearance.h>
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	48 #else
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	49 #include <Carbon/Carbon.h>
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	50 #endif /* WITHOUT_FRAMEWORKS */
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	51
2277 df7e26b5c918 Added stuff so CodeWarrior isn't so verbose about its stdio windows Jack Jansen <jack.jansen@cwi.nl> parents: 2226 diff changeset	52 #ifdef __MWERKS__
df7e26b5c918 Added stuff so CodeWarrior isn't so verbose about its stdio windows Jack Jansen <jack.jansen@cwi.nl> parents: 2226 diff changeset	53 #include <SIOUX.h>
3247 20d74fa3b50b For MW Python, update titlebar of window when python exits. Jack Jansen <jack.jansen@cwi.nl> parents: 3236 diff changeset	54 #define USE_SIOUX
13547 db963a615bc9 ANSIfication step 2: make sure all needed prototypes are available, and all needed Jack Jansen <jack.jansen@cwi.nl> parents: 13542 diff changeset	55 extern int ccommand(char ***);
4911 21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	56 #if __profile__ == 1
21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	57 #include <profiler.h>
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	58 #endif /* __profile__ */
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	59 #endif /* __MWERKS__ */
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	60
12834 c2a0f2a81fa8 Removed (within an #ifdef) Carbon-incompatabilities: Jack Jansen <jack.jansen@cwi.nl> parents: 12593 diff changeset	61 #include <unistd.h>
13702 f840bf6a3351 Added more prototypes. Jack Jansen <jack.jansen@cwi.nl> parents: 13638 diff changeset	62 #ifdef USE_MAC_SHARED_LIBRARY
f840bf6a3351 Added more prototypes. Jack Jansen <jack.jansen@cwi.nl> parents: 13638 diff changeset	63 extern PyMac_AddLibResources(void);
f840bf6a3351 Added more prototypes. Jack Jansen <jack.jansen@cwi.nl> parents: 13638 diff changeset	64 #endif
2277 df7e26b5c918 Added stuff so CodeWarrior isn't so verbose about its stdio windows Jack Jansen <jack.jansen@cwi.nl> parents: 2226 diff changeset	65
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	66 #define STARTUP "PythonStartup"
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	67
14464 17cec96f75bc Use same short banner message as unix/win Python. Jack Jansen <jack.jansen@cwi.nl> parents: 14198 diff changeset	68 #define COPYRIGHT \
17cec96f75bc Use same short banner message as unix/win Python. Jack Jansen <jack.jansen@cwi.nl> parents: 14198 diff changeset	69 "Type \"copyright\", \"credits\" or \"license\" for more information."
17cec96f75bc Use same short banner message as unix/win Python. Jack Jansen <jack.jansen@cwi.nl> parents: 14198 diff changeset	70
4228 84444ea3f5f6 - Rationalized override preferences support, by remembering Jack Jansen <jack.jansen@cwi.nl> parents: 4215 diff changeset	71 short PyMac_AppRefNum; /* RefNum of application resource fork */
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	72
3930 52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	73 /* For Py_GetArgcArgv(); set by main() */
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	74 static char **orig_argv;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	75 static int orig_argc;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	76
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	77 /* A flag which remembers whether the user has acknowledged all the console
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	78 ** output (by typing something)
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	79 */
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	80 #define STATE_UNKNOWN 0
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	81 #define STATE_LASTREAD 1
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	82 #define STATE_LASTWRITE 2
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	83 int console_output_state = STATE_UNKNOWN;
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	84
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	85 PyMac_PrefRecord PyMac_options;
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	86
24564 0bb3986cf653 Renamed Py_Main to PyMac_Main as it has a different signature than the "normal" Py_Main, and that signature has appeared in a .h file. Jack Jansen <jack.jansen@cwi.nl> parents: 23511 diff changeset	87 static void PyMac_Main(int, char *, char ); /* Forward */
13542 ddd6138c9e6f ANSIfication step 1: get rid of Py_PROTO and Py_FPROTO. Jack Jansen <jack.jansen@cwi.nl> parents: 12855 diff changeset	88 void PyMac_Exit(int); /* Forward */
4017 5dc8c042905b Guido: added some void's to declarations Jack Jansen <jack.jansen@cwi.nl> parents: 3930 diff changeset	89
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	90 /* Initialize the Mac toolbox world */
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	91
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	92 static void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	93 init_mac_world(void)
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	94 {
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	95 InitCursor();
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	96 }
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	97
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	98 /*
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	99 ** PyMac_InteractiveOptions - Allow user to set options if option key is pressed
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	100 */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	101 static void
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	102 PyMac_InteractiveOptions(PyMac_PrefRecord p, int argcp, char ***argvp)
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	103 {
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	104 KeyMap rmap;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	105 unsigned char *map;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	106 short item, type;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	107 ControlHandle handle;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	108 DialogPtr dialog;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	109 Rect rect;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	110
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	111 /*
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	112 ** If the preferences disallows interactive options we return,
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	113 ** similarly of <option> isn't pressed.
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	114 */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	115 if (p->nointopt) return;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	116
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	117 GetKeys(rmap);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	118 map = (unsigned char *)rmap;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	119 if ( ( map[0x3a>>3] & (1<<(0x3a&7)) ) == 0 ) /* option key is 3a */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	120 return;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	121
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	122 dialog = GetNewDialog(OPT_DIALOG, NULL, (WindowPtr)-1);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	123 if ( dialog == NULL ) {
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	124 printf("Option dialog not found - cannot set options\n");
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	125 return;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	126 }
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	127 SetDialogDefaultItem(dialog, OPT_OK);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	128 SetDialogCancelItem(dialog, OPT_CANCEL);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	129
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	130 /* Set default values */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	131 #define SET_OPT_ITEM(num, var) \
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	132 GetDialogItem(dialog, (num), &type, (Handle *)&handle, &rect); \
5270 de9d0c5249b0 Changed the few old routine names still used to the new ones Jack Jansen <jack.jansen@cwi.nl> parents: 5153 diff changeset	133 SetControlValue(handle, (short)p->var);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	134
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	135 SET_OPT_ITEM(OPT_INSPECT, inspect);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	136 SET_OPT_ITEM(OPT_VERBOSE, verbose);
19641 c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	137 /* OPT_VERBOSEVERBOSE is default off */
6293 6c0a2658a156 Added old-exception and no-site-python options and balloon help Jack Jansen <jack.jansen@cwi.nl> parents: 6277 diff changeset	138 SET_OPT_ITEM(OPT_OPTIMIZE, optimize);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	139 SET_OPT_ITEM(OPT_UNBUFFERED, unbuffered);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	140 SET_OPT_ITEM(OPT_DEBUGGING, debugging);
14773 c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	141 GetDialogItem(dialog, OPT_KEEPALWAYS, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	142 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_ALWAYS));
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	143 GetDialogItem(dialog, OPT_KEEPOUTPUT, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	144 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_OUTPUT));
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	145 GetDialogItem(dialog, OPT_KEEPERROR, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	146 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_ERROR));
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	147 GetDialogItem(dialog, OPT_KEEPNEVER, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	148 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_NEVER));
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	149 /* SET_OPT_ITEM(OPT_KEEPCONSOLE, keep_console); */
12593 eaee924efb19 Removed string-exception preference, added tabcheck and NavService preference, upped version number. Jack Jansen <jack.jansen@cwi.nl> parents: 12281 diff changeset	150 SET_OPT_ITEM(OPT_TABWARN, tabwarn);
6293 6c0a2658a156 Added old-exception and no-site-python options and balloon help Jack Jansen <jack.jansen@cwi.nl> parents: 6277 diff changeset	151 SET_OPT_ITEM(OPT_NOSITE, nosite);
19641 c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	152 SET_OPT_ITEM(OPT_DIVISIONWARN, divisionwarn);
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	153 SET_OPT_ITEM(OPT_UNIXNEWLINES, unixnewlines);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	154 /* The rest are not settable interactively */
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	155
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	156 #undef SET_OPT_ITEM
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	157
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	158 while (1) {
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	159 handle = NULL;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	160 ModalDialog(NULL, &item);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	161 if ( item == OPT_OK )
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	162 break;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	163 if ( item == OPT_CANCEL ) {
5270 de9d0c5249b0 Changed the few old routine names still used to the new ones Jack Jansen <jack.jansen@cwi.nl> parents: 5153 diff changeset	164 DisposeDialog(dialog);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	165 exit(0);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	166 }
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	167 if ( item == OPT_CMDLINE ) {
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	168 int old_argc = *argcp;
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	169 int i;
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	170 int new_argc, newer_argc;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	171 char new_argv, newer_argv;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	172
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	173 new_argc = ccommand(&new_argv);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	174 newer_argc = (new_argc-1) + old_argc;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	175 newer_argv = malloc((newer_argc+1)sizeof(char ));
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	176 if( !newer_argv )
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	177 Py_FatalError("Cannot malloc argv\n");
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	178 for(i=0; i<old_argc; i++)
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	179 newer_argv[i] = (*argvp)[i];
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	180 for(i=old_argc; i<=newer_argc; i++) /* Copy the NULL too */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	181 newer_argv[i] = new_argv[i-old_argc+1];
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	182 *argvp = newer_argv;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	183 *argcp = newer_argc;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	184
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	185 /* XXXX Is it not safe to use free() here, apparently */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	186 }
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	187 #define OPT_ITEM(num, var) \
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	188 if ( item == (num) ) { \
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	189 p->var = !p->var; \
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	190 GetDialogItem(dialog, (num), &type, (Handle *)&handle, &rect); \
5270 de9d0c5249b0 Changed the few old routine names still used to the new ones Jack Jansen <jack.jansen@cwi.nl> parents: 5153 diff changeset	191 SetControlValue(handle, (short)p->var); \
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	192 }
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	193
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	194 OPT_ITEM(OPT_INSPECT, inspect);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	195 OPT_ITEM(OPT_VERBOSE, verbose);
19641 c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	196 if ( item == OPT_VERBOSEVERBOSE ) {
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	197 if ( p->verbose == 2 )
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	198 p->verbose = 1;
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	199 else
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	200 p->verbose = 2;
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	201 GetDialogItem(dialog, OPT_VERBOSE, &type, (Handle *)&handle, &rect);
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	202 SetControlValue(handle, 1);
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	203 }
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	204 GetDialogItem(dialog, OPT_VERBOSEVERBOSE, &type, (Handle *)&handle, &rect);
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	205 SetControlValue(handle, p->verbose == 2);
6293 6c0a2658a156 Added old-exception and no-site-python options and balloon help Jack Jansen <jack.jansen@cwi.nl> parents: 6277 diff changeset	206 OPT_ITEM(OPT_OPTIMIZE, optimize);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	207 OPT_ITEM(OPT_UNBUFFERED, unbuffered);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	208 OPT_ITEM(OPT_DEBUGGING, debugging);
14773 c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	209 if ( item == OPT_KEEPALWAYS ) p->keep_console = POPT_KEEPCONSOLE_ALWAYS;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	210 if ( item == OPT_KEEPOUTPUT ) p->keep_console = POPT_KEEPCONSOLE_OUTPUT;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	211 if ( item == OPT_KEEPERROR ) p->keep_console = POPT_KEEPCONSOLE_ERROR;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	212 if ( item == OPT_KEEPNEVER ) p->keep_console = POPT_KEEPCONSOLE_NEVER;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	213 GetDialogItem(dialog, OPT_KEEPALWAYS, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	214 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_ALWAYS));
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	215 GetDialogItem(dialog, OPT_KEEPOUTPUT, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	216 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_OUTPUT));
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	217 GetDialogItem(dialog, OPT_KEEPERROR, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	218 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_ERROR));
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	219 GetDialogItem(dialog, OPT_KEEPNEVER, &type, (Handle *)&handle, &rect);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	220 SetControlValue(handle, (short)(p->keep_console == POPT_KEEPCONSOLE_NEVER));
12593 eaee924efb19 Removed string-exception preference, added tabcheck and NavService preference, upped version number. Jack Jansen <jack.jansen@cwi.nl> parents: 12281 diff changeset	221 OPT_ITEM(OPT_TABWARN, tabwarn);
6293 6c0a2658a156 Added old-exception and no-site-python options and balloon help Jack Jansen <jack.jansen@cwi.nl> parents: 6277 diff changeset	222 OPT_ITEM(OPT_NOSITE, nosite);
19641 c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	223 OPT_ITEM(OPT_DIVISIONWARN, divisionwarn);
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	224 OPT_ITEM(OPT_UNIXNEWLINES, unixnewlines);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	225
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	226 #undef OPT_ITEM
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	227 }
5270 de9d0c5249b0 Changed the few old routine names still used to the new ones Jack Jansen <jack.jansen@cwi.nl> parents: 5153 diff changeset	228 DisposeDialog(dialog);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	229 }
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	230
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	231 /*
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	232 ** Initialization code, shared by interpreter and applets
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	233 */
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	234 static void
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	235 init_common(int argcp, char **argvp, int embedded)
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	236 {
4228 84444ea3f5f6 - Rationalized override preferences support, by remembering Jack Jansen <jack.jansen@cwi.nl> parents: 4215 diff changeset	237 /* Remember resource fork refnum, for later */
84444ea3f5f6 - Rationalized override preferences support, by remembering Jack Jansen <jack.jansen@cwi.nl> parents: 4215 diff changeset	238 PyMac_AppRefNum = CurResFile();
84444ea3f5f6 - Rationalized override preferences support, by remembering Jack Jansen <jack.jansen@cwi.nl> parents: 4215 diff changeset	239
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	240 /* Initialize toolboxes */
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	241 init_mac_world();
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	242
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	243 #ifdef USE_MAC_SHARED_LIBRARY
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	244 /* Add the shared library to the stack of resource files */
8792 0f5e0b405bc2 Initialize the program name before adding shared library resources (Just). Jack Jansen <jack.jansen@cwi.nl> parents: 6444 diff changeset	245 (void)PyMac_init_process_location();
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	246 PyMac_AddLibResources();
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	247 #endif
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	248
12281 51c0c3b6d919 Started on GUSI2 and threading support. Jack Jansen <jack.jansen@cwi.nl> parents: 11529 diff changeset	249 #if defined(USE_GUSI)
5617 70855574516b - Added Py_GetProgramFullPath Jack Jansen <jack.jansen@cwi.nl> parents: 5431 diff changeset	250 atexit(PyMac_StopGUSISpin);
12281 51c0c3b6d919 Started on GUSI2 and threading support. Jack Jansen <jack.jansen@cwi.nl> parents: 11529 diff changeset	251 #endif
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	252
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	253 #ifdef USE_SIOUX
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	254 /* Set various SIOUX flags. Some are changed later based on options */
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	255 SIOUXSettings.asktosaveonclose = 0;
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	256 SIOUXSettings.showstatusline = 0;
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	257 SIOUXSettings.tabspaces = 4;
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	258 #endif
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	259
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	260 /* Get options from preference file (or from applet resource fork) */
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	261 PyMac_options.keep_console = POPT_KEEPCONSOLE_OUTPUT; /* default-default */
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	262 PyMac_options.unixnewlines = 1;
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	263 PyMac_PreferenceOptions(&PyMac_options);
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	264
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	265 if ( embedded ) {
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	266 static char *emb_argv[] = {"embedded-python", 0};
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	267
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	268 *argcp = 1;
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	269 *argvp = emb_argv;
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	270 } else {
21619 5d009e5e13f7 In MachoPython, don't simulate argc/argv unless we have argc=1 and argv[1] Jack Jansen <jack.jansen@cwi.nl> parents: 20794 diff changeset	271 /* Create argc/argv. Do it before we go into the options event loop.
5d009e5e13f7 In MachoPython, don't simulate argc/argv unless we have argc=1 and argv[1] Jack Jansen <jack.jansen@cwi.nl> parents: 20794 diff changeset	272 ** In MachoPython we skip this step if we already have plausible
5d009e5e13f7 In MachoPython, don't simulate argc/argv unless we have argc=1 and argv[1] Jack Jansen <jack.jansen@cwi.nl> parents: 20794 diff changeset	273 ** command line arguments.
5d009e5e13f7 In MachoPython, don't simulate argc/argv unless we have argc=1 and argv[1] Jack Jansen <jack.jansen@cwi.nl> parents: 20794 diff changeset	274 */
5d009e5e13f7 In MachoPython, don't simulate argc/argv unless we have argc=1 and argv[1] Jack Jansen <jack.jansen@cwi.nl> parents: 20794 diff changeset	275 *argcp = PyMac_GetArgv(argvp, PyMac_options.noargs);
15921 489692e79151 Trigger keep-console-open on GUSISIOUX_STATE_UNKNOWN. Better than the previous complicated expression. Jack Jansen <jack.jansen@cwi.nl> parents: 15826 diff changeset	276 #ifndef NO_ARGV0_CHDIR
13638 58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	277 if (argcp >= 1 && (argvp)[0] && (*argvp)[0][0]) {
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	278 /* Workaround for MacOS X, which currently (DP4) doesn't set
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	279 ** the working folder correctly
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	280 */
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	281 char app_wd[256], *p;
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	282
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	283 strncpy(app_wd, (*argvp)[0], 256);
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	284 p = strrchr(app_wd, ':');
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	285 if ( p ) *p = 0;
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	286 chdir(app_wd);
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	287 }
58398c0f948b MacPython on MacOSX DP4 gets started in the wrong directory. The workaround (ifdeffed by USE_ARGV0_CHDIR) is to do a chdir() to the folder part of our executable name. Jack Jansen <jack.jansen@cwi.nl> parents: 13608 diff changeset	288 #endif
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	289 /* Do interactive option setting, if allowed and <option> depressed */
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	290 PyMac_InteractiveOptions(&PyMac_options, argcp, argvp);
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	291 }
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	292
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	293 /* Copy selected options to where the machine-independent stuff wants it */
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	294 Py_VerboseFlag = PyMac_options.verbose;
1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	295 /* Py_SuppressPrintingFlag = PyMac_options.suppress_print; */
1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	296 Py_OptimizeFlag = PyMac_options.optimize;
1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	297 Py_DebugFlag = PyMac_options.debugging;
1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	298 Py_NoSiteFlag = PyMac_options.nosite;
1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	299 Py_TabcheckFlag = PyMac_options.tabwarn;
19641 c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	300 Py_DivisionWarningFlag = PyMac_options.divisionwarn;
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	301 if ( PyMac_options.noargs ) {
5711 fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	302 /* don't process events at all without the scripts permission */
fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	303 PyMacSchedParams scp;
fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	304
fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	305 PyMac_GetSchedParams(&scp);
fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	306 scp.process_events = 0;
fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	307 /* Should we disable command-dot as well? */
fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	308 PyMac_SetSchedParams(&scp);
fb170ce82951 Removed old scheduler parameterizing calls and replaced with something Jack Jansen <jack.jansen@cwi.nl> parents: 5617 diff changeset	309 }
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	310
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	311 /* Set buffering */
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	312 if (PyMac_options.unbuffered) {
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	313 #ifndef MPW
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	314 setbuf(stdout, (char *)NULL);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	315 setbuf(stderr, (char *)NULL);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	316 #else
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	317 /* On MPW (3.2) unbuffered seems to hang */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	318 setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	319 setvbuf(stderr, (char *)NULL, _IOLBF, BUFSIZ);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	320 #endif
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	321 }
4911 21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	322 #if __profile__ == 1
21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	323 /* collectSummary or collectDetailed, timebase, #routines, max stack depth */
11350 678a9a79c7e8 Bigger buffer size for C profiler (if profiling is enabled). Jack Jansen <jack.jansen@cwi.nl> parents: 8792 diff changeset	324 ProfilerInit(collectSummary, bestTimeBase, 8000, 250);
4911 21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	325 #endif
5961 35e5acc6532c Adapted for 1.5a3: Py_SupressPrintingFlag is gone, and Jack Jansen <jack.jansen@cwi.nl> parents: 5732 diff changeset	326
35e5acc6532c Adapted for 1.5a3: Py_SupressPrintingFlag is gone, and Jack Jansen <jack.jansen@cwi.nl> parents: 5732 diff changeset	327 /* Tell the rest of python about our argc/argv */
35e5acc6532c Adapted for 1.5a3: Py_SupressPrintingFlag is gone, and Jack Jansen <jack.jansen@cwi.nl> parents: 5732 diff changeset	328 orig_argc = argcp; / For Py_GetArgcArgv() */
35e5acc6532c Adapted for 1.5a3: Py_SupressPrintingFlag is gone, and Jack Jansen <jack.jansen@cwi.nl> parents: 5732 diff changeset	329 orig_argv = *argvp;
35e5acc6532c Adapted for 1.5a3: Py_SupressPrintingFlag is gone, and Jack Jansen <jack.jansen@cwi.nl> parents: 5732 diff changeset	330 Py_SetProgramName((*argvp)[0]);
3422 67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	331 }
67f5d29d405b - Reorganized init code Jack Jansen <jack.jansen@cwi.nl> parents: 3411 diff changeset	332
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	333 /*
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	334 ** Inspection mode after script/applet termination
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	335 */
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	336 static int
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	337 run_inspect(void)
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	338 {
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	339 int sts = 0;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	340
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	341 if (PyMac_options.inspect && isatty((int)fileno(stdin)))
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	342 sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	343 return sts;
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	344 }
19851 f3f694111ea0 Failing to import macfsn is not a fatal error. Jack Jansen <jack.jansen@cwi.nl> parents: 19748 diff changeset	345
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	346 #ifdef USE_MAC_APPLET_SUPPORT
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	347 /* Applet support */
2031 1739f00ffc86 Enlarged version buffer (nobody expects the spanish inquisition:-) Jack Jansen <jack.jansen@cwi.nl> parents: 1821 diff changeset	348
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	349 /* Run a compiled Python Python script from 'PYC ' resource __main__ */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	350 static int
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	351 run_main_resource(void)
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	352 {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	353 Handle h;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	354 long size;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	355 PyObject *code;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	356 PyObject *result;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	357
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	358 h = GetNamedResource('PYC ', "\p__main__");
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	359 if (h == NULL) {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	360 Alert(NOPYC_ALERT, NULL);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	361 return 1;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	362 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	363 size = GetResourceSizeOnDisk(h);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	364 HLock(h);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	365 code = PyMarshal_ReadObjectFromString(*h + 8, (int)(size - 8));
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	366 HUnlock(h);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	367 ReleaseResource(h);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	368 if (code == NULL) {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	369 PyErr_Print();
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	370 return 1;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	371 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	372 result = PyImport_ExecCodeModule("__main__", code);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	373 Py_DECREF(code);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	374 if (result == NULL) {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	375 PyErr_Print();
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	376 return 1;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	377 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	378 Py_DECREF(result);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	379 return 0;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	380 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	381
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	382 /* Initialization sequence for applets */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	383 void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	384 PyMac_InitApplet(void)
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	385 {
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	386 int argc;
ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	387 char **argv;
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	388 int err;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	389
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	390 init_common(&argc, &argv, 0);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	391
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	392 Py_Initialize();
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	393 PySys_SetArgv(argc, argv);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	394
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	395 err = run_main_resource();
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	396
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	397 err = (run_inspect() \|\| err);
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	398
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	399 fflush(stderr);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	400 fflush(stdout);
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	401 PyMac_Exit(err);
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	402 /* XXX Should we bother to Py_Exit(sts)? */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	403 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	404
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	405 /*
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	406 ** Hook for embedding python.
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	407 */
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	408 void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	409 PyMac_Initialize(void)
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	410 {
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	411 int argc;
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	412 char **argv;
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	413
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	414 init_common(&argc, &argv, 1);
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	415 Py_Initialize();
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	416 PySys_SetArgv(argc, argv);
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	417 }
765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	418
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	419 #endif /* USE_MAC_APPLET_SUPPORT */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	420
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	421 /* For normal application */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	422 void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	423 PyMac_InitApplication(void)
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	424 {
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	425 int argc;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	426 char **argv;
23511 7bc31ad9477c Allow the script to have not only a TEXT filetype but also a null filetype (to enable files to be created from the Unix side of OSX to be droppable on the MacPython interpreter). Jack Jansen <jack.jansen@cwi.nl> parents: 23029 diff changeset	427 OSType filetype;
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	428
20779 61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	429 static char scriptpath[1024];
61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	430 char *script = NULL;
61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	431
4962 765d962f4449 Added PyMac_Initialize() routine, to be used by embedding programs (in Jack Jansen <jack.jansen@cwi.nl> parents: 4911 diff changeset	432 init_common(&argc, &argv, 0);
20779 61123b860b45 Mod by Donovan Preston to allow MacPython to live in a Python.app bundle and understand the __main__.py convention used there for applets. This gives us applets that work on both OS9 and OSX! (Although "applet" may not be the correct word for something that is going to be multimegabyte:-). Jack Jansen <jack.jansen@cwi.nl> parents: 19855 diff changeset	433
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	434 if ( argc > 1 ) {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	435 /* We're running a script. Attempt to change current directory */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	436 char curwd[256], *endp;
2313 ff72a5f9a4ee Various changes wrt shared-library python: Jack Jansen <jack.jansen@cwi.nl> parents: 2277 diff changeset	437
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	438 strcpy(curwd, argv[1]);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	439 endp = strrchr(curwd, ':');
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	440 if ( endp && endp > curwd ) {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	441 *endp = '\0';
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	442
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	443 chdir(curwd);
2313 ff72a5f9a4ee Various changes wrt shared-library python: Jack Jansen <jack.jansen@cwi.nl> parents: 2277 diff changeset	444 }
18962 d7590122f9a2 Merging appropriate 2.1.1 fixes back into the main trunk. Jack Jansen <jack.jansen@cwi.nl> parents: 18386 diff changeset	445 /* Check that the first argument is a text file */
23511 7bc31ad9477c Allow the script to have not only a TEXT filetype but also a null filetype (to enable files to be created from the Unix side of OSX to be droppable on the MacPython interpreter). Jack Jansen <jack.jansen@cwi.nl> parents: 23029 diff changeset	446 filetype = PyMac_getfiletype(argv[1]);
7bc31ad9477c Allow the script to have not only a TEXT filetype but also a null filetype (to enable files to be created from the Unix side of OSX to be droppable on the MacPython interpreter). Jack Jansen <jack.jansen@cwi.nl> parents: 23029 diff changeset	447 if ( filetype != 'TEXT' && filetype != 0 ) {
18962 d7590122f9a2 Merging appropriate 2.1.1 fixes back into the main trunk. Jack Jansen <jack.jansen@cwi.nl> parents: 18386 diff changeset	448 Alert(NOTASCRIPT_ID, NULL);
d7590122f9a2 Merging appropriate 2.1.1 fixes back into the main trunk. Jack Jansen <jack.jansen@cwi.nl> parents: 18386 diff changeset	449 exit(0);
d7590122f9a2 Merging appropriate 2.1.1 fixes back into the main trunk. Jack Jansen <jack.jansen@cwi.nl> parents: 18386 diff changeset	450 }
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	451 }
24564 0bb3986cf653 Renamed Py_Main to PyMac_Main as it has a different signature than the "normal" Py_Main, and that signature has appeared in a .h file. Jack Jansen <jack.jansen@cwi.nl> parents: 23511 diff changeset	452 PyMac_Main(argc, argv, script);
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	453 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	454
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	455 /* Main program */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	456
4017 5dc8c042905b Guido: added some void's to declarations Jack Jansen <jack.jansen@cwi.nl> parents: 3930 diff changeset	457 static void
24564 0bb3986cf653 Renamed Py_Main to PyMac_Main as it has a different signature than the "normal" Py_Main, and that signature has appeared in a .h file. Jack Jansen <jack.jansen@cwi.nl> parents: 23511 diff changeset	458 PyMac_Main(int argc, char *argv, char filename)
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	459 {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	460 int sts;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	461 char *command = NULL;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	462 FILE *fp = stdin;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	463
19855 5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	464 if ( filename ) {
5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	465 /* Someone else has found our "script" already */
5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	466 argv[0] = filename;
5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	467 } else {
5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	468 filename = argv[1];
5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	469 argv++;
5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	470 argc--;
5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	471 }
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	472
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	473 if (Py_VerboseFlag \|\|
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	474 (command == NULL && filename == NULL && isatty((int)fileno(fp))))
22654 a82ce198fe69 In MachoPython print "Pythonw" in banner to distinguish from command-line Jack Jansen <jack.jansen@cwi.nl> parents: 21619 diff changeset	475 fprintf(stderr, "%s %s on %s\n%s\n",
a82ce198fe69 In MachoPython print "Pythonw" in banner to distinguish from command-line Jack Jansen <jack.jansen@cwi.nl> parents: 21619 diff changeset	476 "Python",
14464 17cec96f75bc Use same short banner message as unix/win Python. Jack Jansen <jack.jansen@cwi.nl> parents: 14198 diff changeset	477 Py_GetVersion(), Py_GetPlatform(), COPYRIGHT);
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	478
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	479 if (filename != NULL) {
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22958 diff changeset	480 if ((fp = fopen(filename, "r" PY_STDIOTEXTMODE)) == NULL) {
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	481 fprintf(stderr, "%s: can't open file '%s'\n",
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	482 argv[0], filename);
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	483 PyMac_Exit(2);
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	484 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	485 }
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	486
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	487 /* We initialize the menubar here, hoping SIOUX is initialized by now */
4215 0410ed3808ee Python about box implemented. Slightly convoluted, since (a) we have Jack Jansen <jack.jansen@cwi.nl> parents: 4197 diff changeset	488 PyMac_InitMenuBar();
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	489
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	490 Py_Initialize();
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	491
27158 eb6b36b26e8d Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk. Jack Jansen <jack.jansen@cwi.nl> parents: 26635 diff changeset	492 #if 0
eb6b36b26e8d Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk. Jack Jansen <jack.jansen@cwi.nl> parents: 26635 diff changeset	493 /* According to Martin v. Loewis this is a bad idea... */
18386 8cdff545cbde Set the default 8-bit encoding based on the system script and language. unknown <tools@python.org> parents: 17629 diff changeset	494 PyUnicode_SetDefaultEncoding(PyMac_getscript());
27158 eb6b36b26e8d Merging the various tweaks for MacPython-OS9 2.3a1 back into the trunk. Jack Jansen <jack.jansen@cwi.nl> parents: 26635 diff changeset	495 #endif
18386 8cdff545cbde Set the default 8-bit encoding based on the system script and language. unknown <tools@python.org> parents: 17629 diff changeset	496
19855 5568b320914f Mods by Donovan Preston (with changes by me to make them "go with the flow") Jack Jansen <jack.jansen@cwi.nl> parents: 19851 diff changeset	497 PySys_SetArgv(argc, argv);
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	498
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	499 if (filename == NULL && isatty((int)fileno(fp))) {
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22958 diff changeset	500 FILE *fp = fopen(STARTUP, "r" PY_STDIOTEXTMODE);
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	501 if (fp != NULL) {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	502 (void) PyRun_SimpleFile(fp, STARTUP);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	503 PyErr_Clear();
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	504 fclose(fp);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	505 }
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	506 }
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	507 sts = PyRun_AnyFile(
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	508 fp, filename == NULL ? "<stdin>" : filename) != 0;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	509 if (filename != NULL)
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	510 fclose(fp);
4238 6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	511
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	512 if ( filename != NULL \|\| command != NULL )
6c86d9136c09 - Put all options in a struct Jack Jansen <jack.jansen@cwi.nl> parents: 4228 diff changeset	513 sts = (run_inspect() \|\| sts);
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	514
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	515 Py_Exit(sts);
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	516 /NOTREACHED/
1811 ea5b13d11a13 Added macmain.c (separate Mac specific main prog); bump version to 1.1 Guido van Rossum <guido@python.org> parents: diff changeset	517 }
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	518
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	519 /*
15280 a5ca54969a3f Added PyMac_OutputSeen(), which acknowledges all current output in the stdio window, i.e. it acts like input has been read insofar as the keep-console-open option is interested. Jack Jansen <jack.jansen@cwi.nl> parents: 15192 diff changeset	520 ** Reset the "unseen output" flag
a5ca54969a3f Added PyMac_OutputSeen(), which acknowledges all current output in the stdio window, i.e. it acts like input has been read insofar as the keep-console-open option is interested. Jack Jansen <jack.jansen@cwi.nl> parents: 15192 diff changeset	521 */
a5ca54969a3f Added PyMac_OutputSeen(), which acknowledges all current output in the stdio window, i.e. it acts like input has been read insofar as the keep-console-open option is interested. Jack Jansen <jack.jansen@cwi.nl> parents: 15192 diff changeset	522 void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	523 PyMac_OutputSeen(void)
15280 a5ca54969a3f Added PyMac_OutputSeen(), which acknowledges all current output in the stdio window, i.e. it acts like input has been read insofar as the keep-console-open option is interested. Jack Jansen <jack.jansen@cwi.nl> parents: 15192 diff changeset	524 {
16647 728c11562187 More changes to attempt to get the menubar back on exit. Without success:-( Jack Jansen <jack.jansen@cwi.nl> parents: 16557 diff changeset	525 if ( console_output_state == STATE_UNKNOWN )
728c11562187 More changes to attempt to get the menubar back on exit. Without success:-( Jack Jansen <jack.jansen@cwi.nl> parents: 16557 diff changeset	526 PyMac_InitMenuBar();
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	527 console_output_state = STATE_LASTREAD;
15280 a5ca54969a3f Added PyMac_OutputSeen(), which acknowledges all current output in the stdio window, i.e. it acts like input has been read insofar as the keep-console-open option is interested. Jack Jansen <jack.jansen@cwi.nl> parents: 15192 diff changeset	528 }
a5ca54969a3f Added PyMac_OutputSeen(), which acknowledges all current output in the stdio window, i.e. it acts like input has been read insofar as the keep-console-open option is interested. Jack Jansen <jack.jansen@cwi.nl> parents: 15192 diff changeset	529
a5ca54969a3f Added PyMac_OutputSeen(), which acknowledges all current output in the stdio window, i.e. it acts like input has been read insofar as the keep-console-open option is interested. Jack Jansen <jack.jansen@cwi.nl> parents: 15192 diff changeset	530 /*
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	531 ** Set the "unseen output" flag
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	532 */
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	533 void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	534 PyMac_OutputNotSeen(void)
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	535 {
16647 728c11562187 More changes to attempt to get the menubar back on exit. Without success:-( Jack Jansen <jack.jansen@cwi.nl> parents: 16557 diff changeset	536 if ( console_output_state == STATE_UNKNOWN )
728c11562187 More changes to attempt to get the menubar back on exit. Without success:-( Jack Jansen <jack.jansen@cwi.nl> parents: 16557 diff changeset	537 PyMac_InitMenuBar();
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	538 console_output_state = STATE_LASTWRITE;
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	539 }
17629 a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	540
a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	541 /*
a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	542 ** Override abort() - The default one is not what we want.
a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	543 */
a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	544 void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	545 abort(void)
17629 a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	546 {
a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	547 console_output_state = STATE_LASTWRITE;
a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	548 PyMac_Exit(1);
a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	549 }
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	550
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	551 /*
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	552 ** Terminate application
463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	553 */
4017 5dc8c042905b Guido: added some void's to declarations Jack Jansen <jack.jansen@cwi.nl> parents: 3930 diff changeset	554 void
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	555 PyMac_Exit(int status)
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	556 {
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	557 #ifdef USE_SIOUX
14773 c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	558 int keep = 0;
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	559 #endif
4911 21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	560
21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	561 #if __profile__ == 1
21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	562 ProfilerDump("\pPython Profiler Results");
21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	563 ProfilerTerm();
21878c849626 Added profiler initialization/finalization code (if __profile__ is defined) Jack Jansen <jack.jansen@cwi.nl> parents: 4249 diff changeset	564 #endif
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	565
3247 20d74fa3b50b For MW Python, update titlebar of window when python exits. Jack Jansen <jack.jansen@cwi.nl> parents: 3236 diff changeset	566 #ifdef USE_SIOUX
15192 1c63e224f616 Made options global (as PyMac_options) so macosmodule can access it. Jack Jansen <jack.jansen@cwi.nl> parents: 14773 diff changeset	567 switch (PyMac_options.keep_console) {
14773 c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	568 case POPT_KEEPCONSOLE_NEVER:
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	569 keep = 0;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	570 break;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	571 case POPT_KEEPCONSOLE_OUTPUT:
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	572 if (console_output_state == STATE_LASTWRITE \|\|
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	573 console_output_state == STATE_UNKNOWN )
14773 c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	574 keep = 1;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	575 else
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	576 keep = 0;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	577 break;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	578 case POPT_KEEPCONSOLE_ERROR:
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	579 keep = (status != 0);
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	580 break;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	581 default:
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	582 keep = 1;
c5ec0b11f8c9 Keepconsole is now a 4-way option: never/errorexit/unseen output/always. Default is "unseen output". Upped the Popt version number. Jack Jansen <jack.jansen@cwi.nl> parents: 14464 diff changeset	583 }
3247 20d74fa3b50b For MW Python, update titlebar of window when python exits. Jack Jansen <jack.jansen@cwi.nl> parents: 3236 diff changeset	584 if (keep) {
20d74fa3b50b For MW Python, update titlebar of window when python exits. Jack Jansen <jack.jansen@cwi.nl> parents: 3236 diff changeset	585 SIOUXSettings.standalone = 1;
20d74fa3b50b For MW Python, update titlebar of window when python exits. Jack Jansen <jack.jansen@cwi.nl> parents: 3236 diff changeset	586 SIOUXSettings.autocloseonquit = 0;
3477 a4f01d43dad6 Replaced non-ascii chars by backslash escapes Jack Jansen <jack.jansen@cwi.nl> parents: 3465 diff changeset	587 SIOUXSetTitle("\p\307terminated\310");
17629 a9485d404f05 - Raise console window on input. Fixes Carbon hang. Jack Jansen <jack.jansen@cwi.nl> parents: 16647 diff changeset	588 PyMac_RaiseConsoleWindow();
5732 f027dd0a85e4 - Restore SIOUX menubar just before exiting, if the console window is kept Jack Jansen <jack.jansen@cwi.nl> parents: 5711 diff changeset	589 PyMac_RestoreMenuBar();
5431 a56b44b35505 Workaround for bug in MSL and CWGUSI interaction that stopped the Jack Jansen <jack.jansen@cwi.nl> parents: 5270 diff changeset	590 #ifdef USE_MSL
a56b44b35505 Workaround for bug in MSL and CWGUSI interaction that stopped the Jack Jansen <jack.jansen@cwi.nl> parents: 5270 diff changeset	591 /*
a56b44b35505 Workaround for bug in MSL and CWGUSI interaction that stopped the Jack Jansen <jack.jansen@cwi.nl> parents: 5270 diff changeset	592 ** Temporary workaround: autocloseonquit clearing does not
a56b44b35505 Workaround for bug in MSL and CWGUSI interaction that stopped the Jack Jansen <jack.jansen@cwi.nl> parents: 5270 diff changeset	593 ** currently work for the MSL/GUSI combo.
a56b44b35505 Workaround for bug in MSL and CWGUSI interaction that stopped the Jack Jansen <jack.jansen@cwi.nl> parents: 5270 diff changeset	594 */
a56b44b35505 Workaround for bug in MSL and CWGUSI interaction that stopped the Jack Jansen <jack.jansen@cwi.nl> parents: 5270 diff changeset	595 while(getchar() > 0);
a56b44b35505 Workaround for bug in MSL and CWGUSI interaction that stopped the Jack Jansen <jack.jansen@cwi.nl> parents: 5270 diff changeset	596 #endif
3247 20d74fa3b50b For MW Python, update titlebar of window when python exits. Jack Jansen <jack.jansen@cwi.nl> parents: 3236 diff changeset	597 }
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	598 else
463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	599 SIOUXSettings.autocloseonquit = 1;
4197 b70baba1c789 - Fixed PyMac_DoYield: Jack Jansen <jack.jansen@cwi.nl> parents: 4017 diff changeset	600 #endif /* USE_SIOUX */
3236 463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	601
463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	602 exit(status);
463b26fa4d7b Added options for keeping window open on normal/error termination Jack Jansen <jack.jansen@cwi.nl> parents: 3228 diff changeset	603 }
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	604
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	605 /* Make the original argc/argv available to other modules.
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	606 This is rare, but it is needed by the secureware extension. */
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	607
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	608 void
13547 db963a615bc9 ANSIfication step 2: make sure all needed prototypes are available, and all needed Jack Jansen <jack.jansen@cwi.nl> parents: 13542 diff changeset	609 Py_GetArgcArgv(int argc,char **argv)
2985 0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	610 {
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	611 *argc = orig_argc;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	612 *argv = orig_argv;
0d7100ffb61a This is completely different from the old mainmain (which wasn't used Jack Jansen <jack.jansen@cwi.nl> parents: 2313 diff changeset	613 }
3930 52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	614
52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	615 /* More cruft that shouldn't really be here, used in sysmodule.c */
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	616 /* Return the program name -- some code out there needs this. */
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	617 char *
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	618 Py_GetProgramFullPath(void)
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	619 {
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	620 return orig_argv[0];
c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	621 }
3930 52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	622
52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	623 char *
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	624 Py_GetPrefix(void)
3930 52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	625 {
6277 bb5472fb4885 sys.prefix and sys.exec_prefix are now set correctly. Jack Jansen <jack.jansen@cwi.nl> parents: 5961 diff changeset	626 return PyMac_GetPythonDir();
3930 52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	627 }
52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	628
52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	629 char *
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	630 Py_GetExecPrefix(void)
3930 52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	631 {
6277 bb5472fb4885 sys.prefix and sys.exec_prefix are now set correctly. Jack Jansen <jack.jansen@cwi.nl> parents: 5961 diff changeset	632 return PyMac_GetPythonDir();
3930 52c19ee83a6b Guido's 1.4b2 fixes: Py_GetProgramName, Py_GetPrefix and Py_GetExecPrefix. Jack Jansen <jack.jansen@cwi.nl> parents: 3750 diff changeset	633 }
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	634
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	635 int
19748 c93d7d0857a2 Changes to make these work under OSX as the main program for a Jack Jansen <jack.jansen@cwi.nl> parents: 19641 diff changeset	636 PyMac_GetDelayConsoleFlag(void)
16557 9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	637 {
9ce9e0342cc1 Bit the bullet and added a private GUSISIOUX for Python. This makes the delayconsole and keepopen code neater. Also tells Sioux to behave better with events, and handles cmd-. during print better. The pythonpreferences have also changed due to this. Jack Jansen <jack.jansen@cwi.nl> parents: 15921 diff changeset	638 return (int)PyMac_options.delayconsole;
19641 c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	639 }
c9647fa78f05 Added preferences/startup options for division warning Jack Jansen <jack.jansen@cwi.nl> parents: 18962 diff changeset	640

Mercurial > cpython-lru_cache-weakref

annotate Mac/Python/macmain.c @ 27158:eb6b36b26e8d legacy-trunk