mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Simplified STDWIN initialization.

Browse source
This commit is contained in:
Guido van Rossum 1991-06-07 13:55:41 +00:00
parent 185d06ea91
commit 5b02dbc2f8
1 changed files with 4 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Modules/config.c.in
View file

@ -28,8 +28,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifdef USE_STDWIN
#include <stdwin.h>
static int use_stdwin;
#endif
/*ARGSUSED*/
@ -39,37 +37,7 @@ initargs(p_argc, p_argv)
char ***p_argv;
{
#ifdef USE_STDWIN
extern char *getenv();
char *display;
/* Ignore an initial argument of '-s', for backward compatibility */
if (*p_argc > 1 && strcmp((*p_argv)[1], "-s") == 0) {
(*p_argv)[1] = (*p_argv)[0];
(*p_argc)--, (*p_argv)++;
}
/* Assume we have to initialize stdwin if either of the following
conditions holds:
- the environment variable $DISPLAY is set
- there is an argument "-display" somewhere
*/
display = getenv("DISPLAY");
if (display != 0)
use_stdwin = 1;
else {
int i;
/* Scan through the arguments looking for "-display" */
for (i = 1; i < *p_argc; i++) {
if (strcmp((*p_argv)[i], "-display") == 0) {
use_stdwin = 1;
break;
}
}
}
if (use_stdwin)
wargs(p_argc, p_argv);
wargs(p_argc, p_argv);
#endif
}
@ -82,26 +50,13 @@ void
donecalls()
{
#ifdef USE_STDWIN
if (use_stdwin)
wdone();
wdone();
#endif
#ifdef USE_AUDIO
asa_done();
#endif
}
#ifdef USE_STDWIN
static void
maybeinitstdwin()
{
if (use_stdwin)
initstdwin();
else
fprintf(stderr,
"No $DISPLAY nor -display arg -- stdwin not available\n");
}
#endif
#ifndef PYTHONPATH
#define PYTHONPATH ".:/usr/local/lib/python"
#endif
@ -146,7 +101,7 @@ extern void initpanel();
#endif
#endif
#ifdef USE_STDWIN
extern void maybeinitstdwin();
extern void initstdwin();
#endif
struct {
@ -186,7 +141,7 @@ struct {
#endif
#ifdef USE_STDWIN
{"stdwin", maybeinitstdwin},
{"stdwin", initstdwin},
#endif
{0, 0} /* Sentinel */