From 0e63bad7d9f28ac619ad3ae71708d3bee9b0197d Mon Sep 17 00:00:00 2001
From: Jaime Moreira <jmoreirag@gmail.com>
Date: Tue, 4 Jun 2024 15:18:37 -0400
Subject: [PATCH] Sliders and gamepad buttons refactor

Same logic with less code.
---
 src/client/input/sdl2.c | 11 +++--------
 src/client/input/sdl3.c | 11 +++--------
 src/client/menu/qmenu.c | 36 ++++++++++++------------------------
 3 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/src/client/input/sdl2.c b/src/client/input/sdl2.c
index 16e53043..0e0dd9a4 100644
--- a/src/client/input/sdl2.c
+++ b/src/client/input/sdl2.c
@@ -726,14 +726,9 @@ IN_Update(void)
 				qboolean down = (event.type == SDL_CONTROLLERBUTTONDOWN);
 				unsigned char btn = event.cbutton.button;
 
-				// Handle Back Button first, to override its original key
-				if (btn == sdl_back_button)
-				{
-					Key_Event(K_JOY_BACK, down, true);
-					break;
-				}
-
-				Key_Event(K_BTN_A + btn, down, true);
+				// Handle Back Button, to override its original key
+				Key_Event( (btn == sdl_back_button)? K_JOY_BACK : K_BTN_A + btn,
+					down, true );
 				break;
 			}
 
diff --git a/src/client/input/sdl3.c b/src/client/input/sdl3.c
index 96a85a02..33c62dc8 100644
--- a/src/client/input/sdl3.c
+++ b/src/client/input/sdl3.c
@@ -717,14 +717,9 @@ IN_Update(void)
 				qboolean down = (event.type == SDL_EVENT_GAMEPAD_BUTTON_DOWN);
 				unsigned char btn = event.gbutton.button;
 
-				// Handle Back Button first, to override its original key
-				if (btn == sdl_back_button)
-				{
-					Key_Event(K_JOY_BACK, down, true);
-					break;
-				}
-
-				Key_Event(K_BTN_A + btn, down, true);
+				// Handle Back Button, to override its original key
+				Key_Event( (btn == sdl_back_button)? K_JOY_BACK : K_BTN_A + btn,
+					down, true );
 				break;
 			}
 
diff --git a/src/client/menu/qmenu.c b/src/client/menu/qmenu.c
index e4724346..f0e55815 100644
--- a/src/client/menu/qmenu.c
+++ b/src/client/menu/qmenu.c
@@ -613,14 +613,10 @@ Separator_Draw(menuseparator_s *s)
 void
 Slider_DoSlide(menuslider_s *s, int dir)
 {
+	const float step = (s->slidestep)? s->slidestep : 0.1f;
 	float value = Cvar_VariableValue(s->cvar);
-	float step = 0.1f;
 	float sign = 1.0f;
 
-	if (s->slidestep)
-	{
-		step = s->slidestep;
-	}
 	if (s->abs && value < 0)	// absolute value treatment
 	{
 		value = -value;
@@ -641,48 +637,40 @@ Slider_DoSlide(menuslider_s *s, int dir)
 void
 Slider_Draw(menuslider_s *s)
 {
+	const float scale = SCR_GetMenuScale();
+	const int x = s->generic.parent->x + s->generic.x;
+	const int y = s->generic.parent->y + s->generic.y;
+	const int x_rcol = x + (RCOLUMN_OFFSET * scale);
 	int i;
 	char buffer[5];
-	const char * format;
-	float scale = SCR_GetMenuScale();
-	int x = s->generic.parent->x + s->generic.x;
-	int y = s->generic.parent->y + s->generic.y;
 
 	float value = Cvar_VariableValue(s->cvar);
 	if (s->abs && value < 0)	// absolute value
 	{
 		value = -value;
 	}
-	float range = (ClampCvar(s->minvalue, s->maxvalue, value) - s->minvalue) /
+	const float range = (ClampCvar(s->minvalue, s->maxvalue, value) - s->minvalue) /
 			(s->maxvalue - s->minvalue);
 
 	Menu_DrawStringR2LDark(x + (LCOLUMN_OFFSET * scale),
 		y, s->generic.name);
 
-	Draw_CharScaled(x + (RCOLUMN_OFFSET * scale),
+	Draw_CharScaled(x_rcol,
 		y * scale, 128, scale);
 
 	for (i = 0; i < SLIDER_RANGE * scale; i++)
 	{
-		Draw_CharScaled(x + (RCOLUMN_OFFSET * scale) + (i * 8) + 8,
+		Draw_CharScaled(x_rcol + (i * 8) + 8,
 			y * scale, 129, scale);
 	}
 
-	Draw_CharScaled(x + (RCOLUMN_OFFSET * scale) + (i * 8) + 8,
+	Draw_CharScaled(x_rcol + (i * 8) + 8,
 		y * scale, 130, scale);
-	Draw_CharScaled(x + ((int)((RCOLUMN_OFFSET * scale) + (SLIDER_RANGE * scale - 1) * 8 * range)) + 8,
+	Draw_CharScaled(x_rcol + (int)((SLIDER_RANGE * scale - 1) * 8 * range) + 8,
 		y * scale, 131, scale);
 
-	if (!s->printformat)
-	{
-		format = "%.1f";
-	}
-	else
-	{
-		format = s->printformat;
-	}
-	snprintf(buffer, 5, format, value);
-	Menu_DrawString(x + (RCOLUMN_OFFSET * scale) + ((SLIDER_RANGE + 2) * scale * 8),
+	snprintf(buffer, 5, (s->printformat)? s->printformat : "%.1f", value);
+	Menu_DrawString(x_rcol + ((SLIDER_RANGE + 2) * scale * 8),
 		y, buffer);
 }