Re: lynx-dev patch that allows text inputs to be non-sticky

[Vlad Harchev]

On Tue, 27 Jul 1999, Vlad Harchev wrote:

 Here is a patch that contains other small patches posted by me in this thread
(to make the Tom's life easier). I leave the job of renaming commandline
option name and lynx.cfg option name to Tom.
 This patch doesn't contain the extended textarea logic (allowing to treat it
as on link, rather than a group of links) - this models old lynx behaviour.
 But there is following logic wrt to textareas:

 When autogrowing textareas, added line will be in activated.
 When pressind Enter in any line of textarea, next line of textarea is
activated (ie becomes current + selected).
 
 IMO it's enough logic for 1st time.

 Best regards,
  -Vlad

diff -ru lynx2-8-3dev4-fixed-old/lynx.cfg lynx2-8-3dev4-fixed/lynx.cfg
--- lynx2-8-3dev4-fixed-old/lynx.cfg    Thu Jul 15 09:50:46 1999
+++ lynx2-8-3dev4-fixed/lynx.cfg        Mon Jul 26 20:41:32 1999
@@ -2226,3 +2226,13 @@
 # has no influence on CJK text rendering.
 #
 #JUSTIFY:TRUE
+
+# STICKY_INPUTS - Input
+# This option controls whether all text inputs are sticky. If input is not 
+# sticky, then it won't intercept any keyboard input until user activated it
+# (as usual link). Making input non-sticky can be desired for users that 
+# actively use alphanumeric keys for navigation (as ' ','b', INS, DEL, etc).
+# Default is TRUE - ie all inputs are sticky, this models old lynx behaviour.
+#
+#STICKY_INPUTS:TRUE
+ 
\ No newline at end of file
diff -ru lynx2-8-3dev4-fixed-old/lynx.man lynx2-8-3dev4-fixed/lynx.man
--- lynx2-8-3dev4-fixed-old/lynx.man    Thu Jul 15 09:50:46 1999
+++ lynx2-8-3dev4-fixed/lynx.man        Mon Jul 26 20:45:22 1999
@@ -540,6 +540,9 @@
 .B -startfile_ok
 allow non-http startfile and homepage with -validate.
 .TP
+.B -sticky_inputs
+don't require activating inputs in order to edit them.
+.TP
 .B -tagsoup
 initialize parser, using Tag Soup DTD rather than SortaSGML.
 .TP
diff -ru lynx2-8-3dev4-fixed-old/src/HTForms.h lynx2-8-3dev4-fixed/src/HTForms.h
--- lynx2-8-3dev4-fixed-old/src/HTForms.h       Fri Jun 11 14:34:08 1999
+++ lynx2-8-3dev4-fixed/src/HTForms.h   Mon Jul 26 19:11:52 1999
@@ -6,11 +6,21 @@
 #endif /* LYSTRUCTS_H */
 
 /* in LYForms.c */
+
+/* change_form_link calls change_form_link_ex with all its args and FALSE as 
+  last arg */
 extern int change_form_link PARAMS((struct link *form_link,
                                     document *newdoc, BOOLEAN *refresh_screen,
                                    char *link_name, char *link_value,
                                    BOOLEAN use_last_tfpos,
                                    BOOLEAN immediate_submit));
