[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
lynx-dev dev.15 patch 3
From: |
Klaus Weide |
Subject: |
lynx-dev dev.15 patch 3 |
Date: |
Thu, 25 Nov 1999 13:24:32 -0600 (CST) |
Now that the big diff is out of the way, some smaller changes.
As discussed...
* Make ^X a prefix key in all Line Edit styles. That means ^V should
never be needed any more to invoke the special textarea commands
(but it's still supported). Updates to help files to reflect this change.
* Don't produce a link from the KEYMAP page to a help file. The one we
used to use doesn't really help.
Klaus
Index: 2.22/src/LYKeymap.c
--- 2.22/src/LYKeymap.c Thu, 25 Nov 1999 11:29:56 -0600
+++ 2.22(w)/src/LYKeymap.c Thu, 25 Nov 1999 13:13:37 -0600
@@ -1001,11 +1001,15 @@
HTSprintf0(&buf, "<head>\n<title>%s</title>\n</head>\n<body>\n",
CURRENT_KEYMAP_TITLE);
PUTS(buf);
+#if 0 /* There isn't really a help page *on* the current keymap.
+ And we don't need a title and version info here, better
+ make the page as compact as possible. - kw */
HTSprintf0(&buf, "<h1>%s (%s)%s<a href=\"%s%s\">%s</a></h1>\n",
LYNX_NAME, LYNX_VERSION,
HELP_ON_SEGMENT,
helpfilepath, CURRENT_KEYMAP_HELP, CURRENT_KEYMAP_TITLE);
PUTS(buf);
+#endif
HTSprintf0(&buf, "<pre>\n");
PUTS(buf);
Index: 2.22/src/LYEditmap.c
--- 2.22/src/LYEditmap.c Thu, 25 Nov 1999 06:54:09 -0600
+++ 2.22(w)/src/LYEditmap.c Thu, 25 Nov 1999 11:34:55 -0600
@@ -54,7 +54,7 @@
#endif
/* ^T ^U ^V ^W */
-LYE_ERASE, LYE_NOP, LYE_NOP, LYE_NOP,
+LYE_SETM1, LYE_NOP, LYE_NOP, LYE_NOP,
/* ^X ^Y ^Z ESC */
LYE_NOP, LYE_NOP, LYE_SWMAP, LYE_DELEL,
@@ -300,7 +300,7 @@
#endif
/* ^T ^U ^V ^W */
-LYE_DELBL, LYE_NOP, LYE_NOP, LYE_NOP,
+LYE_SETM1, LYE_NOP, LYE_NOP, LYE_NOP,
/* ^X ^Y ^Z ESC */
LYE_NOP, LYE_NOP, LYE_UPPER, LYE_LOWER,
Index: 2.22/src/LYGlobalDefs.h
--- 2.22/src/LYGlobalDefs.h Thu, 25 Nov 1999 11:29:56 -0600
+++ 2.22(w)/src/LYGlobalDefs.h Thu, 25 Nov 1999 13:08:13 -0600
@@ -11,6 +11,10 @@
#include <LYStructs.h>
#endif /* LYSTRUCTS_H */
+/* Of the following definitions, currently unused are and could
+ be removed (at least):
+ CURRENT_KEYMAP_HELP
+*/
#ifdef HAVE_CONFIG_H
#include <LYHelp.h>
#else
Index: 2.22/lynx_help/Lynx_users_guide.html
--- 2.22/lynx_help/Lynx_users_guide.html Thu, 25 Nov 1999 09:49:41 -0600
+++ 2.22(w)/lynx_help/Lynx_users_guide.html Thu, 25 Nov 1999 12:41:56 -0600
@@ -1391,27 +1391,29 @@
The statusline should tell you when this is possible and what
key to use, it might for example say
-<PRE> <strong>(Textarea) Enter text. </strong>[...] <strong>(^Ve for
editor).</strong></PRE>
+<PRE> <strong>(Textarea) Enter text. </strong>[...] <strong>(^Xe for
editor).</strong></PRE>
An external editor has to be defined, for example in the <a
href="#InteractiveOptions">Options Menu</a>, before you can start
using this function.
- <p>To map a key so that it will invoke external TEXTAREA editing, you
- can either configure Lynx to use the <a
- href="keystrokes/bashlike_edit_help.html">Bash-like Line-Editor
- Bindings</a>, or add KEYMAP bindings to your <em>lynx.cfg</em> file,
- e.g.<br>
+ <p>A key to invoke external TEXTAREA editing is normally provided
+ by the <a href="keystrokes/edit_help.html">Line-Editor Key</a> Bindings.
+ A KEYMAP directive in <em>lynx.cfg</em> can also be used to
+ make a different key invoke external editing; it will then normally
+ be necessary to prefix that key with <em>^V</em> to "escape" from
+ line-editing. Two variants exists,<br>
KEYMAP:e:EDITTEXTAREA<br>
or<br>
KEYMAP:e:DWIMEDIT<br>
(the first is only functional for TEXTAREA editing, while the second
allows to use the same key for normal <a href="#FileEdit">file
- editing</A>).</p>
+ editing</a> <em>as long as both functions don't conflict</em>).</p>
You can also use two other special TEXTAREA functions. Again, these
are already bound to key sequences in the <a
- href="keystrokes/bashlike_edit_help.html#TASpecial">Bash-like Bindings</a>.
+ href="keystrokes/edit_help.html#TASpecial">Line-Editor
+ Bindings</a>.
You can invoke them independently of the line edit style
by adding KEYMAP bindings to your <em>lynx.cfg</em> file, e.g.<p>
Index: 2.22/lynx_help/keystrokes/keystroke_help.html
--- 2.22/lynx_help/keystrokes/keystroke_help.html Wed, 06 Oct 1999 14:48:20
-0500
+++ 2.22(w)/lynx_help/keystrokes/keystroke_help.html Thu, 25 Nov 1999 12:09:31
-0600
@@ -83,12 +83,18 @@
] - Send a HEAD request for the current doc or link
" - Toggle valid or "soft" double-quote parsing
CTRL-R - Reload current file and refresh the screen
- CTRL-V - Switch to <A HREF="option_help.html#tagsoup"
- >alternative parsing</A> of HTML documents
CTRL-L - Refresh the screen
+
+ CTRL-V - Outside of a text input line or field,
+ switch to <A HREF="option_help.html#tagsoup"
+ >alternative parsing</A> of HTML.
+ - In a form text input field,
+ CTRL-V prompts for a key command (allows
+ escaping from the field).
CTRL-U - Erase input line (<a href="edit_help.html"
>more input line commands</a>)
CTRL-G - Cancel input or transfer
+
CTRL-T - Toggle trace mode on and off
; - View the Lynx Trace Log for the current session
CTRL-K - Invoke the <A HREF="cookie_help.html"
Index: 2.22/lynx_help/keystrokes/edit_help.html
--- 2.22/lynx_help/keystrokes/edit_help.html Sat, 12 Jun 1999 17:10:16 -0500
+++ 2.22(w)/lynx_help/keystrokes/edit_help.html Thu, 25 Nov 1999 12:18:51 -0600
@@ -27,7 +27,7 @@
ENTER Input complete - RETURN
TAB Input complete - TAB, Do
ABORT Input cancelled - Ctrl-G, Ctrl-O, (Ctrl-C on some systems)
- ERASE Erase the line - Ctrl-U, Ctrl-X
+ ERASE Erase the line - Ctrl-U
BACK Cursor back char - Left-Arrow
FORW Cursor forward char - Right-Arrow
@@ -48,13 +48,23 @@
LKCMD Invoke cmd prompt - Ctrl-V (in form text fields, only) [2]
SWMAP Switch input keymap - Ctrl-^ (if compiled in)
+<A NAME="TASpecial">Special commands for use only in textarea fields</A>[3]:
+
+ Textarea external edit - Ctrl-X e
+ Insert file in textarea - Ctrl-X i
+ Grow textarea - Ctrl-X g
+
[1] "next" means the character "under" a box or underline style cursor; it
means "to the immediate right of" an I-beam (between characters) type
cursor.
-[2] Follow Ctrl-V with the key "e" bound to the DWIMEDIT function,
- or with some other key bound to EDITTEXTAREA or DWIMEDIT,
- to edit the form's textarea field using an external editor.
+[2] Follow Ctrl-V with any recognized key command, to "escape" from a text
+ input field.
+
+[3] For other key combinations using Ctrl-X as a prefix key, see the
+ Help page for the <a rel="Sibling" title="Bash-Like Binding"
+ href="bashlike_edit_help.html"
+ >Bash-Like</a> Binding.
</pre>
</body>
</html>
Index: 2.22/lynx_help/keystrokes/alt_edit_help.html
--- 2.22/lynx_help/keystrokes/alt_edit_help.html Sat, 12 Jun 1999 17:10:16 -0500
+++ 2.22(w)/lynx_help/keystrokes/alt_edit_help.html Thu, 25 Nov 1999 12:15:14
-0600
@@ -38,7 +38,6 @@
DELN Delete next [1] char - Ctrl-D
DELPW Delete prev word - Ctrl-R
DELNW Delete next word - Ctrl-T
- DELBL Delete to beg of line - Ctrl-X
DELEL Delete to end of line - Ctrl-K
UPPER Upper case the line - Ctrl-^
@@ -46,13 +45,23 @@
LKCMD Invoke cmd prompt - Ctrl-V (in form text fields, only) [2]
+<A NAME="TASpecial">Special commands for use only in textarea fields</A>[3]:
+
+ Textarea external edit - Ctrl-X e
+ Insert file in textarea - Ctrl-X i
+ Grow textarea - Ctrl-X g
+
[1] "next" means the character "under" a box or underline style cursor; it
means "to the immediate right of" an I-beam (between characters) type
cursor.
-[2] Follow Ctrl-V with the key "e" bound to the DWIMEDIT function,
- or with some other key bound to EDITTEXTAREA or DWIMEDIT,
- to edit the form's textarea field using an external editor.
+[2] Follow Ctrl-V with any recognized key command, to "escape" from a text
+ input field.
+
+[3] For other key combinations using Ctrl-X as a prefix key, see the
+ Help page for the <a rel="Sibling" title="Bash-Like Binding"
+ href="bashlike_edit_help.html"
+ >Bash-Like</a> Binding.
</pre>
</body>
</html>
- lynx-dev dev.15 patch 3,
Klaus Weide <=