3 files changed, 19 insertions, 1 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp
index 2e3f112ebc..047aeb47fd 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -55,6 +55,12 @@ static const char *_joy_buttons[JOY_BUTTON_SDL_MAX] = {
 	"dpdown",
 	"dpleft",
 	"dpright",
+	"misc1",
+	"paddle1",
+	"paddle2",
+	"paddle3",
+	"paddle4",
+	"touchpad",
 };
 
 static const char *_joy_axes[JOY_AXIS_SDL_MAX] = {
diff --git a/core/input/input_event.cpp b/core/input/input_event.cpp
index 2771a15b80..c91dc4d067 100644
--- a/core/input/input_event.cpp
+++ b/core/input/input_event.cpp
@@ -985,6 +985,12 @@ static const char *_joy_button_descriptions[JOY_BUTTON_SDL_MAX] = {
 	TTRC("D-pad Down"),
 	TTRC("D-pad Left"),
 	TTRC("D-pad Right"),
+	TTRC("Xbox Share, PS5 Microphone, Nintendo Capture"),
+	TTRC("Xbox Paddle 1"),
+	TTRC("Xbox Paddle 2"),
+	TTRC("Xbox Paddle 3"),
+	TTRC("Xbox Paddle 4"),
+	TTRC("PS4/5 Touchpad"),
 };
 
 String InputEventJoypadButton::as_text() const {
diff --git a/core/input/input_event.h b/core/input/input_event.h
index 1500faa24c..a354119cf9 100644
--- a/core/input/input_event.h
+++ b/core/input/input_event.h
@@ -76,7 +76,13 @@ enum JoyButtonList {
 	JOY_BUTTON_DPAD_DOWN = 12,
 	JOY_BUTTON_DPAD_LEFT = 13,
 	JOY_BUTTON_DPAD_RIGHT = 14,
-	JOY_BUTTON_SDL_MAX = 15,
+	JOY_BUTTON_MISC1 = 15,
+	JOY_BUTTON_PADDLE1 = 16,
+	JOY_BUTTON_PADDLE2 = 17,
+	JOY_BUTTON_PADDLE3 = 18,
+	JOY_BUTTON_PADDLE4 = 19,
+	JOY_BUTTON_TOUCHPAD = 20,
+	JOY_BUTTON_SDL_MAX = 21,
 	JOY_BUTTON_MAX = 36, // Android supports up to 36 buttons.
 };