mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Bump the UTF-8 character array up to 18 to allow for more combining

Browse Source 
characters (some languages use up to five). This size doesn't make as
much difference now that UTF-8 goes into an extended cell. GitHub issue
1430.
This commit is contained in:
nicm 2018-08-09 09:53:44 +00:00
parent 9cf1c8d5a1
commit 738a276adb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/tmux/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.89 2017/07/12 09:24:17 nicm Exp $
# $OpenBSD: Makefile,v 1.90 2018/08/09 09:53:44 nicm Exp $
PROG= tmux
SRCS= alerts.c \
@ -122,7 +122,7 @@ SRCS= alerts.c \
CDIAGFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
CDIAGFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
CDIAGFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align -Wunused
LDADD= -lutil -lcurses -levent
DPADD= ${LIBUTIL} ${LIBCURSES} ${LIBEVENT}

9
usr.bin/tmux/tmux.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tmux.h,v 1.836 2018/08/02 18:35:21 nicm Exp $ */
/* $OpenBSD: tmux.h,v 1.837 2018/08/09 09:53:44 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -511,10 +511,11 @@ struct msg_stderr_data {
#define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ALL)
/*
* A single UTF-8 character. UTF8_SIZE must be big enough to hold at least one
* combining character as well.
* A single UTF-8 character. UTF8_SIZE must be big enough to hold
* combining characters as well, currently at most five (of three
* bytes) are supported.
*/
#define UTF8_SIZE 9
#define UTF8_SIZE 18
struct utf8_data {
u_char data[UTF8_SIZE];