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

ketmar patch

This commit is contained in:
Adam D. Ruppe 2017-01-14 09:03:54 -05:00
parent d7645ffbde
commit 85ec0971ca
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
simpledisplay.d
View File

@ -2106,6 +2106,7 @@ const(char)[] toStrBuf(bool growdest=false) (char[] dest) const nothrow @trusted
// put modifiers // put modifiers
if (this.modifierState&ModifierState.ctrl) put("C-"); if (this.modifierState&ModifierState.ctrl) put("C-");
if (this.modifierState&ModifierState.alt) put("M-"); if (this.modifierState&ModifierState.alt) put("M-");
if (this.modifierState&ModifierState.windows) put("H-");
if (this.modifierState&ModifierState.shift) put("S-"); if (this.modifierState&ModifierState.shift) put("S-");
foreach (string kn; __traits(allMembers, Key)) { foreach (string kn; __traits(allMembers, Key)) {
@ -2131,6 +2132,7 @@ static KeyEvent parse (const(char)[] name) nothrow @trusted @nogc {
switch (name.ptr[0]) { switch (name.ptr[0]) {
case 'C': case 'c': mods |= ModifierState.ctrl; break; case 'C': case 'c': mods |= ModifierState.ctrl; break;
case 'M': case 'm': mods |= ModifierState.alt; break; case 'M': case 'm': mods |= ModifierState.alt; break;
case 'H': case 'h': mods |= ModifierState.windows; break;
case 'S': case 's': mods |= ModifierState.shift; break; case 'S': case 's': mods |= ModifierState.shift; break;
default: return res; // alas default: return res; // alas
} }
@ -2178,13 +2180,14 @@ bool opEquals() (const(char)[] name) const nothrow @trusted @nogc {
switch (name.ptr[0]) { switch (name.ptr[0]) {
case 'C': case 'c': mods |= ModifierState.ctrl; break; case 'C': case 'c': mods |= ModifierState.ctrl; break;
case 'M': case 'm': mods |= ModifierState.alt; break; case 'M': case 'm': mods |= ModifierState.alt; break;
case 'H': case 'h': mods |= ModifierState.windows; break;
case 'S': case 's': mods |= ModifierState.shift; break; case 'S': case 's': mods |= ModifierState.shift; break;
default: return false; // alas default: return false; // alas
} }
name = name[2..$]; name = name[2..$];
} }
if (name.length == 0) return false; if (name.length == 0) return false;
if ((this.modifierState&(ModifierState.ctrl|ModifierState.alt|ModifierState.shift)) != mods) return false; if ((this.modifierState&(ModifierState.ctrl|ModifierState.alt|ModifierState.shift|ModifierState.windows)) != mods) return false;
//HACK //HACK
if (name.length == 1 && name.ptr[0] >= '0' && name.ptr[0] <= '9') { if (name.length == 1 && name.ptr[0] >= '0' && name.ptr[0] <= '9') {
final switch (name.ptr[0]) { final switch (name.ptr[0]) {