Merge pull request #5 from broken-bytes/dev

Dev

Author: broken-bytes

CMakeLists.txt

@@ -20,6 +20,7 @@ set(SRC_INC
 	include/Window.hxx
 	include/MainWindow.hxx
 	include/ColorPicker.hxx
+	include/DualSenseInfo.hxx
 )
 
 set(SRC
@@ -44,15 +45,13 @@ set(ASSETS "$<TARGET_FILE_DIR:${APP}>/assets")
 
 add_executable(${APP} WIN32 ${SRC} ${SRC_INC})
 target_link_directories(${APP} PUBLIC lib/)
+target_link_libraries(${APP} comctl32.lib)
 target_link_libraries(${APP} hidapi.lib)
 target_link_libraries(${APP} setupapi)
 target_link_libraries(${APP} ViGEmClient.lib)
 target_include_directories(${APP} PUBLIC external/)
 target_include_directories(${APP} PRIVATE include/)
 
 
-add_custom_command(TARGET ${APP} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets/" "${ASSETS}")
-
 	add_custom_command(TARGET ${APP} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/bin" "$<TARGET_FILE_DIR:${APP}>")

README.md

@@ -2,7 +2,7 @@
 DualSense Support for any game based on emulation provided by [ViGEm](https://github.com/ViGEm/ViGEmClient).
 
 ## Features
-Get the most out of your DualSense controller. 
+Get the most out of your DualSense controller.
 Full support for any game using XInput.
 Enhanced features like touchpad mouse controls.
 Freely bind any action your controller is capable of to your desire.
@@ -13,6 +13,9 @@ Freely bind any action your controller is capable of to your desire.
 * Rumble Support
 * WIP:
   * Support for touchpad
+  * Multiple Controllers
+  * Profiles
+  * Persistence
 
 ## Installation
 Just grab the latest release under [releases](https://github.com/broken-bytes/DualSense4Windows/releases) and run it.
@@ -29,11 +32,10 @@ You'll need to have the following components installed:
 You need to provide library files for the following components used
 * [ViGEmClient](https://github.com/ViGEm/ViGEmClient)
 * [hidapi](https://github.com/libusb/hidapi)
-* [Ultralight](https://github.com/ultralight-ux/Ultralight)
 
 ### Build Steps
 * First, create a dynamic library build for hidapi and ViGEmClient.
-* Place `hidapi.lib`, `ViGEmClient.lib`, `AppCore.lib`, `UltraLight.lib`, `UltraLightCore.lib`, and `WebCore.lib` inside the `lib` folder of the project.
+* Place `hidapi.lib`, `ViGEmClient.lib` inside the `lib` folder of the project.
 * Also place the corrosponding `.dll` files in the `bin` folder of your project root folder
 * Execute `CreateVisualStudioSolution.bat`
 * Open `DualSense4Windows.sln` created in your `build` folder

assets/css/styles.css

@@ -1,22 +1,13 @@
 #pragma once
 
 
-#include "Core.hxx"
-#include "Window.hxx"
 #include <sigslot/signal.hpp>
 
-namespace BrokenBytes::DualSense4Windows::UI {
-
-	struct Color {
-		uint8_t R;
-		uint8_t G;
-		uint8_t B;
+#include "Core.hxx"
+#include "Window.hxx"
+#include "DualSenseInfo.hxx"
 
-		COLORREF RGB_VALUE() const {
-			return RGB(R, G, B);
-		}
-	};
-	
+namespace BrokenBytes::DualSense4Windows::UI {	
 	class ColorPicker : public Window {
 	public:
 		sigslot::signal<Color> ColorChanged;

assets/html/app.html

@@ -0,0 +1,35 @@
+#pragma once
+#include <string>
+#include "Core.hxx"
+
+
+namespace BrokenBytes::DualSense4Windows::UI {
+	struct Color {
+		uint8_t R;
+		uint8_t G;
+		uint8_t B;
+
+		COLORREF RGB_VALUE() const {
+			return RGB(R, G, B);
+		}
+	};
+	
+	enum class ConnectionType {
+		USB,
+		Bluetooth
+	};
+
+	enum class Mode {
+		XBox,
+		DS4,
+		Native
+	};
+	
+	struct DualSenseInfo {
+		char* Path;
+		std::wstring Name;
+		ConnectionType Connection;
+		Mode Mode;
+		Color Color;
+	};
+}

assets/img/dualsense.jpg

@@ -11,13 +11,13 @@
 namespace BrokenBytes::DualSense4Windows::UI {
 
 	enum class Dimensions : uint16_t {
-		VSpacer = 1,
+		VSpacer = 8,
 		HSpacer = 1,
 		NameWidth = 30,
 		ConnectionWidth = 10,
 		ColorSize = 15,
 		HideWidth = 10,
-		BaseHeight = 5
+		BaseHeight = 16
 	};
 
 	class MainWindow : public Window {
@@ -46,18 +46,14 @@ namespace BrokenBytes::DualSense4Windows::UI {
 
 	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>
+		std::vector<DualSenseInfo> _info;
+		HWND _tabView;
+		HWND _listView;
+		std::map<std::wstring, HWND> _tabs;
+		
+		HWND CreateTabControl();
+		HWND CreateListViewControl();
+		void AddControls(char* id, int index);
 		void RemoveControls(char* id);
 	};
 }

assets/js/main.js

@@ -13,6 +13,11 @@
 namespace BrokenBytes::DualSense4Windows::UI {
 	constexpr LPCWSTR WINDOW_DEFAULT = L"WINDOW_DEFAULT";
 
+	constexpr int FONT_TAB = 19;
+	constexpr int FONT_HEADLINE = 23;
+	constexpr int FONT_LABEL = 21;
+	constexpr int FONT_BTN = 22;
+	
 	class Window {
 	public:
 		Window(
@@ -44,8 +49,8 @@ namespace BrokenBytes::DualSense4Windows::UI {
 				GetModuleHandle(nullptr),
 				nullptr
 			);
-			SendMessageW(_handle, WM_THEMECHANGED, 0, 0);
 			SetWindowLongPtr(_handle, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
+			SetFont(Handle(), FONT_HEADLINE);
 
 			if (_handle == nullptr) {
 				return;
@@ -155,6 +160,23 @@ namespace BrokenBytes::DualSense4Windows::UI {
 			_isRegistered = true;
 		}
 
+		/// <summary>
+		/// Sets the default font for the given window
+		/// </summary>
+		/// <param name="handle"></param>
+		void SetFont(HWND handle, int size) {
+			HFONT hFont = CreateFont(size, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET,
+				OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS, HIGH_LEVEL,
+				DEFAULT_PITCH | FF_DONTCARE, TEXT("Roboto"));
+			SendMessage(
+				handle,
+				WM_SETFONT,
+				reinterpret_cast<WPARAM>(hFont),
+				true
+			);
+		}
+
+		
 		/// <summary>
 		/// Sets the handle of this Window
 		/// </summary>