fix little things

This commit is contained in:
Adam D. Ruppe 2021-05-13 14:00:33 -04:00
parent 8966280c01
commit 74093436ec
2 changed files with 16 additions and 2 deletions

View File

@ -4807,7 +4807,7 @@ class Window : Widget {
wid = this;
auto event = new Event(ev.pressed ? "keydown" : "keyup", wid);
event.originalKeyEvent = ev;
event.character = ev.character;
//event.character = ev.character;
event.key = ev.key;
event.state = ev.modifierState;
event.shiftKey = (ev.modifierState & ModifierState.shift) ? true : false;

View File

@ -8279,8 +8279,18 @@ version(TerminalDirectToEmulator) {
return;
}
auto keyToSend = ev.key;
static if(UsingSimpledisplayX11) {
if((ev.state & ModifierState.alt) && ev.originalKeyEvent.charsPossible.length) {
keyToSend = cast(Key) ev.originalKeyEvent.charsPossible[0];
}
}
defaultKeyHandler!(typeof(ev.key))(
ev.key
keyToSend
, (ev.state & ModifierState.shift)?true:false
, (ev.state & ModifierState.alt)?true:false
, (ev.state & ModifierState.ctrl)?true:false
@ -8291,6 +8301,10 @@ version(TerminalDirectToEmulator) {
});
widget.addEventListener("char", (Event ev) {
if(skipNextChar) {
skipNextChar = false;
return;
}
dchar c = ev.character;
if(c == 0x1c) /* ctrl+\, force quit */ {