v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Add UTF8 support for legacy daemons

Browse Source
This commit is contained in:
Nicolas Viennot 2015-12-31 23:40:25 -05:00
parent d2ab60b40c
commit 3d78db5f67
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tmate-daemon-encoder.c
View File

@ -103,8 +103,7 @@ void tmate_client_pane_key(int pane_id, key_code key)
return; return;
if (tmate_session->client_protocol_version < 5) { if (tmate_session->client_protocol_version < 5) {
int legacy_key = tmate_translate_legacy_key(key); tmate_translate_legacy_key(pane_id, key);
tmate_client_legacy_pane_key(pane_id, legacy_key);
return; return;
} }

36
tmate-daemon-legacy.c
View File

@ -62,11 +62,17 @@ enum legacy_key_code {
LEGACY_KEYC_FOCUS_OUT, LEGACY_KEYC_FOCUS_OUT,
}; };
int tmate_translate_legacy_key(key_code key) void tmate_translate_legacy_key(int pane_id, key_code key)
{ {
key_code justkey = key & KEYC_MASK_KEY;
int lflags = 0;
int lkey; int lkey;
switch(key & KEYC_MASK_KEY) { if (key & KEYC_ESCAPE) lflags |= LEGACY_KEYC_ESCAPE;
if (key & KEYC_CTRL) lflags |= LEGACY_KEYC_CTRL;
if (key & KEYC_SHIFT) lflags |= LEGACY_KEYC_SHIFT;
switch(justkey) {
case KEYC_BSPACE: lkey = LEGACY_KEYC_BSPACE; break; case KEYC_BSPACE: lkey = LEGACY_KEYC_BSPACE; break;
case KEYC_F1: lkey = LEGACY_KEYC_F1; break; case KEYC_F1: lkey = LEGACY_KEYC_F1; break;
case KEYC_F2: lkey = LEGACY_KEYC_F2; break; case KEYC_F2: lkey = LEGACY_KEYC_F2; break;
@ -109,12 +115,28 @@ int tmate_translate_legacy_key(key_code key)
case KEYC_KP_PERIOD: lkey = LEGACY_KEYC_KP_PERIOD; break; case KEYC_KP_PERIOD: lkey = LEGACY_KEYC_KP_PERIOD; break;
case KEYC_FOCUS_IN: lkey = LEGACY_KEYC_FOCUS_IN; break; case KEYC_FOCUS_IN: lkey = LEGACY_KEYC_FOCUS_IN; break;
case KEYC_FOCUS_OUT: lkey = LEGACY_KEYC_FOCUS_OUT; break; case KEYC_FOCUS_OUT: lkey = LEGACY_KEYC_FOCUS_OUT; break;
default: lkey = key & KEYC_MASK_KEY; default:
if (justkey >= KEYC_BASE) {
/* Unknown key */
return;
} }
if (key & KEYC_ESCAPE) lkey |= LEGACY_KEYC_ESCAPE; if (justkey > 0x7f) {
if (key & KEYC_CTRL) lkey |= LEGACY_KEYC_CTRL; /* UTF8 */
if (key & KEYC_SHIFT) lkey |= LEGACY_KEYC_SHIFT; int i;
struct utf8_data ud;
if (utf8_split(justkey, &ud) != UTF8_DONE)
return;
return lkey; for (i = 0; i < ud.size; i++) {
tmate_client_legacy_pane_key(pane_id, lflags | ud.data[i]);
lflags = 0;
}
return;
}
lkey = justkey;
}
tmate_client_legacy_pane_key(pane_id, lflags | lkey);
} }

2
tmate.h
View File

@ -103,7 +103,7 @@ extern void tmate_send_mc_obj(msgpack_object *obj);
/* tmate-daemon-legacy.c */ /* tmate-daemon-legacy.c */
extern int tmate_translate_legacy_key(key_code key); extern void tmate_translate_legacy_key(int pane_id, key_code key);
/* tmate-daemon-decoder.c */ /* tmate-daemon-decoder.c */