gamepad support using glfw

Author: nesbox

cmake/sokol.cmake

@@ -4,7 +4,7 @@
 
 if(BUILD_SOKOL)
 
-if(NOT EMSCRIPTEN)
+if(LINUX)
     set(GLFW_BUILD_WAYLAND OFF)
     add_subdirectory(${THIRDPARTY_DIR}/glfw)
 endif()
@@ -18,7 +18,7 @@ if(APPLE)
 elseif(LINUX)
     target_compile_definitions(sokol PUBLIC SOKOL_GLCORE)
 elseif(WIN32)
-    target_compile_definitions(sokol PUBLIC SOKOL_D3D11)
+    target_compile_definitions(sokol PUBLIC SOKOL_D3D11 UNICODE)
 elseif(EMSCRIPTEN)
     target_compile_definitions(sokol PUBLIC SOKOL_WGPU)
 endif()
@@ -36,14 +36,18 @@ if(APPLE)
         "-framework AudioToolbox"
     )
 
-    target_include_directories(sokol PRIVATE 
-        ${THIRDPARTY_DIR}/glfw/src
-        ${THIRDPARTY_DIR}/glfw/include)
-
 elseif(LINUX)
     target_link_libraries(sokol PRIVATE X11 GL Xi Xcursor m dl asound glfw)
 elseif(WIN32)
-    target_link_libraries(sokol PRIVATE D3D11 glfw)
+    target_link_libraries(sokol PRIVATE D3D11)
+endif()
+
+if(APPLE OR WIN32)
+    add_subdirectory(${THIRDPARTY_DIR}/glfw)
+
+    target_include_directories(sokol PRIVATE 
+        ${THIRDPARTY_DIR}/glfw/src
+        ${THIRDPARTY_DIR}/glfw/include)
 endif()
 
 target_include_directories(sokol PRIVATE ${THIRDPARTY_DIR}/sokol)

src/system/sokol/sokol.c

@@ -22,5 +22,18 @@
 
 #define SOKOL_IMPL
 
+#if defined(_WIN32)
+
+#define _GLFW_WIN32
+
+#include "win32_joystick.c"
+#include "win32_time.c"
+#include "input.c"
+#define GLFW_BUILD_WIN32_MODULE
+#include "win32_module.c"
+#define DPI_ENUMS_DECLARED
+
+#endif
+
 #include "sokol.h"
 

src/system/sokol/sokol_gamepad.h

@@ -112,15 +112,7 @@ extern "C" {
 #ifndef SOKOL_UNREACHABLE
     #define SOKOL_UNREACHABLE SOKOL_ASSERT(false)
 #endif
-#if !defined(SOKOL_CALLOC) || !defined(SOKOL_FREE)
-    #include <stdlib.h>
-#endif
-#if !defined(SOKOL_CALLOC)
-    #define SOKOL_CALLOC(n,s) calloc(n,s)
-#endif
-#if !defined(SOKOL_FREE)
-    #define SOKOL_FREE(p) free(p)
-#endif
+
 #ifndef SOKOL_LOG
     #ifdef SOKOL_DEBUG
         #if defined(__ANDROID__)
@@ -253,12 +245,84 @@ _SOKOL_PRIVATE void _sgamepad_record_state() {
 
 #endif
 
-/*=== PUBLIC API FUNCTIONS ===================================================*/
-SOKOL_API_IMPL unsigned int sgamepad_get_max_supported_gamepads() {
-    return SGAMEPAD_MAX_SUPPORTED_GAMEPADS;
+#if defined (_SAPP_WIN32)
+
+void* _glfw_calloc(size_t count, size_t size)
+{
+    return calloc(count, size);
+}
+
+void* _glfw_realloc(void* block, size_t size)
+{
+    return realloc(block, size);
 }
 
-#if defined (_SAPP_WIN32) || defined(_SAPP_LINUX)
+void _glfw_free(void* block)
+{
+    free(block);
+}
+
+_GLFWlibrary _glfw = { GLFW_TRUE };
+
+void _glfwInputError(int code, const char* format, ...)
+{}
+
+SOKOL_API_IMPL void sgamepad_init() {
+
+    _glfw.win32.instance = GetModuleHandle(NULL);
+
+    _glfw.win32.dinput8.instance = _glfwPlatformLoadModule("dinput8.dll");
+    if (_glfw.win32.dinput8.instance)
+    {
+        _glfw.win32.dinput8.Create = (PFN_DirectInput8Create)
+            _glfwPlatformGetModuleSymbol(_glfw.win32.dinput8.instance, "DirectInput8Create");
+    }    
+
+    {
+        int i;
+        const char* names[] =
+        {
+            "xinput1_4.dll",
+            "xinput1_3.dll",
+            "xinput9_1_0.dll",
+            "xinput1_2.dll",
+            "xinput1_1.dll",
+            NULL
+        };
+
+        for (i = 0;  names[i];  i++)
+        {
+            _glfw.win32.xinput.instance = _glfwPlatformLoadModule(names[i]);
+            if (_glfw.win32.xinput.instance)
+            {
+                _glfw.win32.xinput.GetCapabilities = (PFN_XInputGetCapabilities)
+                    _glfwPlatformGetModuleSymbol(_glfw.win32.xinput.instance, "XInputGetCapabilities");
+                _glfw.win32.xinput.GetState = (PFN_XInputGetState)
+                    _glfwPlatformGetModuleSymbol(_glfw.win32.xinput.instance, "XInputGetState");
+
+                break;
+            }
+        }
+    }
+
+    _glfw.platform = (_GLFWplatform)
+    {
+        .initJoysticks = _glfwInitJoysticksWin32,
+        .terminateJoysticks = _glfwTerminateJoysticksWin32,
+        .pollJoystick = _glfwPollJoystickWin32,
+        .getMappingName = _glfwGetMappingNameWin32,
+        .updateGamepadGUID = _glfwUpdateGamepadGUIDWin32,
+    };
+
+    _glfwInitGamepadMappings();
+}
+
+SOKOL_API_IMPL void sgamepad_shutdown() {
+
+    _glfwTerminateJoysticksWin32();
+}
+
+#elif defined(_SAPP_LINUX)
 
 SOKOL_API_IMPL void sgamepad_init() {
     glfwInit();
@@ -317,6 +381,11 @@ SOKOL_API_IMPL void sgamepad_shutdown() {
 
 #endif
 
+/*=== PUBLIC API FUNCTIONS ===================================================*/
+SOKOL_API_IMPL unsigned int sgamepad_get_max_supported_gamepads() {
+    return SGAMEPAD_MAX_SUPPORTED_GAMEPADS;
+}
+
 SOKOL_API_IMPL void sgamepad_record_state() {
     memset(_sgamepad.gamepad_states, 0, sizeof(_sgamepad.gamepad_states));
     _sgamepad_record_state();