+
+extern int change_form_link_ex PARAMS((struct link *form_link,
+                                    document *newdoc, BOOLEAN *refresh_screen,
+                                   char *link_name, char *link_value,
+                                   BOOLEAN use_last_tfpos,
+                                   BOOLEAN immediate_submit,
+                                   BOOLEAN draw_only));
 
 /* InputFieldData is used to pass the info between
  * HTML.c and Gridtext.c in HText_beginInput()
diff -ru lynx2-8-3dev4-fixed-old/src/LYForms.c lynx2-8-3dev4-fixed/src/LYForms.c
--- lynx2-8-3dev4-fixed-old/src/LYForms.c       Thu Jul 15 09:50:48 1999
+++ lynx2-8-3dev4-fixed/src/LYForms.c   Mon Jul 26 19:22:34 1999
@@ -24,7 +24,8 @@
 
 PRIVATE int form_getstr PARAMS((
        struct link *   form_link,
-       BOOLEAN         use_last_tfpos));
+       BOOLEAN         use_last_tfpos,
+       BOOLEAN         redraw_only));
 PRIVATE int popup_options PARAMS((
        int             cur_selection,
        OptionType *    list,
@@ -34,14 +35,16 @@
        int             i_length,
        int             disabled));
 
-PUBLIC int change_form_link ARGS7(
+
+PUBLIC int change_form_link_ex ARGS8(
        struct link *,  form_link,
        document *,     newdoc,
        BOOLEAN *,      refresh_screen,
        char *,         link_name,
        char *,         link_value,
        BOOLEAN,        use_last_tfpos,
-       BOOLEAN,        immediate_submit)
+       BOOLEAN,        immediate_submit,
+       BOOLEAN,        redraw_only)
 {
     FormInfo *form = form_link->form;
     int newdoc_changed = 0;
@@ -179,7 +182,7 @@
        case F_TEXT_TYPE:
        case F_TEXTAREA_TYPE:
        case F_PASSWORD_TYPE:
-           c = form_getstr(form_link, use_last_tfpos);
+           c = form_getstr(form_link, use_last_tfpos,redraw_only);
            if (form->type == F_PASSWORD_TYPE)
                form_link->hightext = STARS(strlen(form->value));
            else
@@ -194,8 +197,12 @@
            break;
 
        case F_TEXT_SUBMIT_TYPE:
+           if (redraw_only) {
+               c = form_getstr(form_link, use_last_tfpos,TRUE);            
+               break;
+           };
            if (!immediate_submit)
-               c = form_getstr(form_link, use_last_tfpos);
+               c = form_getstr(form_link, use_last_tfpos,FALSE);
            if (form->disabled == YES &&
                (c == '\r' || c == '\n' || immediate_submit)) {
                if (peek_mouse_link() >= 0)
@@ -300,6 +307,20 @@
     return(c);
 }
 
+PUBLIC int change_form_link ARGS7(
+       struct link *,  form_link,
+       document *,     newdoc,
+       BOOLEAN *,      refresh_screen,
+       char *,         link_name,
+       char *,         link_value,
+       BOOLEAN,        use_last_tfpos,
+       BOOLEAN,        immediate_submit)
+{
+    /*pass all our args and FALSE as last arg*/
+    return change_form_link_ex(form_link,newdoc,refresh_screen,link_name,
+       link_value,use_last_tfpos,immediate_submit, FALSE /*redraw_only*/ );
+};
+
 PRIVATE int LastTFPos = -1;    /* remember last text field position */
 
 PRIVATE void LYSetLastTFPos ARGS1(
@@ -314,9 +335,10 @@
 }
 #endif /* 0 */
 
-PRIVATE int form_getstr ARGS2(
+PRIVATE int form_getstr ARGS3(
        struct link *,  form_link,
-       BOOLEAN,        use_last_tfpos)
+       BOOLEAN,        use_last_tfpos,
+       BOOLEAN,        redraw_only)
 {
     FormInfo *form = form_link->form;
     char *value = form->value;
@@ -413,7 +435,9 @@
            MyEdit.pos = 0;
     }
     LYRefreshEdit(&MyEdit);
-
+    if (redraw_only) 
+       return 0;/*return value won't be analysed*/     
+    
     /*
      *  And go for it!
      */
diff -ru lynx2-8-3dev4-fixed-old/src/LYGlobalDefs.h 
lynx2-8-3dev4-fixed/src/LYGlobalDefs.h
--- lynx2-8-3dev4-fixed-old/src/LYGlobalDefs.h  Thu Jul 15 09:50:48 1999
+++ lynx2-8-3dev4-fixed/src/LYGlobalDefs.h      Mon Jul 26 20:25:50 1999
@@ -398,6 +398,12 @@
 extern BOOL force_empty_hrefless_a;
 #endif
 
+#ifndef NO_NONSTICKY_INPUTS
+extern BOOL sticky_inputs;
+extern BOOL textarea_drawn; 
+#endif
+
+
 #ifndef VMS
 extern BOOLEAN LYNoCore;
 extern BOOLEAN restore_sigpipe_for_children;
diff -ru lynx2-8-3dev4-fixed-old/src/LYMain.c lynx2-8-3dev4-fixed/src/LYMain.c
--- lynx2-8-3dev4-fixed-old/src/LYMain.c        Thu Jul 15 09:50:48 1999
+++ lynx2-8-3dev4-fixed/src/LYMain.c    Mon Jul 26 20:48:00 1999
@@ -443,6 +443,10 @@
 PUBLIC BOOL force_empty_hrefless_a = FALSE;
 #endif
 
+#ifndef NO_NONSTICKY_INPUTS
+PUBLIC BOOL sticky_inputs = TRUE;
+#endif
+
 #ifdef DISP_PARTIAL
 PUBLIC BOOLEAN display_partial_flag = TRUE; /* Display document during 
download */
 PUBLIC BOOLEAN debug_display_partial = FALSE; /* Show with MessageSecs delay */
