From f76b62a65a51f0b8f65a8e9cee513c0b80f060b6 Mon Sep 17 00:00:00 2001 From: Paul LeoNerd Evans Date: Sun, 10 Feb 2008 18:19:43 +0000 Subject: [PATCH] Interpret XTerm's CSI 27 ~ as modified generic key, report keypresses as appropriate --- termkey.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/termkey.c b/termkey.c index ff290bd..073ed8a 100644 --- a/termkey.c +++ b/termkey.c @@ -310,8 +310,14 @@ static termkey_result getkey_csi(termkey_t *tk, size_t introlen, termkey_key *ke eatbytes(tk, csi_end + 1); + key->modifiers = 0; + key->flags = TERMKEY_KEYFLAG_SPECIAL; + if(cmd == '~') { - if(arg[0] >= 0 && arg[0] < tk->ncsifuncs) + if(arg[0] == 27) { + do_codepoint(tk, arg[2], key); + } + else if(arg[0] >= 0 && arg[0] < tk->ncsifuncs) key->code = tk->csifuncs[arg[0]]; else key->code = TERMKEY_SYM_UNKNOWN; @@ -327,8 +333,8 @@ static termkey_result getkey_csi(termkey_t *tk, size_t introlen, termkey_key *ke fprintf(stderr, "CSI arg1=%d arg2=%d cmd=%c\n", arg[0], arg[1], cmd); } - key->modifiers = (args > 1 && arg[1] != -1) ? arg[1] - 1 : 0; - key->flags = TERMKEY_KEYFLAG_SPECIAL; + if(args > 1 && arg[1] != -1) + key->modifiers |= arg[1] - 1; return TERMKEY_RES_KEY; }