From 36574bdf4685967e9a4921f1ac5875eb4ca8bb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Fri, 7 Jun 2024 01:40:28 +0200 Subject: [PATCH 01/22] refactor: made GamepadReader an interface --- GamepadReader.cs | 8 ++++---- JoyConRead.cs | 8 ++++---- Program.cs | 2 +- SlideSwitcher.cs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/GamepadReader.cs b/GamepadReader.cs index 77770ef..2fbf258 100644 --- a/GamepadReader.cs +++ b/GamepadReader.cs @@ -1,8 +1,8 @@ namespace SwitchSlidePresenter; -public abstract class GamepadReader { - public abstract event Action NextSlide; - public abstract event Action PrevSlide; +public interface IGamepadReader { + public event Action NextSlide; + public event Action PrevSlide; - public abstract Task Read(); + public Task Read(); } \ No newline at end of file diff --git a/JoyConRead.cs b/JoyConRead.cs index 49c1153..5496085 100644 --- a/JoyConRead.cs +++ b/JoyConRead.cs @@ -10,11 +10,11 @@ using wtf.cluster.JoyCon.Rumble; namespace SwitchSlidePresenter; -public class JoyConRead : GamepadReader { - public override event Action NextSlide; - public override event Action PrevSlide; +public class JoyConRead : IGamepadReader { + public event Action NextSlide; + public event Action PrevSlide; - public override async Task Read() { + public async Task Read() { Console.OutputEncoding = Encoding.UTF8; HidDevice? device = GetHidDevice(); diff --git a/Program.cs b/Program.cs index 91aef77..99e227d 100644 --- a/Program.cs +++ b/Program.cs @@ -1,7 +1,7 @@ namespace SwitchSlidePresenter { class Program { private static async Task Main() { - GamepadReader reader = new JoyConRead(); + IGamepadReader reader = new JoyConRead(); SlideSwitcher switcher = new(reader); await reader.Read(); switcher.Dispose(); diff --git a/SlideSwitcher.cs b/SlideSwitcher.cs index 837c292..645d039 100644 --- a/SlideSwitcher.cs +++ b/SlideSwitcher.cs @@ -1,9 +1,9 @@ namespace SwitchSlidePresenter; public class SlideSwitcher : IDisposable { - private readonly GamepadReader _reader; + private readonly IGamepadReader _reader; - public SlideSwitcher(GamepadReader reader) { + public SlideSwitcher(IGamepadReader reader) { _reader = reader; _reader.NextSlide += NextSlide; _reader.PrevSlide += PreviousSlide; From baf15cdb0f6a8c357fb573d7db6aea51b2b9f271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:47:00 +0200 Subject: [PATCH 02/22] feat: Added wiimote support and cleaned up the project --- .../.idea/.gitignore | 0 .../.idea/.name | 1 + .../.idea/encodings.xml | 0 .../.idea/git_toolbox_prj.xml | 0 .../.idea/indexLayout.xml | 0 .../.idea/vcs.xml | 0 ControllerSlidePresenter.sln | 22 +++++++ Program.cs | 10 --- SlidePresenter/ControllerSelector.cs | 27 ++++++++ .../IGamepadReader.cs | 0 JoyConRead.cs => SlidePresenter/JoyConRead.cs | 3 - SlidePresenter/Program.cs | 14 ++++ SlidePresenter/SlideSwitcher.cs | 65 +++++++++++++++++++ .../SwitchSlidePresenter.csproj | 5 ++ SlidePresenter/WiimoteRead.cs | 58 +++++++++++++++++ SlideSwitcher.cs | 26 -------- SwitchSlidePresenter.sln | 16 ----- Win32Api.cs | 14 ---- Win32Api/HardwareInput.cs | 10 +++ Win32Api/Input.cs | 9 +++ Win32Api/InputUnion.cs | 10 +++ Win32Api/KeyboardInput.cs | 12 ++++ Win32Api/MouseInput.cs | 13 ++++ Win32Api/Win32Api.cs | 8 +++ Win32Api/Win32Api.csproj | 9 +++ 25 files changed, 263 insertions(+), 69 deletions(-) rename .idea/{.idea.SwitchSlidePresenter => .idea.ControllerSlidePresenter}/.idea/.gitignore (100%) create mode 100644 .idea/.idea.ControllerSlidePresenter/.idea/.name rename .idea/{.idea.SwitchSlidePresenter => .idea.ControllerSlidePresenter}/.idea/encodings.xml (100%) rename .idea/{.idea.SwitchSlidePresenter => .idea.ControllerSlidePresenter}/.idea/git_toolbox_prj.xml (100%) rename .idea/{.idea.SwitchSlidePresenter => .idea.ControllerSlidePresenter}/.idea/indexLayout.xml (100%) rename .idea/{.idea.SwitchSlidePresenter => .idea.ControllerSlidePresenter}/.idea/vcs.xml (100%) create mode 100644 ControllerSlidePresenter.sln delete mode 100644 Program.cs create mode 100644 SlidePresenter/ControllerSelector.cs rename GamepadReader.cs => SlidePresenter/IGamepadReader.cs (100%) rename JoyConRead.cs => SlidePresenter/JoyConRead.cs (97%) create mode 100644 SlidePresenter/Program.cs create mode 100644 SlidePresenter/SlideSwitcher.cs rename SwitchSlidePresenter.csproj => SlidePresenter/SwitchSlidePresenter.csproj (67%) create mode 100644 SlidePresenter/WiimoteRead.cs delete mode 100644 SlideSwitcher.cs delete mode 100644 SwitchSlidePresenter.sln delete mode 100644 Win32Api.cs create mode 100644 Win32Api/HardwareInput.cs create mode 100644 Win32Api/Input.cs create mode 100644 Win32Api/InputUnion.cs create mode 100644 Win32Api/KeyboardInput.cs create mode 100644 Win32Api/MouseInput.cs create mode 100644 Win32Api/Win32Api.cs create mode 100644 Win32Api/Win32Api.csproj diff --git a/.idea/.idea.SwitchSlidePresenter/.idea/.gitignore b/.idea/.idea.ControllerSlidePresenter/.idea/.gitignore similarity index 100% rename from .idea/.idea.SwitchSlidePresenter/.idea/.gitignore rename to .idea/.idea.ControllerSlidePresenter/.idea/.gitignore diff --git a/.idea/.idea.ControllerSlidePresenter/.idea/.name b/.idea/.idea.ControllerSlidePresenter/.idea/.name new file mode 100644 index 0000000..ef9baeb --- /dev/null +++ b/.idea/.idea.ControllerSlidePresenter/.idea/.name @@ -0,0 +1 @@ +ControllerSlidePresenter \ No newline at end of file diff --git a/.idea/.idea.SwitchSlidePresenter/.idea/encodings.xml b/.idea/.idea.ControllerSlidePresenter/.idea/encodings.xml similarity index 100% rename from .idea/.idea.SwitchSlidePresenter/.idea/encodings.xml rename to .idea/.idea.ControllerSlidePresenter/.idea/encodings.xml diff --git a/.idea/.idea.SwitchSlidePresenter/.idea/git_toolbox_prj.xml b/.idea/.idea.ControllerSlidePresenter/.idea/git_toolbox_prj.xml similarity index 100% rename from .idea/.idea.SwitchSlidePresenter/.idea/git_toolbox_prj.xml rename to .idea/.idea.ControllerSlidePresenter/.idea/git_toolbox_prj.xml diff --git a/.idea/.idea.SwitchSlidePresenter/.idea/indexLayout.xml b/.idea/.idea.ControllerSlidePresenter/.idea/indexLayout.xml similarity index 100% rename from .idea/.idea.SwitchSlidePresenter/.idea/indexLayout.xml rename to .idea/.idea.ControllerSlidePresenter/.idea/indexLayout.xml diff --git a/.idea/.idea.SwitchSlidePresenter/.idea/vcs.xml b/.idea/.idea.ControllerSlidePresenter/.idea/vcs.xml similarity index 100% rename from .idea/.idea.SwitchSlidePresenter/.idea/vcs.xml rename to .idea/.idea.ControllerSlidePresenter/.idea/vcs.xml diff --git a/ControllerSlidePresenter.sln b/ControllerSlidePresenter.sln new file mode 100644 index 0000000..eb48f5c --- /dev/null +++ b/ControllerSlidePresenter.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwitchSlidePresenter", "SlidePresenter\SwitchSlidePresenter.csproj", "{F9832F2F-C7CA-4725-8F70-0FF3F76C0A5D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Win32Api", "Win32Api\Win32Api.csproj", "{16DC83C8-381A-4CA7-9E45-2A9CBC7BF48A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F9832F2F-C7CA-4725-8F70-0FF3F76C0A5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F9832F2F-C7CA-4725-8F70-0FF3F76C0A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F9832F2F-C7CA-4725-8F70-0FF3F76C0A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F9832F2F-C7CA-4725-8F70-0FF3F76C0A5D}.Release|Any CPU.Build.0 = Release|Any CPU + {16DC83C8-381A-4CA7-9E45-2A9CBC7BF48A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {16DC83C8-381A-4CA7-9E45-2A9CBC7BF48A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {16DC83C8-381A-4CA7-9E45-2A9CBC7BF48A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {16DC83C8-381A-4CA7-9E45-2A9CBC7BF48A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Program.cs b/Program.cs deleted file mode 100644 index 99e227d..0000000 --- a/Program.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace SwitchSlidePresenter { - class Program { - private static async Task Main() { - IGamepadReader reader = new JoyConRead(); - SlideSwitcher switcher = new(reader); - await reader.Read(); - switcher.Dispose(); - } - } -} \ No newline at end of file diff --git a/SlidePresenter/ControllerSelector.cs b/SlidePresenter/ControllerSelector.cs new file mode 100644 index 0000000..8efff0f --- /dev/null +++ b/SlidePresenter/ControllerSelector.cs @@ -0,0 +1,27 @@ +namespace SwitchSlidePresenter; + +public static class ControllerSelector { + public static IGamepadReader? GetReader() { + Console.WriteLine("Write a number to select controller type:"); + Console.WriteLine("[1] - JoyCon"); + Console.WriteLine("[2] - Wiimote"); + + string? line = Console.ReadLine(); + if (line == null) { + Console.WriteLine("Invalid input."); + return null; + } + if (!int.TryParse(line, out int id)) { + Console.WriteLine("Invalid number."); + return null; + } + + return GetReader(id); + } + + private static IGamepadReader? GetReader(int id) => id switch { + 1 => new JoyConRead(), + 2 => new WiimoteRead(), + _ => null + }; +} \ No newline at end of file diff --git a/GamepadReader.cs b/SlidePresenter/IGamepadReader.cs similarity index 100% rename from GamepadReader.cs rename to SlidePresenter/IGamepadReader.cs diff --git a/JoyConRead.cs b/SlidePresenter/JoyConRead.cs similarity index 97% rename from JoyConRead.cs rename to SlidePresenter/JoyConRead.cs index 5496085..3eb2a94 100644 --- a/JoyConRead.cs +++ b/SlidePresenter/JoyConRead.cs @@ -1,12 +1,9 @@ using System.Text; using HidSharp; using wtf.cluster.JoyCon; -using wtf.cluster.JoyCon.Calibration; using wtf.cluster.JoyCon.ExtraData; -using wtf.cluster.JoyCon.HomeLed; using wtf.cluster.JoyCon.InputData; using wtf.cluster.JoyCon.InputReports; -using wtf.cluster.JoyCon.Rumble; namespace SwitchSlidePresenter; diff --git a/SlidePresenter/Program.cs b/SlidePresenter/Program.cs new file mode 100644 index 0000000..9a8e12c --- /dev/null +++ b/SlidePresenter/Program.cs @@ -0,0 +1,14 @@ +namespace SwitchSlidePresenter { + internal abstract class Program { + private static async Task Main() { + IGamepadReader? reader = ControllerSelector.GetReader(); + if (reader == null) { + Console.WriteLine("Invalid Controller Selected."); + return; + } + SlideSwitcher switcher = new(reader); + await reader.Read(); + switcher.Dispose(); + } + } +} \ No newline at end of file diff --git a/SlidePresenter/SlideSwitcher.cs b/SlidePresenter/SlideSwitcher.cs new file mode 100644 index 0000000..d81adae --- /dev/null +++ b/SlidePresenter/SlideSwitcher.cs @@ -0,0 +1,65 @@ +using System.Runtime.InteropServices; +using Win32Api; + +namespace SwitchSlidePresenter; + +public class SlideSwitcher : IDisposable { + private readonly IGamepadReader? _reader; + + private const uint INPUT_KEYBOARD = 1; + private const ushort VK_NEXT = 0x22; + private const ushort VK_PRIOR = 0x21; + private const uint KEYEVENTF_KEYDOWN = 0x0000; + private const uint KEYEVENTF_KEYUP = 0x0002; + + public SlideSwitcher(IGamepadReader? reader) { + _reader = reader; + _reader.NextSlide += NextSlide; + _reader.PrevSlide += PreviousSlide; + } + + public void Dispose() { + _reader.NextSlide -= NextSlide; + _reader.PrevSlide -= PreviousSlide; + } + + private static void NextSlide() { + SimulateKeyPress(VK_NEXT); + } + + private static void PreviousSlide() { + SimulateKeyPress(VK_PRIOR); + } + + private static void SimulateKeyPress(ushort keyCode) { + Input[] inputs = new Input[2]; + + inputs[0] = new Input { + type = INPUT_KEYBOARD, + u = new InputUnion { + ki = new KeyboardInput { + wVk = keyCode, + wScan = 0, + dwFlags = KEYEVENTF_KEYDOWN, + time = 0, + dwExtraInfo = IntPtr.Zero + } + } + }; + + inputs[1] = new Input { + type = INPUT_KEYBOARD, + u = new InputUnion { + ki = new KeyboardInput { + wVk = keyCode, + wScan = 0, + dwFlags = KEYEVENTF_KEYUP, + time = 0, + dwExtraInfo = IntPtr.Zero + } + } + }; + + Win32Api.Win32Api.SendInput((uint)inputs.Length, inputs, Marshal.SizeOf(typeof(Input))); + } +} \ No newline at end of file diff --git a/SwitchSlidePresenter.csproj b/SlidePresenter/SwitchSlidePresenter.csproj similarity index 67% rename from SwitchSlidePresenter.csproj rename to SlidePresenter/SwitchSlidePresenter.csproj index 21b392a..3e00c50 100644 --- a/SwitchSlidePresenter.csproj +++ b/SlidePresenter/SwitchSlidePresenter.csproj @@ -9,6 +9,11 @@ + + + + + diff --git a/SlidePresenter/WiimoteRead.cs b/SlidePresenter/WiimoteRead.cs new file mode 100644 index 0000000..7ab8dca --- /dev/null +++ b/SlidePresenter/WiimoteRead.cs @@ -0,0 +1,58 @@ +using WiimoteLib.NetCore; + +namespace SwitchSlidePresenter; + +public class WiimoteRead : IGamepadReader { + public event Action NextSlide; + public event Action PrevSlide; + + private const int RetryDelay = 1000; + + public async Task Read() { + Wiimote wiimote = new(); + while (string.IsNullOrEmpty(wiimote.HIDDevicePath)) { + wiimote.Connect(); + if (string.IsNullOrEmpty(wiimote.HIDDevicePath)) { + Console.WriteLine("Wiimote connection failed, trying again..."); + await Task.Delay(RetryDelay); + } else { + Console.WriteLine("Wiimote ready for presenting!"); + } + } + + ButtonState previousState = wiimote.WiimoteState.ButtonState; + while (true) { + if (PreviousPressed(wiimote.WiimoteState.ButtonState, previousState)) { + PrevSlide?.Invoke(); + } + if (NextPressed(wiimote.WiimoteState.ButtonState, previousState)) { + NextSlide?.Invoke(); + } + previousState = wiimote.WiimoteState.ButtonState; + + await Task.Yield(); + + if (!Console.KeyAvailable || Console.ReadKey().Key != ConsoleKey.Enter) + continue; + wiimote.Disconnect(); + + Console.WriteLine(); + Console.WriteLine("Stopped."); + break; + } + } + + private static bool PreviousPressed(ButtonState input) { + return input.B || input.Left; + } + private static bool NextPressed(ButtonState input) { + return input.A || input.Right; + } + + private static bool PreviousPressed(ButtonState input, ButtonState previousState) { + return PreviousPressed(input) && !PreviousPressed(previousState); + } + private static bool NextPressed(ButtonState input, ButtonState previousState) { + return NextPressed(input) && !NextPressed(previousState); + } +} \ No newline at end of file diff --git a/SlideSwitcher.cs b/SlideSwitcher.cs deleted file mode 100644 index 645d039..0000000 --- a/SlideSwitcher.cs +++ /dev/null @@ -1,26 +0,0 @@ -namespace SwitchSlidePresenter; - -public class SlideSwitcher : IDisposable { - private readonly IGamepadReader _reader; - - public SlideSwitcher(IGamepadReader reader) { - _reader = reader; - _reader.NextSlide += NextSlide; - _reader.PrevSlide += PreviousSlide; - } - - public void Dispose() { - _reader.NextSlide -= NextSlide; - _reader.PrevSlide -= PreviousSlide; - } - - private void NextSlide() { - IntPtr handle = Win32Api.GetForegroundWindow(); - Win32Api.PostMessage(handle, Win32Api.WM_KEYDOWN, Win32Api.VK_NEXT, 0); - } - - private void PreviousSlide() { - IntPtr handle = Win32Api.GetForegroundWindow(); - Win32Api.PostMessage(handle, Win32Api.WM_KEYDOWN, Win32Api.VK_PRIOR, 0); - } -} \ No newline at end of file diff --git a/SwitchSlidePresenter.sln b/SwitchSlidePresenter.sln deleted file mode 100644 index d5f8c1e..0000000 --- a/SwitchSlidePresenter.sln +++ /dev/null @@ -1,16 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwitchSlidePresenter", "SwitchSlidePresenter.csproj", "{50CECFA5-3AC2-4F08-82F2-ED8C82993360}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {50CECFA5-3AC2-4F08-82F2-ED8C82993360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50CECFA5-3AC2-4F08-82F2-ED8C82993360}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50CECFA5-3AC2-4F08-82F2-ED8C82993360}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50CECFA5-3AC2-4F08-82F2-ED8C82993360}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Win32Api.cs b/Win32Api.cs deleted file mode 100644 index e5f503c..0000000 --- a/Win32Api.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Runtime.InteropServices; - -namespace SwitchSlidePresenter; - -public static class Win32Api { - public const UInt32 WM_KEYDOWN = 0x0100; - public const int VK_NEXT = 0x22; - public const int VK_PRIOR = 0x21; - - [DllImport("user32.dll")] - public static extern bool PostMessage(IntPtr hWnd, UInt32 Msg, int wParam, int lParam); - [DllImport("user32.dll")] - public static extern IntPtr GetForegroundWindow(); -} \ No newline at end of file diff --git a/Win32Api/HardwareInput.cs b/Win32Api/HardwareInput.cs new file mode 100644 index 0000000..6df4733 --- /dev/null +++ b/Win32Api/HardwareInput.cs @@ -0,0 +1,10 @@ +using System.Runtime.InteropServices; + +namespace Win32Api; + +[StructLayout(LayoutKind.Sequential)] +public struct HardwareInput { + public uint uMsg; + public ushort wParamL; + public ushort wParamH; +} \ No newline at end of file diff --git a/Win32Api/Input.cs b/Win32Api/Input.cs new file mode 100644 index 0000000..991c3da --- /dev/null +++ b/Win32Api/Input.cs @@ -0,0 +1,9 @@ +using System.Runtime.InteropServices; + +namespace Win32Api; + +[StructLayout(LayoutKind.Sequential)] +public struct Input { + public uint type; + public InputUnion u; +} \ No newline at end of file diff --git a/Win32Api/InputUnion.cs b/Win32Api/InputUnion.cs new file mode 100644 index 0000000..93bf663 --- /dev/null +++ b/Win32Api/InputUnion.cs @@ -0,0 +1,10 @@ +using System.Runtime.InteropServices; + +namespace Win32Api; + +[StructLayout(LayoutKind.Explicit)] +public struct InputUnion { + [FieldOffset(0)] public MouseInput mi; + [FieldOffset(0)] public KeyboardInput ki; + [FieldOffset(0)] public HardwareInput hi; +} \ No newline at end of file diff --git a/Win32Api/KeyboardInput.cs b/Win32Api/KeyboardInput.cs new file mode 100644 index 0000000..0a28b48 --- /dev/null +++ b/Win32Api/KeyboardInput.cs @@ -0,0 +1,12 @@ +using System.Runtime.InteropServices; + +namespace Win32Api; + +[StructLayout(LayoutKind.Sequential)] +public struct KeyboardInput { + public ushort wVk; + public ushort wScan; + public uint dwFlags; + public uint time; + public IntPtr dwExtraInfo; +} \ No newline at end of file diff --git a/Win32Api/MouseInput.cs b/Win32Api/MouseInput.cs new file mode 100644 index 0000000..47eaa35 --- /dev/null +++ b/Win32Api/MouseInput.cs @@ -0,0 +1,13 @@ +using System.Runtime.InteropServices; + +namespace Win32Api; + +[StructLayout(LayoutKind.Sequential)] +public struct MouseInput { + public int dx; + public int dy; + public uint mouseData; + public uint dwFlags; + public uint time; + public IntPtr dwExtraInfo; +} \ No newline at end of file diff --git a/Win32Api/Win32Api.cs b/Win32Api/Win32Api.cs new file mode 100644 index 0000000..62e51fd --- /dev/null +++ b/Win32Api/Win32Api.cs @@ -0,0 +1,8 @@ +using System.Runtime.InteropServices; + +namespace Win32Api; + +public static class Win32Api { + [DllImport("user32.dll", SetLastError = true)] + public static extern uint SendInput(uint nInputs, Input[] pInputs, int cbSize); +} \ No newline at end of file diff --git a/Win32Api/Win32Api.csproj b/Win32Api/Win32Api.csproj new file mode 100644 index 0000000..3a63532 --- /dev/null +++ b/Win32Api/Win32Api.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + From 0c2ff6463970fd03baa2f5b7bb516c735431a9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:49:16 +0200 Subject: [PATCH 03/22] rename: switch slide project to controller slide --- ControllerSlidePresenter.sln | 2 +- ...tchSlidePresenter.csproj => ControllerSlidePresenter.csproj} | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename SlidePresenter/{SwitchSlidePresenter.csproj => ControllerSlidePresenter.csproj} (89%) diff --git a/ControllerSlidePresenter.sln b/ControllerSlidePresenter.sln index eb48f5c..9ce7607 100644 --- a/ControllerSlidePresenter.sln +++ b/ControllerSlidePresenter.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwitchSlidePresenter", "SlidePresenter\SwitchSlidePresenter.csproj", "{F9832F2F-C7CA-4725-8F70-0FF3F76C0A5D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControllerSlidePresenter", "SlidePresenter\ControllerSlidePresenter.csproj", "{F9832F2F-C7CA-4725-8F70-0FF3F76C0A5D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Win32Api", "Win32Api\Win32Api.csproj", "{16DC83C8-381A-4CA7-9E45-2A9CBC7BF48A}" EndProject diff --git a/SlidePresenter/SwitchSlidePresenter.csproj b/SlidePresenter/ControllerSlidePresenter.csproj similarity index 89% rename from SlidePresenter/SwitchSlidePresenter.csproj rename to SlidePresenter/ControllerSlidePresenter.csproj index 3e00c50..66a3144 100644 --- a/SlidePresenter/SwitchSlidePresenter.csproj +++ b/SlidePresenter/ControllerSlidePresenter.csproj @@ -5,6 +5,7 @@ net8.0 enable enable + SwitchSlidePresenter From f7870ff30cd71710523738bd8857bbd0c35bceec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sat, 15 Jun 2024 01:55:04 +0200 Subject: [PATCH 04/22] Create LICENSE to comply with package licenses --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From e8996a382df1197ec1636bc132010dabe7ecc4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sat, 15 Jun 2024 13:01:51 +0200 Subject: [PATCH 05/22] refactor: Removed non-windows calls as I don't support other OS APIs --- SlidePresenter/JoyConRead.cs | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/SlidePresenter/JoyConRead.cs b/SlidePresenter/JoyConRead.cs index 3eb2a94..56aa05a 100644 --- a/SlidePresenter/JoyConRead.cs +++ b/SlidePresenter/JoyConRead.cs @@ -60,37 +60,9 @@ public class JoyConRead : IGamepadReader { private static HidDevice? GetHidDevice() { DeviceList list = DeviceList.Local; - HidDevice? device = null; + IEnumerable? nintendos = list.GetHidDevices(0x057e); - if (OperatingSystem.IsWindows()) { - var nintendos = list.GetHidDevices(0x057e); - device = nintendos.FirstOrDefault(); - } else { - var hidDevices = list.GetHidDevices(); - foreach (var d in hidDevices) { - var rd = d.GetReportDescriptor(); - if (rd != null) { - if ( - rd.OutputReports.Count() == 4 - && rd.OutputReports.Count(r => r.ReportID == 0x01) == 1 - && rd.OutputReports.Count(r => r.ReportID == 0x10) == 1 - && rd.OutputReports.Count(r => r.ReportID == 0x11) == 1 - && rd.OutputReports.Count(r => r.ReportID == 0x12) == 1 - && rd.InputReports.Count() == 6 - && rd.InputReports.Count(r => r.ReportID == 0x21) == 1 - && rd.InputReports.Count(r => r.ReportID == 0x30) == 1 - && rd.InputReports.Count(r => r.ReportID == 0x31) == 1 - && rd.InputReports.Count(r => r.ReportID == 0x32) == 1 - && rd.InputReports.Count(r => r.ReportID == 0x33) == 1 - && rd.InputReports.Count(r => r.ReportID == 0x3F) == 1 - ) { - device = d; - break; - } - } - } - } - return device; + return nintendos.FirstOrDefault(); } private Task OnJoyConOnReportReceived(JoyCon _, IJoyConReport input) { From 42f5ed78fe88ae15a70111dc8e139ad9fa9e141d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sat, 15 Jun 2024 13:20:08 +0200 Subject: [PATCH 06/22] refactor: Moved wiimote reading to event-based calls --- .../.idea/workspace.xml | 140 ++++++++++++++++++ SlidePresenter/JoyConRead.cs | 7 +- SlidePresenter/WiimoteRead.cs | 55 +++---- 3 files changed, 168 insertions(+), 34 deletions(-) create mode 100644 .idea/.idea.SwitchSlidePresenter/.idea/workspace.xml diff --git a/.idea/.idea.SwitchSlidePresenter/.idea/workspace.xml b/.idea/.idea.SwitchSlidePresenter/.idea/workspace.xml new file mode 100644 index 0000000..6d4b518 --- /dev/null +++ b/.idea/.idea.SwitchSlidePresenter/.idea/workspace.xml @@ -0,0 +1,140 @@ + + + + SwitchSlidePresenter.csproj + + + + + + + + + + + { + "lastFilter": { + "state": "OPEN", + "assignee": "GerardGascon" + } +} + { + "selectedUrlAndAccountId": { + "url": "https://github.com/GerardGascon/Switch-Slide-Presenter.git", + "accountId": "0af66c52-cbb7-4844-ad24-01b5c5b9bee8" + } +} + + + + + + + { + "associatedIndex": 6 +} + + + + + + + { + "keyToString": { + ".NET Project.SwitchSlidePresenter.executor": "Run", + "Publish to folder.Publish ControllerSlidePresenter to folder.executor": "Run", + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "master", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" + }, + "keyToStringList": { + "rider.external.source.directories": [ + "C:\\Users\\ggasc\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\DecompilerCache", + "C:\\Users\\ggasc\\AppData\\Roaming\\JetBrains\\Rider2024.1\\resharper-host\\SourcesCache", + "C:\\Users\\ggasc\\AppData\\Local\\Symbols\\src" + ] + } +} + + + + + + + + + + + + + + + + + 1718404015037 + + + + + + + + + + + + + \ No newline at end of file diff --git a/SlidePresenter/JoyConRead.cs b/SlidePresenter/JoyConRead.cs index 56aa05a..09e750f 100644 --- a/SlidePresenter/JoyConRead.cs +++ b/SlidePresenter/JoyConRead.cs @@ -16,7 +16,7 @@ public class JoyConRead : IGamepadReader { HidDevice? device = GetHidDevice(); if (device == null) { - Console.WriteLine("No controller. Please connect Joy-Con or Pro controller via Bluetooth."); + Console.WriteLine("No controller. Please connect Joy-Con via Bluetooth."); Console.WriteLine("Press any key to exit program."); Console.ReadKey(); return; @@ -39,11 +39,14 @@ public class JoyConRead : IGamepadReader { Console.WriteLine("JoyCon ready for presenting."); Console.WriteLine("Press Enter to exit program."); - while (Console.ReadKey().Key != ConsoleKey.Enter) { } + while (Console.ReadKey().Key != ConsoleKey.Enter) { + await Task.Yield(); + } joycon.Stop(); Console.WriteLine(); Console.WriteLine("Stopped."); + await Task.CompletedTask; } private static async Task LogDeviceInfo(JoyCon joycon) { diff --git a/SlidePresenter/WiimoteRead.cs b/SlidePresenter/WiimoteRead.cs index 7ab8dca..1a25b90 100644 --- a/SlidePresenter/WiimoteRead.cs +++ b/SlidePresenter/WiimoteRead.cs @@ -6,39 +6,37 @@ public class WiimoteRead : IGamepadReader { public event Action NextSlide; public event Action PrevSlide; - private const int RetryDelay = 1000; - public async Task Read() { Wiimote wiimote = new(); - while (string.IsNullOrEmpty(wiimote.HIDDevicePath)) { - wiimote.Connect(); - if (string.IsNullOrEmpty(wiimote.HIDDevicePath)) { - Console.WriteLine("Wiimote connection failed, trying again..."); - await Task.Delay(RetryDelay); - } else { - Console.WriteLine("Wiimote ready for presenting!"); - } + wiimote.Connect(); + + if (string.IsNullOrEmpty(wiimote.HIDDevicePath)) { + Console.WriteLine("No controller. Please connect Wiimote via Bluetooth."); + Console.WriteLine("Press any key to exit program."); + Console.ReadKey(); + return; } - ButtonState previousState = wiimote.WiimoteState.ButtonState; - while (true) { - if (PreviousPressed(wiimote.WiimoteState.ButtonState, previousState)) { - PrevSlide?.Invoke(); - } - if (NextPressed(wiimote.WiimoteState.ButtonState, previousState)) { - NextSlide?.Invoke(); - } - previousState = wiimote.WiimoteState.ButtonState; + wiimote.WiimoteChanged += WiimoteChanged; + Console.WriteLine("Wiimote ready for presenting."); + Console.WriteLine("Press Enter to exit program."); + while (Console.ReadKey().Key != ConsoleKey.Enter) { await Task.Yield(); + } + wiimote.Disconnect(); - if (!Console.KeyAvailable || Console.ReadKey().Key != ConsoleKey.Enter) - continue; - wiimote.Disconnect(); + Console.WriteLine(); + Console.WriteLine("Stopped."); + await Task.CompletedTask; + } - Console.WriteLine(); - Console.WriteLine("Stopped."); - break; + private void WiimoteChanged(object? sender, WiimoteChangedEventArgs e) { + if (PreviousPressed(e.WiimoteState.ButtonState)) { + PrevSlide?.Invoke(); + } + if (NextPressed(e.WiimoteState.ButtonState)) { + NextSlide?.Invoke(); } } @@ -48,11 +46,4 @@ public class WiimoteRead : IGamepadReader { private static bool NextPressed(ButtonState input) { return input.A || input.Right; } - - private static bool PreviousPressed(ButtonState input, ButtonState previousState) { - return PreviousPressed(input) && !PreviousPressed(previousState); - } - private static bool NextPressed(ButtonState input, ButtonState previousState) { - return NextPressed(input) && !NextPressed(previousState); - } } \ No newline at end of file From 1e6f8c0b9f6ab6e46e712b6851faf17092d5b118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:23:17 +0200 Subject: [PATCH 07/22] refactor: extract input sender to an interface for multiple platform support --- .../.idea/workspace.xml | 4 ++ SlidePresenter/InputSender/IInputSender.cs | 6 +++ .../InputSender/WindowsInputSender.cs | 47 +++++++++++++++++ SlidePresenter/SlideSwitcher.cs | 51 ++----------------- 4 files changed, 61 insertions(+), 47 deletions(-) create mode 100644 SlidePresenter/InputSender/IInputSender.cs create mode 100644 SlidePresenter/InputSender/WindowsInputSender.cs diff --git a/.idea/.idea.SwitchSlidePresenter/.idea/workspace.xml b/.idea/.idea.SwitchSlidePresenter/.idea/workspace.xml index 6d4b518..41f33f2 100644 --- a/.idea/.idea.SwitchSlidePresenter/.idea/workspace.xml +++ b/.idea/.idea.SwitchSlidePresenter/.idea/workspace.xml @@ -37,11 +37,15 @@ + + { "associatedIndex": 6 } + diff --git a/SlidePresenter/InputSender/IInputSender.cs b/SlidePresenter/InputSender/IInputSender.cs new file mode 100644 index 0000000..e0bce4e --- /dev/null +++ b/SlidePresenter/InputSender/IInputSender.cs @@ -0,0 +1,6 @@ +namespace SwitchSlidePresenter.InputSender; + +public interface IInputSender { + void NextSlide(); + void PreviousSlide(); +} \ No newline at end of file diff --git a/SlidePresenter/InputSender/WindowsInputSender.cs b/SlidePresenter/InputSender/WindowsInputSender.cs new file mode 100644 index 0000000..bcde5ed --- /dev/null +++ b/SlidePresenter/InputSender/WindowsInputSender.cs @@ -0,0 +1,47 @@ +using System.Runtime.InteropServices; +using Win32Api; + +namespace SwitchSlidePresenter.InputSender; + +public class WindowsInputSender : IInputSender { + private const uint INPUT_KEYBOARD = 1; + private const ushort VK_NEXT = 0x22; + private const ushort VK_PRIOR = 0x21; + private const uint KEYEVENTF_KEYDOWN = 0x0000; + private const uint KEYEVENTF_KEYUP = 0x0002; + + public void NextSlide() => SimulateKeyPress(VK_NEXT); + public void PreviousSlide() => SimulateKeyPress(VK_PRIOR); + + private static void SimulateKeyPress(ushort keyCode) { + Input[] inputs = new Input[2]; + + inputs[0] = new Input { + type = INPUT_KEYBOARD, + u = new InputUnion { + ki = new KeyboardInput { + wVk = keyCode, + wScan = 0, + dwFlags = KEYEVENTF_KEYDOWN, + time = 0, + dwExtraInfo = IntPtr.Zero + } + } + }; + + inputs[1] = new Input { + type = INPUT_KEYBOARD, + u = new InputUnion { + ki = new KeyboardInput { + wVk = keyCode, + wScan = 0, + dwFlags = KEYEVENTF_KEYUP, + time = 0, + dwExtraInfo = IntPtr.Zero + } + } + }; + + Win32Api.Win32Api.SendInput((uint)inputs.Length, inputs, Marshal.SizeOf(typeof(Input))); + } +} \ No newline at end of file diff --git a/SlidePresenter/SlideSwitcher.cs b/SlidePresenter/SlideSwitcher.cs index d81adae..004c51a 100644 --- a/SlidePresenter/SlideSwitcher.cs +++ b/SlidePresenter/SlideSwitcher.cs @@ -1,16 +1,10 @@ -using System.Runtime.InteropServices; -using Win32Api; +using SwitchSlidePresenter.InputSender; namespace SwitchSlidePresenter; public class SlideSwitcher : IDisposable { private readonly IGamepadReader? _reader; - - private const uint INPUT_KEYBOARD = 1; - private const ushort VK_NEXT = 0x22; - private const ushort VK_PRIOR = 0x21; - private const uint KEYEVENTF_KEYDOWN = 0x0000; - private const uint KEYEVENTF_KEYUP = 0x0002; + private readonly IInputSender _inputSender = new WindowsInputSender(); public SlideSwitcher(IGamepadReader? reader) { _reader = reader; @@ -23,43 +17,6 @@ public class SlideSwitcher : IDisposable { _reader.PrevSlide -= PreviousSlide; } - private static void NextSlide() { - SimulateKeyPress(VK_NEXT); - } - - private static void PreviousSlide() { - SimulateKeyPress(VK_PRIOR); - } - - private static void SimulateKeyPress(ushort keyCode) { - Input[] inputs = new Input[2]; - - inputs[0] = new Input { - type = INPUT_KEYBOARD, - u = new InputUnion { - ki = new KeyboardInput { - wVk = keyCode, - wScan = 0, - dwFlags = KEYEVENTF_KEYDOWN, - time = 0, - dwExtraInfo = IntPtr.Zero - } - } - }; - - inputs[1] = new Input { - type = INPUT_KEYBOARD, - u = new InputUnion { - ki = new KeyboardInput { - wVk = keyCode, - wScan = 0, - dwFlags = KEYEVENTF_KEYUP, - time = 0, - dwExtraInfo = IntPtr.Zero - } - } - }; - - Win32Api.Win32Api.SendInput((uint)inputs.Length, inputs, Marshal.SizeOf(typeof(Input))); - } + private void NextSlide() => _inputSender.NextSlide(); + private void PreviousSlide() => _inputSender.PreviousSlide(); } \ No newline at end of file From 65d562ee74341605b2007fa38976d23c01ad721e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:39:52 +0200 Subject: [PATCH 08/22] feat: added preprocessor directive for platform dependant compilation --- SlidePresenter/ControllerSlidePresenter.csproj | 12 +++++++++++- SlidePresenter/InputSender/LinuxInputSender.cs | 13 +++++++++++++ SlidePresenter/InputSender/MacInputSender.cs | 13 +++++++++++++ SlidePresenter/InputSender/WindowsInputSender.cs | 6 ++++-- SlidePresenter/SlideSwitcher.cs | 7 +++++++ 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 SlidePresenter/InputSender/LinuxInputSender.cs create mode 100644 SlidePresenter/InputSender/MacInputSender.cs diff --git a/SlidePresenter/ControllerSlidePresenter.csproj b/SlidePresenter/ControllerSlidePresenter.csproj index 66a3144..d6e90c1 100644 --- a/SlidePresenter/ControllerSlidePresenter.csproj +++ b/SlidePresenter/ControllerSlidePresenter.csproj @@ -8,13 +8,23 @@ SwitchSlidePresenter + + OS_WINDOWS + + + OS_LINUX + + + OS_MAC + + - + diff --git a/SlidePresenter/InputSender/LinuxInputSender.cs b/SlidePresenter/InputSender/LinuxInputSender.cs new file mode 100644 index 0000000..5f084eb --- /dev/null +++ b/SlidePresenter/InputSender/LinuxInputSender.cs @@ -0,0 +1,13 @@ +#if OS_LINUX +namespace SwitchSlidePresenter.InputSender; + +public class LinuxInputSender : IInputSender { + public void NextSlide() { + + } + + public void PreviousSlide() { + + } +} +#endif \ No newline at end of file diff --git a/SlidePresenter/InputSender/MacInputSender.cs b/SlidePresenter/InputSender/MacInputSender.cs new file mode 100644 index 0000000..32f8fb3 --- /dev/null +++ b/SlidePresenter/InputSender/MacInputSender.cs @@ -0,0 +1,13 @@ +#if OS_MAC +namespace SwitchSlidePresenter.InputSender; + +public class MacInputSender : IInputSender { + public void NextSlide() { + + } + + public void PreviousSlide() { + + } +} +#endif \ No newline at end of file diff --git a/SlidePresenter/InputSender/WindowsInputSender.cs b/SlidePresenter/InputSender/WindowsInputSender.cs index bcde5ed..233bd3c 100644 --- a/SlidePresenter/InputSender/WindowsInputSender.cs +++ b/SlidePresenter/InputSender/WindowsInputSender.cs @@ -1,4 +1,5 @@ -using System.Runtime.InteropServices; +#if OS_WINDOWS +using System.Runtime.InteropServices; using Win32Api; namespace SwitchSlidePresenter.InputSender; @@ -44,4 +45,5 @@ public class WindowsInputSender : IInputSender { Win32Api.Win32Api.SendInput((uint)inputs.Length, inputs, Marshal.SizeOf(typeof(Input))); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/SlidePresenter/SlideSwitcher.cs b/SlidePresenter/SlideSwitcher.cs index 004c51a..7c02e10 100644 --- a/SlidePresenter/SlideSwitcher.cs +++ b/SlidePresenter/SlideSwitcher.cs @@ -4,7 +4,14 @@ namespace SwitchSlidePresenter; public class SlideSwitcher : IDisposable { private readonly IGamepadReader? _reader; + +#if OS_WINDOWS private readonly IInputSender _inputSender = new WindowsInputSender(); +#elif OS_MAC + private readonly IInputSender _inputSender = new MacInputSender(); +#elif OS_LINUX + private readonly IInputSender _inputSender = new LinuxInputSender(); +#endif public SlideSwitcher(IGamepadReader? reader) { _reader = reader; From 72750c33881c61dc539e5c597b7a815c99e40d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Fri, 28 Jun 2024 15:18:56 +0200 Subject: [PATCH 09/22] refactor: preprocessors for wiimote and joycon compilation --- SlidePresenter/ControllerSelector.cs | 44 ++++++++++++++----- .../ControllerSlidePresenter.csproj | 16 ++++--- .../{ => GamepadReader}/IGamepadReader.cs | 2 +- .../{ => GamepadReader}/JoyConRead.cs | 8 ++-- .../{ => GamepadReader}/WiimoteRead.cs | 8 ++-- SlidePresenter/InputSender/IInputSender.cs | 2 +- .../InputSender/LinuxInputSender.cs | 2 +- SlidePresenter/InputSender/MacInputSender.cs | 2 +- .../InputSender/WindowsInputSender.cs | 2 +- SlidePresenter/Program.cs | 4 +- SlidePresenter/SlideSwitcher.cs | 5 ++- 11 files changed, 63 insertions(+), 32 deletions(-) rename SlidePresenter/{ => GamepadReader}/IGamepadReader.cs (69%) rename SlidePresenter/{ => GamepadReader}/JoyConRead.cs (96%) rename SlidePresenter/{ => GamepadReader}/WiimoteRead.cs (92%) diff --git a/SlidePresenter/ControllerSelector.cs b/SlidePresenter/ControllerSelector.cs index 8efff0f..31e5dd8 100644 --- a/SlidePresenter/ControllerSelector.cs +++ b/SlidePresenter/ControllerSelector.cs @@ -1,11 +1,33 @@ -namespace SwitchSlidePresenter; +using ControllerSlidePresenter.GamepadReader; + +namespace ControllerSlidePresenter; public static class ControllerSelector { - public static IGamepadReader? GetReader() { - Console.WriteLine("Write a number to select controller type:"); - Console.WriteLine("[1] - JoyCon"); - Console.WriteLine("[2] - Wiimote"); + private static readonly List<(string name, IGamepadReader reader)> Readers = [ +#if JoyCon + ("JoyCon", new JoyConRead()), +#endif +#if Wiimote + ("Wiimote", new WiimoteRead()) +#endif + ]; + public static IGamepadReader? GetReader() { + if (Readers.Count == 1) + return Readers[0].reader; + + Console.WriteLine("Write a number to select controller type:"); + for (int i = 0; i < Readers.Count; i++) + Console.WriteLine($"[{i+1}] - {Readers[i].name}"); + + int? id = GetReaderIndex(); + if (id == null) + return null; + + return Readers[id.Value].reader; + } + + private static int? GetReaderIndex() { string? line = Console.ReadLine(); if (line == null) { Console.WriteLine("Invalid input."); @@ -15,13 +37,11 @@ public static class ControllerSelector { Console.WriteLine("Invalid number."); return null; } + if (id <= 0 || id >= Readers.Count) { + Console.WriteLine("Invalid number"); + return null; + } - return GetReader(id); + return id - 1; } - - private static IGamepadReader? GetReader(int id) => id switch { - 1 => new JoyConRead(), - 2 => new WiimoteRead(), - _ => null - }; } \ No newline at end of file diff --git a/SlidePresenter/ControllerSlidePresenter.csproj b/SlidePresenter/ControllerSlidePresenter.csproj index d6e90c1..1de9a6f 100644 --- a/SlidePresenter/ControllerSlidePresenter.csproj +++ b/SlidePresenter/ControllerSlidePresenter.csproj @@ -5,22 +5,26 @@ net8.0 enable enable - SwitchSlidePresenter - OS_WINDOWS + $(DefineConstants);OS_WINDOWS - OS_LINUX + $(DefineConstants);OS_LINUX - OS_MAC + $(DefineConstants);OS_MAC + + + + $(DefineConstants);JoyCon + $(DefineConstants);Wiimote - - + + diff --git a/SlidePresenter/IGamepadReader.cs b/SlidePresenter/GamepadReader/IGamepadReader.cs similarity index 69% rename from SlidePresenter/IGamepadReader.cs rename to SlidePresenter/GamepadReader/IGamepadReader.cs index 2fbf258..f3f0be5 100644 --- a/SlidePresenter/IGamepadReader.cs +++ b/SlidePresenter/GamepadReader/IGamepadReader.cs @@ -1,4 +1,4 @@ -namespace SwitchSlidePresenter; +namespace ControllerSlidePresenter.GamepadReader; public interface IGamepadReader { public event Action NextSlide; diff --git a/SlidePresenter/JoyConRead.cs b/SlidePresenter/GamepadReader/JoyConRead.cs similarity index 96% rename from SlidePresenter/JoyConRead.cs rename to SlidePresenter/GamepadReader/JoyConRead.cs index 09e750f..6b7b199 100644 --- a/SlidePresenter/JoyConRead.cs +++ b/SlidePresenter/GamepadReader/JoyConRead.cs @@ -1,11 +1,12 @@ -using System.Text; +#if JoyCon +using System.Text; using HidSharp; using wtf.cluster.JoyCon; using wtf.cluster.JoyCon.ExtraData; using wtf.cluster.JoyCon.InputData; using wtf.cluster.JoyCon.InputReports; -namespace SwitchSlidePresenter; +namespace ControllerSlidePresenter.GamepadReader; public class JoyConRead : IGamepadReader { public event Action NextSlide; @@ -89,4 +90,5 @@ public class JoyConRead : IGamepadReader { private static bool NextPressed(ButtonsSimple input) { return input.ZLorZR || input.Down; } -} \ No newline at end of file +} +#endif diff --git a/SlidePresenter/WiimoteRead.cs b/SlidePresenter/GamepadReader/WiimoteRead.cs similarity index 92% rename from SlidePresenter/WiimoteRead.cs rename to SlidePresenter/GamepadReader/WiimoteRead.cs index 1a25b90..8f45454 100644 --- a/SlidePresenter/WiimoteRead.cs +++ b/SlidePresenter/GamepadReader/WiimoteRead.cs @@ -1,6 +1,7 @@ -using WiimoteLib.NetCore; +#if Wiimote +using WiimoteLib.NetCore; -namespace SwitchSlidePresenter; +namespace ControllerSlidePresenter.GamepadReader; public class WiimoteRead : IGamepadReader { public event Action NextSlide; @@ -46,4 +47,5 @@ public class WiimoteRead : IGamepadReader { private static bool NextPressed(ButtonState input) { return input.A || input.Right; } -} \ No newline at end of file +} +#endif diff --git a/SlidePresenter/InputSender/IInputSender.cs b/SlidePresenter/InputSender/IInputSender.cs index e0bce4e..461f08d 100644 --- a/SlidePresenter/InputSender/IInputSender.cs +++ b/SlidePresenter/InputSender/IInputSender.cs @@ -1,4 +1,4 @@ -namespace SwitchSlidePresenter.InputSender; +namespace ControllerSlidePresenter.InputSender; public interface IInputSender { void NextSlide(); diff --git a/SlidePresenter/InputSender/LinuxInputSender.cs b/SlidePresenter/InputSender/LinuxInputSender.cs index 5f084eb..cda05c8 100644 --- a/SlidePresenter/InputSender/LinuxInputSender.cs +++ b/SlidePresenter/InputSender/LinuxInputSender.cs @@ -1,5 +1,5 @@ #if OS_LINUX -namespace SwitchSlidePresenter.InputSender; +namespace ControllerSlidePresenter.InputSender; public class LinuxInputSender : IInputSender { public void NextSlide() { diff --git a/SlidePresenter/InputSender/MacInputSender.cs b/SlidePresenter/InputSender/MacInputSender.cs index 32f8fb3..270704a 100644 --- a/SlidePresenter/InputSender/MacInputSender.cs +++ b/SlidePresenter/InputSender/MacInputSender.cs @@ -1,5 +1,5 @@ #if OS_MAC -namespace SwitchSlidePresenter.InputSender; +namespace ControllerSlidePresenter.InputSender; public class MacInputSender : IInputSender { public void NextSlide() { diff --git a/SlidePresenter/InputSender/WindowsInputSender.cs b/SlidePresenter/InputSender/WindowsInputSender.cs index 233bd3c..3ecb477 100644 --- a/SlidePresenter/InputSender/WindowsInputSender.cs +++ b/SlidePresenter/InputSender/WindowsInputSender.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using Win32Api; -namespace SwitchSlidePresenter.InputSender; +namespace ControllerSlidePresenter.InputSender; public class WindowsInputSender : IInputSender { private const uint INPUT_KEYBOARD = 1; diff --git a/SlidePresenter/Program.cs b/SlidePresenter/Program.cs index 9a8e12c..a612818 100644 --- a/SlidePresenter/Program.cs +++ b/SlidePresenter/Program.cs @@ -1,4 +1,6 @@ -namespace SwitchSlidePresenter { +using ControllerSlidePresenter.GamepadReader; + +namespace ControllerSlidePresenter { internal abstract class Program { private static async Task Main() { IGamepadReader? reader = ControllerSelector.GetReader(); diff --git a/SlidePresenter/SlideSwitcher.cs b/SlidePresenter/SlideSwitcher.cs index 7c02e10..cd26bf0 100644 --- a/SlidePresenter/SlideSwitcher.cs +++ b/SlidePresenter/SlideSwitcher.cs @@ -1,6 +1,7 @@ -using SwitchSlidePresenter.InputSender; +using ControllerSlidePresenter.GamepadReader; +using ControllerSlidePresenter.InputSender; -namespace SwitchSlidePresenter; +namespace ControllerSlidePresenter; public class SlideSwitcher : IDisposable { private readonly IGamepadReader? _reader; From 04ebe3f60632da0df5c8525700214220b13a7935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Fri, 28 Jun 2024 15:31:23 +0200 Subject: [PATCH 10/22] feat: added back non-windows joycon detection support --- SlidePresenter/GamepadReader/JoyConRead.cs | 37 +++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/SlidePresenter/GamepadReader/JoyConRead.cs b/SlidePresenter/GamepadReader/JoyConRead.cs index 6b7b199..f9b69fc 100644 --- a/SlidePresenter/GamepadReader/JoyConRead.cs +++ b/SlidePresenter/GamepadReader/JoyConRead.cs @@ -1,6 +1,7 @@ #if JoyCon using System.Text; using HidSharp; +using HidSharp.Reports; using wtf.cluster.JoyCon; using wtf.cluster.JoyCon.ExtraData; using wtf.cluster.JoyCon.InputData; @@ -63,10 +64,44 @@ public class JoyConRead : IGamepadReader { } private static HidDevice? GetHidDevice() { + return OperatingSystem.IsWindows() + ? GetWindowsHidDevice() + : GetNonWindowsHidDevice(); + } + + private static HidDevice? GetWindowsHidDevice() { DeviceList list = DeviceList.Local; IEnumerable? nintendos = list.GetHidDevices(0x057e); + HidDevice? device = nintendos.FirstOrDefault(); + return device; + } - return nintendos.FirstOrDefault(); + private static HidDevice? GetNonWindowsHidDevice() { + HidDevice? device = null; + DeviceList list = DeviceList.Local; + + IEnumerable? hidDevices = list.GetHidDevices(); + foreach (HidDevice d in hidDevices) + { + ReportDescriptor? rd = d.GetReportDescriptor(); + if (rd == null) continue; + if (rd.OutputReports.Count() != 4 + || rd.OutputReports.Count(r => r.ReportID == 0x01) != 1 + || rd.OutputReports.Count(r => r.ReportID == 0x10) != 1 + || rd.OutputReports.Count(r => r.ReportID == 0x11) != 1 + || rd.OutputReports.Count(r => r.ReportID == 0x12) != 1 + || rd.InputReports.Count() != 6 + || rd.InputReports.Count(r => r.ReportID == 0x21) != 1 + || rd.InputReports.Count(r => r.ReportID == 0x30) != 1 + || rd.InputReports.Count(r => r.ReportID == 0x31) != 1 + || rd.InputReports.Count(r => r.ReportID == 0x32) != 1 + || rd.InputReports.Count(r => r.ReportID == 0x33) != 1 + || rd.InputReports.Count(r => r.ReportID == 0x3F) != 1) continue; + + device = d; + break; + } + return device; } private Task OnJoyConOnReportReceived(JoyCon _, IJoyConReport input) { From d996ca0efb06a336107ae9fbc8c676e7c875fcfb Mon Sep 17 00:00:00 2001 From: geri Date: Sat, 29 Jun 2024 23:50:26 +0200 Subject: [PATCH 11/22] feat: linux support --- .../InputSender/LinuxInputSender.cs | 21 ++++++- SlidePresenter/Linux.cs | 55 +++++++++++++++++++ SlidePresenter/Program.cs | 5 ++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 SlidePresenter/Linux.cs diff --git a/SlidePresenter/InputSender/LinuxInputSender.cs b/SlidePresenter/InputSender/LinuxInputSender.cs index cda05c8..011061c 100644 --- a/SlidePresenter/InputSender/LinuxInputSender.cs +++ b/SlidePresenter/InputSender/LinuxInputSender.cs @@ -1,13 +1,32 @@ #if OS_LINUX +using System.Diagnostics; + namespace ControllerSlidePresenter.InputSender; public class LinuxInputSender : IInputSender { - public void NextSlide() { + private const string PageUp = "0xff55"; + private const string PageDown = "0xff56"; + public void NextSlide() { + SendKeys(PageDown); } public void PreviousSlide() { + SendKeys(PageUp); + } + private static void SendKeys(string keycode) { + Process proc = new() { + StartInfo = { + FileName = "xdotool", + Arguments = $"key {keycode}", + UseShellExecute = false, + RedirectStandardError = false, + RedirectStandardInput = false, + RedirectStandardOutput = false + } + }; + proc.Start(); } } #endif \ No newline at end of file diff --git a/SlidePresenter/Linux.cs b/SlidePresenter/Linux.cs new file mode 100644 index 0000000..b13c885 --- /dev/null +++ b/SlidePresenter/Linux.cs @@ -0,0 +1,55 @@ +#if OS_LINUX +using System.Diagnostics; +using System.Runtime.InteropServices; + +namespace ControllerSlidePresenter; + +public static class Linux { + public static bool CanRun() { + if (getuid() != 0) { + Console.WriteLine("On Linux you need tu run as 'sudo'"); + return false; + } + if (!IsXdoToolInstalled()) + return false; + + return true; + } + + private static bool IsXdoToolInstalled() { + string result = RunShellCommand("which xdotool"); + if (!string.IsNullOrEmpty(result)) + return true; + + Console.WriteLine("xdotool is not installed."); + return false; + } + + private static string RunShellCommand(string command) { + try { + ProcessStartInfo procStartInfo = new("bash", "-c \"" + command + "\"") { + RedirectStandardOutput = true, + UseShellExecute = false, + CreateNoWindow = true, + }; + + using Process process = new(); + process.StartInfo = procStartInfo; + process.Start(); + + string result = process.StandardOutput.ReadToEnd(); + process.WaitForExit(); + + return result.Trim(); + } + catch (Exception ex) { + Console.WriteLine("Error: " + ex.Message); + return string.Empty; + } + } + + + [DllImport("libc")] + private static extern uint getuid(); +} +#endif diff --git a/SlidePresenter/Program.cs b/SlidePresenter/Program.cs index a612818..53df152 100644 --- a/SlidePresenter/Program.cs +++ b/SlidePresenter/Program.cs @@ -3,6 +3,11 @@ namespace ControllerSlidePresenter { internal abstract class Program { private static async Task Main() { +#if OS_LINUX + if (!Linux.CanRun()) + return; +#endif + IGamepadReader? reader = ControllerSelector.GetReader(); if (reader == null) { Console.WriteLine("Invalid Controller Selected."); From d91916d785316236cc3ac3e81f7639e6acc5e2c8 Mon Sep 17 00:00:00 2001 From: geri Date: Sun, 30 Jun 2024 00:00:44 +0200 Subject: [PATCH 12/22] feat: rider publish templates added --- .run/Publish Linux-x64.run.xml | 6 ++++++ .run/Publish Windows-x64.run.xml | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 .run/Publish Linux-x64.run.xml create mode 100644 .run/Publish Windows-x64.run.xml diff --git a/.run/Publish Linux-x64.run.xml b/.run/Publish Linux-x64.run.xml new file mode 100644 index 0000000..24fa928 --- /dev/null +++ b/.run/Publish Linux-x64.run.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.run/Publish Windows-x64.run.xml b/.run/Publish Windows-x64.run.xml new file mode 100644 index 0000000..35b8f45 --- /dev/null +++ b/.run/Publish Windows-x64.run.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From e876fef15f4c004a313649f4c1ee2ed336607da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:13:21 +0200 Subject: [PATCH 13/22] Create build.yml --- .github/workflows/build.yml | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..f7f6a04 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,41 @@ +name: .NET Build + +on: + workflow_dispatch: + +jobs: + build: + name: Build on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + include: + - os: ubuntu-latest + mono-version: 'latest' + runtime: 'linux-x64' + - os: windows-latest + vs-version: 'latest' + runtime: 'win-x64' + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '8.x' + + - name: Restore dependencies + run: dotnet restore + + - name: Build self-contained application + run: dotnet publish --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} /p:PublishSingleFile=false + + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: self-contained-${{ matrix.runtime }} + path: | + **/bin/Release/net8.0/${{ matrix.runtime }}/publish/ From 0c34d1839c767f9083ff03eccea0bb6e25333df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:18:12 +0200 Subject: [PATCH 14/22] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7f6a04..9200d72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: run: dotnet restore - name: Build self-contained application - run: dotnet publish --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} /p:PublishSingleFile=false + run: dotnet publish --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} - name: Upload build artifacts uses: actions/upload-artifact@v3 From 168ec1ab6a09d72539a37e6432adc01250f2e484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:19:40 +0200 Subject: [PATCH 15/22] Update build.yml --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9200d72..363b954 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,11 +9,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [windows-latest] include: - - os: ubuntu-latest - mono-version: 'latest' - runtime: 'linux-x64' - os: windows-latest vs-version: 'latest' runtime: 'win-x64' From 1df15a8ba34c62995adad27aad52abcbe8920b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:25:26 +0200 Subject: [PATCH 16/22] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 363b954..f2cf013 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,11 +28,11 @@ jobs: run: dotnet restore - name: Build self-contained application - run: dotnet publish --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} + run: dotnet publish SlidePresenter/ControllerSlidePresenter.csproj --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} - name: Upload build artifacts uses: actions/upload-artifact@v3 with: - name: self-contained-${{ matrix.runtime }} + name: build-${{ matrix.runtime }} path: | **/bin/Release/net8.0/${{ matrix.runtime }}/publish/ From c329754f32d981d533195583459bb7e63960cb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:30:42 +0200 Subject: [PATCH 17/22] feat: added runtime identifiers to project --- SlidePresenter/ControllerSlidePresenter.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/SlidePresenter/ControllerSlidePresenter.csproj b/SlidePresenter/ControllerSlidePresenter.csproj index 1de9a6f..2324e47 100644 --- a/SlidePresenter/ControllerSlidePresenter.csproj +++ b/SlidePresenter/ControllerSlidePresenter.csproj @@ -5,6 +5,7 @@ net8.0 enable enable + win-x64;linux-x64 From 61124fefd7048a40681265c49e52881f28a15533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:37:35 +0200 Subject: [PATCH 18/22] feat: single file windows build config --- .run/Publish Windows-x64.run.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.run/Publish Windows-x64.run.xml b/.run/Publish Windows-x64.run.xml index 35b8f45..78279af 100644 --- a/.run/Publish Windows-x64.run.xml +++ b/.run/Publish Windows-x64.run.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file From 9e50cfbde762a58dea7c6eac50d8a45b615be128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:39:50 +0200 Subject: [PATCH 19/22] Update build.yml --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2cf013..52d41ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,11 +9,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest] + os: [windows-latest, ubuntu-latest] include: - os: windows-latest vs-version: 'latest' runtime: 'win-x64' + - os: ubuntu-latest + vs-version: 'latest' + runtime: 'linux-x64' steps: - name: Checkout code @@ -28,7 +31,7 @@ jobs: run: dotnet restore - name: Build self-contained application - run: dotnet publish SlidePresenter/ControllerSlidePresenter.csproj --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} + run: dotnet publish SlidePresenter/ControllerSlidePresenter.csproj --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Upload build artifacts uses: actions/upload-artifact@v3 From 86eb2137a3e40c5fa8a26ea2c1720a31bd776261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:46:16 +0200 Subject: [PATCH 20/22] fix: build warnings --- SlidePresenter/GamepadReader/JoyConRead.cs | 4 ++-- SlidePresenter/GamepadReader/WiimoteRead.cs | 4 ++-- SlidePresenter/SlideSwitcher.cs | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SlidePresenter/GamepadReader/JoyConRead.cs b/SlidePresenter/GamepadReader/JoyConRead.cs index f9b69fc..9459431 100644 --- a/SlidePresenter/GamepadReader/JoyConRead.cs +++ b/SlidePresenter/GamepadReader/JoyConRead.cs @@ -10,8 +10,8 @@ using wtf.cluster.JoyCon.InputReports; namespace ControllerSlidePresenter.GamepadReader; public class JoyConRead : IGamepadReader { - public event Action NextSlide; - public event Action PrevSlide; + public event Action? NextSlide; + public event Action? PrevSlide; public async Task Read() { Console.OutputEncoding = Encoding.UTF8; diff --git a/SlidePresenter/GamepadReader/WiimoteRead.cs b/SlidePresenter/GamepadReader/WiimoteRead.cs index 8f45454..5918a2e 100644 --- a/SlidePresenter/GamepadReader/WiimoteRead.cs +++ b/SlidePresenter/GamepadReader/WiimoteRead.cs @@ -4,8 +4,8 @@ using WiimoteLib.NetCore; namespace ControllerSlidePresenter.GamepadReader; public class WiimoteRead : IGamepadReader { - public event Action NextSlide; - public event Action PrevSlide; + public event Action? NextSlide; + public event Action? PrevSlide; public async Task Read() { Wiimote wiimote = new(); diff --git a/SlidePresenter/SlideSwitcher.cs b/SlidePresenter/SlideSwitcher.cs index cd26bf0..3cd7c5d 100644 --- a/SlidePresenter/SlideSwitcher.cs +++ b/SlidePresenter/SlideSwitcher.cs @@ -16,11 +16,14 @@ public class SlideSwitcher : IDisposable { public SlideSwitcher(IGamepadReader? reader) { _reader = reader; + if (_reader == null) return; + _reader.NextSlide += NextSlide; _reader.PrevSlide += PreviousSlide; } public void Dispose() { + if (_reader == null) return; _reader.NextSlide -= NextSlide; _reader.PrevSlide -= PreviousSlide; } From ec459f846f5528928c790055e997108e2597a1e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:52:40 +0200 Subject: [PATCH 21/22] update actions to v4 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52d41ae..a29c1ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '8.x' @@ -34,7 +34,7 @@ jobs: run: dotnet publish SlidePresenter/ControllerSlidePresenter.csproj --no-restore --configuration Release --self-contained -r ${{ matrix.runtime }} /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Upload build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-${{ matrix.runtime }} path: | From 9513da302c807c8bd923f33d299bf0527b9ee556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Tue, 9 Jul 2024 00:30:59 +0200 Subject: [PATCH 22/22] Create README.md --- README.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e3599a9 --- /dev/null +++ b/README.md @@ -0,0 +1,41 @@ +# Controller Slide Presenter + +A small tool to emulate a Slide Presenter using a Wiimote or a Joy-Con. + +## Controls + +### Wiimote + +- A or Right - Next Slide +- B or Left - Previous Slide + +### Joy-Con + +- A or ZL/ZR - Next Slide +- B or L/R - Previous Slide + +## Platform Support + +### Windows + +For the Joy-Con you just need to connect it via Bluetooth and then run the program. + +For the Wiimote you may need to connect it using Dolphin Emulator and then just run the program. + +**WARNING:** It's possible that Steam tries reading the Joy-Con in the background and keeps it from working. + +### Linux + +**Prerequisite:** You need [xdotool](https://github.com/jordansissel/xdotool) installed in order to redirect the input. + +At the moment there's only Joy-Con support, so connect it via Bluetooth and run the program. + +### MacOS + +At the moment there's no MacOS support as I don't have a computer to test, but feel free to submit a Pull Request adding that feature, the Joy-Con reading should work just fine, only the input redirection is needed. + +## Packages used + +**JoyCon.NET** - ([GitHub](https://github.com/ClusterM/joycon)) ([NuGet](https://www.nuget.org/packages/JoyCon.NET)) + +**WiimoteLib.NetCore** - ([GitHub](https://github.com/BrianPeek/WiimoteLib)) ([NuGet](https://www.nuget.org/packages/WiimoteLib.NetCore))