diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 1998-09-21 02:40:02 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 1998-09-21 02:40:02 -0400 |
| commit | 51a6f85e8e96e257cbb43d0daab7abdf36ad2186 (patch) | |
| tree | ff68a9445df1c46cf554ab3ab8b2501bfc14c90f /src/LYMain.c | |
| parent | 03b222bbbdbc58cbe5a4eb93e500d490800dee9c (diff) | |
| download | lynx-snapshots-51a6f85e8e96e257cbb43d0daab7abdf36ad2186.tar.gz | |
snapshot of project "lynx", label v2-8-1dev_29
Diffstat (limited to 'src/LYMain.c')
| -rw-r--r-- | src/LYMain.c | 47 |
1 files changed, 14 insertions, 33 deletions
diff --git a/src/LYMain.c b/src/LYMain.c index 6ab74c50..83d0ac22 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -29,9 +29,6 @@ #include <LYJump.h> #include <LYMainLoop.h> #include <LYBookmark.h> -#ifdef DOSPATH -#include <HTDOS.h> -#endif #include <LYCookie.h> #ifdef __DJGPP__ @@ -143,6 +140,9 @@ PUBLIC int port_syntax = 1; PUBLIC int LYShowColor = SHOW_COLOR_UNKNOWN; /* to show or not to show */ PUBLIC int LYChosenShowColor = SHOW_COLOR_UNKNOWN; /* whether to show and save */ PUBLIC int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... as last read or written */ +#ifndef EXP_FORMS_OPTIONS +PUBLIC BOOLEAN LYUseFormsOptions = FALSE; /* use forms-based options menu */ +#endif PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */ PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES; /* show filenames or not */ PUBLIC BOOLEAN LYUseDefShoCur = TRUE; /* Command line -show_cursor toggle */ @@ -690,15 +690,7 @@ PUBLIC int main ARGS2( *(cp++) = '\0'; StrAllocCopy(temp, lynx_temp_space); LYTrimPathSep(temp); -#ifdef DOSPATH - StrAllocCat(temp, HTDOS_wwwName((char *)Home_Dir())); -#else -#ifdef VMS - StrAllocCat(temp, HTVMS_wwwName((char *)Home_Dir())); -#else - StrAllocCat(temp, Home_Dir()); -#endif /* VMS */ -#endif /* DOSPATH */ + StrAllocCat(temp, wwwName(Home_Dir())); StrAllocCat(temp, cp); StrAllocCopy(lynx_temp_space, temp); FREE(temp); @@ -1237,7 +1229,7 @@ PUBLIC int main ARGS2( /* * Process the configuration file. */ - read_cfg(lynx_cfg_file, "main program", 1); + read_cfg(lynx_cfg_file, "main program", 1, (FILE *)0); HTSwitchDTD(New_DTD); @@ -1260,15 +1252,7 @@ PUBLIC int main ARGS2( *(cp++) = '\0'; StrAllocCopy(temp, lynx_save_space); LYTrimPathSep(temp); -#ifdef DOSPATH - StrAllocCat(temp, HTDOS_wwwName((char *)Home_Dir())); -#else -#ifdef VMS - StrAllocCat(temp, HTVMS_wwwName((char *)Home_Dir())); -#else - StrAllocCat(temp, Home_Dir()); -#endif /* VMS */ -#endif /* DOSPATH */ + StrAllocCat(temp, wwwName(Home_Dir())); StrAllocCat(temp, cp); StrAllocCopy(lynx_save_space, temp); FREE(temp); @@ -1505,16 +1489,7 @@ PUBLIC int main ARGS2( *(cp++) = '\0'; StrAllocCopy(temp, cp); LYTrimPathSep(temp); -#ifdef DOSPATH - StrAllocCopy(LYCookieFile, HTDOS_wwwName((char *)Home_Dir())); -#else -#ifdef VMS - StrAllocCopy(LYCookieFile, HTVMS_wwwName((char *)Home_Dir())); -#else - StrAllocCopy(LYCookieFile, Home_Dir()); -#endif /* VMS */ -#endif /* DOSPATH */ - + StrAllocCopy(LYCookieFile, wwwName(Home_Dir())); StrAllocCat(LYCookieFile, temp); FREE(temp); } @@ -1660,7 +1635,7 @@ PUBLIC int main ARGS2( StrAllocCopy(helpfilepath, helpfile); if ((cp = LYPathLeaf(helpfilepath)) != helpfilepath) *cp = '\0'; - LYAddPathSep(&helpfilepath); + LYAddHtmlSep(&helpfilepath); /* * Make sure our bookmark default strings @@ -2665,6 +2640,12 @@ keys (may be incompatible with some curses packages)" "from", TOGGLE_ARG, &LYNoFromHeader, "toggle transmissions of From headers" ), +#ifndef EXP_FORMS_OPTIONS + PARSE_SET( + "forms_options", TOGGLE_ARG, &LYUseFormsOptions, + "toggles forcing of forms-based options menu style" + ), +#endif PARSE_SET( "ftp", UNSET_ARG, &ftp_ok, "disable ftp access" |