mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-14 20:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make wcswidth useable in a streaming fashion

Browse Source
This commit is contained in:
Kovid Goyal
2020-09-21 13:31:24 +05:30
parent b5007ba276
commit 444080f320
6 changed files with 162 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
kitty/data-types.c
View File

@@ -13,8 +13,8 @@
#endif
#include "data-types.h"
#include "control-codes.h"
#include "unicode-data.h"
#include "wcwidth-std.h"
#include "wcswidth.h"
#include "modes.h"
#include <stddef.h>
#include <termios.h>
@@ -150,115 +150,6 @@ close_tty(PyObject *self UNUSED, PyObject *args) {
#undef TTY_ARGS
static inline bool is_flag_pair(char_type a, char_type b) {
return is_flag_codepoint(a) && is_flag_codepoint(b);
}
static PyObject*
wcswidth_impl(PyObject UNUSED *self, PyObject *str) {
if (PyUnicode_READY(str) != 0) return NULL;
int kind = PyUnicode_KIND(str);
void *data = PyUnicode_DATA(str);
Py_ssize_t len = PyUnicode_GET_LENGTH(str), i;
unsigned long ans = 0;
char_type prev_ch = 0;
int prev_width = 0;
typedef enum {NORMAL, IN_CSI, FLAG_PAIR_STARTED, IN_ST_TERMINATED} WCSState;
WCSState state = NORMAL;
for (i = 0; i < len; i++) {
char_type ch = PyUnicode_READ(kind, data, i);
switch(state) {
case IN_CSI: {
if (0x40 <= ch && ch <= 0x7e) state = NORMAL;
} continue;
case IN_ST_TERMINATED: {
if (ch == 0x9c) state = NORMAL;
else if (ch == 0x1b && i + 1 < len && PyUnicode_READ(kind, data, i + 1) == '\\') { i++; state = NORMAL; }
} continue;
case FLAG_PAIR_STARTED: {
state = NORMAL;
if (is_flag_pair(prev_ch, ch)) break;
} /* fallthrough */
case NORMAL: {
switch(ch) {
case 0x1b: {
prev_width = 0;
if (i + 1 < len) {
switch (PyUnicode_READ(kind, data, i + 1)) {
case '[':
state = IN_CSI; i++; continue;
case 'P':
case ']':
case 'X':
case '^':
case '_':
state = IN_ST_TERMINATED; i++; continue;
case 'D':
case 'E':
case 'H':
case 'M':
case 'N':
case 'O':
case 'Z':
case '6':
case '7':
case '8':
case '9':
case '=':
case '>':
case 'F':
case 'c':
case 'l':
case 'm':
case 'n':
case 'o':
case '|':
case '}':
case '~':
i++; continue;
}
}
} break;
case 0xfe0f: {
if (is_emoji_presentation_base(prev_ch) && prev_width == 1) {
ans += 1;
prev_width = 2;
} else prev_width = 0;
} break;
case 0xfe0e: {
if (is_emoji_presentation_base(prev_ch) && prev_width == 2) {
ans -= 1;
prev_width = 1;
} else prev_width = 0;
} break;
default: {
if (is_flag_codepoint(ch)) state = FLAG_PAIR_STARTED;
int w = wcwidth_std(ch);
switch(w) {
case -1:
case 0:
prev_width = 0; break;
case 2:
prev_width = 2; break;
default:
prev_width = 1; break;
}
ans += prev_width;
} break;
} break; // switch(ch)
} break; // case NORMAL
} // switch(state)
prev_ch = ch;
}
return PyLong_FromUnsignedLong(ans);
}
static PyObject*
wcwidth_wrap(PyObject UNUSED *self, PyObject *chr) {
return PyLong_FromLong(wcwidth_std(PyLong_AsLong(chr)));
@@ -267,7 +158,7 @@ wcwidth_wrap(PyObject UNUSED *self, PyObject *chr) {
static PyMethodDef module_methods[] = {
{"wcwidth", (PyCFunction)wcwidth_wrap, METH_O, ""},
{"wcswidth", (PyCFunction)wcswidth_impl, METH_O, ""},
{"wcswidth", (PyCFunction)wcswidth_std, METH_O, ""},
{"open_tty", open_tty, METH_VARARGS, ""},
{"normal_tty", normal_tty, METH_VARARGS, ""},
{"raw_tty", raw_tty, METH_VARARGS, ""},