Refactor HID, fix issues (#48)
* Refactor HID, fix issues * Fix on touch screen code with wrong offset * Don't use magic values * Replace more magic values with actual variables, fix touch screen coordinates on different window sizes
This commit is contained in:
gdkchan
GitHub
parent
efef605b26
commit
c14c69a10c
22 changed files with 491 additions and 709 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using Ryujinx.Core.Input;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
|
|
||||||
|
|
@ -1,225 +0,0 @@
|
||||||
using Ryujinx.Core.OsHle;
|
|
||||||
using System;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
namespace Ryujinx.Core
|
|
||||||
{
|
|
||||||
public class Hid
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
Thanks to:
|
|
||||||
https://github.com/reswitched/libtransistor/blob/development/lib/hid.c
|
|
||||||
https://github.com/reswitched/libtransistor/blob/development/include/libtransistor/hid.h
|
|
||||||
https://github.com/switchbrew/libnx/blob/master/nx/source/services/hid.c
|
|
||||||
https://github.com/switchbrew/libnx/blob/master/nx/include/switch/services/hid.h
|
|
||||||
|
|
||||||
struct HidSharedMemory
|
|
||||||
{
|
|
||||||
header[0x400];
|
|
||||||
touchscreen[0x3000];
|
|
||||||
mouse[0x400];
|
|
||||||
keyboard[0x400];
|
|
||||||
unkSection1[0x400];
|
|
||||||
unkSection2[0x400];
|
|
||||||
unkSection3[0x400];
|
|
||||||
unkSection4[0x400];
|
|
||||||
unkSection5[0x200];
|
|
||||||
unkSection6[0x200];
|
|
||||||
unkSection7[0x200];
|
|
||||||
unkSection8[0x800];
|
|
||||||
controllerSerials[0x4000];
|
|
||||||
controllers[0x5000 * 10];
|
|
||||||
unkSection9[0x4600];
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
private const int Hid_Num_Entries = 17;
|
|
||||||
private Switch Ns;
|
|
||||||
private long SharedMemOffset;
|
|
||||||
|
|
||||||
public Hid(Switch Ns)
|
|
||||||
{
|
|
||||||
this.Ns = Ns;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Init(long HidOffset)
|
|
||||||
{
|
|
||||||
unsafe
|
|
||||||
{
|
|
||||||
if (HidOffset == 0 || HidOffset + Horizon.HidSize > uint.MaxValue)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
SharedMemOffset = HidOffset;
|
|
||||||
|
|
||||||
uint InnerOffset = (uint)Marshal.SizeOf(typeof(HidSharedMemHeader));
|
|
||||||
|
|
||||||
IntPtr HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
|
|
||||||
|
|
||||||
HidTouchScreen TouchScreen = new HidTouchScreen();
|
|
||||||
TouchScreen.Header.TimestampTicks = (ulong)Environment.TickCount;
|
|
||||||
TouchScreen.Header.NumEntries = (ulong)Hid_Num_Entries;
|
|
||||||
TouchScreen.Header.LatestEntry = 0;
|
|
||||||
TouchScreen.Header.MaxEntryIndex = (ulong)Hid_Num_Entries - 1;
|
|
||||||
TouchScreen.Header.Timestamp = (ulong)Environment.TickCount;
|
|
||||||
|
|
||||||
Marshal.StructureToPtr(TouchScreen, HidPtr, false);
|
|
||||||
|
|
||||||
InnerOffset += (uint)Marshal.SizeOf(typeof(HidTouchScreen));
|
|
||||||
HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
|
|
||||||
|
|
||||||
HidMouse Mouse = new HidMouse();
|
|
||||||
Mouse.Header.TimestampTicks = (ulong)Environment.TickCount;
|
|
||||||
Mouse.Header.NumEntries = (ulong)Hid_Num_Entries;
|
|
||||||
Mouse.Header.LatestEntry = 0;
|
|
||||||
Mouse.Header.MaxEntryIndex = (ulong)Hid_Num_Entries - 1;
|
|
||||||
|
|
||||||
//TODO: Write this structure when the input is implemented
|
|
||||||
//Marshal.StructureToPtr(Mouse, HidPtr, false);
|
|
||||||
|
|
||||||
InnerOffset += (uint)Marshal.SizeOf(typeof(HidMouse));
|
|
||||||
HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
|
|
||||||
|
|
||||||
HidKeyboard Keyboard = new HidKeyboard();
|
|
||||||
Keyboard.Header.TimestampTicks = (ulong)Environment.TickCount;
|
|
||||||
Keyboard.Header.NumEntries = (ulong)Hid_Num_Entries;
|
|
||||||
Keyboard.Header.LatestEntry = 0;
|
|
||||||
Keyboard.Header.MaxEntryIndex = (ulong)Hid_Num_Entries - 1;
|
|
||||||
|
|
||||||
//TODO: Write this structure when the input is implemented
|
|
||||||
//Marshal.StructureToPtr(Keyboard, HidPtr, false);
|
|
||||||
|
|
||||||
InnerOffset += (uint)Marshal.SizeOf(typeof(HidKeyboard)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection1)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection2)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection3)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection4)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection5)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection6)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection7)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection8)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidControllerSerials));
|
|
||||||
|
|
||||||
//Increase the loop to initialize more controller.
|
|
||||||
for (int i = 8; i < Enum.GetNames(typeof(HidControllerID)).Length - 1; i++)
|
|
||||||
{
|
|
||||||
HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset + (uint)(Marshal.SizeOf(typeof(HidController)) * i));
|
|
||||||
|
|
||||||
HidController Controller = new HidController();
|
|
||||||
Controller.Header.Type = (uint)(HidControllerType.ControllerType_Handheld | HidControllerType.ControllerType_JoyconPair);
|
|
||||||
Controller.Header.IsHalf = 0;
|
|
||||||
Controller.Header.SingleColorsDescriptor = (uint)(HidControllerColorDescription.ColorDesc_ColorsNonexistent);
|
|
||||||
Controller.Header.SingleColorBody = 0;
|
|
||||||
Controller.Header.SingleColorButtons = 0;
|
|
||||||
Controller.Header.SplitColorsDescriptor = 0;
|
|
||||||
Controller.Header.LeftColorBody = (uint)JoyConColor.Body_Neon_Red;
|
|
||||||
Controller.Header.LeftColorButtons = (uint)JoyConColor.Buttons_Neon_Red;
|
|
||||||
Controller.Header.RightColorBody = (uint)JoyConColor.Body_Neon_Blue;
|
|
||||||
Controller.Header.RightColorButtons = (uint)JoyConColor.Buttons_Neon_Blue;
|
|
||||||
|
|
||||||
Controller.Layouts = new HidControllerLayout[Enum.GetNames(typeof(HidControllerLayouts)).Length];
|
|
||||||
Controller.Layouts[(int)HidControllerLayouts.Main] = new HidControllerLayout();
|
|
||||||
Controller.Layouts[(int)HidControllerLayouts.Main].Header.LatestEntry = (ulong)Hid_Num_Entries;
|
|
||||||
|
|
||||||
Marshal.StructureToPtr(Controller, HidPtr, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
Logging.Info("HID Initialized!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SendControllerButtons(HidControllerID ControllerId,
|
|
||||||
HidControllerLayouts Layout,
|
|
||||||
HidControllerKeys Buttons,
|
|
||||||
JoystickPosition LeftJoystick,
|
|
||||||
JoystickPosition RightJoystick)
|
|
||||||
{
|
|
||||||
uint InnerOffset = (uint)Marshal.SizeOf(typeof(HidSharedMemHeader)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidTouchScreen)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidMouse)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidKeyboard)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection1)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection2)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection3)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection4)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection5)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection6)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection7)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidUnknownSection8)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidControllerSerials)) +
|
|
||||||
((uint)(Marshal.SizeOf(typeof(HidController)) * (int)ControllerId)) +
|
|
||||||
(uint)Marshal.SizeOf(typeof(HidControllerHeader)) +
|
|
||||||
(uint)Layout * (uint)Marshal.SizeOf(typeof(HidControllerLayout));
|
|
||||||
|
|
||||||
IntPtr HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
|
|
||||||
|
|
||||||
HidControllerLayoutHeader OldControllerHeaderLayout = (HidControllerLayoutHeader)Marshal.PtrToStructure(HidPtr, typeof(HidControllerLayoutHeader));
|
|
||||||
|
|
||||||
HidControllerLayoutHeader ControllerLayoutHeader = new HidControllerLayoutHeader
|
|
||||||
{
|
|
||||||
TimestampTicks = (ulong)Environment.TickCount,
|
|
||||||
NumEntries = (ulong)Hid_Num_Entries,
|
|
||||||
MaxEntryIndex = (ulong)Hid_Num_Entries - 1,
|
|
||||||
LatestEntry = (OldControllerHeaderLayout.LatestEntry < (ulong)Hid_Num_Entries ? OldControllerHeaderLayout.LatestEntry + 1 : 0)
|
|
||||||
};
|
|
||||||
|
|
||||||
Marshal.StructureToPtr(ControllerLayoutHeader, HidPtr, false);
|
|
||||||
|
|
||||||
InnerOffset += (uint)Marshal.SizeOf(typeof(HidControllerLayoutHeader)) + (uint)((uint)(ControllerLayoutHeader.LatestEntry) * Marshal.SizeOf(typeof(HidControllerInputEntry)));
|
|
||||||
HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
|
|
||||||
|
|
||||||
HidControllerInputEntry ControllerInputEntry = new HidControllerInputEntry
|
|
||||||
{
|
|
||||||
Timestamp = (ulong)Environment.TickCount,
|
|
||||||
Timestamp_2 = (ulong)Environment.TickCount,
|
|
||||||
Buttons = (ulong)Buttons,
|
|
||||||
Joysticks = new JoystickPosition[(int)HidControllerJoystick.Joystick_Num_Sticks]
|
|
||||||
};
|
|
||||||
ControllerInputEntry.Joysticks[(int)HidControllerJoystick.Joystick_Left] = LeftJoystick;
|
|
||||||
ControllerInputEntry.Joysticks[(int)HidControllerJoystick.Joystick_Right] = RightJoystick;
|
|
||||||
ControllerInputEntry.ConnectionState = (ulong)(HidControllerConnectionState.Controller_State_Connected | HidControllerConnectionState.Controller_State_Wired);
|
|
||||||
|
|
||||||
Marshal.StructureToPtr(ControllerInputEntry, HidPtr, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SendTouchPoint(HidTouchScreenEntryTouch TouchPoint)
|
|
||||||
{
|
|
||||||
uint InnerOffset = (uint)Marshal.SizeOf(typeof(HidSharedMemHeader));
|
|
||||||
|
|
||||||
IntPtr HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
|
|
||||||
|
|
||||||
HidTouchScreenHeader OldTouchScreenHeader = (HidTouchScreenHeader)Marshal.PtrToStructure(HidPtr,typeof(HidTouchScreenHeader));
|
|
||||||
|
|
||||||
HidTouchScreenHeader TouchScreenHeader = new HidTouchScreenHeader()
|
|
||||||
{
|
|
||||||
TimestampTicks = (ulong)Environment.TickCount,
|
|
||||||
NumEntries = (ulong)Hid_Num_Entries,
|
|
||||||
MaxEntryIndex = (ulong)Hid_Num_Entries - 1,
|
|
||||||
Timestamp = (ulong)Environment.TickCount,
|
|
||||||
LatestEntry = OldTouchScreenHeader.LatestEntry < Hid_Num_Entries-1 ? OldTouchScreenHeader.LatestEntry + 1 : 0
|
|
||||||
};
|
|
||||||
|
|
||||||
Marshal.StructureToPtr(TouchScreenHeader, HidPtr, false);
|
|
||||||
|
|
||||||
InnerOffset += (uint)Marshal.SizeOf(typeof(HidTouchScreenHeader))
|
|
||||||
+ (uint)((uint)(OldTouchScreenHeader.LatestEntry) * Marshal.SizeOf(typeof(HidTouchScreenEntry)));
|
|
||||||
HidPtr = new IntPtr(Ns.Ram.ToInt64() + (uint)SharedMemOffset + InnerOffset);
|
|
||||||
|
|
||||||
HidTouchScreenEntry hidTouchScreenEntry = new HidTouchScreenEntry()
|
|
||||||
{
|
|
||||||
Header = new HidTouchScreenEntryHeader()
|
|
||||||
{
|
|
||||||
Timestamp = (ulong)Environment.TickCount,
|
|
||||||
NumTouches = 1
|
|
||||||
},
|
|
||||||
Touches = new HidTouchScreenEntryTouch[16]
|
|
||||||
};
|
|
||||||
|
|
||||||
//Only supports single touch
|
|
||||||
hidTouchScreenEntry.Touches[0] = TouchPoint;
|
|
||||||
|
|
||||||
Marshal.StructureToPtr(hidTouchScreenEntry, HidPtr, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
235
Ryujinx.Core/Hid/Hid.cs
Normal file
235
Ryujinx.Core/Hid/Hid.cs
Normal file
|
|
@ -0,0 +1,235 @@
|
||||||
|
using ChocolArm64.Memory;
|
||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
public class Hid
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Reference:
|
||||||
|
* https://github.com/reswitched/libtransistor/blob/development/lib/hid.c
|
||||||
|
* https://github.com/reswitched/libtransistor/blob/development/include/libtransistor/hid.h
|
||||||
|
* https://github.com/switchbrew/libnx/blob/master/nx/source/services/hid.c
|
||||||
|
* https://github.com/switchbrew/libnx/blob/master/nx/include/switch/services/hid.h
|
||||||
|
*/
|
||||||
|
|
||||||
|
private const int HidHeaderSize = 0x400;
|
||||||
|
private const int HidTouchScreenSize = 0x3000;
|
||||||
|
private const int HidMouseSize = 0x400;
|
||||||
|
private const int HidKeyboardSize = 0x400;
|
||||||
|
private const int HidUnkSection1Size = 0x400;
|
||||||
|
private const int HidUnkSection2Size = 0x400;
|
||||||
|
private const int HidUnkSection3Size = 0x400;
|
||||||
|
private const int HidUnkSection4Size = 0x400;
|
||||||
|
private const int HidUnkSection5Size = 0x200;
|
||||||
|
private const int HidUnkSection6Size = 0x200;
|
||||||
|
private const int HidUnkSection7Size = 0x200;
|
||||||
|
private const int HidUnkSection8Size = 0x800;
|
||||||
|
private const int HidControllerSerialsSize = 0x4000;
|
||||||
|
private const int HidControllersSize = 0x32000;
|
||||||
|
private const int HidUnkSection9Size = 0x800;
|
||||||
|
|
||||||
|
private const int HidTouchHeaderSize = 0x28;
|
||||||
|
private const int HidTouchEntrySize = 0x298;
|
||||||
|
|
||||||
|
private const int HidTouchEntryHeaderSize = 0x10;
|
||||||
|
private const int HidTouchEntryTouchSize = 0x28;
|
||||||
|
|
||||||
|
private const int HidControllerSize = 0x5000;
|
||||||
|
private const int HidControllerHeaderSize = 0x28;
|
||||||
|
private const int HidControllerLayoutsSize = 0x350;
|
||||||
|
|
||||||
|
private const int HidControllersLayoutHeaderSize = 0x20;
|
||||||
|
private const int HidControllersInputEntrySize = 0x30;
|
||||||
|
|
||||||
|
private const int HidHeaderOffset = 0;
|
||||||
|
private const int HidTouchScreenOffset = HidHeaderOffset + HidHeaderSize;
|
||||||
|
private const int HidMouseOffset = HidTouchScreenOffset + HidTouchScreenSize;
|
||||||
|
private const int HidKeyboardOffset = HidMouseOffset + HidMouseSize;
|
||||||
|
private const int HidUnkSection1Offset = HidKeyboardOffset + HidKeyboardSize;
|
||||||
|
private const int HidUnkSection2Offset = HidUnkSection1Offset + HidUnkSection1Size;
|
||||||
|
private const int HidUnkSection3Offset = HidUnkSection2Offset + HidUnkSection2Size;
|
||||||
|
private const int HidUnkSection4Offset = HidUnkSection3Offset + HidUnkSection3Size;
|
||||||
|
private const int HidUnkSection5Offset = HidUnkSection4Offset + HidUnkSection4Size;
|
||||||
|
private const int HidUnkSection6Offset = HidUnkSection5Offset + HidUnkSection5Size;
|
||||||
|
private const int HidUnkSection7Offset = HidUnkSection6Offset + HidUnkSection6Size;
|
||||||
|
private const int HidUnkSection8Offset = HidUnkSection7Offset + HidUnkSection7Size;
|
||||||
|
private const int HidControllerSerialsOffset = HidUnkSection8Offset + HidUnkSection8Size;
|
||||||
|
private const int HidControllersOffset = HidControllerSerialsOffset + HidControllerSerialsSize;
|
||||||
|
private const int HidUnkSection9Offset = HidControllersOffset + HidControllersSize;
|
||||||
|
|
||||||
|
private const int HidEntryCount = 17;
|
||||||
|
|
||||||
|
private long SharedMemOffset;
|
||||||
|
|
||||||
|
private Switch Ns;
|
||||||
|
|
||||||
|
public Hid(Switch Ns)
|
||||||
|
{
|
||||||
|
this.Ns = Ns;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Init(long HidOffset)
|
||||||
|
{
|
||||||
|
SharedMemOffset = HidOffset;
|
||||||
|
|
||||||
|
InitializeJoyconPair(
|
||||||
|
JoyConColor.Body_Neon_Red,
|
||||||
|
JoyConColor.Buttons_Neon_Red,
|
||||||
|
JoyConColor.Body_Neon_Blue,
|
||||||
|
JoyConColor.Buttons_Neon_Blue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void InitializeJoyconPair(
|
||||||
|
JoyConColor LeftColorBody,
|
||||||
|
JoyConColor LeftColorButtons,
|
||||||
|
JoyConColor RightColorBody,
|
||||||
|
JoyConColor RightColorButtons)
|
||||||
|
{
|
||||||
|
long BaseControllerOffset = HidControllersOffset + 8 * HidControllerSize;
|
||||||
|
|
||||||
|
HidControllerType Type =
|
||||||
|
HidControllerType.ControllerType_Handheld |
|
||||||
|
HidControllerType.ControllerType_JoyconPair;
|
||||||
|
|
||||||
|
bool IsHalf = false;
|
||||||
|
|
||||||
|
HidControllerColorDesc SingleColorDesc =
|
||||||
|
HidControllerColorDesc.ColorDesc_ColorsNonexistent;
|
||||||
|
|
||||||
|
JoyConColor SingleColorBody = JoyConColor.Black;
|
||||||
|
JoyConColor SingleColorButtons = JoyConColor.Black;
|
||||||
|
|
||||||
|
HidControllerColorDesc SplitColorDesc = 0;
|
||||||
|
|
||||||
|
WriteInt32(BaseControllerOffset + 0x0, (int)Type);
|
||||||
|
|
||||||
|
WriteInt32(BaseControllerOffset + 0x4, IsHalf ? 1 : 0);
|
||||||
|
|
||||||
|
WriteInt32(BaseControllerOffset + 0x8, (int)SingleColorDesc);
|
||||||
|
WriteInt32(BaseControllerOffset + 0xc, (int)SingleColorBody);
|
||||||
|
WriteInt32(BaseControllerOffset + 0x10, (int)SingleColorButtons);
|
||||||
|
WriteInt32(BaseControllerOffset + 0x14, (int)SplitColorDesc);
|
||||||
|
|
||||||
|
WriteInt32(BaseControllerOffset + 0x18, (int)LeftColorBody);
|
||||||
|
WriteInt32(BaseControllerOffset + 0x1c, (int)LeftColorButtons);
|
||||||
|
|
||||||
|
WriteInt32(BaseControllerOffset + 0x20, (int)RightColorBody);
|
||||||
|
WriteInt32(BaseControllerOffset + 0x24, (int)RightColorButtons);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetJoyconButton(
|
||||||
|
HidControllerId ControllerId,
|
||||||
|
HidControllerLayouts ControllerLayout,
|
||||||
|
HidControllerButtons Buttons,
|
||||||
|
HidJoystickPosition LeftStick,
|
||||||
|
HidJoystickPosition RightStick)
|
||||||
|
{
|
||||||
|
long ControllerOffset = HidControllersOffset + (int)ControllerId * HidControllerSize;
|
||||||
|
|
||||||
|
ControllerOffset += HidControllerHeaderSize;
|
||||||
|
|
||||||
|
ControllerOffset += (int)ControllerLayout * HidControllerLayoutsSize;
|
||||||
|
|
||||||
|
long LastEntry = ReadInt64(ControllerOffset + 0x10);
|
||||||
|
|
||||||
|
long CurrEntry = (LastEntry + 1) % HidEntryCount;
|
||||||
|
|
||||||
|
long Timestamp = Stopwatch.GetTimestamp();
|
||||||
|
|
||||||
|
WriteInt64(ControllerOffset + 0x0, Timestamp);
|
||||||
|
WriteInt64(ControllerOffset + 0x8, HidEntryCount);
|
||||||
|
WriteInt64(ControllerOffset + 0x10, CurrEntry);
|
||||||
|
WriteInt64(ControllerOffset + 0x18, HidEntryCount - 1);
|
||||||
|
|
||||||
|
ControllerOffset += HidControllersLayoutHeaderSize;
|
||||||
|
|
||||||
|
ControllerOffset += CurrEntry * HidControllersInputEntrySize;
|
||||||
|
|
||||||
|
WriteInt64(ControllerOffset + 0x0, Timestamp);
|
||||||
|
WriteInt64(ControllerOffset + 0x8, Timestamp);
|
||||||
|
|
||||||
|
WriteInt64(ControllerOffset + 0x10, (uint)Buttons);
|
||||||
|
|
||||||
|
WriteInt32(ControllerOffset + 0x18, LeftStick.DX);
|
||||||
|
WriteInt32(ControllerOffset + 0x1c, LeftStick.DY);
|
||||||
|
|
||||||
|
WriteInt64(ControllerOffset + 0x20, RightStick.DX);
|
||||||
|
WriteInt64(ControllerOffset + 0x24, RightStick.DY);
|
||||||
|
|
||||||
|
WriteInt64(ControllerOffset + 0x28,
|
||||||
|
(uint)HidControllerConnState.Controller_State_Connected |
|
||||||
|
(uint)HidControllerConnState.Controller_State_Wired);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTouchPoints(params HidTouchPoint[] Points)
|
||||||
|
{
|
||||||
|
long LastEntry = ReadInt64(HidTouchScreenOffset + 0x10);
|
||||||
|
|
||||||
|
long CurrEntry = (LastEntry + 1) % HidEntryCount;
|
||||||
|
|
||||||
|
long Timestamp = Stopwatch.GetTimestamp();
|
||||||
|
|
||||||
|
WriteInt64(HidTouchScreenOffset + 0x0, Timestamp);
|
||||||
|
WriteInt64(HidTouchScreenOffset + 0x8, HidEntryCount);
|
||||||
|
WriteInt64(HidTouchScreenOffset + 0x10, CurrEntry);
|
||||||
|
WriteInt64(HidTouchScreenOffset + 0x18, HidEntryCount - 1);
|
||||||
|
WriteInt64(HidTouchScreenOffset + 0x20, Timestamp);
|
||||||
|
|
||||||
|
long TouchEntryOffset = HidTouchScreenOffset + HidTouchHeaderSize;
|
||||||
|
|
||||||
|
TouchEntryOffset += CurrEntry * HidTouchEntrySize;
|
||||||
|
|
||||||
|
WriteInt64(TouchEntryOffset + 0x0, Timestamp);
|
||||||
|
WriteInt64(TouchEntryOffset + 0x8, Points.Length);
|
||||||
|
|
||||||
|
TouchEntryOffset += HidTouchEntryHeaderSize;
|
||||||
|
|
||||||
|
const int Padding = 0;
|
||||||
|
|
||||||
|
int Index = 0;
|
||||||
|
|
||||||
|
foreach (HidTouchPoint Point in Points)
|
||||||
|
{
|
||||||
|
WriteInt64(TouchEntryOffset + 0x0, Timestamp);
|
||||||
|
WriteInt32(TouchEntryOffset + 0x8, Padding);
|
||||||
|
WriteInt32(TouchEntryOffset + 0xc, Index++);
|
||||||
|
WriteInt32(TouchEntryOffset + 0x10, Point.X);
|
||||||
|
WriteInt32(TouchEntryOffset + 0x14, Point.Y);
|
||||||
|
WriteInt32(TouchEntryOffset + 0x18, Point.DiameterX);
|
||||||
|
WriteInt32(TouchEntryOffset + 0x1c, Point.DiameterY);
|
||||||
|
WriteInt32(TouchEntryOffset + 0x20, Point.Angle);
|
||||||
|
WriteInt32(TouchEntryOffset + 0x24, Padding);
|
||||||
|
|
||||||
|
TouchEntryOffset += HidTouchEntryTouchSize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private unsafe long ReadInt64(long Position)
|
||||||
|
{
|
||||||
|
Position += SharedMemOffset;
|
||||||
|
|
||||||
|
if ((ulong)Position + 8 > AMemoryMgr.AddrSize) return 0;
|
||||||
|
|
||||||
|
return *((long*)((byte*)Ns.Ram + Position));
|
||||||
|
}
|
||||||
|
|
||||||
|
private unsafe void WriteInt32(long Position, int Value)
|
||||||
|
{
|
||||||
|
Position += SharedMemOffset;
|
||||||
|
|
||||||
|
if ((ulong)Position + 4 > AMemoryMgr.AddrSize) return;
|
||||||
|
|
||||||
|
*((int*)((byte*)Ns.Ram + Position)) = Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private unsafe void WriteInt64(long Position, long Value)
|
||||||
|
{
|
||||||
|
Position += SharedMemOffset;
|
||||||
|
|
||||||
|
if ((ulong)Position + 8 > AMemoryMgr.AddrSize) return;
|
||||||
|
|
||||||
|
*((long*)((byte*)Ns.Ram + Position)) = Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,188 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
namespace Ryujinx.Core
|
|
||||||
{
|
|
||||||
[Flags]
|
|
||||||
public enum HidControllerKeys
|
|
||||||
{
|
|
||||||
KEY_A = (1 << 0),
|
|
||||||
KEY_B = (1 << 1),
|
|
||||||
KEY_X = (1 << 2),
|
|
||||||
KEY_Y = (1 << 3),
|
|
||||||
KEY_LSTICK = (1 << 4),
|
|
||||||
KEY_RSTICK = (1 << 5),
|
|
||||||
KEY_L = (1 << 6),
|
|
||||||
KEY_R = (1 << 7),
|
|
||||||
KEY_ZL = (1 << 8),
|
|
||||||
KEY_ZR = (1 << 9),
|
|
||||||
KEY_PLUS = (1 << 10),
|
|
||||||
KEY_MINUS = (1 << 11),
|
|
||||||
KEY_DLEFT = (1 << 12),
|
|
||||||
KEY_DUP = (1 << 13),
|
|
||||||
KEY_DRIGHT = (1 << 14),
|
|
||||||
KEY_DDOWN = (1 << 15),
|
|
||||||
KEY_LSTICK_LEFT = (1 << 16),
|
|
||||||
KEY_LSTICK_UP = (1 << 17),
|
|
||||||
KEY_LSTICK_RIGHT = (1 << 18),
|
|
||||||
KEY_LSTICK_DOWN = (1 << 19),
|
|
||||||
KEY_RSTICK_LEFT = (1 << 20),
|
|
||||||
KEY_RSTICK_UP = (1 << 21),
|
|
||||||
KEY_RSTICK_RIGHT = (1 << 22),
|
|
||||||
KEY_RSTICK_DOWN = (1 << 23),
|
|
||||||
KEY_SL = (1 << 24),
|
|
||||||
KEY_SR = (1 << 25),
|
|
||||||
|
|
||||||
// Pseudo-key for at least one finger on the touch screen
|
|
||||||
KEY_TOUCH = (1 << 26),
|
|
||||||
|
|
||||||
// Buttons by orientation (for single Joy-Con), also works with Joy-Con pairs, Pro Controller
|
|
||||||
KEY_JOYCON_RIGHT = (1 << 0),
|
|
||||||
KEY_JOYCON_DOWN = (1 << 1),
|
|
||||||
KEY_JOYCON_UP = (1 << 2),
|
|
||||||
KEY_JOYCON_LEFT = (1 << 3),
|
|
||||||
|
|
||||||
// Generic catch-all directions, also works for single Joy-Con
|
|
||||||
KEY_UP = KEY_DUP | KEY_LSTICK_UP | KEY_RSTICK_UP,
|
|
||||||
KEY_DOWN = KEY_DDOWN | KEY_LSTICK_DOWN | KEY_RSTICK_DOWN,
|
|
||||||
KEY_LEFT = KEY_DLEFT | KEY_LSTICK_LEFT | KEY_RSTICK_LEFT,
|
|
||||||
KEY_RIGHT = KEY_DRIGHT | KEY_LSTICK_RIGHT | KEY_RSTICK_RIGHT,
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum HidControllerID
|
|
||||||
{
|
|
||||||
CONTROLLER_PLAYER_1 = 0,
|
|
||||||
CONTROLLER_PLAYER_2 = 1,
|
|
||||||
CONTROLLER_PLAYER_3 = 2,
|
|
||||||
CONTROLLER_PLAYER_4 = 3,
|
|
||||||
CONTROLLER_PLAYER_5 = 4,
|
|
||||||
CONTROLLER_PLAYER_6 = 5,
|
|
||||||
CONTROLLER_PLAYER_7 = 6,
|
|
||||||
CONTROLLER_PLAYER_8 = 7,
|
|
||||||
CONTROLLER_HANDHELD = 8,
|
|
||||||
CONTROLLER_UNKNOWN = 9
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum HidControllerJoystick
|
|
||||||
{
|
|
||||||
Joystick_Left = 0,
|
|
||||||
Joystick_Right = 1,
|
|
||||||
Joystick_Num_Sticks = 2
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum HidControllerLayouts
|
|
||||||
{
|
|
||||||
Pro_Controller,
|
|
||||||
Handheld_Joined,
|
|
||||||
Joined,
|
|
||||||
Left,
|
|
||||||
Right,
|
|
||||||
Main_No_Analog,
|
|
||||||
Main
|
|
||||||
}
|
|
||||||
|
|
||||||
[Flags]
|
|
||||||
public enum HidControllerConnectionState
|
|
||||||
{
|
|
||||||
Controller_State_Connected = (1 << 0),
|
|
||||||
Controller_State_Wired = (1 << 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
[Flags]
|
|
||||||
public enum HidControllerType
|
|
||||||
{
|
|
||||||
ControllerType_ProController = (1 << 0),
|
|
||||||
ControllerType_Handheld = (1 << 1),
|
|
||||||
ControllerType_JoyconPair = (1 << 2),
|
|
||||||
ControllerType_JoyconLeft = (1 << 3),
|
|
||||||
ControllerType_JoyconRight = (1 << 4)
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum HidControllerColorDescription
|
|
||||||
{
|
|
||||||
ColorDesc_ColorsNonexistent = (1 << 1),
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x8)]
|
|
||||||
public struct JoystickPosition
|
|
||||||
{
|
|
||||||
public int DX;
|
|
||||||
public int DY;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x20)]
|
|
||||||
public struct HidControllerMAC
|
|
||||||
{
|
|
||||||
public ulong Timestamp;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
|
|
||||||
public byte[] MAC;
|
|
||||||
public ulong Unknown;
|
|
||||||
public ulong Timestamp_2;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x28)]
|
|
||||||
public struct HidControllerHeader
|
|
||||||
{
|
|
||||||
public uint Type;
|
|
||||||
public uint IsHalf;
|
|
||||||
public uint SingleColorsDescriptor;
|
|
||||||
public uint SingleColorBody;
|
|
||||||
public uint SingleColorButtons;
|
|
||||||
public uint SplitColorsDescriptor;
|
|
||||||
public uint LeftColorBody;
|
|
||||||
public uint LeftColorButtons;
|
|
||||||
public uint RightColorBody;
|
|
||||||
public uint RightColorButtons;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x20)]
|
|
||||||
public struct HidControllerLayoutHeader
|
|
||||||
{
|
|
||||||
public ulong TimestampTicks;
|
|
||||||
public ulong NumEntries;
|
|
||||||
public ulong LatestEntry;
|
|
||||||
public ulong MaxEntryIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x30)]
|
|
||||||
public struct HidControllerInputEntry
|
|
||||||
{
|
|
||||||
public ulong Timestamp;
|
|
||||||
public ulong Timestamp_2;
|
|
||||||
public ulong Buttons;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = (int)HidControllerJoystick.Joystick_Num_Sticks)]
|
|
||||||
public JoystickPosition[] Joysticks;
|
|
||||||
public ulong ConnectionState;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x350)]
|
|
||||||
public struct HidControllerLayout
|
|
||||||
{
|
|
||||||
public HidControllerLayoutHeader Header;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
|
|
||||||
public HidControllerInputEntry[] Entries;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x5000)]
|
|
||||||
public struct HidController
|
|
||||||
{
|
|
||||||
public HidControllerHeader Header;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
|
|
||||||
public HidControllerLayout[] Layouts;
|
|
||||||
/*
|
|
||||||
pro_controller
|
|
||||||
handheld_joined
|
|
||||||
joined
|
|
||||||
left
|
|
||||||
right
|
|
||||||
main_no_analog
|
|
||||||
main
|
|
||||||
*/
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x2A70)]
|
|
||||||
public byte[] Unknown_1;
|
|
||||||
public HidControllerMAC MacLeft;
|
|
||||||
public HidControllerMAC MacRight;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xDF8)]
|
|
||||||
public byte[] Unknown_2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
35
Ryujinx.Core/Hid/HidControllerButtons.cs
Normal file
35
Ryujinx.Core/Hid/HidControllerButtons.cs
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
[Flags]
|
||||||
|
public enum HidControllerButtons
|
||||||
|
{
|
||||||
|
KEY_A = (1 << 0),
|
||||||
|
KEY_B = (1 << 1),
|
||||||
|
KEY_X = (1 << 2),
|
||||||
|
KEY_Y = (1 << 3),
|
||||||
|
KEY_LSTICK = (1 << 4),
|
||||||
|
KEY_RSTICK = (1 << 5),
|
||||||
|
KEY_L = (1 << 6),
|
||||||
|
KEY_R = (1 << 7),
|
||||||
|
KEY_ZL = (1 << 8),
|
||||||
|
KEY_ZR = (1 << 9),
|
||||||
|
KEY_PLUS = (1 << 10),
|
||||||
|
KEY_MINUS = (1 << 11),
|
||||||
|
KEY_DLEFT = (1 << 12),
|
||||||
|
KEY_DUP = (1 << 13),
|
||||||
|
KEY_DRIGHT = (1 << 14),
|
||||||
|
KEY_DDOWN = (1 << 15),
|
||||||
|
KEY_LSTICK_LEFT = (1 << 16),
|
||||||
|
KEY_LSTICK_UP = (1 << 17),
|
||||||
|
KEY_LSTICK_RIGHT = (1 << 18),
|
||||||
|
KEY_LSTICK_DOWN = (1 << 19),
|
||||||
|
KEY_RSTICK_LEFT = (1 << 20),
|
||||||
|
KEY_RSTICK_UP = (1 << 21),
|
||||||
|
KEY_RSTICK_RIGHT = (1 << 22),
|
||||||
|
KEY_RSTICK_DOWN = (1 << 23),
|
||||||
|
KEY_SL = (1 << 24),
|
||||||
|
KEY_SR = (1 << 25)
|
||||||
|
}
|
||||||
|
}
|
||||||
10
Ryujinx.Core/Hid/HidControllerColorDesc.cs
Normal file
10
Ryujinx.Core/Hid/HidControllerColorDesc.cs
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
[Flags]
|
||||||
|
public enum HidControllerColorDesc
|
||||||
|
{
|
||||||
|
ColorDesc_ColorsNonexistent = (1 << 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Ryujinx.Core/Hid/HidControllerConnState.cs
Normal file
11
Ryujinx.Core/Hid/HidControllerConnState.cs
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
[Flags]
|
||||||
|
public enum HidControllerConnState
|
||||||
|
{
|
||||||
|
Controller_State_Connected = (1 << 0),
|
||||||
|
Controller_State_Wired = (1 << 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
16
Ryujinx.Core/Hid/HidControllerId.cs
Normal file
16
Ryujinx.Core/Hid/HidControllerId.cs
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
public enum HidControllerId
|
||||||
|
{
|
||||||
|
CONTROLLER_PLAYER_1 = 0,
|
||||||
|
CONTROLLER_PLAYER_2 = 1,
|
||||||
|
CONTROLLER_PLAYER_3 = 2,
|
||||||
|
CONTROLLER_PLAYER_4 = 3,
|
||||||
|
CONTROLLER_PLAYER_5 = 4,
|
||||||
|
CONTROLLER_PLAYER_6 = 5,
|
||||||
|
CONTROLLER_PLAYER_7 = 6,
|
||||||
|
CONTROLLER_PLAYER_8 = 7,
|
||||||
|
CONTROLLER_HANDHELD = 8,
|
||||||
|
CONTROLLER_UNKNOWN = 9
|
||||||
|
}
|
||||||
|
}
|
||||||
13
Ryujinx.Core/Hid/HidControllerLayouts.cs
Normal file
13
Ryujinx.Core/Hid/HidControllerLayouts.cs
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
public enum HidControllerLayouts
|
||||||
|
{
|
||||||
|
Pro_Controller = 0,
|
||||||
|
Handheld_Joined = 1,
|
||||||
|
Joined = 2,
|
||||||
|
Left = 3,
|
||||||
|
Right = 4,
|
||||||
|
Main_No_Analog = 5,
|
||||||
|
Main = 6
|
||||||
|
}
|
||||||
|
}
|
||||||
14
Ryujinx.Core/Hid/HidControllerType.cs
Normal file
14
Ryujinx.Core/Hid/HidControllerType.cs
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
[Flags]
|
||||||
|
public enum HidControllerType
|
||||||
|
{
|
||||||
|
ControllerType_ProController = (1 << 0),
|
||||||
|
ControllerType_Handheld = (1 << 1),
|
||||||
|
ControllerType_JoyconPair = (1 << 2),
|
||||||
|
ControllerType_JoyconLeft = (1 << 3),
|
||||||
|
ControllerType_JoyconRight = (1 << 4)
|
||||||
|
}
|
||||||
|
}
|
||||||
8
Ryujinx.Core/Hid/HidJoystickPosition.cs
Normal file
8
Ryujinx.Core/Hid/HidJoystickPosition.cs
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
public struct HidJoystickPosition
|
||||||
|
{
|
||||||
|
public int DX;
|
||||||
|
public int DY;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
namespace Ryujinx.Core
|
|
||||||
{
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x20)]
|
|
||||||
public struct HidKeyboardHeader
|
|
||||||
{
|
|
||||||
public ulong TimestampTicks;
|
|
||||||
public ulong NumEntries;
|
|
||||||
public ulong LatestEntry;
|
|
||||||
public ulong MaxEntryIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x38)]
|
|
||||||
public struct HidKeyboardEntry
|
|
||||||
{
|
|
||||||
public ulong Timestamp;
|
|
||||||
public ulong Timestamp_2;
|
|
||||||
public ulong Modifier;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
|
|
||||||
public uint[] Keys;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x400)]
|
|
||||||
public struct HidKeyboard
|
|
||||||
{
|
|
||||||
public HidKeyboardHeader Header;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
|
|
||||||
public HidKeyboardEntry[] Entries;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x28)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
namespace Ryujinx.Core
|
|
||||||
{
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x20)]
|
|
||||||
public struct HidMouseHeader
|
|
||||||
{
|
|
||||||
public ulong TimestampTicks;
|
|
||||||
public ulong NumEntries;
|
|
||||||
public ulong LatestEntry;
|
|
||||||
public ulong MaxEntryIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x30)]
|
|
||||||
public struct HidMouseEntry
|
|
||||||
{
|
|
||||||
public ulong Timestamp;
|
|
||||||
public ulong Timestamp_2;
|
|
||||||
public uint X;
|
|
||||||
public uint Y;
|
|
||||||
public uint VelocityX;
|
|
||||||
public uint VelocityY;
|
|
||||||
public uint ScrollVelocityX;
|
|
||||||
public uint ScrollVelocityY;
|
|
||||||
public ulong Buttons;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x400)]
|
|
||||||
public struct HidMouse
|
|
||||||
{
|
|
||||||
public HidMouseHeader Header;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
|
|
||||||
public HidMouseEntry[] Entries;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xB0)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
11
Ryujinx.Core/Hid/HidTouchPoint.cs
Normal file
11
Ryujinx.Core/Hid/HidTouchPoint.cs
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
public struct HidTouchPoint
|
||||||
|
{
|
||||||
|
public int X;
|
||||||
|
public int Y;
|
||||||
|
public int DiameterX;
|
||||||
|
public int DiameterY;
|
||||||
|
public int Angle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
namespace Ryujinx.Core
|
|
||||||
{
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x28)]
|
|
||||||
public struct HidTouchScreenHeader
|
|
||||||
{
|
|
||||||
public ulong TimestampTicks;
|
|
||||||
public ulong NumEntries;
|
|
||||||
public ulong LatestEntry;
|
|
||||||
public ulong MaxEntryIndex;
|
|
||||||
public ulong Timestamp;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x10)]
|
|
||||||
public struct HidTouchScreenEntryHeader
|
|
||||||
{
|
|
||||||
public ulong Timestamp;
|
|
||||||
public ulong NumTouches;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x28)]
|
|
||||||
public struct HidTouchScreenEntryTouch
|
|
||||||
{
|
|
||||||
public ulong Timestamp;
|
|
||||||
public uint Padding;
|
|
||||||
public uint TouchIndex;
|
|
||||||
public uint X;
|
|
||||||
public uint Y;
|
|
||||||
public uint DiameterX;
|
|
||||||
public uint DiameterY;
|
|
||||||
public uint Angle;
|
|
||||||
public uint Padding_2;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x298)]
|
|
||||||
public struct HidTouchScreenEntry
|
|
||||||
{
|
|
||||||
public HidTouchScreenEntryHeader Header;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
|
|
||||||
public HidTouchScreenEntryTouch[] Touches;
|
|
||||||
public ulong Unknown;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x3000)]
|
|
||||||
public struct HidTouchScreen
|
|
||||||
{
|
|
||||||
public HidTouchScreenHeader Header;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
|
|
||||||
public HidTouchScreenEntry[] Entries;
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x3C0)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
namespace Ryujinx.Core
|
|
||||||
{
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x400)]
|
|
||||||
public struct HidSharedMemHeader
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x400)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x400)]
|
|
||||||
public struct HidUnknownSection1
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x400)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x400)]
|
|
||||||
public struct HidUnknownSection2
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x400)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x400)]
|
|
||||||
public struct HidUnknownSection3
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x400)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x400)]
|
|
||||||
public struct HidUnknownSection4
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x400)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x200)]
|
|
||||||
public struct HidUnknownSection5
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x200)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x200)]
|
|
||||||
public struct HidUnknownSection6
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x200)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x200)]
|
|
||||||
public struct HidUnknownSection7
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x200)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x800)]
|
|
||||||
public struct HidUnknownSection8
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x800)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x4000)]
|
|
||||||
public struct HidControllerSerials
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x4000)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Size = 0x4600)]
|
|
||||||
public struct HidUnknownSection9
|
|
||||||
{
|
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x4600)]
|
|
||||||
public byte[] Padding;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,27 +1,6 @@
|
||||||
namespace Ryujinx
|
//TODO: This is only used by Config, it doesn't belong to Core.
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Common RGB color hex codes for JoyCon coloring.
|
|
||||||
/// </summary>
|
|
||||||
public enum JoyConColor //Thanks to CTCaer
|
|
||||||
{
|
|
||||||
Body_Grey = 0x828282,
|
|
||||||
Body_Neon_Blue = 0x0AB9E6,
|
|
||||||
Body_Neon_Red = 0xFF3C28,
|
|
||||||
Body_Neon_Yellow = 0xE6FF00,
|
|
||||||
Body_Neon_Pink = 0xFF3278,
|
|
||||||
Body_Neon_Green = 0x1EDC00,
|
|
||||||
Body_Red = 0xE10F00,
|
|
||||||
|
|
||||||
Buttons_Grey = 0x0F0F0F,
|
|
||||||
Buttons_Neon_Blue = 0x001E1E,
|
|
||||||
Buttons_Neon_Red = 0x1E0A0A,
|
|
||||||
Buttons_Neon_Yellow = 0x142800,
|
|
||||||
Buttons_Neon_Pink = 0x28001E,
|
|
||||||
Buttons_Neon_Green = 0x002800,
|
|
||||||
Buttons_Red = 0x280A0A
|
|
||||||
}
|
|
||||||
|
|
||||||
public struct JoyConLeft
|
public struct JoyConLeft
|
||||||
{
|
{
|
||||||
public int StickUp;
|
public int StickUp;
|
||||||
|
|
|
||||||
23
Ryujinx.Core/Hid/JoyConColor.cs
Normal file
23
Ryujinx.Core/Hid/JoyConColor.cs
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
namespace Ryujinx.Core.Input
|
||||||
|
{
|
||||||
|
public enum JoyConColor //Thanks to CTCaer
|
||||||
|
{
|
||||||
|
Black = 0,
|
||||||
|
|
||||||
|
Body_Grey = 0x828282,
|
||||||
|
Body_Neon_Blue = 0x0AB9E6,
|
||||||
|
Body_Neon_Red = 0xFF3C28,
|
||||||
|
Body_Neon_Yellow = 0xE6FF00,
|
||||||
|
Body_Neon_Pink = 0xFF3278,
|
||||||
|
Body_Neon_Green = 0x1EDC00,
|
||||||
|
Body_Red = 0xE10F00,
|
||||||
|
|
||||||
|
Buttons_Grey = 0x0F0F0F,
|
||||||
|
Buttons_Neon_Blue = 0x001E1E,
|
||||||
|
Buttons_Neon_Red = 0x1E0A0A,
|
||||||
|
Buttons_Neon_Yellow = 0x142800,
|
||||||
|
Buttons_Neon_Pink = 0x28001E,
|
||||||
|
Buttons_Neon_Green = 0x002800,
|
||||||
|
Buttons_Red = 0x280A0A
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -242,6 +242,16 @@ namespace Ryujinx.Core.OsHle
|
||||||
Logging.Trace($"Executing at 0x{e.Position:x16} {e.SubName}");
|
Logging.Trace($"Executing at 0x{e.Position:x16} {e.SubName}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void EnableCpuTracing()
|
||||||
|
{
|
||||||
|
Translator.EnableCpuTrace = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void DisableCpuTracing()
|
||||||
|
{
|
||||||
|
Translator.EnableCpuTrace = false;
|
||||||
|
}
|
||||||
|
|
||||||
private int GetFreeTlsSlot(AThread Thread)
|
private int GetFreeTlsSlot(AThread Thread)
|
||||||
{
|
{
|
||||||
for (int Index = 1; Index < TotalTlsSlots; Index++)
|
for (int Index = 1; Index < TotalTlsSlots; Index++)
|
||||||
|
|
|
||||||
|
|
@ -121,6 +121,8 @@ namespace Ryujinx.Core.OsHle.Svc
|
||||||
|
|
||||||
if (SharedMem != null)
|
if (SharedMem != null)
|
||||||
{
|
{
|
||||||
|
AMemoryHelper.FillWithZeros(Memory, Src, (int)Size);
|
||||||
|
|
||||||
SharedMem.AddVirtualPosition(Src);
|
SharedMem.AddVirtualPosition(Src);
|
||||||
|
|
||||||
Memory.Manager.Map(Src, Size, (int)MemoryType.SharedMemory, (AMemoryPerm)Perm);
|
Memory.Manager.Map(Src, Size, (int)MemoryType.SharedMemory, (AMemoryPerm)Perm);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using ChocolArm64.Memory;
|
using ChocolArm64.Memory;
|
||||||
|
using Ryujinx.Core.Input;
|
||||||
using Ryujinx.Core.OsHle;
|
using Ryujinx.Core.OsHle;
|
||||||
using Ryujinx.Graphics.Gal;
|
using Ryujinx.Graphics.Gal;
|
||||||
using Ryujinx.Graphics.Gpu;
|
using Ryujinx.Graphics.Gpu;
|
||||||
|
|
@ -14,7 +15,7 @@ namespace Ryujinx.Core
|
||||||
internal NsGpu Gpu { get; private set; }
|
internal NsGpu Gpu { get; private set; }
|
||||||
internal Horizon Os { get; private set; }
|
internal Horizon Os { get; private set; }
|
||||||
internal VirtualFs VFs { get; private set; }
|
internal VirtualFs VFs { get; private set; }
|
||||||
internal Hid Hid { get; private set; }
|
public Hid Hid { get; private set; }
|
||||||
|
|
||||||
public event EventHandler Finish;
|
public event EventHandler Finish;
|
||||||
|
|
||||||
|
|
@ -43,20 +44,6 @@ namespace Ryujinx.Core
|
||||||
Os.LoadProgram(FileName);
|
Os.LoadProgram(FileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SendControllerButtons(HidControllerID ControllerId,
|
|
||||||
HidControllerLayouts Layout,
|
|
||||||
HidControllerKeys Buttons,
|
|
||||||
JoystickPosition LeftJoystick,
|
|
||||||
JoystickPosition RightJoystick)
|
|
||||||
{
|
|
||||||
Hid.SendControllerButtons(ControllerId, Layout, Buttons, LeftJoystick, RightJoystick);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SendTouchScreenEntry(HidTouchScreenEntryTouch TouchPoint)
|
|
||||||
{
|
|
||||||
Hid.SendTouchPoint(TouchPoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal virtual void OnFinish(EventArgs e)
|
internal virtual void OnFinish(EventArgs e)
|
||||||
{
|
{
|
||||||
Finish?.Invoke(this, e);
|
Finish?.Invoke(this, e);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
using OpenTK;
|
using OpenTK;
|
||||||
using OpenTK.Graphics;
|
using OpenTK.Graphics;
|
||||||
using OpenTK.Graphics.OpenGL;
|
using OpenTK.Graphics.OpenGL;
|
||||||
|
using OpenTK.Input;
|
||||||
using Ryujinx.Core;
|
using Ryujinx.Core;
|
||||||
|
using Ryujinx.Core.Input;
|
||||||
using Ryujinx.Graphics.Gal;
|
using Ryujinx.Graphics.Gal;
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
|
|
@ -9,6 +11,12 @@ namespace Ryujinx
|
||||||
{
|
{
|
||||||
public class GLScreen : GameWindow
|
public class GLScreen : GameWindow
|
||||||
{
|
{
|
||||||
|
private const int TouchScreenWidth = 1280;
|
||||||
|
private const int TouchScreenHeight = 720;
|
||||||
|
|
||||||
|
private const float TouchScreenRatioX = (float)TouchScreenWidth / TouchScreenHeight;
|
||||||
|
private const float TouchScreenRatioY = (float)TouchScreenHeight / TouchScreenWidth;
|
||||||
|
|
||||||
private Switch Ns;
|
private Switch Ns;
|
||||||
|
|
||||||
private IGalRenderer Renderer;
|
private IGalRenderer Renderer;
|
||||||
|
|
@ -32,86 +40,124 @@ namespace Ryujinx
|
||||||
|
|
||||||
protected override void OnUpdateFrame(FrameEventArgs e)
|
protected override void OnUpdateFrame(FrameEventArgs e)
|
||||||
{
|
{
|
||||||
HidControllerKeys CurrentButton = 0;
|
HidControllerButtons CurrentButton = 0;
|
||||||
JoystickPosition LeftJoystick;
|
HidJoystickPosition LeftJoystick;
|
||||||
JoystickPosition RightJoystick;
|
HidJoystickPosition RightJoystick;
|
||||||
|
|
||||||
|
|
||||||
if (Keyboard[OpenTK.Input.Key.Escape]) this.Exit();
|
if (Keyboard[OpenTK.Input.Key.Escape]) this.Exit();
|
||||||
|
|
||||||
//RightJoystick
|
|
||||||
int LeftJoystickDX = 0;
|
int LeftJoystickDX = 0;
|
||||||
int LeftJoystickDY = 0;
|
int LeftJoystickDY = 0;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.StickUp]) LeftJoystickDY = short.MaxValue;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.StickDown]) LeftJoystickDY = -short.MaxValue;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.StickLeft]) LeftJoystickDX = -short.MaxValue;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.StickRight]) LeftJoystickDX = short.MaxValue;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.StickButton]) CurrentButton |= HidControllerKeys.KEY_LSTICK;
|
|
||||||
|
|
||||||
//LeftButtons
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.DPadUp]) CurrentButton |= HidControllerKeys.KEY_DUP;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.DPadDown]) CurrentButton |= HidControllerKeys.KEY_DDOWN;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.DPadLeft]) CurrentButton |= HidControllerKeys.KEY_DLEFT;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.DPadRight]) CurrentButton |= HidControllerKeys.KEY_DRIGHT;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.ButtonMinus]) CurrentButton |= HidControllerKeys.KEY_MINUS;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.ButtonL]) CurrentButton |= HidControllerKeys.KEY_L;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Left.ButtonZL]) CurrentButton |= HidControllerKeys.KEY_ZL;
|
|
||||||
|
|
||||||
//RightJoystick
|
|
||||||
int RightJoystickDX = 0;
|
int RightJoystickDX = 0;
|
||||||
int RightJoystickDY = 0;
|
int RightJoystickDY = 0;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.StickUp]) RightJoystickDY = short.MaxValue;
|
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.StickDown]) RightJoystickDY = -short.MaxValue;
|
//RightJoystick
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.StickLeft]) RightJoystickDX = -short.MaxValue;
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.StickUp]) LeftJoystickDY = short.MaxValue;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.StickRight]) RightJoystickDX = short.MaxValue;
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.StickDown]) LeftJoystickDY = -short.MaxValue;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.StickButton]) CurrentButton |= HidControllerKeys.KEY_RSTICK;
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.StickLeft]) LeftJoystickDX = -short.MaxValue;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.StickRight]) LeftJoystickDX = short.MaxValue;
|
||||||
|
|
||||||
|
//LeftButtons
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.StickButton]) CurrentButton |= HidControllerButtons.KEY_LSTICK;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.DPadUp]) CurrentButton |= HidControllerButtons.KEY_DUP;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.DPadDown]) CurrentButton |= HidControllerButtons.KEY_DDOWN;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.DPadLeft]) CurrentButton |= HidControllerButtons.KEY_DLEFT;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.DPadRight]) CurrentButton |= HidControllerButtons.KEY_DRIGHT;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.ButtonMinus]) CurrentButton |= HidControllerButtons.KEY_MINUS;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.ButtonL]) CurrentButton |= HidControllerButtons.KEY_L;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Left.ButtonZL]) CurrentButton |= HidControllerButtons.KEY_ZL;
|
||||||
|
|
||||||
|
//RightJoystick
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.StickUp]) RightJoystickDY = short.MaxValue;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.StickDown]) RightJoystickDY = -short.MaxValue;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.StickLeft]) RightJoystickDX = -short.MaxValue;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.StickRight]) RightJoystickDX = short.MaxValue;
|
||||||
|
|
||||||
//RightButtons
|
//RightButtons
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.ButtonA]) CurrentButton |= HidControllerKeys.KEY_A;
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.StickButton]) CurrentButton |= HidControllerButtons.KEY_RSTICK;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.ButtonB]) CurrentButton |= HidControllerKeys.KEY_B;
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonA]) CurrentButton |= HidControllerButtons.KEY_A;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.ButtonX]) CurrentButton |= HidControllerKeys.KEY_X;
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonB]) CurrentButton |= HidControllerButtons.KEY_B;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.ButtonY]) CurrentButton |= HidControllerKeys.KEY_Y;
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonX]) CurrentButton |= HidControllerButtons.KEY_X;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.ButtonPlus]) CurrentButton |= HidControllerKeys.KEY_PLUS;
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonY]) CurrentButton |= HidControllerButtons.KEY_Y;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.ButtonR]) CurrentButton |= HidControllerKeys.KEY_R;
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonPlus]) CurrentButton |= HidControllerButtons.KEY_PLUS;
|
||||||
if (Keyboard[(OpenTK.Input.Key)Config.FakeJoyCon.Right.ButtonZR]) CurrentButton |= HidControllerKeys.KEY_ZR;
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonR]) CurrentButton |= HidControllerButtons.KEY_R;
|
||||||
|
if (Keyboard[(Key)Config.FakeJoyCon.Right.ButtonZR]) CurrentButton |= HidControllerButtons.KEY_ZR;
|
||||||
|
|
||||||
LeftJoystick = new JoystickPosition
|
LeftJoystick = new HidJoystickPosition
|
||||||
{
|
{
|
||||||
DX = LeftJoystickDX,
|
DX = LeftJoystickDX,
|
||||||
DY = LeftJoystickDY
|
DY = LeftJoystickDY
|
||||||
};
|
};
|
||||||
|
|
||||||
RightJoystick = new JoystickPosition
|
RightJoystick = new HidJoystickPosition
|
||||||
{
|
{
|
||||||
DX = RightJoystickDX,
|
DX = RightJoystickDX,
|
||||||
DY = RightJoystickDY
|
DY = RightJoystickDY
|
||||||
};
|
};
|
||||||
|
|
||||||
|
bool HasTouch = false;
|
||||||
|
|
||||||
//Get screen touch position from left mouse click
|
//Get screen touch position from left mouse click
|
||||||
//Opentk always captures mouse events, even if out of focus, so check if window is focused.
|
//OpenTK always captures mouse events, even if out of focus, so check if window is focused.
|
||||||
if (Mouse != null && Focused)
|
if (Focused && Mouse?.GetState().LeftButton == OpenTK.Input.ButtonState.Pressed)
|
||||||
if (Mouse.GetState().LeftButton == OpenTK.Input.ButtonState.Pressed)
|
{
|
||||||
|
int ScrnWidth = Width;
|
||||||
|
int ScrnHeight = Height;
|
||||||
|
|
||||||
|
if (Width > Height * TouchScreenRatioX)
|
||||||
{
|
{
|
||||||
HidTouchScreenEntryTouch CurrentPoint = new HidTouchScreenEntryTouch
|
ScrnWidth = (int)(Height * TouchScreenRatioX);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ScrnHeight = (int)(Width * TouchScreenRatioY);
|
||||||
|
}
|
||||||
|
|
||||||
|
int StartX = (Width - ScrnWidth) >> 1;
|
||||||
|
int StartY = (Height - ScrnHeight) >> 1;
|
||||||
|
|
||||||
|
int EndX = StartX + ScrnWidth;
|
||||||
|
int EndY = StartY + ScrnHeight;
|
||||||
|
|
||||||
|
if (Mouse.X >= StartX &&
|
||||||
|
Mouse.Y >= StartY &&
|
||||||
|
Mouse.X < EndX &&
|
||||||
|
Mouse.Y < EndY)
|
||||||
|
{
|
||||||
|
int ScrnMouseX = Mouse.X - StartX;
|
||||||
|
int ScrnMouseY = Mouse.Y - StartY;
|
||||||
|
|
||||||
|
int MX = (int)(((float)ScrnMouseX / ScrnWidth) * TouchScreenWidth);
|
||||||
|
int MY = (int)(((float)ScrnMouseY / ScrnHeight) * TouchScreenHeight);
|
||||||
|
|
||||||
|
HidTouchPoint CurrentPoint = new HidTouchPoint
|
||||||
{
|
{
|
||||||
Timestamp = (uint)Environment.TickCount,
|
X = MX,
|
||||||
X = (uint)Mouse.X,
|
Y = MY,
|
||||||
Y = (uint)Mouse.Y,
|
|
||||||
|
|
||||||
//Placeholder values till more data is acquired
|
//Placeholder values till more data is acquired
|
||||||
DiameterX = 10,
|
DiameterX = 10,
|
||||||
DiameterY = 10,
|
DiameterY = 10,
|
||||||
Angle = 90,
|
Angle = 90
|
||||||
|
|
||||||
//Only support single touch
|
|
||||||
TouchIndex = 0,
|
|
||||||
};
|
};
|
||||||
if (Mouse.X > -1 && Mouse.Y > -1)
|
|
||||||
Ns.SendTouchScreenEntry(CurrentPoint);
|
|
||||||
}
|
|
||||||
|
|
||||||
//We just need one pair of JoyCon because it's emulate by the keyboard.
|
HasTouch = true;
|
||||||
Ns.SendControllerButtons(HidControllerID.CONTROLLER_HANDHELD, HidControllerLayouts.Main, CurrentButton, LeftJoystick, RightJoystick);
|
|
||||||
|
Ns.Hid.SetTouchPoints(CurrentPoint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!HasTouch)
|
||||||
|
{
|
||||||
|
Ns.Hid.SetTouchPoints();
|
||||||
|
}
|
||||||
|
|
||||||
|
Ns.Hid.SetJoyconButton(
|
||||||
|
HidControllerId.CONTROLLER_HANDHELD,
|
||||||
|
HidControllerLayouts.Main,
|
||||||
|
CurrentButton,
|
||||||
|
LeftJoystick,
|
||||||
|
RightJoystick);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnRenderFrame(FrameEventArgs e)
|
protected override void OnRenderFrame(FrameEventArgs e)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue