ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Numpad 2,4,6,8 != Arrow keys!

This commit is contained in:
andres.delikat 2011-06-19 23:31:58 +00:00
parent f5014946db
commit 38422fda10
3 changed files with 1174 additions and 1174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.MultiClient/Input/Input.cs
View File

@ -37,6 +37,14 @@ namespace BizHawk.MultiClient
if (control.StartsWith("J2 ")) return GetGamePad(1, control.Substring(3)); if (control.StartsWith("J2 ")) return GetGamePad(1, control.Substring(3));
if (control.StartsWith("J3 ")) return GetGamePad(2, control.Substring(3)); if (control.StartsWith("J3 ")) return GetGamePad(2, control.Substring(3));
if (control.StartsWith("J4 ")) return GetGamePad(3, control.Substring(3)); if (control.StartsWith("J4 ")) return GetGamePad(3, control.Substring(3));
//Key z = Key.n
Key z = Key.NumberPad4;
Key y = Key.LeftArrow;
if (z == Key.LeftArrow || y == Key.LeftArrow)
{
int x = 0;
x++;
}
Key k = (Key) Enum.Parse(typeof(Key), control, true); Key k = (Key) Enum.Parse(typeof(Key), control, true);
return KeyInput.IsPressed(k); return KeyInput.IsPressed(k);
} }

126
BizHawk.MultiClient/Input/Keyboard.cs
View File

@ -4,80 +4,72 @@ using SlimDX.DirectInput;
namespace BizHawk.MultiClient namespace BizHawk.MultiClient
{ {
public static class KeyInput public static class KeyInput
{ {
private static DirectInput dinput; private static DirectInput dinput;
private static Keyboard keyboard; private static Keyboard keyboard;
private static KeyboardState state = new KeyboardState(); private static KeyboardState state = new KeyboardState();
private static List<Key> unpressedKeys = new List<Key>(); private static List<Key> unpressedKeys = new List<Key>();
public static void Initialize() public static void Initialize()
{ {
if (dinput == null) if (dinput == null)
dinput = new DirectInput(); dinput = new DirectInput();
if (keyboard == null || keyboard.Disposed) if (keyboard == null || keyboard.Disposed)
keyboard = new Keyboard(dinput); keyboard = new Keyboard(dinput);
if (Global.Config.AcceptBackgroundInput) if (Global.Config.AcceptBackgroundInput)
keyboard.SetCooperativeLevel(Global.MainForm.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive); keyboard.SetCooperativeLevel(Global.MainForm.Handle, CooperativeLevel.Background | CooperativeLevel.Nonexclusive);
else else
keyboard.SetCooperativeLevel(Global.MainForm.Handle, CooperativeLevel.Foreground | CooperativeLevel.Nonexclusive); keyboard.SetCooperativeLevel(Global.MainForm.Handle, CooperativeLevel.Foreground | CooperativeLevel.Nonexclusive);
} }
public static void Update() public static void Update()
{ {
if (keyboard.Acquire().IsFailure) if (keyboard.Acquire().IsFailure)
return; return;
if (keyboard.Poll().IsFailure) if (keyboard.Poll().IsFailure)
return; return;
state = keyboard.GetCurrentState(); state = keyboard.GetCurrentState();
if (Result.Last.IsFailure) if (Result.Last.IsFailure)
return; return;
unpressedKeys.RemoveAll(key => state.IsReleased(key)); unpressedKeys.RemoveAll(key => state.IsReleased(key));
} }
public static KeyboardState State { get { return state; } } public static KeyboardState State { get { return state; } }
public static void Unpress(Key key) public static void Unpress(Key key)
{ {
if (unpressedKeys.Contains(key)) if (unpressedKeys.Contains(key))
return; return;
unpressedKeys.Add(key); unpressedKeys.Add(key);
} }
public static bool IsPressed(Key key) public static bool IsPressed(Key key)
{ {
if (unpressedKeys.Contains(key)) if (unpressedKeys.Contains(key))
return false; return false;
if (state.IsPressed(key)) if (state.IsPressed(key))
return true; return true;
if (key == Key.UpArrow && state.IsPressed(Key.NumberPad8)) return false;
return true; }
if (key == Key.DownArrow && state.IsPressed(Key.NumberPad2))
return true;
if (key == Key.LeftArrow && state.IsPressed(Key.NumberPad4))
return true;
if (key == Key.RightArrow && state.IsPressed(Key.NumberPad6))
return true;
return false;
}
public static Key? GetPressedKey() public static Key? GetPressedKey()
{ {
// TODO uhh this will return the same key over and over though. // TODO uhh this will return the same key over and over though.
if (state.PressedKeys.Count == 0) if (state.PressedKeys.Count == 0)
return null; return null;
if (state.PressedKeys[0] == Key.NumberPad8) if (state.PressedKeys[0] == Key.NumberPad8)
return Key.UpArrow; return Key.UpArrow;
if (state.PressedKeys[0] == Key.NumberPad2) if (state.PressedKeys[0] == Key.NumberPad2)
return Key.DownArrow; return Key.DownArrow;
if (state.PressedKeys[0] == Key.NumberPad4) if (state.PressedKeys[0] == Key.NumberPad4)
return Key.LeftArrow; return Key.LeftArrow;
if (state.PressedKeys[0] == Key.NumberPad6) if (state.PressedKeys[0] == Key.NumberPad6)
return Key.RightArrow; return Key.RightArrow;
return state.PressedKeys[0]; return state.PressedKeys[0];
} }
} }
} }

2210
BizHawk.MultiClient/tools/Cheats.cs
View File

File diff suppressed because it is too large Load Diff