circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 02:18:47 +00:00
Code Issues Projects Releases Wiki Activity

|PatchSet 871

Browse Source 
|Date: 2011/03/27 21:31:25
|Author: nicm
|Branch: HEAD
|Tag: (none)
|Log:
|Don't include meta twice when working out the flags to output for
|xterm-style keys - bit 3 is accepted on input but not on output. Also a
|style nit in the header.
This commit is contained in:
Nicholas Marriott 2011-04-06 22:17:33 +00:00
parent 536fc24653
commit 2b508f7f6b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.613 2011-04-06 22:16:33 nicm Exp $ */ /* $Id: tmux.h,v 1.614 2011-04-06 22:17:33 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -106,7 +106,7 @@ extern char **environ;
#define KEYC_SHIFT 0x8000 #define KEYC_SHIFT 0x8000
#define KEYC_PREFIX 0x10000 #define KEYC_PREFIX 0x10000
/* Mask to obtain key w/o modifiers */ /* Mask to obtain key w/o modifiers. */
#define KEYC_MASK_MOD (KEYC_ESCAPE|KEYC_CTRL|KEYC_SHIFT|KEYC_PREFIX) #define KEYC_MASK_MOD (KEYC_ESCAPE|KEYC_CTRL|KEYC_SHIFT|KEYC_PREFIX)
#define KEYC_MASK_KEY (~KEYC_MASK_MOD) #define KEYC_MASK_KEY (~KEYC_MASK_MOD)

4
xterm-keys.c
View File

@ -1,4 +1,4 @@
/* $Id: xterm-keys.c,v 1.8 2011-01-03 23:32:04 tcunha Exp $ */ /* $Id: xterm-keys.c,v 1.9 2011-04-06 22:17:33 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -174,8 +174,6 @@ xterm_keys_lookup(int key)
modifiers += 2; modifiers += 2;
if (key & KEYC_CTRL) if (key & KEYC_CTRL)
modifiers += 4; modifiers += 4;
if (key & KEYC_ESCAPE)
modifiers += 8;
/* /*
* If the key has no modifiers, return NULL and let it fall through to * If the key has no modifiers, return NULL and let it fall through to