[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
lynx-dev PATCH Fix for keybinding and statusline problem
|
From: |
Doug Kaufman |
|
Subject: |
lynx-dev PATCH Fix for keybinding and statusline problem |
|
Date: |
Sun, 14 Feb 1999 10:07:04 -0800 (PST) |
The following patch should fix most of the problems with incompatible
keybindings and fixes the statusline problem. I have built and tested
this against the three different DOS builds. Interesting differences
in behavior became apparent, which I don't know how to resolve (or if
they need to be resolved). The plain SLANG DOS port (makefile.wsl)
doesn't handle the DELETE key, due to a defect in the SLANG code for
DOS. To make this port work correctly, SLANG needs to be patched. I'll
check to see if this is taken care of in the current beta. If not,
I'll send the patch to John Davis, unless he is still reading the
lynx-dev list. The PDCurses DOS port can't handle the keypad
[ENTER + - * /] keys in textedit mode, but they can be mapped for
lynxactions. Neither SLANG port displays characters > 0x80 normally
in textedit mode. They appear as "~" plus a character representing
(ch - 128), so decimal 129 appears as ~^A and 135 appears as ~^G. This
only applies to display. They seem to be stored as single characters,
and are removed with one delete or backspace. The PDCurses port shows
these characters in the terminal's character set, regardless of the
lynx settings for Display Character Set or Assumed Character Set.
I hope this works without too many problems. First the patch for slang
1.2.2:
*** slang/src/slkeypad.c Thu Apr 23 23:17:08 1998
--- slang/src/slkeypad.c.new Sun Feb 14 03:00:22 1999
***************
*** 59,64 ****
--- 59,65 ----
SLkm_define_keysym ("address@hidden", SL_KEY_NPAGE, Keymap_List );
SLkm_define_keysym ("address@hidden", SL_KEY_END, Keymap_List );
SLkm_define_keysym ("address@hidden", SL_KEY_IC, Keymap_List );
+ SLkm_define_keysym ("address@hidden", SL_KEY_DELETE, Keymap_List );
strcpy (esc_seq, "^@ "); /* guarantees esc_seq[3] = 0. */
Now the patch for lynx. This is against a clean dev.16. You should be
able to ignore the previous patches that I sent.
Doug
*** lynx2-8-2/src/LYEditmap.c Wed Jan 13 03:37:34 1999
--- lynx2-8-2/src/LYEditmap.c.new Sun Feb 14 00:59:04 1999
***************
*** 106,116 ****
--- 106,239 ----
LYE_NOP, LYE_NOP, LYE_BOL, LYE_EOL,
/* PGDOWN PGUP HOME END */
+ #if (defined(_WINDOWS) || defined(__DJGPP__))
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* F1 */
+
+ #else
+
LYE_NOP, LYE_TAB, LYE_BOL, LYE_EOL,
/* F1 Do key Find key Select key */
+ #endif /* _WINDOWS || __DJGPP__ */
+
LYE_NOP, LYE_DELP, LYE_NOP, LYE_NOP,
/* Insert key Remove key MOUSE_KEY DO_NOTHING */
+
+ /* 110..18F */
+ #if (defined(_WINDOWS) || defined(__DJGPP__)) && defined(USE_SLANG) &&
!defined(DJGPP_KEYHANDLER)
+
+ LYE_DELP, LYE_ENTER, LYE_NOP, LYE_NOP,
+ /* Backspace Enter */
+
+ #else
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+
+ #endif /* USE_SLANG &&(_WINDOWS || __DJGPP) && !DJGPP_KEYHANDLER */
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* 190..20F */
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* 210..28F */
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* 290..293 */
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
};
/*
***************
*** 219,229 ****
--- 342,475 ----
LYE_NOP, LYE_NOP, LYE_BOL, LYE_EOL,
/* PGDOWN PGUP HOME END */
+ #if (defined(_WINDOWS) || defined(__DJGPP__))
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* F1 */
+
+ #else
+
LYE_NOP, LYE_TAB, LYE_BOL, LYE_EOL,
/* F1 Do key Find key Select key */
+ #endif /* _WINDOWS || __DJGPP__ */
+
LYE_NOP, LYE_DELP, LYE_NOP, LYE_NOP,
/* Insert key Remove key MOUSE_KEY DO_NOTHING */
+
+ /* 110..18F */
+ #if (defined(_WINDOWS) || defined(__DJGPP__)) && defined(USE_SLANG) &&
!defined(DJGPP_KEYHANDLER)
+
+ LYE_DELP, LYE_ENTER, LYE_NOP, LYE_NOP,
+ /* Backspace Enter */
+
+ #else
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+
+ #endif /* USE_SLANG &&(_WINDOWS || __DJGPP) && !DJGPP_KEYHANDLER */
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* 190..20F */
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* 210..28F */
+
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
+ /* 290..293 */
+ LYE_NOP, LYE_NOP, LYE_NOP, LYE_NOP,
};
#endif
*** lynx2-8-2/src/LYKeymap.c Mon Feb 8 02:33:00 1999
--- lynx2-8-2/src/LYKeymap.c.new Sat Feb 13 22:48:10 1999
***************
*** 164,172 ****
--- 164,181 ----
LYK_NOCACHE, 0, LYK_INTERRUPT, 0,
/* x */ /* y */ /* z */ /* { */
+ #if (defined(_WINDOWS) || defined(__DJGPP__))
+
+ LYK_PIPE, 0, 0, 0,
+ /* | */ /* } */ /* ~ */
+
+ #else
+
LYK_PIPE, 0, 0, LYK_HISTORY,
/* | */ /* } */ /* ~ */ /* del */
+ #endif /* _WINDOWS || __DJGPP__ */
+
/* 80..9F (illegal ISO-8859-1) 8-bit characters. */
0, 0, 0, 0,
0, 0, 0, 0,
***************
*** 203,249 ****
0, 0, 0, 0,
0, 0, 0, 0,
! /* 100..10E function key definitions in LYStrings.h */
LYK_PREV_LINK, LYK_NEXT_LINK, LYK_ACTIVATE, LYK_PREV_DOC,
/* UPARROW */ /* DNARROW */ /* RTARROW */ /* LTARROW */
LYK_NEXT_PAGE, LYK_PREV_PAGE, LYK_HOME, LYK_END,
/* PGDOWN */ /* PGUP */ /* HOME */ /* END */
! #if defined(__DJGPP__) || defined(_WINDOWS)
! #ifdef USE_SLANG
! LYK_END, LYK_HOME, LYK_PREV_PAGE, 0,
! /* END */ /* HOME */ /* PGUP */ /* B2 Key */
!
! LYK_END, LYK_NEXT_PAGE, 0,
! /* END */ /* PGDOWN */
#else
- 0, LYK_HELP, 0, 0,
- /* F0 */ /* F1 */ /* F2 */ /* F3 */
- 0, 0, 0,
-
- #endif /* USE_SLANG */
- #else
LYK_HELP, LYK_ACTIVATE, LYK_HOME, LYK_END,
/* F1*/ /* Do key */ /* Find key */ /* Select key */
! LYK_UP_TWO, LYK_DOWN_TWO,
! /* Insert key */ /* Remove key */
! LYK_DO_NOTHING,
! /* DO_NOTHING*/
! #endif /* __DJGPP__ || _WINDOWS */
! /* 10F..18F */
! 0,
! #if defined(USE_SLANG) && !defined(DJGPP_KEYHANDLER)
LYK_HISTORY, LYK_ACTIVATE, 0, 0,
/* Backspace */ /* Enter */
#else
0, 0, 0, 0,
! #endif /* USE_SLANG */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
--- 212,246 ----
0, 0, 0, 0,
0, 0, 0, 0,
! /* 100..10F function key definitions in LYStrings.h */
LYK_PREV_LINK, LYK_NEXT_LINK, LYK_ACTIVATE, LYK_PREV_DOC,
/* UPARROW */ /* DNARROW */ /* RTARROW */ /* LTARROW */
LYK_NEXT_PAGE, LYK_PREV_PAGE, LYK_HOME, LYK_END,
/* PGDOWN */ /* PGUP */ /* HOME */ /* END */
! #if (defined(_WINDOWS) || defined(__DJGPP__))
+ LYK_HELP, 0, 0, 0,
+ /* F1*/
#else
LYK_HELP, LYK_ACTIVATE, LYK_HOME, LYK_END,
/* F1*/ /* Do key */ /* Find key */ /* Select key */
! #endif /* _WINDOWS || __DJGPP__ */
! LYK_UP_TWO, LYK_DOWN_TWO, 0, LYK_DO_NOTHING,
! /* Insert key */ /* Remove key */ /* Mouse key */ /* DO_NOTHING */
! /* 110..18F */
!
! #if (defined(_WINDOWS) || defined(__DJGPP__)) && defined(USE_SLANG) &&
!defined(DJGPP_KEYHANDLER)
LYK_HISTORY, LYK_ACTIVATE, 0, 0,
/* Backspace */ /* Enter */
#else
0, 0, 0, 0,
! #endif /* USE_SLANG &&(_WINDOWS || __DJGPP) && !DJGPP_KEYHANDLER */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
***************
*** 253,268 ****
#ifdef DJGPP_KEYHANDLER
0, LYK_ABORT, 0, 0,
/* ALT_X */
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, LYK_HELP,
- /* F1 */
#else
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- #endif /* DJGPP_KEYHANDLER */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
--- 250,261 ----
#ifdef DJGPP_KEYHANDLER
0, LYK_ABORT, 0, 0,
/* ALT_X */
#else
0, 0, 0, 0,
+ #endif /* DJGPP_KEYHANDLER */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
***************
*** 296,312 ****
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
LYK_ABORT, 0, 0, 0,
/* ALT_X */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
! 0, 0, 0, LYK_ACTIVATE,
! /* KP_ENTER */
0, 0, 0, LYK_IMAGE_TOGGLE,
/* KP_* */
LYK_PREV_PAGE, LYK_NEXT_PAGE, 0, 0,
/* KP_- */ /* KP_+ */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
--- 289,315 ----
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
+ #if (defined(_WINDOWS) || defined(__DJGPP__)) && !defined(USE_SLANG) /*
PDCurses */
LYK_ABORT, 0, 0, 0,
/* ALT_X */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
! 0, 0, LYK_WHEREIS, LYK_ACTIVATE,
! /* KP_SLASH KP_ENTER */
0, 0, 0, LYK_IMAGE_TOGGLE,
/* KP_* */
LYK_PREV_PAGE, LYK_NEXT_PAGE, 0, 0,
/* KP_- */ /* KP_+ */
+ #else
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ #endif /* (_WINDOWS || __DJGPP__) && !USE_SLANG */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
***************
*** 318,329 ****
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- #if defined(USE_SLANG) && !defined(DJGPP_KEYHANDLER)
- 0, LYK_HELP, 0, 0,
- /* F1 */
- #else
0, 0, 0, 0,
- #endif /* USE_SLANG */
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
--- 321,327 ----
***************
*** 509,515 ****
0, 0, 0, 0,
0, 0, 0, 0,
! /* 100..10E function key definitions in LYStrings.h */
0, 0, 0, 0,
/* UPARROW */ /* DNARROW */ /* RTARROW */ /* LTARROW */
--- 507,513 ----
0, 0, 0, 0,
0, 0, 0, 0,
! /* 100..10F function key definitions in LYStrings.h */
0, 0, 0, 0,
/* UPARROW */ /* DNARROW */ /* RTARROW */ /* LTARROW */
***************
*** 519,529 ****
0, 0, 0, 0,
/* F1*/ /* Do key */ /* Find key */ /* Select key */
! 0, 0,
! /* Insert key */ /* Remove key */
! LYK_DO_NOTHING,
! /* DO_NOTHING*/
};
#endif /* DIRED_SUPPORT && OK_OVERRIDE */
--- 517,629 ----
0, 0, 0, 0,
/* F1*/ /* Do key */ /* Find key */ /* Select key */
! 0, 0, 0, LYK_DO_NOTHING,
! /* Insert key */ /* Remove key */ /* Mouse Key */ /* DO_NOTHING */
! /* 110..18F */
!
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! /* 190..20F */
!
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! /* 210..28F */
!
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! 0, 0, 0, 0,
! /* 290...293 */
! 0, 0, 0, 0,
};
#endif /* DIRED_SUPPORT && OK_OVERRIDE */
*** lynx2-8-2/src/LYStrings.c Mon Feb 8 02:33:00 1999
--- lynx2-8-2/src/LYStrings.c.new Sun Feb 14 01:39:36 1999
***************
*** 1372,1381 ****
c = CH_DEL; /* backspace key (delete, not Ctrl-H) S/390
-- gil -- 2041 */
break;
#endif /* KEY_BACKSPACE */
- #if defined(KEY_F) && !defined(__DJGPP__) && !defined(_WINDOWS)
case KEY_F(1):
c = F1; /* VTxxx Help */
break;
case KEY_F(16):
c = DO_KEY; /* VTxxx Do */
break;
--- 1372,1381 ----
c = CH_DEL; /* backspace key (delete, not Ctrl-H) S/390
-- gil -- 2041 */
break;
#endif /* KEY_BACKSPACE */
case KEY_F(1):
c = F1; /* VTxxx Help */
break;
+ #if defined(KEY_F) && !defined(__DJGPP__) && !defined(_WINDOWS)
case KEY_F(16):
c = DO_KEY; /* VTxxx Do */
break;
***************
*** 1405,1410 ****
--- 1405,1432 ----
c = REMOVE_KEY; /* VTxxx Remove */
break;
#endif /* KEY_DC */
+
+ /* The following maps PDCurses keys away from lynx reserved values */
+ #if (defined(_WINDOWS) || defined(__DJGPP__)) && !defined(USE_SLANG)
+ case KEY_F(2):
+ c = 0x213;
+ break;
+ case KEY_F(3):
+ c = 0x214;
+ break;
+ case KEY_F(4):
+ c = 0x215;
+ break;
+ case KEY_F(5):
+ c = 0x216;
+ break;
+ case KEY_F(6):
+ c = 0x217;
+ break;
+ case KEY_F(7):
+ c = 0x218;
+ break;
+ #endif /* PDCurses */
#ifdef NCURSES_MOUSE_VERSION
case KEY_MOUSE:
if (code == FOR_CHOICE) {
***************
*** 1504,1509 ****
--- 1526,1554 ----
case K_EEnd:
c = END_KEY;
break;
+ case K_F1: /* F1 key */
+ c = F1;
+ break;
+ case K_Insert: /* Insert key */
+ case K_EInsert:
+ c = INSERT_KEY;
+ break;
+ case K_Delete: /* Delete key */
+ case K_EDelete:
+ c = REMOVE_KEY;
+ break;
+ case K_Alt_Escape: /* Alt-Escape */
+ c = 0x1a7;
+ break;
+ case K_Control_At: /* CTRL-@ */
+ c = 0x1a8;
+ break;
+ case K_Alt_Backspace: /* Alt-Backspace */
+ c = 0x1a9;
+ break;
+ case K_BackTab: /* BackTab */
+ c = 0x1aa;
+ break;
}
}
#endif /* DGJPP_KEYHANDLER */
***************
*** 1537,1542 ****
--- 1582,1596 ----
case SL_KEY_END: /* home down or bottom (lower left) */
case SL_KEY_C1: /* lower left of keypad */
c = END_KEY;
+ break;
+ case SL_KEY_F(1): /* F1 key */
+ c = F1;
+ break;
+ case SL_KEY_IC: /* Insert key */
+ c = INSERT_KEY;
+ break;
+ case SL_KEY_DELETE: /* Delete key */
+ c = REMOVE_KEY;
break;
}
}
*** lynx2-8-2/docs/djgpp.key Sat Aug 15 14:57:56 1998
--- lynx2-8-2/docs/djgpp.key.new Sun Feb 14 01:33:02 1999
***************
*** 70,79 ****
RBrace 0x07d
Tilde 0x07e
Control_Backspace 0x07f
- Alt_Escape 0x101
- Control_At 0x103
- Alt_Backspace 0x10e
- BackTab 0x10f
Alt_Q 0x110
Alt_W 0x111
Alt_E 0x112
--- 70,75 ----
***************
*** 111,117 ****
Alt_Period 0x134
Alt_Slash 0x135
Alt_KPStar 0x137
- F1 0x13b
F2 0x13c
F3 0x13d
F4 0x13e
--- 107,112 ----
***************
*** 124,131 ****
Alt_KPMinus 0x14a
Center 0x14c
Alt_KPPlus 0x14e
- Insert 0x152
- Delete 0x153
Shift_F1 0x154
Shift_F2 0x155
Shift_F3 0x156
--- 119,124 ----
***************
*** 205,212 ****
Alt_KPSlash 0x1a4
Alt_Tab 0x1a5
Alt_Enter 0x1a6
! EInsert 0x252
! EDelete 0x253
Control_ELeft 0x273
Control_ERight 0x274
Control_EEnd 0x275
--- 198,207 ----
Alt_KPSlash 0x1a4
Alt_Tab 0x1a5
Alt_Enter 0x1a6
! Alt_Escape 0x1a7
! Control_At 0x1a8
! Alt_Backspace 0x1a9
! BackTab 0x1aa
Control_ELeft 0x273
Control_ERight 0x274
Control_EEnd 0x275
*** lynx2-8-2/docs/pdcurses.key Sat Aug 15 14:57:56 1998
--- lynx2-8-2/docs/pdcurses.key.new Sat Feb 13 14:51:20 1999
***************
*** 1,7 ****
PDCurses Keymaps
! KEY_F0 0x108 /* function keys. space for */
! KEY_F(n) (KEY_F0+(n))/* 64 keys are reserved. */
ALT_0 0x197 /* Alt-0 */
ALT_1 0x198 /* Alt-1 */
ALT_2 0x199 /* Alt-2 */
--- 1,12 ----
PDCurses Keymaps
! KEY_F2 0x213 /* F2 */
! KEY_F3 0x214 /* F3 */
! KEY_F4 0x215 /* F4 */
! KEY_F5 0x216 /* F5 */
! KEY_F6 0x217 /* F6 */
! KEY_F7 0x218 /* F7 */
! KEY_F(n) (0x108+(n)) /* If n>7 (57 keys are reserved) */
ALT_0 0x197 /* Alt-0 */
ALT_1 0x198 /* Alt-1 */
ALT_2 0x199 /* Alt-2 */
*** lynx2-8-2/docs/slang.key Sat Aug 15 14:57:56 1998
--- lynx2-8-2/docs/slang.key.new Sat Feb 13 14:53:10 1999
***************
*** 1,4 ****
S-Lang Keymaps for DOS
F0 0x200
! F(X) (SL_KEY_F0 + X)
--- 1,4 ----
S-Lang Keymaps for DOS
F0 0x200
! F(X) (SL_KEY_F0 + X) /* If X>1 */
__
Doug Kaufman
Internet: address@hidden (preferred)
address@hidden
- lynx-dev PATCH Fix for keybinding and statusline problem,
Doug Kaufman <=