kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a regression in 2.1 where tmux was misshandling key strokes if you

Browse source 
started typing too fast after a tmux command.

PR:		205372
Submitted by:	me jahn de
Obtained from:	8c8cddbe02
MFH:		2015Q4
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2015-12-17 17:19:28 +00:00
parent 6bb642b982
commit b4c4d6656e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=403912
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysutils/tmux/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= tmux
PORTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ \
SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}

34
sysutils/tmux/files/patch-server-client.c Normal file
View file

@ -0,0 +1,34 @@
From 8c8cddbe022af5ece9949804cacffbee6b8972fa Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 20 Oct 2015 14:19:27 +0000
Subject: [PATCH] The table could change when retrying so don't save it at
start of server_client_handle_key.
--- server-client.c.orig 2015-09-27 09:42:08 UTC
+++ server-client.c
@@ -540,7 +540,7 @@ server_client_handle_key(struct client *
struct window *w;
struct window_pane *wp;
struct timeval tv;
- struct key_table *table = c->keytable;
+ struct key_table *table;
struct key_binding bd_find, *bd;
int xtimeout;
@@ -606,7 +606,7 @@ server_client_handle_key(struct client *
retry:
/* Try to see if there is a key binding in the current table. */
bd_find.key = key;
- bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find);
+ bd = RB_FIND(key_bindings, &c->keytable->key_bindings, &bd_find);
if (bd != NULL) {
/*
* Key was matched in this table. If currently repeating but a
@@ -624,6 +624,7 @@ retry:
* Take a reference to this table to make sure the key binding
* doesn't disappear.
*/
+ table = c->keytable;
table->references++;
/*