Move ControlDown to SDL2_FNAPlatform

FNA-XNA · Jan 1, 2024 · 3c02a81 · 3c02a81
1 parent 1c0f0ad
commit 3c02a81
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/FNAPlatform/SDL2_FNAPlatform.cs b/src/FNAPlatform/SDL2_FNAPlatform.cs
@@ -45,6 +45,14 @@ internal static class SDL2_FNAPlatform
 
  #endregion
 
+ #region Keyboard State
+
+ // Used for special copy-paste text input
+ private static bool LeftControlDown = false;
+ private static bool RightControlDown = false;
+
+ #endregion
+
  #region Init/Exit Methods
 
  public static string ProgramInit(LaunchParameters args)
@@ -956,11 +964,11 @@ ref bool textInputSuppress
  Keys key = ToXNAKey(ref evt.key.keysym);
  if (key == Keys.LeftControl)
  {
- Keyboard.LeftControlDown = true;
+ LeftControlDown = true;
  }
  else if (key == Keys.RightControl)
  {
- Keyboard.RightControlDown = true;
+ RightControlDown = true;
  }
 
  if (evt.key.repeat == 0)
@@ -971,7 +979,7 @@ ref bool textInputSuppress
  textInputControlDown[textIndex] = true;
  TextInputEXT.OnTextInput(FNAPlatform.TextInputCharacters[textIndex]);
  }
- else if ((Keyboard.LeftControlDown || Keyboard.RightControlDown)
+ else if ((LeftControlDown || RightControlDown)
  && key == Keys.V)
  {
  textInputControlDown[6] = true;
@@ -986,7 +994,7 @@ ref bool textInputSuppress
  {
  TextInputEXT.OnTextInput(FNAPlatform.TextInputCharacters[textIndex]);
  }
- else if ((Keyboard.LeftControlDown || Keyboard.RightControlDown)
+ else if ((LeftControlDown || RightControlDown)
  && key == Keys.V)
  {
  TextInputEXT.OnTextInput(FNAPlatform.TextInputCharacters[6]);
@@ -999,19 +1007,19 @@ ref bool textInputSuppress
 
  if (key == Keys.LeftControl)
  {
- Keyboard.LeftControlDown = false;
+ LeftControlDown = false;
  }
  else if (key == Keys.RightControl)
  {
- Keyboard.RightControlDown = false;
+ RightControlDown = false;
  }
 
  int value;
  if (FNAPlatform.TextInputBindings.TryGetValue(key, out value))
  {
  textInputControlDown[value] = false;
  }
- else if (((!Keyboard.LeftControlDown && !Keyboard.RightControlDown) && textInputControlDown[6])
+ else if (((!LeftControlDown && !RightControlDown) && textInputControlDown[6])
  || key == Keys.V)
  {
  textInputControlDown[6] = false;

diff --git a/src/Input/Keyboard.cs b/src/Input/Keyboard.cs
@@ -53,14 +53,6 @@ public static Keys GetKeyFromScancodeEXT(Keys scancode)
 
  #endregion
 
- #region Internal Static Variables
-
- // Used for special copy-paste text input
- internal static bool LeftControlDown = false;
- internal static bool RightControlDown = false;
-
- #endregion
-
  #region Private Static Variables
 
  private static List<Keys> activeKeys = new List<Keys>();