KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add emoji presentation variation selector support to wcswidth() as well

Browse Source
This commit is contained in:
Kovid Goyal 2018-02-06 10:01:50 +05:30
parent 9c874f6685
commit e830b7edf7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/screen.c
View File

@ -1462,17 +1462,27 @@ refresh_sprite_positions(Screen *self) {
} }
static PyObject* static PyObject*
screen_wcswidth(Screen UNUSED *self, PyObject *str) { screen_wcswidth(PyObject UNUSED *self, PyObject *str) {
if (PyUnicode_READY(str) != 0) return NULL; if (PyUnicode_READY(str) != 0) return NULL;
int kind = PyUnicode_KIND(str); int kind = PyUnicode_KIND(str);
void *data = PyUnicode_DATA(str); void *data = PyUnicode_DATA(str);
Py_ssize_t len = PyUnicode_GET_LENGTH(str), i; Py_ssize_t len = PyUnicode_GET_LENGTH(str), i;
unsigned long ans = 0; unsigned long ans = 0;
char_type prev_ch = 0;
int prev_width = 0;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
char_type ch = PyUnicode_READ(kind, data, i); char_type ch = PyUnicode_READ(kind, data, i);
int cw = wcwidth_std(ch); if (ch == 0xfe0f) {
if (cw < 1) cw = 1; if (is_emoji_presentation_base(prev_ch) && prev_width == 1) {
ans += cw; ans += 1;
prev_width = 2;
} else prev_width = 0;
} else {
prev_width = wcwidth_std(ch);
if (prev_width < 1) prev_width = 1;
ans += prev_width;
}
prev_ch = ch;
} }
return PyLong_FromUnsignedLong(ans); return PyLong_FromUnsignedLong(ans);
} }

5
kitty_tests/datatypes.py
View File

@ -4,7 +4,7 @@
from kitty.config import build_ansi_color_table, defaults from kitty.config import build_ansi_color_table, defaults
from kitty.fast_data_types import ( from kitty.fast_data_types import (
REVERSE, ColorProfile, Cursor as C, HistoryBuf, LineBuf, wcwidth REVERSE, ColorProfile, Cursor as C, HistoryBuf, LineBuf, wcswidth, wcwidth
) )
from kitty.rgb import to_color from kitty.rgb import to_color
from kitty.utils import sanitize_title from kitty.utils import sanitize_title
@ -335,7 +335,8 @@ class TestDataTypes(BaseTest):
def w(x): def w(x):
return wcwidth(ord(x)) return wcwidth(ord(x))
self.ae(tuple(map(w, 'a1\0コニチ ✔')), (1, 1, 0, 2, 2, 2, 1, 1)) self.ae(tuple(map(w, 'a1\0コニチ ✔')), (1, 1, 0, 2, 2, 2, 1, 1))
self.assertEqual(sanitize_title('a\0\01 \t\n\f\rb'), 'a b') self.ae(wcswidth('\u2716\u2716\ufe0f\U0001f337'), 5)
self.ae(sanitize_title('a\0\01 \t\n\f\rb'), 'a b')
def test_color_profile(self): def test_color_profile(self):
c = ColorProfile() c = ColorProfile()