diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Doc/Zsh/options.yo | 2 | ||||
| -rw-r--r-- | Doc/Zsh/params.yo | 10 | ||||
| -rw-r--r-- | FEATURES | 1 | ||||
| -rw-r--r-- | Src/input.c | 40 | ||||
| -rw-r--r-- | Src/options.c | 3 | ||||
| -rw-r--r-- | Src/params.c | 46 |
7 files changed, 96 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 0db433e32..46db7b029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-01-13 Peter Stephenson <pws@csr.com> + + * Joakim Rosqvist: 27591 as modified in 27594: + FEATURES, Doc/Zsh/options.yo, Doc/Zsh/params.yo, Src/input.c, + Src/options.c, Src/params.c: extend SUN_KEYBOARD_HACK option + to KEYBOARD_HACK variable. + 2010-01-04 Peter Stephenson <p.w.stephenson@ntlworld.com> * 27553: Jesse Weinstein: Doc/Zsh/compsys.yo: improve phrasing. @@ -12568,5 +12575,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4859 $ +* $Revision: 1.4860 $ ***************************************************** diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo index 46e21d672..8c11c828d 100644 --- a/Doc/Zsh/options.yo +++ b/Doc/Zsh/options.yo @@ -1209,6 +1209,8 @@ If a line ends with a backquote, and there are an odd number of backquotes on the line, ignore the trailing backquote. This is useful on some keyboards where the return key is too small, and the backquote key lies annoyingly close to it. +As an alternative the variable tt(KEYBOARD_HACK) lets you choose the +character to be removed. ) enditem() diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo index 18c146802..99a6e6958 100644 --- a/Doc/Zsh/params.yo +++ b/Doc/Zsh/params.yo @@ -897,6 +897,16 @@ space character. If the parameter is unset, the default is used. Note this has a different effect from setting the parameter to an empty string. ) +vindex(KEYBOARD_HACK) +item(tt(KEYBOARD_HACK))( +This variable defines a character to be removed from the end of the +command line before interpreting it (interactive shells only). It is +intended to fix the problem with keys placed annoyingly close to return +and replaces the tt(SUNKEYBOARDHACK) option which did this for +backquotes only. Should the chosen character be one of singlequote, +doublequote or backquote, there must also be an odd number of them +on the command line for the last one to be removed. +) vindex(KEYTIMEOUT) item(tt(KEYTIMEOUT))( The time the shell waits, in hundredths of seconds, for another key to diff --git a/FEATURES b/FEATURES index 2dc27368b..9b0d0c29d 100644 --- a/FEATURES +++ b/FEATURES @@ -66,6 +66,7 @@ with histverify option, performing csh-style history expansions causes the input line to be brought up for editing instead of being executed with sunkeyboardhack option, accidentally typed trailing ` characters are removed from the input line (for those of you with Sun keyboards :-) ) +with KEYBOARD_HACK, any accidentally typed trailing ascii character can be junked "cd old new" replaces "old" with "new" in directory string generalized argument completion, new system based on shell functions: - highly context sensitive diff --git a/Src/input.c b/Src/input.c index 80f8ec8d5..248d2ae71 100644 --- a/Src/input.c +++ b/Src/input.c @@ -291,20 +291,32 @@ inputline(void) zputs(ingetcline, stderr); fflush(stderr); } - if (*ingetcline && ingetcline[strlen(ingetcline) - 1] == '\n' && - interact && isset(SUNKEYBOARDHACK) && isset(SHINSTDIN) && - SHTTY != -1 && *ingetcline && ingetcline[1] && - ingetcline[strlen(ingetcline) - 2] == '`') { - /* Junk an unmatched "`" at the end of the line. */ - int ct; - char *ptr; - - for (ct = 0, ptr = ingetcline; *ptr; ptr++) - if (*ptr == '`') - ct++; - if (ct & 1) { - ptr[-2] = '\n'; - ptr[-1] = '\0'; + if (keyboardhackchar && *ingetcline && + ingetcline[strlen(ingetcline) - 1] == '\n' && + interact && isset(SHINSTDIN) && + SHTTY != -1 && ingetcline[1]) + { + char *stripptr = ingetcline + strlen(ingetcline) - 2; + if (*stripptr == keyboardhackchar) { + /* Junk an unwanted character at the end of the line. + (key too close to return key) */ + int ct = 1; /* force odd */ + char *ptr; + + if (keyboardhackchar == '\'' || keyboardhackchar == '"' || + keyboardhackchar == '`') { + /* + * for the chars above, also require an odd count before + * junking + */ + for (ct = 0, ptr = ingetcline; *ptr; ptr++) + if (*ptr == keyboardhackchar) + ct++; + } + if (ct & 1) { + stripptr[0] = '\n'; + stripptr[1] = '\0'; + } } } isfirstch = 1; diff --git a/Src/options.c b/Src/options.c index c5b7c3b8f..a5f299e49 100644 --- a/Src/options.c +++ b/Src/options.c @@ -748,6 +748,9 @@ dosetopt(int optno, int value, int force) } else if ((optno == EMACSMODE || optno == VIMODE) && value) { zleentry(ZLE_CMD_SET_KEYMAP, optno); opts[(optno == EMACSMODE) ? VIMODE : EMACSMODE] = 0; + } else if (optno == SUNKEYBOARDHACK) { + /* for backward compatibility */ + keyboardhackchar = (value ? '`' : '\0'); } opts[optno] = value; if (optno == BANGHIST || optno == SHINSTDIN) diff --git a/Src/params.c b/Src/params.c index 0425e0700..abc4c0002 100644 --- a/Src/params.c +++ b/Src/params.c @@ -108,6 +108,9 @@ zlong lineno, /* $LINENO */ mod_export unsigned char bangchar; /**/ unsigned char hatchar, hashchar; + +/**/ +unsigned char keyboardhackchar = '\0'; /* $SECONDS = now.tv_sec - shtimer.tv_sec * + (now.tv_usec - shtimer.tv_usec) / 1000000.0 @@ -204,6 +207,8 @@ static const struct gsu_scalar ifs_gsu = { ifsgetfn, ifssetfn, stdunsetfn }; static const struct gsu_scalar underscore_gsu = { underscoregetfn, nullstrsetfn, stdunsetfn }; +static const struct gsu_scalar keyboard_hack_gsu = +{ keyboardhackgetfn, keyboardhacksetfn, stdunsetfn }; #ifdef USE_LOCALE static const struct gsu_scalar lc_blah_gsu = { strgetfn, lcsetfn, stdunsetfn }; @@ -273,6 +278,7 @@ IPDEF2("TERM", term_gsu, 0), IPDEF2("WORDCHARS", wordchars_gsu, 0), IPDEF2("IFS", ifs_gsu, PM_DONTIMPORT), IPDEF2("_", underscore_gsu, PM_READONLY), +IPDEF2("KEYBOARD_HACK", keyboard_hack_gsu, PM_DONTIMPORT), #ifdef USE_LOCALE # define LCIPDEF(name) IPDEF2(name, lc_blah_gsu, PM_UNSET) @@ -3834,6 +3840,46 @@ errnogetfn(UNUSED(Param pm)) return errno; } +/* Function to get value for special parameter `KEYBOARD_HACK' */ + +/**/ +char * +keyboardhackgetfn(UNUSED(Param pm)) +{ + static char buf[2]; + + buf[0] = keyboardhackchar; + buf[1] = '\0'; + return buf; +} + + +/* Function to set value of special parameter `KEYBOARD_HACK' */ + +/**/ +void +keyboardhacksetfn(UNUSED(Param pm), char *x) +{ + if (x) { + int len, i; + + unmetafy(x, &len); + if (len > 1) { + len = 1; + zwarn("Only one KEYBOARD_HACK character can be defined"); /* could be changed if needed */ + } + for (i = 0; i < len; i++) { + if (!isascii(STOUC(x[i]))) { + zwarn("KEYBOARD_HACK can only contain ASCII characters"); + return; + } + } + keyboardhackchar = len ? STOUC(x[0]) : '\0'; + free(x); + } else + keyboardhackchar = '\0'; +} + /* Function to get value for special parameter `histchar' */ /**/ |