mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Instead of always setting the extended flag, set it only when searching.
Allows send-keys to work. From Aaron Jensen.
This commit is contained in:
		@@ -431,7 +431,7 @@ input_key_write(const char *from, struct bufferevent *bev, const char *data,
 | 
			
		||||
int
 | 
			
		||||
input_key(struct screen *s, struct bufferevent *bev, key_code key)
 | 
			
		||||
{
 | 
			
		||||
	struct input_key_entry	*ike;
 | 
			
		||||
	struct input_key_entry	*ike = NULL;
 | 
			
		||||
	key_code		 justkey, newkey, outkey, modifiers;
 | 
			
		||||
	struct utf8_data	 ud;
 | 
			
		||||
	char			 tmp[64], modifier;
 | 
			
		||||
@@ -483,8 +483,9 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
 | 
			
		||||
		key &= ~KEYC_KEYPAD;
 | 
			
		||||
	if (~s->mode & MODE_KCURSOR)
 | 
			
		||||
		key &= ~KEYC_CURSOR;
 | 
			
		||||
	if (~s->mode & MODE_KEXTENDED)
 | 
			
		||||
		key &= ~KEYC_EXTENDED;
 | 
			
		||||
	if (s->mode & MODE_KEXTENDED)
 | 
			
		||||
		ike = input_key_get(key|KEYC_EXTENDED);
 | 
			
		||||
	if (ike == NULL)
 | 
			
		||||
		ike = input_key_get(key);
 | 
			
		||||
	if (ike == NULL && (key & KEYC_META) && (~key & KEYC_IMPLIED_META))
 | 
			
		||||
		ike = input_key_get(key & ~KEYC_META);
 | 
			
		||||
 
 | 
			
		||||
@@ -210,7 +210,7 @@ static const struct tty_default_key_raw tty_default_raw_keys[] = {
 | 
			
		||||
	{ "\033[201~", KEYC_PASTE_END },
 | 
			
		||||
 | 
			
		||||
	/* Extended keys. */
 | 
			
		||||
	{ "\033[1;5Z", '\011'|KEYC_CTRL|KEYC_SHIFT|KEYC_EXTENDED },
 | 
			
		||||
	{ "\033[1;5Z", '\011'|KEYC_CTRL|KEYC_SHIFT },
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
/* Default xterm keys. */
 | 
			
		||||
@@ -977,7 +977,7 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
 | 
			
		||||
		log_debug("%s: extended key %.*s is %llx (%s)", c->name,
 | 
			
		||||
		    (int)*size, buf, nkey, key_string_lookup_key(nkey, 1));
 | 
			
		||||
	}
 | 
			
		||||
	*key = nkey|KEYC_EXTENDED;
 | 
			
		||||
	*key = nkey;
 | 
			
		||||
	return (0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user