\n",
- LYNX_NAME, LYNX_VERSION);
-
-
- fprintf(fp0, " You have the following download choices.\n");
- fprintf(fp0, " Please select one:\n\n");
-
if(!no_disk_save && !child_lynx)
#ifdef DIRED_SUPPORT
/*
--- 618,633 ----
fprintf(fp0, "\n%s \n\n\n",
DOWNLOAD_OPTIONS_TITLE);
+ fprintf(fp0, "%s (%s), help on %s
\n",
+ LYNX_NAME, LYNX_VERSION,
+ helpfilepath, DOWNLOAD_OPTIONS_HELP, DOWNLOAD_OPTIONS_TITLE);
+ fprintf(fp0, "\n");
+ fprintf(fp0, "\
+ Current File: %s\n\
+ Suggested File: %s%s\n",
+ data_file, (lynx_save_space ? lynx_save_space : ""), sug_filename);
+ fprintf(fp0, "\nStandard download options:\n");
if(!no_disk_save && !child_lynx)
#ifdef DIRED_SUPPORT
/*
***************
*** 640,647 ****
else {}
#endif /* DIRED_SUPPORT */
else
! fprintf(fp0," Save to disk disabled.\n");
if (downloaders != NULL) {
for (count = 0, cur_download = downloaders; cur_download != NULL;
cur_download = cur_download->next, count++) {
--- 642,651 ----
else {}
#endif /* DIRED_SUPPORT */
else
! fprintf(fp0," Save to disk disabled.\n");
+ fprintf(fp0, "\nLocal additions:\n");
+
if (downloaders != NULL) {
for (count = 0, cur_download = downloaders; cur_download != NULL;
cur_download = cur_download->next, count++) {
***************
*** 655,663 ****
}
}
} else {
! fprintf(fp0, "\n\
! No other download methods have been defined yet. You may define\n\
! an unlimited number of download methods using the lynx.cfg file.\n");
}
fprintf(fp0, "\n\n");
LYCloseTempFP(fp0);
--- 659,670 ----
}
}
} else {
! fprintf(fp0, " \
! <NONE>\n\n \
! You may define an unlimited number of download methods.\n \
! Please refer to the lynx.cfg file, \
! sections 'DOWNLOAD' and 'INCLUDE'.\n",
! LYNX_CFG_FILE);
}
fprintf(fp0, "\n\n");
LYCloseTempFP(fp0);
diff -rc lynx2-8-1.orig/src/LYDownload.h lynx2-8-1/src/LYDownload.h
*** lynx2-8-1.orig/src/LYDownload.h Wed Mar 25 13:58:54 1998
--- lynx2-8-1/src/LYDownload.h Mon Aug 24 17:20:28 1998
***************
*** 9,15 ****
extern void LYDownload PARAMS((char *line));
extern int LYdownload_options PARAMS((char **newfile, char *data_file));
! #define DOWNLOAD_OPTIONS_TITLE "Lynx Download Options"
#endif /* LYDOWNLOAD_H */
--- 9,16 ----
extern void LYDownload PARAMS((char *line));
extern int LYdownload_options PARAMS((char **newfile, char *data_file));
! #define DOWNLOAD_OPTIONS_TITLE "Lynx Download Options"
! #define DOWNLOAD_OPTIONS_HELP "Lynx_users_guide.html#9"
#endif /* LYDOWNLOAD_H */
diff -rc lynx2-8-1.orig/src/LYHistory.c lynx2-8-1/src/LYHistory.c
*** lynx2-8-1.orig/src/LYHistory.c Fri Aug 21 14:30:14 1998
--- lynx2-8-1/src/LYHistory.c Mon Aug 24 17:51:35 1998
***************
*** 406,413 ****
LYAddMETAcharsetToFD(fp0, -1);
fprintf(fp0, "", LYNX_NAME, LYNX_VERSION);
fprintf(fp0, "You selected:\n");
for (x = nhist-1; x >= 0; x--) {
/*
--- 406,415 ----
LYAddMETAcharsetToFD(fp0, -1);
fprintf(fp0, "%s \n\n\n",
HISTORY_PAGE_TITLE);
! fprintf(fp0, "%s (%s), help on %s
\n",
! LYNX_NAME, LYNX_VERSION,
! helpfilepath, HISTORY_PAGE_HELP, HISTORY_PAGE_TITLE);
! fprintf(fp0, "\n");
fprintf(fp0, "You selected:\n");
for (x = nhist-1; x >= 0; x--) {
/*
***************
*** 438,444 ****
}
fprintf(fp0, "%s\n", x, Title);
}
-
fprintf(fp0," \n\n");
LYCloseTempFP(fp0);
--- 440,445 ----
***************
*** 556,563 ****
LYAddMETAcharsetToFD(fp0, -1);
fprintf(fp0, "%s \n\n\n",
VISITED_LINKS_TITLE);
! fprintf(fp0, "You have reached the Visited Links Page
\n");
! fprintf(fp0, "%s Version %s
\n", LYNX_NAME, LYNX_VERSION);
fprintf(fp0,
"You visited (POSTs, bookmark, menu and list files excluded):\n");
x = HTList_count(Visited_Links);
--- 557,566 ----
LYAddMETAcharsetToFD(fp0, -1);
fprintf(fp0, "%s \n\n\n",
VISITED_LINKS_TITLE);
! fprintf(fp0, "%s (%s), help on %s
\n",
! LYNX_NAME, LYNX_VERSION,
! helpfilepath, VISITED_LINKS_HELP, VISITED_LINKS_TITLE);
! fprintf(fp0, "\n");
fprintf(fp0,
"You visited (POSTs, bookmark, menu and list files excluded):\n");
x = HTList_count(Visited_Links);
***************
*** 593,599 ****
fprintf(fp0, "%s\n", x,
((Address != NULL) ? Address : "(no address)"));
}
-
fprintf(fp0," \n\n");
LYCloseTempFP(fp0);
--- 596,601 ----
diff -rc lynx2-8-1.orig/src/LYHistory.h lynx2-8-1/src/LYHistory.h
*** lynx2-8-1.orig/src/LYHistory.h Wed Mar 25 13:58:54 1998
--- lynx2-8-1/src/LYHistory.h Mon Aug 24 16:28:43 1998
***************
*** 14,20 ****
extern BOOLEAN historytarget PARAMS((document *newdoc));
extern int LYShowVisitedLinks PARAMS((char **newfile));
! #define HISTORY_PAGE_TITLE "Lynx History Page"
! #define VISITED_LINKS_TITLE "Lynx Visited Links Page"
#endif /* LYHISTORY_H */
--- 14,22 ----
extern BOOLEAN historytarget PARAMS((document *newdoc));
extern int LYShowVisitedLinks PARAMS((char **newfile));
! #define HISTORY_PAGE_TITLE "Lynx History Page"
! #define HISTORY_PAGE_HELP "keystrokes/history_help.html"
! #define VISITED_LINKS_TITLE "Lynx Visited Links Page"
! #define VISITED_LINKS_HELP "keystrokes/visited_help.html"
#endif /* LYHISTORY_H */
diff -rc lynx2-8-1.orig/src/LYKeymap.c lynx2-8-1/src/LYKeymap.c
*** lynx2-8-1.orig/src/LYKeymap.c Sat Aug 15 22:57:56 1998
--- lynx2-8-1/src/LYKeymap.c Mon Aug 24 17:38:24 1998
***************
*** 709,718 ****
sprintf(buf, "\n%s \n\n\n",
CURRENT_KEYMAP_TITLE);
(*target->isa->put_block)(target, buf, strlen(buf));
!
! sprintf(buf, "%s (%s Version %s)
\n",
! CURRENT_KEYMAP_TITLE, LYNX_NAME, LYNX_VERSION);
(*target->isa->put_block)(target, buf, strlen(buf));
for (i = 'a'+1; i <= 'z'+1; i++) {
print_binding(target, buf, i);
--- 709,720 ----
sprintf(buf, "\n%s \n\n\n",
CURRENT_KEYMAP_TITLE);
(*target->isa->put_block)(target, buf, strlen(buf));
! sprintf(buf, "%s (%s), help on %s
\n",
! LYNX_NAME, LYNX_VERSION,
! helpfilepath, CURRENT_KEYMAP_HELP, CURRENT_KEYMAP_TITLE);
(*target->isa->put_block)(target, buf, strlen(buf));
+ sprintf(buf, "\n");
+ (*target->isa->put_block)(target, buf, strlen(buf));
for (i = 'a'+1; i <= 'z'+1; i++) {
print_binding(target, buf, i);
diff -rc lynx2-8-1.orig/src/LYKeymap.h lynx2-8-1/src/LYKeymap.h
*** lynx2-8-1.orig/src/LYKeymap.h Thu Aug 6 13:28:22 1998
--- lynx2-8-1/src/LYKeymap.h Mon Aug 24 17:36:10 1998
***************
*** 23,29 ****
extern unsigned short key_override[];
#endif
! #define CURRENT_KEYMAP_TITLE "Current Key Map"
#define LYK_1 1
#define LYK_2 2
--- 23,30 ----
extern unsigned short key_override[];
#endif
! #define CURRENT_KEYMAP_TITLE "Current Key Map"
! #define CURRENT_KEYMAP_HELP "keystrokes/keystroke_help.html"
#define LYK_1 1
#define LYK_2 2
diff -rc lynx2-8-1.orig/src/LYList.c lynx2-8-1/src/LYList.c
*** lynx2-8-1.orig/src/LYList.c Sat Aug 15 22:57:56 1998
--- lynx2-8-1/src/LYList.c Mon Aug 24 17:48:48 1998
***************
*** 96,109 ****
}
fprintf(fp0, "%s \n\n\n",
LIST_PAGE_TITLE);
! fprintf(fp0, "You have reached the List Page
\n");
! fprintf(fp0, "%s Version %s
\n", LYNX_NAME, LYNX_VERSION);
StrAllocCopy(Address, HTLoadedDocumentURL());
LYEntify(&Address, FALSE);
! fprintf(fp0,
! " References in %s\n",
! ((Address != NULL && *Address != '\0') ?
! Address : "this document:"));
FREE(Address);
if (refs > 0) {
fprintf(fp0, "<%s compact>\n", ((keypad_mode == NUMBERS_AS_ARROWS) ?
--- 96,108 ----
}
fprintf(fp0, "
%s \n\n\n",
LIST_PAGE_TITLE);
! fprintf(fp0, "%s (%s), help on %s
\n",
! LYNX_NAME, LYNX_VERSION,
! helpfilepath, LIST_PAGE_HELP, LIST_PAGE_TITLE);
StrAllocCopy(Address, HTLoadedDocumentURL());
LYEntify(&Address, FALSE);
! fprintf(fp0, "References in %s\n",
! ((Address != NULL && *Address != '\0') ? Address : "this document:"));
FREE(Address);
if (refs > 0) {
fprintf(fp0, "<%s compact>\n", ((keypad_mode == NUMBERS_AS_ARROWS) ?
diff -rc lynx2-8-1.orig/src/LYList.h lynx2-8-1/src/LYList.h
*** lynx2-8-1.orig/src/LYList.h Thu Aug 6 13:28:22 1998
--- lynx2-8-1/src/LYList.h Mon Aug 24 17:45:52 1998
***************
*** 7,12 ****
extern int showlist PARAMS((document *newdoc, BOOLEAN titles));
extern void printlist PARAMS((FILE *fp, BOOLEAN titles));
! #define LIST_PAGE_TITLE "Lynx List Page"
#endif /* LYLIST_H */
--- 7,13 ----
extern int showlist PARAMS((document *newdoc, BOOLEAN titles));
extern void printlist PARAMS((FILE *fp, BOOLEAN titles));
! #define LIST_PAGE_TITLE "Lynx List Page"
! #define LIST_PAGE_HELP "keystrokes/follow_help.html"
#endif /* LYLIST_H */
diff -rc lynx2-8-1.orig/src/LYLocal.c lynx2-8-1/src/LYLocal.c
*** lynx2-8-1.orig/src/LYLocal.c Sat Aug 15 22:57:56 1998
--- lynx2-8-1/src/LYLocal.c Mon Aug 24 17:55:43 1998
***************
*** 1686,1705 ****
nothing_tagged = (HTList_isEmpty(tagged));
! fprintf(fp0,
! "
\n%s \n\n", DIRED_MENU_TITLE);
- fprintf(fp0,
- "\nFile Management Options (%s Version %s)
",
- LYNX_NAME, LYNX_VERSION);
-
- fprintf(fp0, "Current directory is %s
\n", dir);
-
if (nothing_tagged) {
if (strlen(path)) {
! fprintf(fp0, "Current selection is %s\n", path);
} else {
! fprintf(fp0, "Nothing currently selected.
\n");
}
} else {
/*
--- 1686,1703 ----
nothing_tagged = (HTList_isEmpty(tagged));
! fprintf(fp0, "
\n%s \n\n",
! DIRED_MENU_TITLE);
! fprintf(fp0, "%s (%s), help on %s
\n",
! LYNX_NAME, LYNX_VERSION,
! helpfilepath, DIRED_MENU_HELP, DIRED_MENU_TITLE);
! fprintf(fp0, "Current directory: %s
\n", dir);
if (nothing_tagged) {
if (strlen(path)) {
! fprintf(fp0, "Current selection: %s\n", path);
} else {
! fprintf(fp0, "Current selection: Nothing currently selected.
\n");
}
} else {
/*
***************
*** 1712,1718 ****
char *cd = NULL;
int i, m;
#define NUM_TAGS_TO_WRITE 10
! fprintf(fp0, "Current selection is %d tagged item%s",
n, ((n == 1) ? ":" : "s:"));
StrAllocCopy(cd, doc->address);
HTUnEscapeSome(cd, "/");
--- 1710,1716 ----
char *cd = NULL;
int i, m;
#define NUM_TAGS_TO_WRITE 10
! fprintf(fp0, "Current selection: %d tagged item%s",
n, ((n == 1) ? ":" : "s:"));
StrAllocCopy(cd, doc->address);
HTUnEscapeSome(cd, "/");
***************
*** 1724,1730 ****
(*cd ? cd : "file://localhost"));
HTUnEscape(cp1);
LYEntify(&cp1, TRUE); /* _should_ do this everywhere... */
! fprintf(fp0, "%s
\n %s",
(i == 1 ? "" : " ,"), cp1);
FREE(cp1);
}
--- 1722,1728 ----
(*cd ? cd : "file://localhost"));
HTUnEscape(cp1);
LYEntify(&cp1, TRUE); /* _should_ do this everywhere... */
! fprintf(fp0, "%s
\n %s",
(i == 1 ? "" : " ,"), cp1);
FREE(cp1);
}
diff -rc lynx2-8-1.orig/src/LYLocal.h lynx2-8-1/src/LYLocal.h
*** lynx2-8-1.orig/src/LYLocal.h Thu Aug 6 13:28:22 1998
--- lynx2-8-1/src/LYLocal.h Mon Aug 24 18:12:33 1998
***************
*** 60,67 ****
extern int local_dired PARAMS((document *doc));
extern int dired_options PARAMS ((document *doc, char ** newfile));
! #define DIRED_MENU_TITLE "File Management Options"
! #define PERMIT_OPTIONS_TITLE "File Permission Options"
extern void add_menu_item PARAMS((char *str));
--- 60,68 ----
extern int local_dired PARAMS((document *doc));
extern int dired_options PARAMS ((document *doc, char ** newfile));
! #define DIRED_MENU_TITLE "File Management Options"
! #define DIRED_MENU_HELP "keystrokes/dired_help.html"
! #define PERMIT_OPTIONS_TITLE "File Permission Options"
extern void add_menu_item PARAMS((char *str));
diff -rc lynx2-8-1.orig/src/LYMainLoop.c lynx2-8-1/src/LYMainLoop.c
*** lynx2-8-1.orig/src/LYMainLoop.c Fri Aug 21 14:30:14 1998
--- lynx2-8-1/src/LYMainLoop.c Mon Aug 24 23:19:33 1998
***************
*** 2556,2561 ****
--- 2556,2562 ----
newdoc.safe = FALSE;
newdoc.internal_link = FALSE;
LYforce_no_cache = TRUE;
+ newdoc.link++; /* skips help links - SKY */
if (LYValidate || check_realm) {
LYPermitURL = TRUE;
}
***************
*** 2606,2611 ****
--- 2607,2613 ----
if (LYValidate || check_realm) {
LYPermitURL = TRUE;
}
+ newdoc.link++; /* skips help links - SKY */
break;
} /* end if strncmp */
/*
***************
*** 3862,3867 ****
--- 3864,3870 ----
if (check_realm)
LYPermitURL = TRUE;
refresh_screen = TRUE; /* redisplay */
+ newdoc.link = 3; /* skips help links - SKY */
/*
* FIXME: this is a temporary solution until we find the
***************
*** 4391,4396 ****
--- 4394,4400 ----
LYPermitURL = TRUE;
refresh_screen = TRUE; /* redisplay */
}
+ newdoc.link++; /* skips help links - SKY */
break;
case LYK_LIST: /* list links in the current document */
***************
*** 4424,4429 ****
--- 4428,4434 ----
LYPermitURL = TRUE;
StrAllocCopy(lynxlistfile, newdoc.address);
}
+ newdoc.link++; /* skips help links - SKY */
break;
case LYK_VLINKS: /* list links visited during the current session */
***************
*** 4455,4460 ****
--- 4460,4466 ----
LYPermitURL = TRUE;
StrAllocCopy(lynxlinksfile, newdoc.address);
}
+ newdoc.link++; /* skips help links - SKY */
break;
case LYK_TOOLBAR: /* go to Toolbar or Banner in current document */
***************
*** 4608,4613 ****
--- 4614,4620 ----
DIRED_MENU_TITLE)) {
dired_options(&curdoc,&newdoc.address);
refresh_screen = TRUE; /* redisplay */
+ newdoc.link = 1;
}
break;
#endif /* VMS */
***************
*** 4987,4993 ****
newdoc.safe = history[number].safe;
newdoc.internal_link = FALSE;
newdoc.line = curdoc.line; /* need for display_partial ! */
! newdoc.link = 0;
HTOutputFormat = HTAtom_for("www/download");
LYUserSpecifiedURL = TRUE;
/*
--- 4994,5000 ----
newdoc.safe = history[number].safe;
newdoc.internal_link = FALSE;
newdoc.line = curdoc.line; /* need for display_partial ! */
! newdoc.link = 1; /* skips help links - SKY */
HTOutputFormat = HTAtom_for("www/download");
LYUserSpecifiedURL = TRUE;
/*
***************
*** 5047,5053 ****
}
newdoc.internal_link = FALSE;
newdoc.line = curdoc.line; /* need for display_partial ! */
! newdoc.link = 0;
HTOutputFormat = HTAtom_for("www/download");
/*
* Force the document to be reloaded.
--- 5054,5060 ----
}
newdoc.internal_link = FALSE;
newdoc.line = curdoc.line; /* need for display_partial ! */
! newdoc.link = 1; /* skips help links - SKY */
HTOutputFormat = HTAtom_for("www/download");
/*
* Force the document to be reloaded.
***************
*** 5080,5085 ****
--- 5087,5093 ----
newdoc.isHEAD = FALSE;
newdoc.safe = FALSE;
newdoc.internal_link = FALSE;
+ newdoc.link++; /* skips help links - SKY */
/*
* Uncache the current listing so that it will
* be updated to included the uploaded file if
diff -rc lynx2-8-1.orig/src/LYOptions.c lynx2-8-1/src/LYOptions.c
*** lynx2-8-1.orig/src/LYOptions.c Fri Aug 21 14:30:14 1998
--- lynx2-8-1/src/LYOptions.c Mon Aug 24 23:13:59 1998
***************
*** 3164,3170 ****
static char * user_mode_string = "user_mode";
#define PutLabel(fp, text) \
! fprintf(fp," ", text)
#define PutOption(fp, flag, html, name) \
fprintf(fp, "\n", \
--- 3164,3170 ----
static char * user_mode_string = "user_mode";
#define PutLabel(fp, text) \
! fprintf(fp," ", text)
#define PutOption(fp, flag, html, name) \
fprintf(fp, "\n", \
***************
*** 3599,3608 ****
fprintf(fp0, "\n
\n%s \n\n\n",
OPTIONS_TITLE);
- fprintf(fp0,"Options Menu (%s Version %s)
\n",
- LYNX_NAME, LYNX_VERSION);
-
/*
* I do C, not HTML. Feel free to pretty this up.
*/
--- 3599,3608 ----
fprintf(fp0, "\n\n%s \n\n\n",
OPTIONS_TITLE);
+ fprintf(fp0, "%s (%s), help on %s
\n",
+ LYNX_NAME, LYNX_VERSION,
+ helpfilepath, OPTIONS_HELP, OPTIONS_TITLE);
/*
* I do C, not HTML. Feel free to pretty this up.
*/
***************
*** 3620,3710 ****
/*
* visible preformatted text begins here
*/
- fprintf(fp0,"\n\n");
/*
* save/reset
*/
! fprintf(fp0,"");
! fprintf(fp0," ");
! fprintf(fp0," Use the back key to cancel changes.");
! strcpy(any_filename, helpfile);
! if ((leaf = strrchr(any_filename, '/')) != 0)
! leaf++;
! else
! leaf = any_filename;
! strcpy(leaf, "keystrokes/option_help.html");
! fprintf(fp0," HELP available\n\n", any_filename);
/*
! * editor
*/
! PutLabel(fp0, "Editor");
! fprintf(fp0,"\n",
! DISABLED(no_editor || system_editor),
! editor_string,
! NOTEMPTY(editor));
/*
* display
*/
PutLabel(fp0, "Display");
! fprintf(fp0,"\n",
display_string,
NOTEMPTY(display));
/*
! * multi-bookmarks mode
*/
! if (!LYMBMBlocked) {
! PutLabel(fp0, "Multi-bookmarks");
! BeginSelect(fp0, mbm_string);
! PutOption(fp0, !LYMultiBookmarks,
! mbm_off_string,
! mbm_off_string);
! PutOption(fp0, LYMultiBookmarks && !LYMBMAdvanced,
! mbm_standard_string,
! mbm_standard_string);
! PutOption(fp0, LYMultiBookmarks && LYMBMAdvanced,
! mbm_advanced_string,
! mbm_advanced_string);
! EndSelect(fp0);
! }
!
/*
! * bookmarks files menu
*/
! if (LYMultiBookmarks) {
- PutLabel(fp0, "Review/edit Bookmarks files");
- fprintf(fp0,"go mbm menu\n");
-
- } else {
- PutLabel(fp0, "Bookmarks file");
- fprintf(fp0,"\n",
- single_bookmark_string,
- NOTEMPTY(bookmark_page));
- }
-
/*
! * ftp sort
*/
! PutLabel(fp0, "Ftp sort criteria");
! BeginSelect(fp0, ftp_sort_string);
! PutOptValues(fp0, HTfileSortMethod, ftp_sort_values);
EndSelect(fp0);
/*
- * mail_address
- */
- PutLabel(fp0, "Personal mail address");
- fprintf(fp0,"\n",
- mail_address_string,
- NOTEMPTY(personal_mail_address));
-
- /*
* search_type
*/
PutLabel(fp0, "Searching type");
--- 3620,3694 ----
/*
* visible preformatted text begins here
*/
/*
* save/reset
*/
! fprintf(fp0,"\n");
! fprintf(fp0,"[ ] ");
! fprintf(fp0,"[ ]
");
! fprintf(fp0,"Back Arrow cancels changes
\n");
! /*
! * save options
! */
! if (!no_option_save) {
! fprintf(fp0, "Save options to disk: ");
! fprintf(fp0,"\n",
! save_options_string);
! }
! fprintf(fp0,"
\n");
! fprintf(fp0,"\nPersonal Preferences\n");
/*
! * user_mode
! *
! * This option is here because we come from LYMainLoop() with
! * newdoc.links = 3, and land on 'save options', however if
! * no_option_save is set we will land on 'Display' which is an input
! * field and leaving back to previous document will be annoying.
! * Thus 'user mode' is the most sensible option to put into the
! * front lines. - SKY
*/
! PutLabel(fp0, "User Mode");
! BeginSelect(fp0, user_mode_string);
! PutOptValues(fp0, user_mode, user_mode_values);
! EndSelect(fp0);
/*
* display
*/
PutLabel(fp0, "Display");
! fprintf(fp0,"\n",
display_string,
NOTEMPTY(display));
/*
! * editor
*/
! PutLabel(fp0, "Editor");
! fprintf(fp0,"\n",
! DISABLED(no_editor || system_editor),
! editor_string,
! NOTEMPTY(editor));
/*
! * emacs_keys
*/
! PutLabel(fp0, "Emacs Keys");
! BeginSelect(fp0, emacs_keys_string);
! PutOptValues(fp0, emacs_keys, bool_values);
! EndSelect(fp0);
/*
! * keypad_mode
*/
! PutLabel(fp0, "Keypad Mode");
! BeginSelect(fp0, keypad_mode_string);
! PutOptValues(fp0, keypad_mode, keypad_mode_values);
EndSelect(fp0);
/*
* search_type
*/
PutLabel(fp0, "Searching type");
***************
*** 3713,3791 ****
EndSelect(fp0);
/*
! * preferred_doc_lang
*/
! PutLabel(fp0, "Preferred document language");
! fprintf(fp0,"\n",
! preferred_doc_lang_string,
! NOTEMPTY(language));
/*
! * preferred_doc_char
*/
! PutLabel(fp0, "Preferred document character set");
! fprintf(fp0,"\n",
! preferred_doc_char_string,
! NOTEMPTY(pref_charset));
!
! /*
! * display_char_set
! */
! PutLabel(fp0, "Display character set");
! BeginSelect(fp0, display_char_set_string);
! for (i = 0; LYchar_set_names[i]; i++) {
! char temp[10];
! sprintf(temp, "%d", i);
! PutOption(fp0, i==current_char_set, temp, LYchar_set_names[i]);
! }
EndSelect(fp0);
/*
- * raw_mode
- */
- if (LYHaveCJKCharacterSet)
- /*
- * Since CJK people hardly mixed with other world
- * we split the header to make it more readable:
- * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
- */
- PutLabel(fp0, "CJK mode");
- else
- PutLabel(fp0, "Raw 8-bit");
-
- BeginSelect(fp0, raw_mode_string);
- PutOptValues(fp0, LYRawMode, bool_values);
- EndSelect(fp0);
-
- /*
- * assume_char_set
- */
- /*
- * FIXME: If bogus value in lynx.cfg, then in old way, that is the
- * string that was displayed. Now, user will never see that. Good
- * or bad? I don't know. MRC
- */
- /* if (user_mode==ADVANCED_MODE) */ {
- int curval;
-
- curval = UCLYhndl_for_unspec;
- if (curval == current_char_set && UCAssume_MIMEcharset) {
- curval = UCGetLYhndl_byMIME(UCAssume_MIMEcharset);
- }
- if (curval < 0) {
- curval = LYRawMode ? current_char_set : 0;
- }
- PutLabel(fp0, "Assumed document character set");
- BeginSelect(fp0, assume_char_set_string);
- for (i = 0; i < LYNumCharsets; i++) {
- PutOption(fp0, i==curval,
- LYCharSet_UC[i].MIMEname,
- LYCharSet_UC[i].MIMEname);
- }
- EndSelect(fp0);
- }
-
- /*
* show_color
*/
#if defined(USE_SLANG) || defined(COLOR_CURSES)
--- 3697,3718 ----
EndSelect(fp0);
/*
! * mail_address
*/
! PutLabel(fp0, "Personal mail address");
! fprintf(fp0,"\n",
! mail_address_string,
! NOTEMPTY(personal_mail_address));
/*
! * select_popups
*/
! PutLabel(fp0, "Popups for select fields");
! BeginSelect(fp0, select_popups_string);
! PutOptValues(fp0, LYSelectPopups, bool_values);
EndSelect(fp0);
/*
* show_color
*/
#if defined(USE_SLANG) || defined(COLOR_CURSES)
***************
*** 3831,3836 ****
--- 3758,3771 ----
#endif /* USE_SLANG || COLOR_CURSES */
/*
+ * show_cursor
+ */
+ PutLabel(fp0, "Show cursor");
+ BeginSelect(fp0, show_cursor_string);
+ PutOptValues(fp0, LYShowCursor, bool_values);
+ EndSelect(fp0);
+
+ /*
* vi_keys
*/
PutLabel(fp0, "VI Keys");
***************
*** 3838,3883 ****
PutOptValues(fp0, vi_keys, bool_values);
EndSelect(fp0);
/*
! * emacs_keys
*/
! PutLabel(fp0, "Emacs Keys");
! BeginSelect(fp0, emacs_keys_string);
! PutOptValues(fp0, emacs_keys, bool_values);
! EndSelect(fp0);
/*
! * show_dotfiles
*/
! if (!no_dotfiles) {
! PutLabel(fp0, "Show dot files");
! BeginSelect(fp0, show_dotfiles_string);
! PutOptValues(fp0, show_dotfiles, bool_values);
EndSelect(fp0);
}
/*
! * select_popups
*/
! PutLabel(fp0, "Popups for select fields");
! BeginSelect(fp0, select_popups_string);
! PutOptValues(fp0, LYSelectPopups, bool_values);
EndSelect(fp0);
/*
! * show_cursor
*/
! PutLabel(fp0, "Show cursor");
! BeginSelect(fp0, show_cursor_string);
! PutOptValues(fp0, LYShowCursor, bool_values);
EndSelect(fp0);
/*
! * keypad_mode
*/
! PutLabel(fp0, "Keypad Mode");
! BeginSelect(fp0, keypad_mode_string);
! PutOptValues(fp0, keypad_mode, keypad_mode_values);
EndSelect(fp0);
#ifdef DIRED_SUPPORT
--- 3773,3897 ----
PutOptValues(fp0, vi_keys, bool_values);
EndSelect(fp0);
+ fprintf(fp0,"\nBookmarks Options\n");
+
/*
! * multi-bookmarks mode
*/
! if (!LYMBMBlocked) {
! PutLabel(fp0, "Multi-bookmarks");
! BeginSelect(fp0, mbm_string);
! PutOption(fp0, !LYMultiBookmarks,
! mbm_off_string,
! mbm_off_string);
! PutOption(fp0, LYMultiBookmarks && !LYMBMAdvanced,
! mbm_standard_string,
! mbm_standard_string);
! PutOption(fp0, LYMultiBookmarks && LYMBMAdvanced,
! mbm_advanced_string,
! mbm_advanced_string);
! EndSelect(fp0);
! }
/*
! * bookmarks files menu
*/
! if (LYMultiBookmarks) {
!
! PutLabel(fp0, "Review/edit Bookmarks files");
! fprintf(fp0,
! "Goto multi-bookmark menu\n");
!
! } else {
! PutLabel(fp0, "Bookmarks file");
! fprintf(fp0,"\n",
! single_bookmark_string,
! NOTEMPTY(bookmark_page));
! }
!
! fprintf(fp0,"\nCharacter Set Options\n");
!
! /*
! * assume_char_set
! */
! /*
! * FIXME: If bogus value in lynx.cfg, then in old way, that is the
! * string that was displayed. Now, user will never see that. Good
! * or bad? I don't know. MRC
! */
! /* if (user_mode==ADVANCED_MODE) */ {
! int curval;
!
! curval = UCLYhndl_for_unspec;
! if (curval == current_char_set && UCAssume_MIMEcharset) {
! curval = UCGetLYhndl_byMIME(UCAssume_MIMEcharset);
! }
! if (curval < 0) {
! curval = LYRawMode ? current_char_set : 0;
! }
! PutLabel(fp0, "Assumed document character set");
! BeginSelect(fp0, assume_char_set_string);
! for (i = 0; i < LYNumCharsets; i++) {
! PutOption(fp0, i==curval,
! LYCharSet_UC[i].MIMEname,
! LYCharSet_UC[i].MIMEname);
! }
EndSelect(fp0);
}
/*
! * display_char_set
*/
! PutLabel(fp0, "Display character set");
! BeginSelect(fp0, display_char_set_string);
! for (i = 0; LYchar_set_names[i]; i++) {
! char temp[10];
! sprintf(temp, "%d", i);
! PutOption(fp0, i==current_char_set, temp, LYchar_set_names[i]);
! }
EndSelect(fp0);
/*
! * preferred_doc_char
*/
! PutLabel(fp0, "Preferred document character set");
! fprintf(fp0,"\n",
! preferred_doc_char_string,
! NOTEMPTY(pref_charset));
!
! /*
! * preferred_doc_lang
! */
! PutLabel(fp0, "Preferred document language");
! fprintf(fp0,"\n",
! preferred_doc_lang_string,
! NOTEMPTY(language));
!
! /*
! * raw_mode
! */
! if (LYHaveCJKCharacterSet)
! /*
! * Since CJK people hardly mixed with other world
! * we split the header to make it more readable:
! * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
! */
! PutLabel(fp0, "CJK mode");
! else
! PutLabel(fp0, "Raw 8-bit");
!
! BeginSelect(fp0, raw_mode_string);
! PutOptValues(fp0, LYRawMode, bool_values);
EndSelect(fp0);
+ fprintf(fp0,"\nFile Management Options\n");
+
/*
! * ftp sort
*/
! PutLabel(fp0, "Ftp sort criteria");
! BeginSelect(fp0, ftp_sort_string);
! PutOptValues(fp0, HTfileSortMethod, ftp_sort_values);
EndSelect(fp0);
#ifdef DIRED_SUPPORT
***************
*** 3891,3924 ****
#endif /* DIRED_SUPPORT */
/*
! * user_mode
*/
! PutLabel(fp0, "User Mode");
! BeginSelect(fp0, user_mode_string);
! PutOptValues(fp0, user_mode, user_mode_values);
! EndSelect(fp0);
!
! /*
! * save options
! */
! if (!no_option_save) {
! PutLabel(fp0, "Save options to disk");
! fprintf(fp0,"\n",
! save_options_string);
}
/*
* save/reset
*/
! fprintf(fp0,"\n");
! fprintf(fp0,"");
! fprintf(fp0," ");
! fprintf(fp0," Use the back key to cancel changes.\n");
/*
* close HTML
*/
- fprintf(fp0,"\n");
fprintf(fp0,"\n");
fprintf(fp0,"\n");
--- 3905,3931 ----
#endif /* DIRED_SUPPORT */
/*
! * show_dotfiles
*/
! if (!no_dotfiles) {
! PutLabel(fp0, "Show dot files");
! BeginSelect(fp0, show_dotfiles_string);
! PutOptValues(fp0, show_dotfiles, bool_values);
! EndSelect(fp0);
}
/*
* save/reset
*/
! fprintf(fp0,"\n\n");
! fprintf(fp0,"\n");
! fprintf(fp0,"Back Arrow cancels changes
");
! fprintf(fp0,"[ ] ");
! fprintf(fp0,"[ ]\n");
/*
* close HTML
*/
fprintf(fp0,"\n");
fprintf(fp0,"\n");
diff -rc lynx2-8-1.orig/src/LYOptions.h lynx2-8-1/src/LYOptions.h
*** lynx2-8-1.orig/src/LYOptions.h Thu Aug 6 13:28:22 1998
--- lynx2-8-1/src/LYOptions.h Mon Aug 24 21:50:07 1998
***************
*** 71,76 ****
#endif /* EXP_FORMS_OPTIONS */
! #define OPTIONS_TITLE "Lynx Options Configuration"
#endif /* LYOPTIONS_H */
--- 71,77 ----
#endif /* EXP_FORMS_OPTIONS */
! #define OPTIONS_TITLE "Lynx Options Page"
! #define OPTIONS_HELP "keystrokes/option_help.html"
#endif /* LYOPTIONS_H */
diff -rc lynx2-8-1.orig/src/LYPrint.c lynx2-8-1/src/LYPrint.c
*** lynx2-8-1.orig/src/LYPrint.c Sat Aug 15 22:57:56 1998
--- lynx2-8-1/src/LYPrint.c Mon Aug 24 18:19:01 1998
***************
*** 1264,1284 ****
fprintf(fp0, "\n
\n%s \n\n\n",
PRINT_OPTIONS_TITLE);
- fprintf(fp0,"Printing Options (%s Version %s)
\n",
- LYNX_NAME, LYNX_VERSION);
-
pages = (lines_in_file+65)/66;
! sprintf(buffer,
! " There are %d lines, or approximately %d page%s, to print.\n",
! lines_in_file, pages, (pages > 1 ? "s" : ""));
fputs(buffer,fp0);
if (no_print || no_disk_save || child_lynx || no_mail)
! fprintf(fp0, " Some print functions have been disabled!!!\n");
! fprintf(fp0, " You have the following print choices.\n");
! fprintf(fp0, " Please select one:\n\n");
if (child_lynx == FALSE && no_disk_save == FALSE && no_print == FALSE)
fprintf(fp0,
--- 1264,1286 ----
fprintf(fp0, "\n\n%s \n\n\n",
PRINT_OPTIONS_TITLE);
+ fprintf(fp0, "%s (%s), help on %s
\n",
+ LYNX_NAME, LYNX_VERSION,
+ helpfilepath, PRINT_OPTIONS_HELP, PRINT_OPTIONS_TITLE);
pages = (lines_in_file+65)/66;
! fprintf(fp0, "\n");
! sprintf(buffer, " \
! Current file: %s\n \
! Number of lines: %d\n \
! Number of pages: %d page%s (approximately)\n",
! tempfile, lines_in_file, pages, (pages > 1 ? "s" : ""));
fputs(buffer,fp0);
if (no_print || no_disk_save || child_lynx || no_mail)
! fprintf(fp0, " Some print functions have been disabled!\n");
! fprintf(fp0, "\nStandard print options:\n");
if (child_lynx == FALSE && no_disk_save == FALSE && no_print == FALSE)
fprintf(fp0,
***************
*** 1285,1291 ****
" Save to a local file\n",
lines_in_file);
else
! fprintf(fp0," Save to disk disabled.\n");
if (child_lynx == FALSE && no_mail == FALSE && local_host_only == FALSE)
fprintf(fp0,
" Mail the file\n",
--- 1287,1293 ----
" Save to a local file\n",
lines_in_file);
else
! fprintf(fp0," Save to disk disabled.\n");
if (child_lynx == FALSE && no_mail == FALSE && local_host_only == FALSE)
fprintf(fp0,
" Mail the file\n",
***************
*** 1300,1305 ****
--- 1302,1308 ----
lines_in_file);
#endif
+ fprintf(fp0, "\nLocal additions:\n");
for (count = 0, cur_printer = printers; cur_printer != NULL;
cur_printer = cur_printer->next, count++)
if (no_print == FALSE || cur_printer->always_enabled) {
diff -rc lynx2-8-1.orig/src/LYPrint.h lynx2-8-1/src/LYPrint.h
*** lynx2-8-1.orig/src/LYPrint.h Wed Mar 25 13:58:54 1998
--- lynx2-8-1/src/LYPrint.h Mon Aug 24 18:15:26 1998
***************
*** 9,15 ****
extern int printfile PARAMS((document *newdoc));
extern int print_options PARAMS((char **newfile, int lines_in_file));
! #define PRINT_OPTIONS_TITLE "Lynx Printing Options"
#endif /* LYPRINT_H */
--- 9,16 ----
extern int printfile PARAMS((document *newdoc));
extern int print_options PARAMS((char **newfile, int lines_in_file));
! #define PRINT_OPTIONS_TITLE "Lynx Printing Options"
! #define PRINT_OPTIONS_HELP "keystrokes/print_help.html"
#endif /* LYPRINT_H */
diff -rc lynx2-8-1.orig/src/LYShowInfo.c lynx2-8-1/src/LYShowInfo.c
*** lynx2-8-1.orig/src/LYShowInfo.c Sat Aug 15 22:57:56 1998
--- lynx2-8-1/src/LYShowInfo.c Mon Aug 24 19:54:19 1998
***************
*** 75,87 ****
LYAddMETAcharsetToFD(fp0, -1);
fprintf(fp0, "%s \n\n\n",
SHOWINFO_TITLE);
! fprintf(fp0,"You have reached the Information Page
\n");
! fprintf(fp0,"%s Version %s
\n", LYNX_NAME, LYNX_VERSION);
#ifdef DIRED_SUPPORT
if (lynx_edit_mode && nlinks > 0) {
! fprintf(fp0,
! "Directory that you are currently viewing
\n");
cp = doc->address;
if (!strncmp(cp, "file://localhost", 16))
--- 75,90 ----
LYAddMETAcharsetToFD(fp0, -1);
fprintf(fp0, "%s \n\n\n",
SHOWINFO_TITLE);
! fprintf(fp0, "%s %s (%s) - compile time settings\n",
! LYNX_NAME, LYNX_VERSION,
! (LYNX_RELEASE ? LYNX_WWW_HOME : LYNX_WWW_DIST),
! (LYNX_RELEASE ? "major release" : "development version"),
! LYNX_COMPILE_OPTS);
#ifdef DIRED_SUPPORT
if (lynx_edit_mode && nlinks > 0) {
! fprintf(fp0, "\n");
! fprintf(fp0, "\nDirectory that you are currently viewing\n\n");
cp = doc->address;
if (!strncmp(cp, "file://localhost", 16))
***************
*** 157,163 ****
cp = ctime(&dir_info.st_atime);
fprintf(fp0, " Last accessed: %s\n", cp);
! fprintf(fp0, " Access Permissions\n");
fprintf(fp0, " Owner: ");
modes[0] = '\0';
modes[1] = '\0'; /* In case there are no permissions */
--- 160,166 ----
cp = ctime(&dir_info.st_atime);
fprintf(fp0, " Last accessed: %s\n", cp);
! fprintf(fp0, " Access Permissions\n");
fprintf(fp0, " Owner: ");
modes[0] = '\0';
modes[1] = '\0'; /* In case there are no permissions */
diff -rc lynx2-8-1.orig/src/LYUpload.c lynx2-8-1/src/LYUpload.c
*** lynx2-8-1.orig/src/LYUpload.c Sat Aug 15 22:57:56 1998
--- lynx2-8-1/src/LYUpload.c Mon Aug 24 20:03:02 1998
***************
*** 241,253 ****
fprintf(fp0, "\n%s \n\n\n",
UPLOAD_OPTIONS_TITLE);
- fprintf(fp0, "Upload Options (%s Version %s)
\n",
- LYNX_NAME, LYNX_VERSION);
-
- fputs(" You have the following upload choices.
\n", fp0);
- fputs(" Please select one:
\n\n", fp0);
-
if (uploaders != NULL) {
for (count = 0, cur_upload = uploaders;
cur_upload != NULL;
--- 241,253 ----
fprintf(fp0, "\n%s \n\n\n",
UPLOAD_OPTIONS_TITLE);
+ fprintf(fp0, "%s (%s), help on %s
\n",
+ LYNX_NAME, LYNX_VERSION,
+ helpfilepath, UPLOAD_OPTIONS_HELP, UPLOAD_OPTIONS_TITLE);
+ fprintf(fp0, "\n");
+ fprintf(fp0, " Upload To: %s\n", curloc);
+ fputs("\nUpload options:\n", fp0);
if (uploaders != NULL) {
for (count = 0, cur_upload = uploaders;
cur_upload != NULL;
***************
*** 259,268 ****
fprintf(fp0, "\n");
}
} else {
! fprintf(fp0, "\n \
! No other upload methods have been defined yet. You may define\n \
! an unlimited number of upload methods using the lynx.cfg file.\n");
!
}
fprintf(fp0, "\n\n");
LYCloseTempFP(fp0);
--- 259,270 ----
fprintf(fp0, "\n");
}
} else {
! fprintf(fp0, " \
! <NONE>\n\n \
! You may define an unlimited number of upload methods.\n \
! Please refer to the lynx.cfg file, \
! sections 'UPLOAD' and 'INCLUDE'.\n",
! LYNX_CFG_FILE);
}
fprintf(fp0, "\n\n");
LYCloseTempFP(fp0);
diff -rc lynx2-8-1.orig/src/LYUpload.h lynx2-8-1/src/LYUpload.h
*** lynx2-8-1.orig/src/LYUpload.h Wed Mar 25 13:58:54 1998
--- lynx2-8-1/src/LYUpload.h Mon Aug 24 19:59:43 1998
***************
*** 9,15 ****
extern int LYUpload PARAMS((char *line));
extern int LYUpload_options PARAMS((char **newfile, char *directory));
! #define UPLOAD_OPTIONS_TITLE "Lynx Upload Options"
#endif /* LYUPLOAD_H */
--- 9,16 ----
extern int LYUpload PARAMS((char *line));
extern int LYUpload_options PARAMS((char **newfile, char *directory));
! #define UPLOAD_OPTIONS_TITLE "Lynx Upload Options"
! #define UPLOAD_OPTIONS_HELP "Lynx_users_guide.html#17"
#endif /* LYUPLOAD_H */