lynx-dev Non-forms options menu

[Ismael Cordeiro]

Here's a patch to pre.9 for making the commands of the non-forms options
menu more visible. With the patch they are displayed in bold.


*** lynx2-8-1/src/LYOptions.c.ori       Sat Oct 10 14:53:16 1998
--- lynx2-8-1/src/LYOptions.c   Tue Oct 13 09:45:33 1998
***************
*** 236,293 ****
      addch(')');
      lynx_stop_h1_color ();
      move(L_EDITOR, 5);
!     addstr("E)ditor                      : ");
      addstr((editor && *editor) ? editor : "NONE");
  
      move(L_DISPLAY, 5);
!     addstr("D)ISPLAY variable            : ");
      addstr((x_display && *x_display) ? x_display : "NONE");
  
      move(L_HOME, 5);
!     addstr("mu(L)ti-bookmarks: ");
      addstr((LYMultiBookmarks ?
              (LYMBMAdvanced ? "ADVANCED"
                             : "STANDARD")
                             : "OFF     "));
      move(L_HOME, B_BOOK);
      if (LYMultiBookmarks) {
!       addstr("review/edit B)ookmarks files");
      } else {
!       addstr("B)ookmark file: ");
        addstr((bookmark_page && *bookmark_page) ? bookmark_page : "NONE");
      }
  
      move(L_FTPSTYPE, 5);
!     addstr("F)TP sort criteria           : ");
      addstr((HTfileSortMethod == FILE_BY_NAME ? "By Filename" :
           (HTfileSortMethod == FILE_BY_SIZE ? "By Size    " :
           (HTfileSortMethod == FILE_BY_TYPE ? "By Type    " :
                                               "By Date    "))));
  
      move(L_MAIL_ADDRESS, 5);
!     addstr("P)ersonal mail address       : ");
      addstr((personal_mail_address && *personal_mail_address) ?
                                       personal_mail_address : "NONE");
  
      move(L_SSEARCH, 5);
!     addstr("S)earching type              : ");
      addstr(case_sensitive ? "CASE SENSITIVE  " : "CASE INSENSITIVE");
  
      move(L_Charset, 5);
!     addstr("display (C)haracter set      : ");
      addstr((char *)LYchar_set_names[current_char_set]);
  
      move(L_LANGUAGE, 5);
!     addstr("preferred document lan(G)uage: ");
      addstr((language && *language) ? language : "NONE");
  
      move(L_PREF_CHARSET, 5);
