empathicqubit/BetterJoy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump WindowsInput version (#830)

Browse source
This commit is contained in:
empathicqubit 2021-08-22 14:43:44 +02:00 • committed by GitHub
parent 50b64b1165
commit 0ccd62fd88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BetterJoyForCemu/BetterJoy.csproj
View file

@ -119,8 +119,8 @@
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="WindowsInput, Version=6.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="WindowsInput, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\WindowsInput.6.1.0\lib\net461\WindowsInput.dll</HintPath> <HintPath>..\packages\WindowsInput.6.3.0\lib\net461\WindowsInput.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
BetterJoyForCemu/Program.cs
View file

@ -358,8 +358,8 @@ namespace BetterJoyForCemu {
public static List<SController> thirdPartyCons = new List<SController>(); public static List<SController> thirdPartyCons = new List<SController>();
private static WindowsInput.EventSources.IKeyboardEventSource keyboard; private static WindowsInput.Events.Sources.IKeyboardEventSource keyboard;
private static WindowsInput.EventSources.IMouseEventSource mouse; private static WindowsInput.Events.Sources.IMouseEventSource mouse;
public static void Start() { public static void Start() {
pid = Process.GetCurrentProcess().Id.ToString(); // get current process id for HidCerberus.Srv pid = Process.GetCurrentProcess().Id.ToString(); // get current process id for HidCerberus.Srv
@ -442,7 +442,7 @@ namespace BetterJoyForCemu {
form.console.AppendText("All systems go\r\n"); form.console.AppendText("All systems go\r\n");
} }
private static void Mouse_MouseEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.MouseEvent> e) { private static void Mouse_MouseEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.MouseEvent> e) {
if (e.Data.ButtonDown != null) { if (e.Data.ButtonDown != null) {
string res_val = Config.Value("reset_mouse"); string res_val = Config.Value("reset_mouse");
if (res_val.StartsWith("mse_")) if (res_val.StartsWith("mse_"))
@ -465,7 +465,7 @@ namespace BetterJoyForCemu {
} }
} }
private static void Keyboard_KeyEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.KeyboardEvent> e) { private static void Keyboard_KeyEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.KeyboardEvent> e) {
if (e.Data.KeyDown != null) { if (e.Data.KeyDown != null) {
string res_val = Config.Value("reset_mouse"); string res_val = Config.Value("reset_mouse");
if (res_val.StartsWith("key_")) if (res_val.StartsWith("key_"))

8
BetterJoyForCemu/Reassign.cs
View file

@ -11,8 +11,8 @@ using System.Windows.Forms;
namespace BetterJoyForCemu { namespace BetterJoyForCemu {
public partial class Reassign : Form { public partial class Reassign : Form {
private WindowsInput.EventSources.IKeyboardEventSource keyboard; private WindowsInput.Events.Sources.IKeyboardEventSource keyboard;
private WindowsInput.EventSources.IMouseEventSource mouse; private WindowsInput.Events.Sources.IMouseEventSource mouse;
ContextMenuStrip menu_joy_buttons = new ContextMenuStrip(); ContextMenuStrip menu_joy_buttons = new ContextMenuStrip();
@ -73,7 +73,7 @@ namespace BetterJoyForCemu {
mouse.MouseEvent += Mouse_MouseEvent; mouse.MouseEvent += Mouse_MouseEvent;
} }
private void Mouse_MouseEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.MouseEvent> e) { private void Mouse_MouseEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.MouseEvent> e) {
if (curAssignment != null && e.Data.ButtonDown != null) { if (curAssignment != null && e.Data.ButtonDown != null) {
Config.SetValue((string)curAssignment.Tag, "mse_" + ((int)e.Data.ButtonDown.Button)); Config.SetValue((string)curAssignment.Tag, "mse_" + ((int)e.Data.ButtonDown.Button));
AsyncPrettyName(curAssignment); AsyncPrettyName(curAssignment);
@ -82,7 +82,7 @@ namespace BetterJoyForCemu {
} }
} }
private void Keyboard_KeyEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.KeyboardEvent> e) { private void Keyboard_KeyEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.KeyboardEvent> e) {
if (curAssignment != null && e.Data.KeyDown != null) { if (curAssignment != null && e.Data.KeyDown != null) {
Config.SetValue((string)curAssignment.Tag, "key_" + ((int)e.Data.KeyDown.Key)); Config.SetValue((string)curAssignment.Tag, "key_" + ((int)e.Data.KeyDown.Key));
AsyncPrettyName(curAssignment); AsyncPrettyName(curAssignment);

2
BetterJoyForCemu/packages.config
View file

@ -3,5 +3,5 @@
<package id="Crc32.NET" version="1.2.0" targetFramework="net461" /> <package id="Crc32.NET" version="1.2.0" targetFramework="net461" />
<package id="JetBrains.Annotations" version="2020.1.0" targetFramework="net461" /> <package id="JetBrains.Annotations" version="2020.1.0" targetFramework="net461" />
<package id="Nefarius.ViGEm.Client" version="1.17.178" targetFramework="net461" /> <package id="Nefarius.ViGEm.Client" version="1.17.178" targetFramework="net461" />
<package id="WindowsInput" version="6.1.0" targetFramework="net461" /> <package id="WindowsInput" version="6.3.0" targetFramework="net461" />
</packages> </packages>