Skip to content

Allow setting a custom function to compute grapheme cluster width #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NikitaIvanovV wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow setting a custom function to compute grapheme cluster width #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions termbox2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,13 @@ extern "C" {
#define tb_free free
#endif

/* Define this to swap in a different function for computing cluster width. */
#ifdef tb_cluster_width
#define TB_CUSTOM_CLUSTER_WIDTH 1
#else
#define tb_cluster_width tb_cluster_width_approx
#endif

#if TB_OPT_ATTR_W == 64
typedef uint64_t uintattr_t;
#elif TB_OPT_ATTR_W == 32
Expand Down Expand Up @@ -2334,7 +2341,9 @@ static int bytebuf_flush(struct bytebuf *b, int fd);
static int bytebuf_reserve(struct bytebuf *b, size_t sz);
static int bytebuf_free(struct bytebuf *b);
static int tb_iswprint_ex(uint32_t ch, int *width);
static int tb_cluster_width(uint32_t *ch, size_t nch);
#ifndef TB_CUSTOM_CLUSTER_WIDTH
static int tb_cluster_width_approx(uint32_t *ch, size_t nch);
#endif

int tb_init(void) {
return tb_init_file("/dev/tty");
Expand Down Expand Up @@ -4251,7 +4260,8 @@ int tb_wcwidth(uint32_t ch) {
return w;
}

static int tb_cluster_width(uint32_t *ch, size_t nch) {
#ifndef TB_CUSTOM_CLUSTER_WIDTH
static int tb_cluster_width_approx(uint32_t *ch, size_t nch) {
int wmax = -1;
int vs15 = 0, vs16 = 0, ri = 0, zwj = 0;
size_t i = 0;
Expand All @@ -4272,6 +4282,7 @@ static int tb_cluster_width(uint32_t *ch, size_t nch) {
}
return wmax;
}
#endif

static int tb_iswprint_ex(uint32_t ch, int *w) {
#ifdef TB_OPT_LIBC_WCHAR
Expand Down