mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	|PatchSet 871
|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:
		
							
								
								
									
										4
									
								
								tmux.h
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								tmux.h
									
									
									
									
									
								
							@@ -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>
 | 
			
		||||
@@ -106,7 +106,7 @@ extern char   **environ;
 | 
			
		||||
#define KEYC_SHIFT 0x8000
 | 
			
		||||
#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_KEY (~KEYC_MASK_MOD)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
@@ -174,8 +174,6 @@ xterm_keys_lookup(int key)
 | 
			
		||||
		modifiers += 2;
 | 
			
		||||
	if (key & KEYC_CTRL)
 | 
			
		||||
		modifiers += 4;
 | 
			
		||||
	if (key & KEYC_ESCAPE)
 | 
			
		||||
		modifiers += 8;
 | 
			
		||||
 | 
			
		||||
	/*
 | 
			
		||||
	 * If the key has no modifiers, return NULL and let it fall through to
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user