forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ketmar key patch

This commit is contained in:
Adam D. Ruppe 2017-05-07 13:19:16 -04:00
parent a2b40b5b46
commit b4b167f6d7
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
simpledisplay.d
View File

@ -3802,11 +3802,29 @@ struct KeyEvent {
} }
bool opEquals() (const(char)[] name) const nothrow @trusted @nogc { bool opEquals() (const(char)[] name) const nothrow @trusted @nogc {
enum modmask = (ModifierState.ctrl|ModifierState.alt|ModifierState.shift|ModifierState.windows);
void doModKey (ref uint mask, ref Key kk, Key k, ModifierState mst) {
if (kk == k) { mask |= mst; kk = cast(Key)0; }
}
auto ke = KeyEvent.parse(name); auto ke = KeyEvent.parse(name);
if (this.key != ke.key) return false; if (this.key != ke.key) {
// check modifiers // things like "ctrl+alt" are complicated
ke.modifierState &= (ModifierState.ctrl|ModifierState.alt|ModifierState.shift|ModifierState.windows); uint tkm = this.modifierState&modmask;
return ((this.modifierState&(ModifierState.ctrl|ModifierState.alt|ModifierState.shift|ModifierState.windows)) == ke.modifierState); uint kkm = ke.modifierState&modmask;
Key tk = this.key;
// ke
doModKey(kkm, ke.key, Key.Ctrl, ModifierState.ctrl);
doModKey(kkm, ke.key, Key.Alt, ModifierState.alt);
doModKey(kkm, ke.key, Key.Windows, ModifierState.windows);
doModKey(kkm, ke.key, Key.Shift, ModifierState.shift);
// this
doModKey(tkm, tk, Key.Ctrl, ModifierState.ctrl);
doModKey(tkm, tk, Key.Alt, ModifierState.alt);
doModKey(tkm, tk, Key.Windows, ModifierState.windows);
doModKey(tkm, tk, Key.Shift, ModifierState.shift);
return (tk == ke.key && tkm == kkm);
}
return ((this.modifierState&modmask) == (ke.modifierState&modmask));
} }
} }