Merge pull request #4 from broken-bytes/dev

UI updates

Author: broken-bytes

CMakeLists.txt

@@ -31,6 +31,7 @@ set(SRC
 	src/MainWindow.cxx
 	src/ColorPicker.cxx
 	DualSense4Windows.exe.manifest
+	DeclareDPIAware.manifest
 )
 
 set(ASSETS "$<TARGET_FILE_DIR:${APP}>/assets")

DeclareDPIAware.manifest

@@ -0,0 +1,7 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+</assembly>

include/App.hxx

@@ -19,7 +19,6 @@ namespace BrokenBytes::DualSense4Windows::UI {
 	constexpr uint32_t WINDOW_HEIGHT = 600;
 
 	class App {
-
     public:
 		/// <summary>
 		/// Called when the app starts
@@ -28,37 +27,49 @@ namespace BrokenBytes::DualSense4Windows::UI {
 		/// <summary>
 		/// Called when the app receives a device change event
 		/// </summary>
-		sigslot::signal<> DeviceChange;
+		sigslot::signal<> DevicesChanged;
 
+		/// <summary>
+		/// Called when the app triggers a color picker change
+		/// </summary>
 		sigslot::signal<uint8_t, Color> ColorChanged;
 
 		/// <summary>
 		/// Creates an app instance
 		/// </summary>
-		/// <param name="instance">The Win32 App instance</param>
-		App(HINSTANCE instance);
+		App();
 	    ~App();
 
 		/// <summary>
 		/// The currently window that is active
 		/// </summary>
 		/// <returns>The window handle</returns>
 		std::shared_ptr<UI::Window> Window() const;
-		
+
+		/// <summary>
+		/// Runs the app loop
+		/// </summary>
 		void Run();
+
+	    /// <summary>
+	    /// Called on Update
+	    /// </summary>
 	    void OnUpdate();
+
+	    /// <summary>
+	    /// Called on close of the App
+	    /// </summary>
 	    void OnClose();
 
 		// Slots
 		/// <summary>
 		/// Called when the number of DualSense devices connected changes
 		/// </summary>
 		/// <param name="devices"></param>
-		void DualSenseDevicesChanged(std::map<char*, DualSense*> devices);
+		void DualSenseDevicesChanged(std::vector<char*> devices);
 
 
 	private:
-		HINSTANCE _win32Instance;
 		std::shared_ptr<UI::Window> _mainWindow;
 		std::shared_ptr<UI::Window> _window;
 

include/DualSense.hxx

@@ -13,7 +13,7 @@ namespace BrokenBytes::DualSense4Windows {
 	/// <summary>
 	/// The rate at which to send reports to the DS
 	/// </summary>
-	constexpr uint8_t DS_SENDRATE = 50;
+	constexpr uint8_t DS_SENDRATE = 20;
 	/// <summary>
 	/// The Default mode at which DualSense operates
 	/// </summary>
@@ -111,6 +111,11 @@ namespace BrokenBytes::DualSense4Windows {
 		/// <param name="controllerNumber">The number of the controller</param>
 		DualSense(char* path, uint8_t controllerNumber);
 
+		/// <summary>
+		/// Destroys this instance and frees resources
+		/// </summary>
+		~DualSense();
+
 		/// <summary>
 		/// Returns the mode of the controller
 		/// </summary>

include/Interface.hxx

@@ -2,13 +2,15 @@
 
 #include "Core.hxx"
 #include <map>
-#include <memory>
+#include <vector>
 #include <ViGEm/Client.h>
 #include <sigslot/signal.hpp>
 
 #include "Types.hxx"
 
 namespace BrokenBytes::DualSense4Windows {
+	struct DS_LIGHTBARCOLOR;
+
 	namespace UI {
 		struct Color;
 	}
@@ -28,7 +30,7 @@ namespace BrokenBytes::DualSense4Windows {
 		/// <summary>
 		/// The signal used for device change notifications
 		/// </summary>
-		sigslot::signal < std::map<char*, DualSense*>> DevicesChanged;
+		sigslot::signal < std::vector<char*>> DevicesChanged;
 
 
 		/// <summary>
@@ -45,7 +47,7 @@ namespace BrokenBytes::DualSense4Windows {
 		/// Gets all DualSense devices connected
 		/// </summary>
 		/// <returns>A map of devices, by HID path and instance </returns>
-		std::map<char*, DualSense*> GetDualSenses();
+		std::vector<char*> GetDualSenses();
 		/// <summary>
 		/// Updates the list of connected DualSenses
 		/// </summary>
@@ -71,7 +73,7 @@ namespace BrokenBytes::DualSense4Windows {
 		/// <param name="target">The target to be bound to</param>
 		void BindVirtualDevice(DualSense* device, PVIGEM_TARGET target);
 
-		void SetColor(uint8_t ID, UI::Color c);
+		void SetColor(uint8_t ID, DS_LIGHTBARCOLOR c);
 
 		// Slots
 

include/MainWindow.hxx

@@ -1,14 +1,28 @@
 #pragma once
 
+#include <map>
+#include <vector>
 #include <sigslot/signal.hpp>
 
 #include "ColorPicker.hxx"
+#include "DualSense.hxx"
 #include "Window.hxx"
 
 namespace BrokenBytes::DualSense4Windows::UI {
+	
+	enum class Dimensions : uint16_t {
+		VSpacer = 1,
+		HSpacer = 1,
+		NameWidth = 30,
+		ConnectionWidth = 10,
+		ColorSize = 15,
+		HideWidth = 10,
+		BaseHeight = 5
+	};
+	
 	class MainWindow : public Window {
 	public:
-
+		sigslot::signal<> DevicesChanged;
 		sigslot::signal<uint8_t, Color> ColorChanged;
 
 		/// <summary>
@@ -21,7 +35,29 @@ namespace BrokenBytes::DualSense4Windows::UI {
 		void Show() override;
 		void Hide() override;
 
+		/// <summary>
+		/// Changes the device list of this window
+		/// </summary>
+		/// <param name="devices">The devices</param>
+		void DualSenseDevicesChanged(std::vector<char*> devices);
 
+	protected:
 		LRESULT CALLBACK ProcessEvent(UINT uMsg, WPARAM wParam, LPARAM lParam) override;
+
+	private:
+		std::vector<char*> _devices;
+		std::map<char*, std::array<void*, 4>> _controls;
+
+		/// <summary>
+		/// Adds the controls for a given DualSense
+		/// </summary>
+		/// <param name="id">The path of the DualSense</param>
+		void AddControls(char* id);
+
+		/// <summary>
+		/// Removes the controls for a given DualSense
+		/// </summary>
+		/// <param name="id">The path of the DualSense</param>
+		void RemoveControls(char* id);
 	};
 }

include/Window.hxx

@@ -8,6 +8,7 @@
 #include <Uxtheme.h>
 
 #include "Core.hxx"
+#include "Math.hxx"
 
 namespace BrokenBytes::DualSense4Windows::UI {
 	constexpr LPCWSTR WINDOW_DEFAULT = L"WINDOW_DEFAULT";
@@ -17,10 +18,12 @@ namespace BrokenBytes::DualSense4Windows::UI {
 		Window(
 			LPCWSTR title,
 			uint16_t width,
-			uint16_t height
+			uint16_t height,
+			UINT extraStyles = 0
 		) {
 			_handle = nullptr;
 			_isRegistered = false;
+			_dimensions = { width, height };
 			WNDCLASSW wnd = { };
 			wnd.hInstance = GetModuleHandle(nullptr);
 			wnd.lpszClassName = WINDOW_DEFAULT;
@@ -31,7 +34,7 @@ namespace BrokenBytes::DualSense4Windows::UI {
 			_handle = CreateWindow(
 				WINDOW_DEFAULT,
 				title,
-				WS_OVERLAPPEDWINDOW,
+				WS_OVERLAPPEDWINDOW | extraStyles,
 				0,
 				0,
 				width,
@@ -75,6 +78,22 @@ namespace BrokenBytes::DualSense4Windows::UI {
 			ShowWindow(_handle, SW_HIDE);
 		}
 
+		/// <summary>
+		/// The width of the Window
+		/// </summary>
+		/// <returns>The width</returns>
+		[[nodiscard]] uint16_t Width() const {
+			return _dimensions.x;
+		}
+
+		/// <summary>
+		/// The height of the window
+		/// </summary>
+		/// <returns>The height</returns>
+		[[nodiscard]] uint16_t Height() const {
+			return _dimensions.y;
+		}
+		
 		/// <summary>
 		/// Toggles if this window can be resized
 		/// </summary>
@@ -148,5 +167,6 @@ namespace BrokenBytes::DualSense4Windows::UI {
 		HWND _handle;
 		WNDCLASS* _class;
 		bool _isRegistered;
+		Math::Vector2<uint16_t> _dimensions;
 	};
 }

src/App.cxx

@@ -12,8 +12,7 @@
 
 
 namespace BrokenBytes::DualSense4Windows::UI {
-	App::App(HINSTANCE instance) {
-		_win32Instance = instance;
+	App::App() {
 		RegisterWindows();
 	}
 
@@ -31,19 +30,25 @@ namespace BrokenBytes::DualSense4Windows::UI {
 	void App::Run() {
 		_mainWindow = std::make_shared<MainWindow>(L"DualSense4Windows", 1024, 512);
 
-		reinterpret_cast<MainWindow*>(_mainWindow.get())->ColorChanged.connect([this](
+		auto m = reinterpret_cast<MainWindow*>(_mainWindow.get());
+		m->ColorChanged.connect([this](
 			uint8_t id, Color c) {
 			this->ColorChanged(id, c);
 		});
+
+		m->DevicesChanged.connect([this] {
+			DevicesChanged();
+		});
+		
 		_mainWindow->Show();
 		AppStarted();
 	}
 
 	void App::OnUpdate() {}
 	void App::OnClose() {}
 
-	void App::DualSenseDevicesChanged(std::map<char*, DualSense*> devices) {
-	
+	void App::DualSenseDevicesChanged(std::vector<char*> devices) {
+		reinterpret_cast<MainWindow*>(_mainWindow.get())->DualSenseDevicesChanged(devices);
 	}
 }
 

src/ColorPicker.cxx

@@ -5,13 +5,14 @@
 
 namespace BrokenBytes::DualSense4Windows::UI {
     constexpr uint16_t WIDTH = 512;
-    constexpr uint16_t HEIGHT = 242;
+    constexpr uint16_t HEIGHT = 250;
 
     constexpr uint8_t BTN_OK = 0;
     constexpr uint8_t BTN_CANCEL = 1;
 
     constexpr long COLOR_RANGE = MAKELONG(0, 255);
-	ColorPicker::ColorPicker(Color initColor) : Window(TEXT("Color Picker"), WIDTH, HEIGHT) {
+	ColorPicker::ColorPicker(Color initColor):
+		Window(TEXT("Color Picker"), WIDTH, HEIGHT) {
         _color = initColor;
         _oldColor = initColor;
         _rH = CreateWindowEx(

src/ControllerKit.cxx

@@ -23,7 +23,7 @@ namespace BrokenBytes::DualSense4Windows {
 	}
 
 	void InitUI() {
-		APP = std::make_unique<UI::App>(*INSTANCE);
+		APP = std::make_unique<UI::App>();
 	}
 
 	void InitInterface() {
@@ -34,16 +34,16 @@ namespace BrokenBytes::DualSense4Windows {
 		APP->AppStarted.connect([] {
 			INTERFACE->Init();
 		});
-		APP->DeviceChange.connect([] {
+		APP->DevicesChanged.connect([] {
 			INTERFACE->UpdateDualSenseDevices();
 		});
 		INTERFACE->DevicesChanged.connect([](
-			std::map<char*, DualSense*> devices
+			std::vector<char*> devices
 			) {
 				APP->DualSenseDevicesChanged(devices);
 		});
 		APP->ColorChanged.connect([](uint8_t id, UI::Color c) {
-			INTERFACE->SetColor(id, c);
+			INTERFACE->SetColor(id, DS_LIGHTBARCOLOR{c.R, c.G, c.B});
 		});
 	}