circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-06 17:49:52 +00:00
Code Issues Projects Releases Wiki Activity

Adjust widths of a few codepoints incorrectly set to double width, from

Browse Source 
Sidney Cammeresi.
This commit is contained in:
nicm
2026-10-05 08:32:24 +00:00
committed by tmux update bot
parent a21247a508
commit a1fd084d19
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utf8-combined.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: utf8-combined.c,v 1.10 2026/06/09 11:49:36 nicm Exp $ */ /* $OpenBSD: utf8-combined.c,v 1.11 2026/10/05 08:32:24 nicm Exp $ */
/* /*
* Copyright (c) 2023 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2023 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -121,6 +121,12 @@ utf8_should_combine(const struct utf8_data *with, const struct utf8_data *add)
/* Emoji skin tone modifiers. */ /* Emoji skin tone modifiers. */
switch (a) { switch (a) {
case 0x0261D:
case 0x026F9:
case 0x0270A:
case 0x0270B:
case 0x0270C:
case 0x0270D:
case 0x1F44B: case 0x1F44B:
case 0x1F44C: case 0x1F44C:
case 0x1F44D: case 0x1F44D:

6
utf8.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: utf8.c,v 1.73 2026/09/20 08:11:00 nicm Exp $ */ /* $OpenBSD: utf8.c,v 1.74 2026/10/05 08:32:24 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -50,12 +50,8 @@ static struct utf8_width_cache utf8_width_cache =
RB_INITIALIZER(utf8_width_cache); RB_INITIALIZER(utf8_width_cache);
static struct utf8_width_item utf8_default_width_cache[] = { static struct utf8_width_item utf8_default_width_cache[] = {
{ .wc = 0x0261D, .width = 2 },
{ .wc = 0x026F9, .width = 2 },
{ .wc = 0x0270A, .width = 2 }, { .wc = 0x0270A, .width = 2 },
{ .wc = 0x0270B, .width = 2 }, { .wc = 0x0270B, .width = 2 },
{ .wc = 0x0270C, .width = 2 },
{ .wc = 0x0270D, .width = 2 },
{ .wc = 0x1F1E6, .width = 1 }, { .wc = 0x1F1E6, .width = 1 },
{ .wc = 0x1F1E7, .width = 1 }, { .wc = 0x1F1E7, .width = 1 },
{ .wc = 0x1F1E8, .width = 1 }, { .wc = 0x1F1E8, .width = 1 },