shithub: cstory

Download patch

ref: 0cf1a781b715fe35978724b7a16352823ab02624
parent: b72b631e950479478d5a6516c6e9c3ccf1a27864
author: Clownacy <Clownacy@users.noreply.github.com>
date: Sat Apr 4 14:38:56 EDT 2020 

Add hotplugging support to the GLFW3 backend

The GLFW windowing backend supports window-resizing, so I don't think
it's wrong to add enhancements to the backend code. It's not like the
SDL2 backend emulates DirectDraw's unstable framerate or anything.


--- a/src/Backends/GLFW3/Controller.cpp
+++ b/src/Backends/GLFW3/Controller.cpp
@@ -11,9 +11,39 @@
 
 static BOOL joystick_connected;
 static int connected_joystick_id;
-static float joystick_neutral_x;
-static float joystick_neutral_y;
 
+static void JoystickCallback(int joystick_id, int event)
+{
+	switch (event)
+	{
+		case GLFW_CONNECTED:
+			printf("Joystick #%d connected - %s\n", joystick_id, glfwGetJoystickName(joystick_id));
+
+			if (!joystick_connected)
+			{
+#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
+				if (glfwJoystickIsGamepad(joystick_id) == GLFW_TRUE)	// Avoid selecting things like laptop touchpads
+#endif
+				{
+					printf("Joystick #%d selected\n", joystick_id);
+					joystick_connected = TRUE;
+					connected_joystick_id = joystick_id;
+				}
+			}
+
+			break;
+
+		case GLFW_DISCONNECTED:
+			if (joystick_connected && joystick_id == connected_joystick_id)
+			{
+				printf("Joystick #%d disconnected\n", connected_joystick_id);
+				joystick_connected = FALSE;
+			}
+
+			break;
+	}
+}
+
 void ControllerBackend_Deinit(void)
 {
 	
@@ -23,24 +53,11 @@
 {
 	for (int i = GLFW_JOYSTICK_1; i < GLFW_JOYSTICK_LAST; ++i)
 		if (glfwJoystickPresent(i) == GLFW_TRUE)
-			printf("Joystick #%d name: %s\n", i, glfwGetJoystickName(i));
+			JoystickCallback(i, GLFW_CONNECTED);
 
-	for (int i = GLFW_JOYSTICK_1; i < GLFW_JOYSTICK_LAST; ++i)
-	{
-#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
-		if (glfwJoystickPresent(i) == GLFW_TRUE && glfwJoystickIsGamepad(i) == GLFW_TRUE)
-#else
-		if (glfwJoystickPresent(i) == GLFW_TRUE)
-#endif
-		{
-			printf("Joystick #%d selected\n", i);
-			joystick_connected = TRUE;
-			connected_joystick_id = i;
-			return TRUE;
-		}
-	}
+	glfwSetJoystickCallback(JoystickCallback);
 
-	return FALSE;
+	return TRUE;
 }
 
 BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
@@ -48,20 +65,13 @@
 	if (!joystick_connected)
 		return FALSE;
 
-#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
-	if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE || glfwJoystickIsGamepad(connected_joystick_id) == GLFW_FALSE)
-#else
-	if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE)
-#endif
-		return FALSE;
-
 	int total_axis;
 	const float *axis = glfwGetJoystickAxes(connected_joystick_id, &total_axis);
 
-	status->bLeft = axis[0] < joystick_neutral_x - DEADZONE;
-	status->bRight = axis[0] > joystick_neutral_x + DEADZONE;
-	status->bUp = axis[1] < joystick_neutral_x - DEADZONE;
-	status->bDown = axis[1] > joystick_neutral_x + DEADZONE;
+	status->bLeft = axis[0] < -DEADZONE;
+	status->bRight = axis[0] > DEADZONE;
+	status->bUp = axis[1] < -DEADZONE;
+	status->bDown = axis[1] > DEADZONE;
 
 	int total_buttons;
 	const unsigned char *buttons = glfwGetJoystickButtons(connected_joystick_id, &total_buttons);
@@ -82,19 +92,6 @@
 {
 	if (!joystick_connected)
 		return FALSE;
-
-#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
-	if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE || glfwJoystickIsGamepad(connected_joystick_id) == GLFW_FALSE)
-#else
-	if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE)
-#endif
-		return FALSE;
-
-	int total_axis;
-	const float *axis = glfwGetJoystickAxes(connected_joystick_id, &total_axis);
-
-	joystick_neutral_x = axis[0];
-	joystick_neutral_y = axis[1];
 
 	return TRUE;
 }
-- 
⑨