diff --git a/src/FNAPlatform.cs b/src/FNAPlatform.cs index 179dfb3..d205340 100644 --- a/src/FNAPlatform.cs +++ b/src/FNAPlatform.cs @@ -44,9 +44,11 @@ namespace Microsoft.Xna.Framework CreateALDevice = SDL2_FNAPlatform.CreateALDevice; SetPresentationInterval = SDL2_FNAPlatform.SetPresentationInterval; GetGraphicsAdapters = SDL2_FNAPlatform.GetGraphicsAdapters; - GetKeyFromScancode = SDL2_FNAPlatform.GetKeyFromScancode; + GetKeyFromScancode = SDL2_KeyboardUtil.GetKeyFromScancode; + StartTextInput = SDL2.SDL.SDL_StartTextInput; + StopTextInput = SDL2.SDL.SDL_StopTextInput; GetMouseState = SDL2_FNAPlatform.GetMouseState; - SetMousePosition = SDL2_FNAPlatform.SetMousePosition; + SetMousePosition = SDL2.SDL.SDL_WarpMouseInWindow; OnIsMouseVisibleChanged = SDL2_FNAPlatform.OnIsMouseVisibleChanged; GetGamePadCapabilities = SDL2_FNAPlatform.GetGamePadCapabilities; GetGamePadState = SDL2_FNAPlatform.GetGamePadState; @@ -97,6 +99,12 @@ namespace Microsoft.Xna.Framework public delegate Keys GetKeyFromScancodeFunc(Keys scancode); public static GetKeyFromScancodeFunc GetKeyFromScancode; + public delegate void StartTextInputFunc(); + public static StartTextInputFunc StartTextInput; + + public delegate void StopTextInputFunc(); + public static StopTextInputFunc StopTextInput; + public delegate void GetMouseStateFunc( out int x, out int y, diff --git a/src/Input/TextInputEXT.cs b/src/Input/TextInputEXT.cs index 77c550e..218c272 100644 --- a/src/Input/TextInputEXT.cs +++ b/src/Input/TextInputEXT.cs @@ -28,6 +28,20 @@ namespace Microsoft.Xna.Framework.Input #endregion + #region Public Static Methods + + public static void StartTextInput() + { + FNAPlatform.StartTextInput(); + } + + public static void StopTextInput() + { + FNAPlatform.StopTextInput(); + } + + #endregion + #region Internal Event Access Method internal static void OnTextInput(char c) diff --git a/src/SDL2/SDL2_FNAPlatform.cs b/src/SDL2/SDL2_FNAPlatform.cs index b010a78..2a72295 100644 --- a/src/SDL2/SDL2_FNAPlatform.cs +++ b/src/SDL2/SDL2_FNAPlatform.cs @@ -535,11 +535,6 @@ namespace Microsoft.Xna.Framework return adapters; } - public static Keys GetKeyFromScancode(Keys scancode) - { - return SDL2_KeyboardUtil.KeyFromScancode(scancode); - } - public static void GetMouseState( out int x, out int y, diff --git a/src/SDL2/SDL2_KeyboardUtil.cs b/src/SDL2/SDL2_KeyboardUtil.cs index b0950b8..9dfdb7d 100644 --- a/src/SDL2/SDL2_KeyboardUtil.cs +++ b/src/SDL2/SDL2_KeyboardUtil.cs @@ -440,7 +440,7 @@ namespace Microsoft.Xna.Framework.Input return Keys.None; } - public static Keys KeyFromScancode(Keys scancode) + public static Keys GetKeyFromScancode(Keys scancode) { SDL.SDL_Scancode retVal; if (INTERNAL_xnaMap.TryGetValue((int) scancode, out retVal))