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

/s/RIM_KEY/RI_KEY 

seems to be a dumb typo (docs have RI_KEY_* not RIM_KEY_*)
This commit is contained in:
CasualPokePlayer 2023-12-31 06:00:48 -08:00
parent 6330a703a1
commit d6fdf503b9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Bizware.Input/KeyInput/RawKeyInput.cs
View File

@ -87,7 +87,7 @@ namespace BizHawk.Bizware.Input
}
if (input->header.dwType == RAWINPUTHEADER.RIM_TYPE.KEYBOARD &&
(input->data.keyboard.Flags & ~(RAWKEYBOARD.RIM_KEY.E0 | RAWKEYBOARD.RIM_KEY.BREAK)) == 0)
(input->data.keyboard.Flags & ~(RAWKEYBOARD.RI_KEY.E0 | RAWKEYBOARD.RI_KEY.BREAK)) == 0)
{
var handle = GCHandle.FromIntPtr(ud);
var rawKeyInput = (RawKeyInput)handle.Target;
@ -96,7 +96,7 @@ namespace BizHawk.Bizware.Input
{
// TODO: Make a separate enum map for RAWINPUT / VKeys and don't rely on DKeyInput's maps
var rawKey = (RawKey)(input->data.keyboard.MakeCode |
((input->data.keyboard.Flags & RAWKEYBOARD.RIM_KEY.E0) != 0 ? 0x80 : 0));
((input->data.keyboard.Flags & RAWKEYBOARD.RI_KEY.E0) != 0 ? 0x80 : 0));
// kind of a dumb hack, the Pause key is apparently special here
// keyboards would send scancode 0x1D with an E1 prefix, followed by 0x45 (which is NumLock!)
@ -114,7 +114,7 @@ namespace BizHawk.Bizware.Input
if (DKeyInput.KeyEnumMap.TryGetValue(rawKey, out var key) && key != DistinctKey.Unknown)
{
rawKeyInput.KeyEvents.Add(new(key, (input->data.keyboard.Flags & RAWKEYBOARD.RIM_KEY.BREAK) == RAWKEYBOARD.RIM_KEY.MAKE));
rawKeyInput.KeyEvents.Add(new(key, (input->data.keyboard.Flags & RAWKEYBOARD.RI_KEY.BREAK) == RAWKEYBOARD.RI_KEY.MAKE));
}
}
}

4
src/BizHawk.Common/Win32/RawInputImports.cs
View File

@ -88,14 +88,14 @@ namespace BizHawk.Common
public struct RAWKEYBOARD
{
public ushort MakeCode;
public RIM_KEY Flags;
public RI_KEY Flags;
public ushort Reserved;
public ushort VKey;
public uint Message;
public uint ExtraInformation;
[Flags]
public enum RIM_KEY : ushort
public enum RI_KEY : ushort
{
MAKE = 0,
BREAK = 1,