|
@@ -465,7 +465,7 @@ class Window {
|
|
case GControllerAdded, GControllerRemoved, GControllerUp, GControllerDown, GControllerAxis:
|
|
case GControllerAdded, GControllerRemoved, GControllerUp, GControllerDown, GControllerAxis:
|
|
@:privateAccess hxd.Pad.onEvent( e );
|
|
@:privateAccess hxd.Pad.onEvent( e );
|
|
case KeyDown:
|
|
case KeyDown:
|
|
- eh = new Event(EKeyDown);
|
|
|
|
|
|
+ eh = new Event(EKeyDown, curMouseX, curMouseY);
|
|
if( e.keyCode & (1 << 30) != 0 ) e.keyCode = (e.keyCode & ((1 << 30) - 1)) + 1000;
|
|
if( e.keyCode & (1 << 30) != 0 ) e.keyCode = (e.keyCode & ((1 << 30) - 1)) + 1000;
|
|
eh.keyCode = CODEMAP[e.keyCode];
|
|
eh.keyCode = CODEMAP[e.keyCode];
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
@@ -473,7 +473,7 @@ class Window {
|
|
onEvent(e);
|
|
onEvent(e);
|
|
}
|
|
}
|
|
case KeyUp:
|
|
case KeyUp:
|
|
- eh = new Event(EKeyUp);
|
|
|
|
|
|
+ eh = new Event(EKeyUp, curMouseX, curMouseY);
|
|
if( e.keyCode & (1 << 30) != 0 ) e.keyCode = (e.keyCode & ((1 << 30) - 1)) + 1000;
|
|
if( e.keyCode & (1 << 30) != 0 ) e.keyCode = (e.keyCode & ((1 << 30) - 1)) + 1000;
|
|
eh.keyCode = CODEMAP[e.keyCode];
|
|
eh.keyCode = CODEMAP[e.keyCode];
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
@@ -515,14 +515,14 @@ class Window {
|
|
|
|
|
|
#elseif hldx
|
|
#elseif hldx
|
|
case KeyDown:
|
|
case KeyDown:
|
|
- eh = new Event(EKeyDown);
|
|
|
|
|
|
+ eh = new Event(EKeyDown, curMouseX, curMouseY);
|
|
eh.keyCode = e.keyCode;
|
|
eh.keyCode = e.keyCode;
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
e.keyCode = eh.keyCode & 0xFF;
|
|
e.keyCode = eh.keyCode & 0xFF;
|
|
onEvent(e);
|
|
onEvent(e);
|
|
}
|
|
}
|
|
case KeyUp:
|
|
case KeyUp:
|
|
- eh = new Event(EKeyUp);
|
|
|
|
|
|
+ eh = new Event(EKeyUp, curMouseX, curMouseY);
|
|
eh.keyCode = CODEMAP[e.keyCode];
|
|
eh.keyCode = CODEMAP[e.keyCode];
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
if( eh.keyCode & (K.LOC_LEFT | K.LOC_RIGHT) != 0 ) {
|
|
e.keyCode = eh.keyCode & 0xFF;
|
|
e.keyCode = eh.keyCode & 0xFF;
|