@@ -3266,6 +3270,12 @@
       "startfile_ok",  SET_ARG,                &startfile_ok,
       "allow non-http startfile and homepage with -validate"
    ),
+#ifndef NO_NONSTICKY_INPUTS
+   PARSE_SET(
+      "sticky_inputs", SET_ARG,                &sticky_inputs,
+      "don't require activating inputs in order to edit them"
+   ),
+#endif
 #ifndef VMS
 #ifdef SYSLOG_REQUESTED_URLS
    PARSE_STR(
diff -ru lynx2-8-3dev4-fixed-old/src/LYMainLoop.c 
lynx2-8-3dev4-fixed/src/LYMainLoop.c
--- lynx2-8-3dev4-fixed-old/src/LYMainLoop.c    Thu Jul 15 09:50:48 1999
+++ lynx2-8-3dev4-fixed/src/LYMainLoop.c        Wed Jul 28 07:02:14 1999
@@ -199,6 +199,12 @@
 PRIVATE char *traversal_host = NULL;
 PRIVATE char *traversal_link_to_add = NULL;
 
+#ifndef NO_NONSTICKY_INPUTS
+PRIVATE BOOL textarea_activated = FALSE;
+PUBLIC BOOL textarea_drawn = FALSE; 
+    /*must be public since used in highlight(..)*/
+#endif
+
 #ifdef LY_FIND_LEAKS
 /*
  *  Function for freeing allocated mainloop() variables. - FM
@@ -742,6 +748,10 @@
                getresult = getfile(&newdoc);
 #endif /* TRACK_INTERNAL_LINKS */
 
+#ifndef NO_NOSTICKY_INPUTS
+               textarea_drawn = FALSE; /* for sure */
+#endif
+
                switch(getresult) {
 
                case NOT_FOUND:
@@ -1453,7 +1463,9 @@
         *  All display_partial calls ends here for final redraw.
         */
        if (curdoc.line != Newline) {
-
+#ifndef NO_NONSTICKY_INPUTS
+           textarea_drawn = FALSE;
+#endif
            refresh_screen = FALSE;
 
            HText_pageDisplay(Newline, prev_target);
@@ -1649,6 +1661,7 @@
              *  Highlight current link.
              */
            highlight(ON, curdoc.link, prev_target);
+       
 
        if (traversal) {
            /*
@@ -1688,6 +1701,9 @@
             *  Normal, non-traversal handling.
             */
            if (nlinks > 0 &&
+#ifndef NO_NONSTICKY_INPUTS
+               (textarea_activated || !textarea_drawn) &&
+#endif
                links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
                (links[curdoc.link].form->type == F_TEXT_TYPE ||
                 links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE ||
@@ -1695,7 +1711,24 @@
                 links[curdoc.link].form->type == F_TEXTAREA_TYPE)) {
 
                BOOLEAN use_last_tfpos;
-               /*
+               use_last_tfpos = (real_cmd==LYK_LPOS_PREV_LINK ||
+                                 real_cmd==LYK_LPOS_NEXT_LINK);                
+               
+#ifndef NO_NONSTICKY_INPUTS
+               if (!sticky_inputs && !textarea_activated) {
+                   /*draw the text entry, but don't activate it*/
+                   change_form_link_ex(&links[curdoc.link],
+                                    &newdoc, &refresh_screen,
+                                    links[curdoc.link].form->name,
+                                     links[curdoc.link].form->value,
+                                     use_last_tfpos, FALSE, TRUE);
+                   c = DO_NOTHING;
+                   textarea_drawn = TRUE;                  
+               } else 
+#endif         
+               {
+               
+               /*              
                 *  Replace novice lines if in NOVICE_MODE.
                 */
                if (user_mode==NOVICE_MODE) {
@@ -1704,13 +1737,15 @@
                    move(LYlines-1,0); clrtoeol();
                    addstr(FORM_NOVICELINE_TWO);
                }
-               use_last_tfpos = (real_cmd==LYK_LPOS_PREV_LINK ||
-                                 real_cmd==LYK_LPOS_NEXT_LINK);
                real_c = change_form_link(&links[curdoc.link],
                                     &newdoc, &refresh_screen,
                                     links[curdoc.link].form->name,
                                          links[curdoc.link].form->value,
                                          use_last_tfpos, FALSE);
+#ifndef NO_NONSTICKY_INPUTS                
+               textarea_activated = FALSE; 
+               textarea_drawn = FALSE;
+#endif             
 
                c = (real_c==LKC_DONE) ? DO_NOTHING : LKC_TO_C(real_c);
                if (c != DO_NOTHING &&
@@ -1784,6 +1819,12 @@
                        }
                   }
 #endif /* AUTOGROW */
+#ifndef NO_NONSTICKY_INPUTS
+                   if (!sticky_inputs) {
+                       textarea_activated = TRUE;
+                       textarea_drawn = TRUE;
+                   };
+#endif
 
                    /*
                     *  Make return in input field (if it was returned
@@ -1794,9 +1835,11 @@
                    c = LAC_TO_LKC0(LYK_NEXT_LINK);
                    break;
                default:
+
                    if (old_c != c && old_c != real_c && c != real_c)
                        real_c = c;
                }
+               } /*  !(!sticky_inputs && !textarea_activated)*/
            } else {
                /*
                 *  Get a keystroke from the user.
@@ -3279,6 +3322,21 @@
 
        case LYK_ACTIVATE:      /* follow a link */
        case LYK_SUBMIT:        /* follow a link, submit TEXT_SUBMIT input */
+#ifndef NO_NONSTICKY_INPUTS    
+           if (nlinks > 0 &&
+               links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
+               (links[curdoc.link].form->type == F_TEXT_TYPE ||
+                links[curdoc.link].form->type == F_TEXT_SUBMIT_TYPE ||
+                links[curdoc.link].form->type == F_PASSWORD_TYPE ||
+                links[curdoc.link].form->type == F_TEXTAREA_TYPE)) {
+                
+                textarea_activated = TRUE;
+                textarea_drawn = FALSE;
+                if (!sticky_inputs)
+                    show_main_statusline(links[curdoc.link]);
+                break;
+           };
+#endif                 
            if (do_change_link(prev_target) == -1) {
                LYforce_no_cache = FALSE;
                reloading = FALSE;
@@ -6701,6 +6759,12 @@
     } else {
        _statusline(HELP);
     }
+    
+#ifndef NO_NOSTICKY_INPUTS
+    if (textarea_drawn) {
+       _statusline(gettext("Inactive text input, activate to edit (eg press 
ENTER)"));
+    }
+#endif    
     /* turn off cursor since now it's probably on statusline -HV */
     move((LYlines - 1), (LYcols - 1));
 }
diff -ru lynx2-8-3dev4-fixed-old/src/LYReadCFG.c 
lynx2-8-3dev4-fixed/src/LYReadCFG.c
--- lynx2-8-3dev4-fixed-old/src/LYReadCFG.c     Thu Jul 15 09:50:49 1999
+++ lynx2-8-3dev4-fixed/src/LYReadCFG.c Mon Jul 26 20:35:56 1999
@@ -1224,6 +1224,9 @@
      PARSE_SET("source_cache", CONF_FUN, source_cache_fun),
 #endif
      PARSE_STR("startfile", CONF_STR, &startfile),
+#ifndef NO_NONSTICKY_INPUTS     
+     PARSE_SET("sticky_inputs", CONF_BOOL, &sticky_inputs),     
+#endif     
      PARSE_SET("strip_dotdot_urls", CONF_BOOL, &LYStripDotDotURLs),
      PARSE_SET("substitute_underscores", CONF_BOOL, &use_underscore),
      PARSE_FUN("suffix", CONF_FUN, suffix_fun),
diff -ru lynx2-8-3dev4-fixed-old/src/LYUtils.c lynx2-8-3dev4-fixed/src/LYUtils.c
--- lynx2-8-3dev4-fixed-old/src/LYUtils.c       Thu Jul 15 09:50:49 1999
+++ lynx2-8-3dev4-fixed/src/LYUtils.c   Mon Jul 26 20:27:24 1999
@@ -145,6 +145,10 @@
      */
     if (cur < 0)
        cur = 0;
+#ifndef NO_NONSTICKY_INPUTS    
+    if (flag == OFF)
+       textarea_drawn = FALSE;
+#endif
 
     if (nlinks > 0) {
 #if  defined(USE_COLOR_STYLE) && !defined(NO_HILIT_FIX)
diff -ru lynx2-8-3dev4-fixed-old/userdefs.h lynx2-8-3dev4-fixed/userdefs.h
--- lynx2-8-3dev4-fixed-old/userdefs.h  Thu Jul 15 10:07:27 1999
+++ lynx2-8-3dev4-fixed/userdefs.h      Mon Jul 26 20:52:01 1999
@@ -1528,6 +1528,11 @@
  * This ends the section specific to anonymous accounts.
  */
 
+#ifndef USE_COLOR_STYLE
+    /*it's useless for such setup*/
+#  define NO_EMPTY_HREFLESS_A
+#endif
+
 #define EXP_JUSTIFY_ELTS
 
 #endif /* USERDEFS_H */