snapshot of project "lynx", label v2-8-8dev_16r

4 files changed, 27 insertions, 18 deletions

diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 7f243447..6fce1ec5 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.3 2013/10/13 23:03:48 tom Exp $
+// $LynxId: LYIcon.rc,v 1.4 2013/10/14 23:34:13 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,8,17
-PRODUCTVERSION 2,8,8,17
+FILEVERSION    2,8,8,1017
+PRODUCTVERSION 2,8,8,1017
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://lynx.isc.org"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.8.17"
+      VALUE "FileVersion",      "2.8.8.1017"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2013 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.8.17"
+      VALUE "ProductVersion",   "2.8.8.1017"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index e3e4cd9b..f7b59ecf 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.95 2013/10/13 20:23:07 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.97 2013/10/15 08:16:40 tom Exp $ */
 #include <HTUtils.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
@@ -1014,6 +1014,17 @@ static const struct {
     { HOME_KEY,		"Home" },
     { END_KEY,		"End" },
     { F1_KEY,		"F1" },
+    { F2_KEY,		"F2" },
+    { F3_KEY,		"F3" },
+    { F4_KEY,		"F4" },
+    { F5_KEY,		"F5" },
+    { F6_KEY,		"F6" },
+    { F7_KEY,		"F7" },
+    { F8_KEY,		"F8" },
+    { F9_KEY,		"F9" },
+    { F10_KEY,		"F10" },
+    { F11_KEY,		"F11" },
+    { F12_KEY,		"F12" },
     { DO_KEY,		"Do key" },
     { FIND_KEY,		"Find key" },
     { SELECT_KEY,	"Select key" },
@@ -1414,9 +1425,8 @@ int lkcstring_to_lkc(const char *src)
 	map_string_to_keysym(src, &c);
 #ifndef USE_SLANG
 	if (c >= 0) {
-	    if ((c & LKC_MASK) > 255 && !(c & LKC_ISLKC))
-		c = (-1);	/* Don't accept untranslated curses KEY_* */
-	    else
+	    /* make curses-keys mapped from Keysym_Strings[] available here */
+	    if ((c & LKC_MASK) > 255)
 		c &= ~LKC_ISLKC;
 	}
 #endif
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 66acf897..351d7c41 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.253 2013/10/13 20:47:25 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.255 2013/10/15 09:08:42 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -980,7 +980,7 @@ static Keysym_String_List Keysym_Strings [] =
     INTERN_KEY( "INSERT_KEY",	INSERT_KEY,	KEY_IC ),
     INTERN_KEY( "REMOVE_KEY",	REMOVE_KEY,	KEY_DC ),
     INTERN_KEY( "DO_NOTHING",	DO_NOTHING,	DO_NOTHING|LKC_ISLKC ),
-    INTERN_KEY( NULL,		-1,		ERR )
+    INTERN_KEY( NULL,		UNKNOWN_KEY,	ERR )
 };
 /* *INDENT-ON* */
 
@@ -1214,8 +1214,7 @@ int map_string_to_keysym(const char *str, int *keysym)
 	    *keysym = LAC_TO_LKC0(*keysym);
 	    return (*keysym);
 	}
-    }
-    if (strncasecomp(str, "Meta-", 5) == 0) {
+    } else if (strncasecomp(str, "Meta-", 5) == 0) {
 	str += 5;
 	modifier = LKC_MOD2;
 	if (*str) {
@@ -1242,8 +1241,7 @@ int map_string_to_keysym(const char *str, int *keysym)
 		    return (*keysym = (UCH(buf[0])) | modifier);
 	    }
 	}
-    }
-    if (*str == SQUOTE) {
+    } else if (*str == SQUOTE) {
 	unescaped_char(str, keysym);
     } else if (isdigit(UCH(*str))) {
 	char *tmp;
@@ -1272,7 +1270,7 @@ int map_string_to_keysym(const char *str, int *keysym)
 LYExtraKeys LYnameToExtraKeys(const char *name)
 {
     Keysym_String_List *k = lookupKeysymByName(name);
-    LYExtraKeys result = -1;
+    LYExtraKeys result = UNKNOWN_KEY;
 
     if (k != 0)
 	result = k->internal;
diff --git a/src/LYStrings.h b/src/LYStrings.h
index 906c59a0..972f65a3 100644
--- a/src/LYStrings.h
+++ b/src/LYStrings.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStrings.h,v 1.110 2013/10/13 20:30:39 tom Exp $
+ * $LynxId: LYStrings.h,v 1.111 2013/10/15 09:07:48 tom Exp $
  */
 #ifndef LYSTRINGS_H
 #define LYSTRINGS_H
@@ -144,7 +144,8 @@ extern "C" {
      * These are "extra" keys which do not fit into a single byte.
      */
     typedef enum {
-	UPARROW_KEY = 256
+	UNKNOWN_KEY = -1
+	,UPARROW_KEY = 256
 	,DNARROW_KEY
 	,RTARROW_KEY
 	,LTARROW_KEY