Joypad control in menus

Author: twojstaryzdomu

engine/h2shared/in_sdl.c

@@ -52,7 +52,7 @@ static int buttonremap[] =
 static	SDL_Joystick	*joy_id = NULL;
 static	int		joy_available;
 
-static	cvar_t	in_joystick = {"joystick", "0", CVAR_ARCHIVE};		/* enable/disable joystick */
+static	cvar_t	in_joystick = {"joystick", "1", CVAR_ARCHIVE};		/* enable/disable joystick */
 
 static	cvar_t	joy_index = {"joy_index", "0", CVAR_NONE};		/* joystick to use when have multiple */
 static	cvar_t	joy_axisforward = {"joy_axisforward", "1", CVAR_NONE};	/* axis for forward/backward movement */
@@ -75,9 +75,9 @@ static	cvar_t	joy_sensitivityyaw = {"joy_sensitivityyaw", "-1", CVAR_NONE};		/*
 /* hack to generate uparrow/leftarrow etc. key events
  * for axes if the stick driver isn't generating them. */
 /* might be useful for menu navigation etc. */
-#define JOY_KEYEVENT_FOR_AXES 0 /* not for now */
+#define JOY_KEYEVENT_FOR_AXES 1 /* not for now */
 #if (JOY_KEYEVENT_FOR_AXES)
-static	cvar_t	joy_axiskeyevents = {"joy_axiskeyevents", "0", CVAR_ARCHIVE};
+static	cvar_t	joy_axiskeyevents = {"joy_axiskeyevents", "1", CVAR_ARCHIVE};
 static	cvar_t	joy_axiskeyevents_deadzone = {"joy_axiskeyevents_deadzone", "0.5", CVAR_ARCHIVE};
 
 /* joystick axes state */
@@ -1102,13 +1102,23 @@ void IN_SendKeyEvents (void)
 		case SDL_JOYBUTTONUP:
 			if (in_mode_set)
 				break;
+			uint8_t key = 0;
+			switch (K_JOY1 + event.jbutton.button) {
+			/* Hard code SELECT & START buttons for menu control */
+			case K_AUX5:
+				key = K_ESCAPE;
+				break;
+			case K_AUX6:
+				key = K_ENTER;
+			}
+			Con_DPrintf ("Pressed joystick button %s\n", Key_KeynumToString(K_JOY1 + event.jbutton.button));
 			if (event.jbutton.button > K_AUX28 - K_JOY1)
 			{
 				Con_Printf ("Ignored event for joystick button %d\n",
 							event.jbutton.button);
 				break;
 			}
-			Key_Event(K_JOY1 + event.jbutton.button, event.jbutton.state == SDL_PRESSED);
+			Key_Event(key ? key : (K_JOY1 + event.jbutton.button), event.jbutton.state == SDL_PRESSED);
 			break;
 
 		/* mouse/trackball motion handled by IN_MouseMove() */

engine/hexen2/cl_main.c

@@ -907,9 +907,6 @@ void CL_SendCmd (void)
 {
 	usercmd_t	cmd;
 
-	if (cls.state != ca_connected)
-		return;
-
 	if (cls.signon == SIGNONS)
 	{
 	// get basic movement from keyboard
@@ -921,6 +918,14 @@ void CL_SendCmd (void)
 	// send the unreliable message
 		CL_SendMove (&cmd);
 	}
+	else
+	{
+	// enable directional joypad input in menus
+		IN_Move (&cmd);
+	}
+
+	if (cls.state != ca_connected)
+		return;
 
 	if (cls.demoplayback)
 	{

engine/hexen2/menu.c

@@ -3494,6 +3494,7 @@ static void M_Quit_Key (int key)
 		}
 		break;
 
+	case K_ENTER:
 	case 'Y':
 	case 'y':
 		Key_SetDest (key_console);