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

Merge pull request #583 from Disco1267/x11-fixes 

Fixed handling of modfier keys, see issue #582
This commit is contained in:
Vadim Lopatin 2018-12-06 21:00:02 +03:00 committed by GitHub
parent 317599ce87 c24c544f7e
commit d08f28204a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
src/dlangui/platforms/x11/x11app.d
View File

@ -817,12 +817,14 @@ class X11Window : DWindow {
return MouseButton.None; return MouseButton.None;
} }
ushort lastFlags;
short lastx; short lastx;
short lasty; short lasty;
uint _keyFlags; uint _keyFlags;
void processMouseEvent(MouseAction action, uint button, uint state, int x, int y) { void processMouseEvent(MouseAction action, uint button, uint state, int x, int y) {
MouseEvent event = null; MouseEvent event = null;
ushort lastFlags;
if (action == MouseAction.Wheel) { if (action == MouseAction.Wheel) {
// handle wheel // handle wheel
short wheelDelta = cast(short)y; short wheelDelta = cast(short)y;
@ -882,6 +884,7 @@ class X11Window : DWindow {
} }
} }
uint convertKeyCode(uint keyCode) { uint convertKeyCode(uint keyCode) {
import x11.keysymdef; import x11.keysymdef;
alias KeyCode = dlangui.core.events.KeyCode; alias KeyCode = dlangui.core.events.KeyCode;
@ -1127,51 +1130,57 @@ class X11Window : DWindow {
} }
bool processKeyEvent(KeyAction action, uint keyCode, uint flags) { bool processKeyEvent(KeyAction action, uint keyCode, uint flagsX11) {
//debug(DebugSDL) //debug(DebugSDL)
Log.d("processKeyEvent ", action, " X11 key=0x", format("%08x", keyCode), " X11 flags=0x", format("%08x", flags)); Log.d("processKeyEvent ", action, " X11 key=0x", format("%08x", keyCode), " X11 flags=0x", format("%08x", flagsX11));
keyCode = convertKeyCode(keyCode); keyCode = convertKeyCode(keyCode);
flags = convertKeyFlags(flags); uint flagsConverted = convertKeyFlags(flagsX11);
Log.d("processKeyEvent ", action, " converted key=0x", format("%08x", keyCode), " flags=0x", format("%08x", flags));
alias KeyCode = dlangui.core.events.KeyCode; alias KeyCode = dlangui.core.events.KeyCode;
if (action == KeyAction.KeyDown) {
switch(keyCode) {
case KeyCode.ALT:
flags |= KeyFlag.Alt;
break;
case KeyCode.RALT:
flags |= KeyFlag.Alt | KeyFlag.RAlt;
break;
case KeyCode.LALT:
flags |= KeyFlag.Alt | KeyFlag.LAlt;
break;
case KeyCode.CONTROL:
flags |= KeyFlag.Control;
break;
case KeyCode.RCONTROL:
flags |= KeyFlag.Control | KeyFlag.RControl;
break;
case KeyCode.LCONTROL:
flags |= KeyFlag.Control | KeyFlag.LControl;
break;
case KeyCode.SHIFT:
flags |= KeyFlag.Shift;
break;
case KeyCode.RSHIFT:
flags |= KeyFlag.Shift | KeyFlag.RShift;
break;
case KeyCode.LSHIFT:
flags |= KeyFlag.Shift | KeyFlag.LShift;
break;
default:
break;
}
}
_keyFlags = flags;
debug(DebugSDL) Log.d("processKeyEvent ", action, " converted key=0x", format("%08x", keyCode), " converted flags=0x", format("%08x", flags)); {
bool res = dispatchKeyEvent(new KeyEvent(action, keyCode, flags)); uint flags = 0;
switch(keyCode) {
case KeyCode.ALT:
flags |= KeyFlag.Alt;
break;
case KeyCode.RALT:
flags |= KeyFlag.Alt | KeyFlag.RAlt;
break;
case KeyCode.LALT:
flags |= KeyFlag.Alt | KeyFlag.LAlt;
break;
case KeyCode.CONTROL:
flags |= KeyFlag.Control;
break;
case KeyCode.RCONTROL:
flags |= KeyFlag.Control | KeyFlag.RControl;
break;
case KeyCode.LCONTROL:
flags |= KeyFlag.Control | KeyFlag.LControl;
break;
case KeyCode.SHIFT:
flags |= KeyFlag.Shift;
break;
case KeyCode.RSHIFT:
flags |= KeyFlag.Shift | KeyFlag.RShift;
break;
case KeyCode.LSHIFT:
flags |= KeyFlag.Shift | KeyFlag.LShift;
break;
default:
break;
}
if (action == KeyAction.KeyDown)
flagsConverted |= flags;
else
flagsConverted &= ~flags;
}
Log.d("processKeyEvent ", action, " converted key=0x", format("%08x", keyCode), " flags=0x", format("%08x", flagsConverted));
_keyFlags = flagsConverted;
debug(DebugSDL) Log.d("processKeyEvent ", action, " converted key=0x", format("%08x", keyCode), " converted flags=0x", format("%08x", flagsConverted));
bool res = dispatchKeyEvent(new KeyEvent(action, keyCode, flagsConverted));
// if ((keyCode & 0x10000) && (keyCode & 0xF000) != 0xF000) { // if ((keyCode & 0x10000) && (keyCode & 0xF000) != 0xF000) {
// dchar[1] text; // dchar[1] text;
// text[0] = keyCode & 0xFFFF; // text[0] = keyCode & 0xFFFF;