adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.1027: GUI: multi-byte characters do not work in a terminal

Browse Source 
Problem:    GUI: multi-byte characters do not work in a terminal.
Solution:   Do not assume a key is one byte. (closes #6304)
This commit is contained in:
Bram Moolenaar
2020-06-21 15:09:14 +02:00
parent a3b7fdc1bb
commit 820ffa567c
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui_gtk_x11.c
View File

@ -1215,7 +1215,10 @@ key_press_event(GtkWidget *widget UNUSED,
if (len == -3) if (len == -3)
key = TO_SPECIAL(string[1], string[2]); key = TO_SPECIAL(string[1], string[2]);
else else
key = string[0]; {
string[len] = NUL;
key = mb_ptr2char(string);
}
// Handle modifiers. // Handle modifiers.
modifiers = modifiers_gdk2vim(state); modifiers = modifiers_gdk2vim(state);
@ -1240,8 +1243,7 @@ key_press_event(GtkWidget *widget UNUSED,
// May remove the shift modifier if it's included in the key. // May remove the shift modifier if it's included in the key.
modifiers = may_remove_shift_modifier(modifiers, key); modifiers = may_remove_shift_modifier(modifiers, key);
string[0] = key; len = mb_char2bytes(key, string);
len = 1;
} }
if (modifiers != 0) if (modifiers != 0)

8
src/gui_x11.c
View File

@ -938,7 +938,10 @@ gui_x11_key_hit_cb(
if (len == -3) if (len == -3)
key = TO_SPECIAL(string[1], string[2]); key = TO_SPECIAL(string[1], string[2]);
else else
key = string[0]; {
string[len] = NUL;
key = mb_ptr2char(string);
}
key = simplify_key(key, &modifiers); key = simplify_key(key, &modifiers);
if (key == CSI) if (key == CSI)
key = K_CSI; key = K_CSI;
@ -951,8 +954,7 @@ gui_x11_key_hit_cb(
} }
else else
{ {
string[0] = key; len = mb_char2bytes(key, string);
len = 1;
// Remove the SHIFT modifier for keys where it's already included, // Remove the SHIFT modifier for keys where it's already included,
// e.g., '(', '!' and '*'. // e.g., '(', '!' and '*'.

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1027,
/**/ /**/
1026, 1026,
/**/ /**/