Attachment #175304 for bug #213119

View | Details | Raw Unified | Return to bug 213119
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tmux	4	PORTNAME= tmux
5	PORTVERSION= 2.2	5	PORTVERSION= 2.3
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/	7	MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468847551	1	TIMESTAMP = 1475240981
2	SHA256 (tmux-2.2.tar.gz) = bc28541b64f99929fe8e3ae7a02291263f3c97730781201824c0f05d7c8e19e4	2	SHA256 (tmux-2.3.tar.gz) = 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b
3	SIZE (tmux-2.2.tar.gz) = 466852	3	SIZE (tmux-2.3.tar.gz) = 473944
4	SHA256 (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 5957606b43ec4010084e20d7028044e23cc516ea100c4138d48984de53a7941b	4	SHA256 (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 5957606b43ec4010084e20d7028044e23cc516ea100c4138d48984de53a7941b
5	SIZE (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 1661	5	SIZE (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 1661

Lines 1-11 Link Here

(-)files/extra-patch-tty-keys.c (-6 / +6 lines)
1	--- tty-keys.c.orig 2016-03-02 18:08:46 UTC	1	--- tty-keys.c.orig 2016-04-30 12:46:35 UTC
2	+++ tty-keys.c	2	+++ tty-keys.c
3	@@ -572,8 +572,6 @@ first_key:	3	@@ -628,8 +628,6 @@ complete_key:
4	* used. termios should have a better idea.	4	* used. termios should have a better idea.
5	*/	5	*/
6	bspace = tty->tio.c_cc[VERASE];	6	bspace = tty->tio.c_cc[VERASE];
7	- if (bspace != _POSIX_VDISABLE && key == bspace)	7	- if (bspace != _POSIX_VDISABLE && (key & KEYC_MASK_KEY) == bspace)
8	- key = KEYC_BSPACE;	8	- key = (key & KEYC_MASK_MOD) \| KEYC_BSPACE;
9		9
10	goto complete_key;	10	/* Remove data from buffer. */
11		11	evbuffer_drain(tty->event->input, size);




commit 65e4c57d3a554940ed5cada6dfeff403ae8d9572
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
Date:   2016-04-29 12:47:15 +0100

    Only assume width 1 when wcwidth() returns -1 on non-OpenBSD platforms.

--- utf8.c.orig	2016-03-02 18:29:06 UTC
+++ utf8.c
@@ -115,8 +115,24 @@ utf8_width(wchar_t wc)
 	int	width;
 
 	width = wcwidth(wc);
-	if (width < 0 || width > 0xff)
+	if (width < 0 || width > 0xff) {
+		log_debug("Unicode %04x, wcwidth() %d", wc, width);
+
+#ifndef __OpenBSD__
+		/*
+		 * Many platforms (particularly and inevitably OS X) have no
+		 * width for relatively common characters (wcwidth() returns
+		 * -1); assume width 1 in this case. This will be wrong for
+		 * genuinely nonprintable characters, but they should be
+		 * rare. We may pass through stuff that ideally we would block,
+		 * but this is no worse than sending the same to the terminal
+		 * without tmux.
+		 */
+		if (width < 0)
+			return (1);
+#endif
 		return (-1);
+	}
 	return (width);
 }
 

Return to bug 213119

Lines 1-34 Link Here

(-)files/patch-utf8.c (-34 lines)
1	commit 65e4c57d3a554940ed5cada6dfeff403ae8d9572
2	Author: Nicholas Marriott <nicholas.marriott@gmail.com>
3	Date: 2016-04-29 12:47:15 +0100
4
5	Only assume width 1 when wcwidth() returns -1 on non-OpenBSD platforms.
6
7	--- utf8.c.orig 2016-03-02 18:29:06 UTC
8	+++ utf8.c
9	@@ -115,8 +115,24 @@ utf8_width(wchar_t wc)
10	int width;
11
12	width = wcwidth(wc);
13	- if (width < 0 \|\| width > 0xff)
14	+ if (width < 0 \|\| width > 0xff) {
15	+ log_debug("Unicode %04x, wcwidth() %d", wc, width);
16	+
17	+#ifndef __OpenBSD__
18	+ /*
19	+ * Many platforms (particularly and inevitably OS X) have no
20	+ * width for relatively common characters (wcwidth() returns
21	+ * -1); assume width 1 in this case. This will be wrong for
22	+ * genuinely nonprintable characters, but they should be
23	+ * rare. We may pass through stuff that ideally we would block,
24	+ * but this is no worse than sending the same to the terminal
25	+ * without tmux.
26	+ */
27	+ if (width < 0)
28	+ return (1);
29	+#endif
30	return (-1);
31	+ }
32	return (width);
33	}
34