aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-28 01:35:32 +00:00
Code

terminal: Read modifiers from the first UTF-8 byte, not the last.

Browse Source 
Previously, ELinks used to silently discard the Alt modifier from
Alt- keystrokes when UTF-8 I/O was enabled.  Now, separate actions
can be bound to  and Alt-.

However, if CONFIG_UTF_8 is defined, then actions cannot be bound to
non-ASCII characters, regardless of modifiers.  This is because the
code that handles names of keystrokes assumes a character can only be
a single byte.  This commit does not change that.
This commit is contained in:
Kalle Olavi Niemitalo 2006-08-06 14:09:20 +03:00 committed by Miciah Dashiel Butler Masters
parent a9da075eb5
commit 462607416c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/terminal/event.c
View File

@ -44,6 +44,12 @@ struct terminal_interlink {
unicode_val_T ucs;
int len;
int min;
/* Modifier keys from the key event that carried the
* first byte of the character. We need this because
* ELinks sees e.g. ESC U+00F6 as 0x1B 0xC3 0xB6 and
* converts it to Alt-0xC3 0xB6, attaching the
* modifier to the first byte only. */
int modifier;
} utf_8;
/* This is the queue of events as coming from the other ELinks instance
@ -321,13 +327,15 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
if (u < interlink->utf_8.min)
u = UCS_NO_CHAR;
term_send_ucs(term, u, modifier);
term_send_ucs(term, u,
term->interlink->utf_8.modifier);
}
break;
} else {
interlink->utf_8.len = 0;
term_send_ucs(term, UCS_NO_CHAR, modifier);
term_send_ucs(term, UCS_NO_CHAR,
term->interlink->utf_8.modifier);
}
}
@ -357,6 +365,7 @@ handle_interlink_event(struct terminal *term, struct interlink_event *ilev)
interlink->utf_8.len = len - 1;
interlink->utf_8.ucs = key & (mask - 1);
interlink->utf_8.modifier = modifier;
break;
}