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

More charset fixes

Browse Source 
Properly use the G0/G1 charsets only to map characters being drawn to
the screen. And only decode bytes using either Latin-1 or UTF-8,
defaulting to UTF-8 at startup/reset.
This commit is contained in:
Kovid Goyal
2016-11-30 23:36:10 +05:30
parent 83787fbc40
commit 489504cda5
5 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kitty/parser.c
+7 -8
View File
@@ -218,9 +218,11 @@ handle_esc_mode_char(Screen *screen, uint32_t ch, PyObject DUMP_UNUSED *dump_cal
case '%':
switch(ch) {
case '@':
CALL_ED1(screen_change_charset, 0); break;
REPORT_COMMAND(screen_use_latin1, 1);
screen->use_latin1 = true; screen->utf8_state = 0; break;
case 'G':
CALL_ED1(screen_change_charset, 2); break;
REPORT_COMMAND(screen_use_latin1, 0);
screen->use_latin1 = false; screen->utf8_state = 0; break;
default:
REPORT_ERROR("Unhandled Esc %% code: 0x%x", ch); break;
}
@@ -631,12 +633,9 @@ static inline void
_parse_bytes(Screen *screen, uint8_t *buf, Py_ssize_t len, PyObject DUMP_UNUSED *dump_callback) {
uint32_t prev = screen->utf8_state, codepoint = 0;
for (unsigned int i = 0; i < len; i++) {
switch(screen->charset) {
case 0:
dispatch_unicode_char(screen, screen->g0_charset[buf[i]], dump_callback);
break;
case 1:
dispatch_unicode_char(screen, screen->g1_charset[buf[i]], dump_callback);
switch(screen->use_latin1) {
case true:
dispatch_unicode_char(screen, latin1_charset[buf[i]], dump_callback);
break;
default:
switch (decode_utf8(&screen->utf8_state, &codepoint, buf[i])) {