mirror of
git://git.sv.gnu.org/nano.git
synced 2025-01-22 17:22:19 +03:00
in parse_kbinput(), interpret Shift-Begin, Shift-Delete, Shift-End,
Shift-Home, Shift-Insert, and Shift-Suspend as Begin, Delete, End, Home, Insert, and Suspend, respectively, regardless of whether --rebindkeypad is used git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3265 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
parent
4a2e0000f7
commit
475c402b65
@ -23,6 +23,11 @@ CVS code -
|
|||||||
set errno to EINVAL as well as return -1 if they fail. This
|
set errno to EINVAL as well as return -1 if they fail. This
|
||||||
matches the manual page. (DLR)
|
matches the manual page. (DLR)
|
||||||
- winio.c:
|
- winio.c:
|
||||||
|
parse_kbinput()
|
||||||
|
- Interpret Shift-Begin, Shift-Delete, Shift-End, Shift-Home,
|
||||||
|
Shift-Insert, and Shift-Suspend as Begin, Delete, End, Home,
|
||||||
|
Insert, and Suspend, respectively, regardless of whether
|
||||||
|
--rebindkeypad is used. (DLR, found by David Benbennick)
|
||||||
edit_redraw()
|
edit_redraw()
|
||||||
- If either current or old_current is offscreen, we're not on
|
- If either current or old_current is offscreen, we're not on
|
||||||
the first page, and/or we're not on the same page as before,
|
the first page, and/or we're not on the same page as before,
|
||||||
|
45
src/winio.c
45
src/winio.c
@ -469,10 +469,35 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key
|
|||||||
retval = NANO_END_KEY;
|
retval = NANO_END_KEY;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#ifdef KEY_SUSPEND
|
#ifdef KEY_SBEG
|
||||||
/* Slang doesn't support KEY_SUSPEND. */
|
/* Slang doesn't support KEY_SBEG. */
|
||||||
case KEY_SUSPEND:
|
case KEY_SBEG: /* Center (5) on numeric keypad
|
||||||
retval = NANO_SUSPEND_KEY;
|
* with NumLock off. */
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef KEY_SDC
|
||||||
|
/* Slang doesn't support KEY_SDC. */
|
||||||
|
case KEY_SDC:
|
||||||
|
retval = NANO_DELETE_KEY;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef KEY_SEND
|
||||||
|
/* HP-UX 10 and 11 don't support KEY_SEND. */
|
||||||
|
case KEY_SEND:
|
||||||
|
retval = NANO_END_KEY;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef KEY_SHOME
|
||||||
|
/* HP-UX 10 and 11 and Slang don't support
|
||||||
|
* KEY_SHOME. */
|
||||||
|
case KEY_SHOME:
|
||||||
|
retval = NANO_HOME_KEY;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef KEY_SIC
|
||||||
|
/* Slang doesn't support KEY_SIC. */
|
||||||
|
case KEY_SIC:
|
||||||
|
retval = NANO_INSERTFILE_KEY;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#ifdef KEY_SLEFT
|
#ifdef KEY_SLEFT
|
||||||
@ -486,6 +511,18 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key
|
|||||||
case KEY_SRIGHT:
|
case KEY_SRIGHT:
|
||||||
retval = NANO_FORWARD_KEY;
|
retval = NANO_FORWARD_KEY;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef KEY_SSUSPEND
|
||||||
|
/* Slang doesn't support KEY_SSUSPEND. */
|
||||||
|
case KEY_SSUSPEND:
|
||||||
|
retval = NANO_SUSPEND_KEY;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef KEY_SUSPEND
|
||||||
|
/* Slang doesn't support KEY_SUSPEND. */
|
||||||
|
case KEY_SUSPEND:
|
||||||
|
retval = NANO_SUSPEND_KEY;
|
||||||
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
retval = *kbinput;
|
retval = *kbinput;
|
||||||
|
Loading…
Reference in New Issue
Block a user