diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/LYForms.c | 151 | ||||
| -rw-r--r-- | src/LYGlobalDefs.h | 4 | ||||
| -rw-r--r-- | src/LYStrings.c | 64 | ||||
| -rw-r--r-- | src/tidy_tls.c | 6 |
4 files changed, 134 insertions, 91 deletions
diff --git a/src/LYForms.c b/src/LYForms.c index fa8000dd..d74d9d0f 100644 --- a/src/LYForms.c +++ b/src/LYForms.c @@ -1,4 +1,4 @@ -/* $LynxId: LYForms.c,v 1.111 2013/12/07 13:46:58 tom Exp $ */ +/* $LynxId: LYForms.c,v 1.117 2015/12/15 01:32:45 tom Exp $ */ #include <HTUtils.h> #include <HTCJK.h> #include <HTTP.h> @@ -855,6 +855,12 @@ static int form_getstr(int cur, return (ch); } +#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION +#define TMA_PANEL(fp,np) ((for_what == FOR_PANEL) ? fp : np) +#else +#define TMA_PANEL(fp,np) np +#endif + /* * Display statusline info tailored for the current form field. */ @@ -866,30 +872,47 @@ void show_formlink_statusline(const FormInfo * form, if (FormIsReadonly(form)) statusline(FORM_LINK_PASSWORD_UNM_MSG); else -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - statusline(FORM_LINK_PASSWORD_MESSAGE_INA); - else -#endif - statusline(FORM_LINK_PASSWORD_MESSAGE); + statusline(TMA_PANEL(FORM_LINK_PASSWORD_MESSAGE_INA, + FORM_LINK_PASSWORD_MESSAGE)); break; case F_OPTION_LIST_TYPE: - if (FormIsReadonly(form)) + if (FormIsReadonly(form)) { statusline(FORM_LINK_OPTION_LIST_UNM_MSG); - else + } else if (fields_are_named()) { + char *submit_str = NULL; + + HTSprintf0(&submit_str, FORM_LINK_OPTION_LIST_ADV_MSG, form->name); + statusline(submit_str); + FREE(submit_str); + } else { statusline(FORM_LINK_OPTION_LIST_MESSAGE); + } break; case F_CHECKBOX_TYPE: - if (FormIsReadonly(form)) + if (FormIsReadonly(form)) { statusline(FORM_LINK_CHECKBOX_UNM_MSG); - else + } else if (fields_are_named()) { + char *submit_str = NULL; + + HTSprintf0(&submit_str, FORM_LINK_CHECKBOX_ADV_MSG, form->name); + statusline(submit_str); + FREE(submit_str); + } else { statusline(FORM_LINK_CHECKBOX_MESSAGE); + } break; case F_RADIO_TYPE: - if (FormIsReadonly(form)) + if (FormIsReadonly(form)) { statusline(FORM_LINK_RADIO_UNM_MSG); - else + } else if (fields_are_named()) { + char *submit_str = NULL; + + HTSprintf0(&submit_str, FORM_LINK_RADIO_ADV_MSG, form->name); + statusline(submit_str); + FREE(submit_str); + } else { statusline(FORM_LINK_RADIO_MESSAGE); + } break; case F_TEXT_SUBMIT_TYPE: if (FormIsReadonly(form)) { @@ -899,41 +922,25 @@ void show_formlink_statusline(const FormInfo * form, if (no_mail) statusline(FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG); else -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - statusline(FORM_TEXT_SUBMIT_MAILTO_MSG_INA); - else -#endif - statusline(FORM_LINK_TEXT_SUBMIT_MAILTO_MSG); + statusline(TMA_PANEL(FORM_TEXT_SUBMIT_MAILTO_MSG_INA, + FORM_LINK_TEXT_SUBMIT_MAILTO_MSG)); } else if (form->no_cache) { -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - statusline(FORM_TEXT_RESUBMIT_MESSAGE_INA); - else -#endif - statusline(FORM_LINK_TEXT_RESUBMIT_MESSAGE); + statusline(TMA_PANEL(FORM_TEXT_RESUBMIT_MESSAGE_INA, + FORM_LINK_TEXT_RESUBMIT_MESSAGE)); } else { char *submit_str = NULL; char *xkey_info = key_for_func_ext(LYK_NOCACHE, for_what); if (non_empty(xkey_info)) { -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - HTSprintf0(&submit_str, FORM_TEXT_SUBMIT_MESSAGE_INA_X, - xkey_info); - else -#endif - HTSprintf0(&submit_str, FORM_LINK_TEXT_SUBMIT_MESSAGE_X, - xkey_info); + HTSprintf0(&submit_str, + TMA_PANEL(FORM_TEXT_SUBMIT_MESSAGE_INA_X, + FORM_LINK_TEXT_SUBMIT_MESSAGE_X), + xkey_info); statusline(submit_str); FREE(submit_str); } else { -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - statusline(FORM_LINK_TEXT_SUBMIT_MESSAGE_INA); - else -#endif - statusline(FORM_LINK_TEXT_SUBMIT_MESSAGE); + statusline(TMA_PANEL(FORM_LINK_TEXT_SUBMIT_MESSAGE_INA, + FORM_LINK_TEXT_SUBMIT_MESSAGE)); } FREE(xkey_info); } @@ -989,10 +996,17 @@ void show_formlink_statusline(const FormInfo * form, statusline(FORM_LINK_RESET_MESSAGE); break; case F_BUTTON_TYPE: - if (FormIsReadonly(form)) + if (FormIsReadonly(form)) { statusline(FORM_LINK_BUTTON_DIS_MSG); - else + } else if (fields_are_named()) { + char *submit_str = NULL; + + HTSprintf0(&submit_str, FORM_LINK_BUTTON_ADV_MSG, form->name); + statusline(submit_str); + FREE(submit_str); + } else { statusline(FORM_LINK_BUTTON_MESSAGE); + } break; case F_FILE_TYPE: if (FormIsReadonly(form)) @@ -1001,15 +1015,21 @@ void show_formlink_statusline(const FormInfo * form, statusline(FORM_LINK_FILE_MESSAGE); break; case F_TEXT_TYPE: - if (FormIsReadonly(form)) + if (FormIsReadonly(form)) { statusline(FORM_LINK_TEXT_UNM_MSG); - else -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - statusline(FORM_LINK_TEXT_MESSAGE_INA); - else -#endif - statusline(FORM_LINK_TEXT_MESSAGE); + } else if (fields_are_named()) { + char *submit_str = NULL; + + HTSprintf0(&submit_str, + TMA_PANEL(FORM_LINK_TEXT_ADV_MSG_INA, + FORM_LINK_TEXT_ADV_MSG), + form->name); + statusline(submit_str); + FREE(submit_str); + } else { + statusline(TMA_PANEL(FORM_LINK_TEXT_MESSAGE_INA, + FORM_LINK_TEXT_MESSAGE)); + } break; case F_TEXTAREA_TYPE: if (FormIsReadonly(form)) { @@ -1026,23 +1046,32 @@ void show_formlink_statusline(const FormInfo * form, #endif } if (non_empty(xkey_info)) { -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - HTSprintf0(&submit_str, FORM_LINK_TEXTAREA_MESSAGE_INA_E, + if (fields_are_named()) { + HTSprintf0(&submit_str, + TMA_PANEL(FORM_LINK_TEXTAREA_ADV_MSG_INA_E, + FORM_LINK_TEXTAREA_ADV_MSG_E), + form->name, xkey_info); - else -#endif - HTSprintf0(&submit_str, FORM_LINK_TEXTAREA_MESSAGE_E, + } else { + HTSprintf0(&submit_str, + TMA_PANEL(FORM_LINK_TEXTAREA_MESSAGE_INA_E, + FORM_LINK_TEXTAREA_MESSAGE_E), xkey_info); + } statusline(submit_str); FREE(submit_str); } else { -#ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - if (for_what == FOR_PANEL) - statusline(FORM_LINK_TEXTAREA_MESSAGE_INA); - else -#endif - statusline(FORM_LINK_TEXTAREA_MESSAGE); + if (fields_are_named()) { + HTSprintf0(&submit_str, + TMA_PANEL(FORM_LINK_TEXTAREA_ADV_MSG_INA, + FORM_LINK_TEXTAREA_ADV_MSG), + form->name); + statusline(submit_str); + FREE(submit_str); + } else { + statusline(TMA_PANEL(FORM_LINK_TEXTAREA_MESSAGE_INA, + FORM_LINK_TEXTAREA_MESSAGE)); + } } FREE(xkey_info); } diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index 0fc576e8..96db75b5 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: LYGlobalDefs.h,v 1.139 2015/10/08 08:51:26 Simon.Kainz Exp $ + * $LynxId: LYGlobalDefs.h,v 1.140 2015/12/14 09:52:22 tom Exp $ * * global variable definitions */ @@ -141,6 +141,8 @@ extern "C" { #define fields_are_numbered() \ (keypad_mode == FIELDS_ARE_NUMBERED || \ keypad_mode == LINKS_AND_FIELDS_ARE_NUMBERED) +#define fields_are_named() \ + (user_mode == ADVANCED_MODE) #define HIDDENLINKS_MERGE 0 #define HIDDENLINKS_SEPARATE 1 diff --git a/src/LYStrings.c b/src/LYStrings.c index 64418ab2..8c716fa2 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -1,4 +1,4 @@ -/* $LynxId: LYStrings.c,v 1.260 2014/12/09 01:49:18 tom Exp $ */ +/* $LynxId: LYStrings.c,v 1.262 2015/12/14 09:52:43 tom Exp $ */ #include <HTUtils.h> #include <HTCJK.h> #include <UCAux.h> @@ -4126,6 +4126,32 @@ static void draw_option(WINDOW * win, int entry, #endif /* USE_SLANG */ } +static void show_popup_status(int cur_choice, + STRING2PTR choices, + int disabled, + int for_mouse) +{ + if (disabled) { + _statusline(CHOICE_LIST_UNM_MSG); + } else if (!for_mouse) { + if (fields_are_named()) { + char *status_msg = NULL; + + HTSprintf0(&status_msg, CHOICE_LIST_ADV_MSG, choices[cur_choice]); + _statusline(status_msg); + FREE(status_msg); + } else { + _statusline(CHOICE_LIST_MESSAGE); + } +#if defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES)) + } else { + _statusline(MOUSE_CHOICE_MESSAGE); +#endif + } +} + +#define SHOW_POPUP_STATUS() show_popup_status(cur_choice, choices, disabled, for_mouse) + /* * This function offers the choices for values of an option via a popup window * which functions like that for selection of options in a form. - FM @@ -4165,7 +4191,6 @@ int LYhandlePopupList(int cur_choice, BOOLEAN ReDraw = FALSE; int number; char buffer[MAX_LINE]; - const char *popup_status_msg = NULL; STRING2PTR Cptr = NULL; #define CAN_SCROLL_DOWN 1 @@ -4327,20 +4352,7 @@ int LYhandlePopupList(int cur_choice, width -= Lnum; bottom += top; - /* - * Clear the command line and write the popup statusline. - FM - */ - if (disabled) { - popup_status_msg = CHOICE_LIST_UNM_MSG; - } else if (!for_mouse) { - popup_status_msg = CHOICE_LIST_MESSAGE; -#if defined(USE_MOUSE) && (defined(NCURSES) || defined(PDCURSES)) - } else { - popup_status_msg = - gettext("Left mouse button or return to select, arrow keys to scroll."); -#endif - } - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); /* * Set up the window_offset for choices. @@ -4487,12 +4499,12 @@ int LYhandlePopupList(int cur_choice, if (number <= 1) { if (window_offset == 0) { HTUserMsg(ALREADY_AT_OPTION_BEGIN); - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); break; } window_offset = 0; cur_choice = 0; - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); goto redraw; } @@ -4503,7 +4515,7 @@ int LYhandlePopupList(int cur_choice, if (number >= npages) { if (window_offset >= ((num_choices - length) + 1)) { HTUserMsg(ALREADY_AT_OPTION_END); - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); break; } window_offset = ((npages - 1) * length); @@ -4512,7 +4524,7 @@ int LYhandlePopupList(int cur_choice, } if (cur_choice < window_offset) cur_choice = window_offset; - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); goto redraw; } @@ -4525,11 +4537,11 @@ int LYhandlePopupList(int cur_choice, HTSprintf0(&msg, ALREADY_AT_OPTION_PAGE, number); HTUserMsg(msg); FREE(msg); - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); break; } cur_choice = window_offset = ((number - 1) * length); - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); goto redraw; } @@ -4569,7 +4581,7 @@ int LYhandlePopupList(int cur_choice, HTSprintf0(&msg, OPTION_ALREADY_CURRENT, (number + 1)); HTUserMsg(msg); FREE(msg); - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); break; } @@ -4590,7 +4602,7 @@ int LYhandlePopupList(int cur_choice, if (window_offset < 0) window_offset = 0; } - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); goto redraw; } @@ -4604,7 +4616,7 @@ int LYhandlePopupList(int cur_choice, /* * Restore the popup statusline. - FM */ - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); break; case LYK_PREV_LINK: @@ -5028,7 +5040,7 @@ int LYhandlePopupList(int cur_choice, * Restore the popup statusline and reset the search variables. - * FM */ - _statusline(popup_status_msg); + SHOW_POPUP_STATUS(); BStrCopy0(prev_target, ""); QueryTotal = (search_queries ? HTList_count(search_queries) : 0); diff --git a/src/tidy_tls.c b/src/tidy_tls.c index d94ba5cf..012c25d8 100644 --- a/src/tidy_tls.c +++ b/src/tidy_tls.c @@ -1,5 +1,5 @@ /* - * $LynxId: tidy_tls.c,v 1.31 2015/10/12 00:31:21 tom Exp $ + * $LynxId: tidy_tls.c,v 1.32 2015/12/15 01:41:06 tom Exp $ * Copyright 2008-2014,2015 Thomas E. Dickey * with fix Copyright 2008 by Thomas Viehmann * @@ -441,10 +441,10 @@ SSL *SSL_new(SSL_CTX * ctx) ssl->rfd = (gnutls_transport_ptr_t) (-1); ssl->wfd = (gnutls_transport_ptr_t) (-1); + ssl->bytes_sent = 0; + ssl->sendbuffer = 0; } } - ssl->bytes_sent = 0; - ssl->sendbuffer = 0; return ssl; } |