mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-14 15:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2013-03-25 14:59:29 +00:00
parent 418ba99078 58bb6f8c56
commit f90eb43fcb
111 changed files with 4151 additions and 2409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
key-string.c
View File

@@ -136,9 +136,10 @@ key_string_get_modifiers(const char **string)
int
key_string_lookup_string(const char *string)
{
int key, modifiers;
u_short u;
int size;
static const char *other = "!#()+,-.0123456789:;<=>?'\r\t";
int key, modifiers;
u_short u;
int size;
/* Is this a hexadecimal value? */
if (string[0] == '0' && string[1] == 'x') {
@@ -170,7 +171,7 @@ key_string_lookup_string(const char *string)
}
/* Convert the standard control keys. */
if (key < KEYC_BASE && (modifiers & KEYC_CTRL)) {
if (key < KEYC_BASE && (modifiers & KEYC_CTRL) && !strchr(other, key)) {
if (key >= 97 && key <= 122)
key -= 96;
else if (key >= 64 && key <= 95)
@@ -193,7 +194,7 @@ key_string_lookup_key(int key)
{
static char out[24];
char tmp[8];
u_int i;
u_int i;
*out = '\0';