!     addstr("preferred document c(H)arset : ");
      addstr((pref_charset && *pref_charset) ? pref_charset : "NONE");
  
      if (use_assume_charset) {
        move(L_ASSUME_CHARSET, 5);
!       addstr("^A)ssume charset if unknown  : ");
        if (UCAssume_MIMEcharset)
            addstr(UCAssume_MIMEcharset);
        else
--- 236,341 ----
      addch(')');
      lynx_stop_h1_color ();
      move(L_EDITOR, 5);
!     addstr("(");
!     start_bold();
!     addstr("E");
!     stop_bold();
!     addstr(")ditor                     : ");
      addstr((editor && *editor) ? editor : "NONE");
  
      move(L_DISPLAY, 5);
!     addstr("(");
!     start_bold();
!     addstr("D");
!     stop_bold();
!     addstr(")ISPLAY variable           : ");
      addstr((x_display && *x_display) ? x_display : "NONE");
  
      move(L_HOME, 5);
!     addstr("mu(");
!     start_bold();
!     addstr("L");
!     stop_bold();
!     addstr(")ti-bookmarks: ");
      addstr((LYMultiBookmarks ?
              (LYMBMAdvanced ? "ADVANCED"
                             : "STANDARD")
                             : "OFF     "));
      move(L_HOME, B_BOOK);
      if (LYMultiBookmarks) {
!       addstr("review/edit ");
!       addstr("(");
!       start_bold();
!       addstr("B");
!       stop_bold();
!       addstr(")ookmarks files");
      } else {
!       start_bold();
!       addstr("B");
!       stop_bold();
!       addstr(")ookmark file: ");
        addstr((bookmark_page && *bookmark_page) ? bookmark_page : "NONE");
      }
  
      move(L_FTPSTYPE, 5);
!     addstr("(");
!     start_bold();
!     addstr("F");
!     stop_bold();
!     addstr(")TP sort criteria          : ");
      addstr((HTfileSortMethod == FILE_BY_NAME ? "By Filename" :
           (HTfileSortMethod == FILE_BY_SIZE ? "By Size    " :
           (HTfileSortMethod == FILE_BY_TYPE ? "By Type    " :
                                               "By Date    "))));
  
      move(L_MAIL_ADDRESS, 5);
!     addstr("(");
!     start_bold();
!     addstr("P");
!     stop_bold();
!     addstr(")ersonal mail address      : ");
      addstr((personal_mail_address && *personal_mail_address) ?
                                       personal_mail_address : "NONE");
  
      move(L_SSEARCH, 5);
!     addstr("(");
!     start_bold();
!     addstr("S");
!     stop_bold();
!     addstr(")earching type             : ");
      addstr(case_sensitive ? "CASE SENSITIVE  " : "CASE INSENSITIVE");
  
      move(L_Charset, 5);
!     addstr("display (");
!     start_bold();
!     addstr("C");
!     stop_bold();
!     addstr(")haracter set      : ");
      addstr((char *)LYchar_set_names[current_char_set]);
  
      move(L_LANGUAGE, 5);
!     addstr("preferred document lan(");
!     start_bold();
!     addstr("G");
!     stop_bold();
!     addstr(")uage: ");
      addstr((language && *language) ? language : "NONE");
  
      move(L_PREF_CHARSET, 5);
!     addstr("preferred document c(");
!     start_bold();
!     addstr("H");
!     stop_bold();
!     addstr(")arset : ");
      addstr((pref_charset && *pref_charset) ? pref_charset : "NONE");
  
      if (use_assume_charset) {
        move(L_ASSUME_CHARSET, 5);
!       addstr("(");
!       start_bold();
!       addstr("^A");
!       stop_bold();
!       addstr(")ssume charset if unknown : ");
        if (UCAssume_MIMEcharset)
            addstr(UCAssume_MIMEcharset);
        else
***************
*** 297,308 ****
      }
  
      move(L_Rawmode, 5);
!     addstr("Raw 8-bit or CJK m(O)de      : ");
      addstr(LYRawMode ? "ON " : "OFF");
  
  #if defined(USE_SLANG) || defined(COLOR_CURSES)
      move(L_Color, B_COLOR);
!     addstr("show color (&)  : ");
      if (no_option_save) {
        addstr((LYShowColor == SHOW_COLOR_OFF ? "OFF" :
                                                "ON "));
--- 345,364 ----
      }
  
      move(L_Rawmode, 5);
!     addstr("Raw 8-bit or CJK m(");
!     start_bold();
!     addstr("O");
!     stop_bold();
!     addstr(")de      : ");
      addstr(LYRawMode ? "ON " : "OFF");
  
  #if defined(USE_SLANG) || defined(COLOR_CURSES)
      move(L_Color, B_COLOR);
!     addstr("show color (");
!     start_bold();
!     addstr("&");
!     stop_bold();
!     addstr(")  : ");
      if (no_option_save) {
        addstr((LYShowColor == SHOW_COLOR_OFF ? "OFF" :
                                                "ON "));
***************
*** 329,355 ****
  #endif /* USE_SLANG || COLOR_CURSES */
  
      move(L_Bool_A, B_VIKEYS);
!     addstr("V)I keys: ");
      addstr(vi_keys ? "ON " : "OFF");
  
      move(L_Bool_A, B_EMACSKEYS);
!     addstr("e(M)acs keys: ");
      addstr(emacs_keys ? "ON " : "OFF");
  
      move(L_Bool_A, B_SHOW_DOTFILES);
!     addstr("sho(W) dot files: ");
      addstr((!no_dotfiles && show_dotfiles) ? "ON " : "OFF");
  
      move(L_Bool_B, B_SELECT_POPUPS);
!     addstr("popups for selec(T) fields   : ");
      addstr(LYSelectPopups ? "ON " : "OFF");
  
      move(L_Bool_B, B_SHOW_CURSOR);
!     addstr("show cursor (@) : ");
      addstr(LYShowCursor ? "ON " : "OFF");
  
      move(L_Keypad, 5);
!     addstr("K)eypad mode                 : ");
      addstr((keypad_mode == NUMBERS_AS_ARROWS) ?
                                "Numbers act as arrows             " :
         ((keypad_mode == LINKS_ARE_NUMBERED) ?
--- 385,435 ----
  #endif /* USE_SLANG || COLOR_CURSES */
  
      move(L_Bool_A, B_VIKEYS);
!     addstr("(");
!     start_bold();
!     addstr("V");
!     stop_bold();
!     addstr(")I keys: ");
      addstr(vi_keys ? "ON " : "OFF");
  
      move(L_Bool_A, B_EMACSKEYS);
!     addstr("e(");
!     start_bold();
!     addstr("M");
!     stop_bold();
!     addstr(")acs keys: ");
      addstr(emacs_keys ? "ON " : "OFF");
  
      move(L_Bool_A, B_SHOW_DOTFILES);
!     addstr("sho(");
!     start_bold();
!     addstr("W");
!     stop_bold();
!     addstr(") dot files: ");
      addstr((!no_dotfiles && show_dotfiles) ? "ON " : "OFF");
  
      move(L_Bool_B, B_SELECT_POPUPS);
!     addstr("popups for selec(");
!     start_bold();
!     addstr("T");
!     stop_bold();
!     addstr(") fields   : ");
      addstr(LYSelectPopups ? "ON " : "OFF");
  
      move(L_Bool_B, B_SHOW_CURSOR);
!     addstr("show cursor (");
!     start_bold();
!     addstr("@");
!     stop_bold();
!     addstr(") : ");
      addstr(LYShowCursor ? "ON " : "OFF");
  
      move(L_Keypad, 5);
!     addstr("(");
!     start_bold();
!     addstr("K");
!     stop_bold();
!     addstr(")eypad mode                : ");
      addstr((keypad_mode == NUMBERS_AS_ARROWS) ?
                                "Numbers act as arrows             " :
         ((keypad_mode == LINKS_ARE_NUMBERED) ?
***************
*** 357,389 ****
                                "Links and form fields are numbered"));
  
      move(L_Lineed, 5);
!     addstr("li(N)e edit style            : ");
      addstr(LYLineeditNames[current_lineedit]);
  
  #ifdef DIRED_SUPPORT
      move(L_Dired, 5);
!     addstr("l(I)st directory style       : ");
      addstr((dir_list_style == FILES_FIRST) ? "Files first      " :
          ((dir_list_style == MIXED_STYLE) ? "Mixed style      " :
                                             "Directories first"));
  #endif /* DIRED_SUPPORT */
  
      move(L_User_Mode, 5);
!     addstr("U)ser mode                   : ");
      addstr(  (user_mode == NOVICE_MODE) ? "Novice      " :
        ((user_mode == INTERMEDIATE_MODE) ? "Intermediate" :
                                          "Advanced    "));
  
!     addstr("  verbose images (!) : ");
      addstr( verbose_img ? "ON " : "OFF" );
  
      move(L_User_Agent, 5);
!     addstr("user (A)gent                 : ");
      addstr((LYUserAgent && *LYUserAgent) ? LYUserAgent : "NONE");
  
  #ifdef ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS
      move(L_Exec, 5);
!     addstr("local e(X)ecution links      : ");
  #ifndef NEVER_ALLOW_REMOTE_EXEC
      addstr(               local_exec ? "ALWAYS ON           " :
          (local_exec_on_local_files ? "FOR LOCAL FILES ONLY" :
--- 437,493 ----
                                "Links and form fields are numbered"));
  
      move(L_Lineed, 5);
!     addstr("li(");
!     start_bold();
!     addstr("N");
!     stop_bold();
!     addstr(")e edit style            : ");
      addstr(LYLineeditNames[current_lineedit]);
  
  #ifdef DIRED_SUPPORT
      move(L_Dired, 5);
!     addstr("l(");
!     start_bold();
!     addstr("I");
!     stop_bold();
!     addstr(")st directory style       : ");
      addstr((dir_list_style == FILES_FIRST) ? "Files first      " :
          ((dir_list_style == MIXED_STYLE) ? "Mixed style      " :
                                             "Directories first"));
  #endif /* DIRED_SUPPORT */
  
      move(L_User_Mode, 5);
!     addstr("(");
!     start_bold();
!     addstr("U");
!     stop_bold();
!     addstr(")ser mode                  : ");
      addstr(  (user_mode == NOVICE_MODE) ? "Novice      " :
        ((user_mode == INTERMEDIATE_MODE) ? "Intermediate" :
                                          "Advanced    "));
  
!     addstr("  verbose images (");
!     start_bold();
!     addstr("!");
!     stop_bold();
!     addstr(") : ");
      addstr( verbose_img ? "ON " : "OFF" );
  
      move(L_User_Agent, 5);
!     addstr("user (");
!     start_bold();
!     addstr("A");
!     stop_bold();
!     addstr(")gent                 : ");
      addstr((LYUserAgent && *LYUserAgent) ? LYUserAgent : "NONE");
  
  #ifdef ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS
      move(L_Exec, 5);
!     addstr("local e(");
!     start_bold();
!     addstr("X");
!     stop_bold();
!     addstr(")ecution links      : ");
  #ifndef NEVER_ALLOW_REMOTE_EXEC
      addstr(               local_exec ? "ALWAYS ON           " :
          (local_exec_on_local_files ? "FOR LOCAL FILES ONLY" :


Ismael
-- 

       +--------------------------------------------------------------+
       | ISMAEL CORDEIRO            | mailto:address@hidden           |
       | Production sound mixer     | http://www.cam.org/~ismael/     |
       | Montréal - Québec - Canada | ftp://ftp.cam.org/users/ismael/ |
       +--------------------------------------------------------------+