epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidy multitap code up a lot

Browse Source
This commit is contained in:
Chris Forbes
2011-10-08 15:30:17 +13:00
parent 9b826d91a4
commit 8e3bcb892f
2 changed files with 34 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Renderer.SdlCommon/SdlInput.cs
View File

@@ -84,11 +84,10 @@ namespace OpenRA.Renderer.SdlCommon
var button = MakeButton( e.button.button );
lastButtonBits &= ~button;
MultiTapDetection.DetectFromMouse( e.button.button, new int2( e.button.x , e.button.y ) );
var pos = new int2( e.button.x, e.button.y );
inputHandler.OnMouseInput( new MouseInput(
MouseInputEvent.Up, button, new int2( e.button.x, e.button.y ), mods,
MultiTapDetection.MouseButtonTapsCounted ) );
MouseInputEvent.Up, button, pos, mods,
MultiTapDetection.DetectFromMouse( e.button.button, pos )));
} break;
case Sdl.SDL_MOUSEMOTION:
@@ -122,18 +121,10 @@ namespace OpenRA.Renderer.SdlCommon
Event = KeyInputEvent.Up,
Modifiers = mods,
UnicodeChar = (char)e.key.keysym.unicode,
KeyName = Sdl.SDL_GetKeyName( e.key.keysym.sym ),
KeyName = MultiTapDetection.DetectFromKeyboard(Sdl.SDL_GetKeyName( e.key.keysym.sym )),
VirtKey = e.key.keysym.sym
};
MultiTapDetection.DetectFromKeyboard( Sdl.SDL_GetKeyName( e.key.keysym.sym ) );
if ( MultiTapDetection.MultiTapDetected )
{
keyEvent.KeyName = MultiTapDetection.VirtualKeyNameOfDetectedMultiTap;
// More info-changes here.
}
inputHandler.OnKeyInput( keyEvent );
} break;
}