thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use proper controller names in settings (#544)

Browse source 
* Use proper controller names in settings

Make the controller names show up in the selection box instead of things like 0, 1, etc... Now it will show names like "PS4 Controller", if provided by SDL2.

* Fix use-after-free, name length, and indentation.

* Add ellipsis

* oops

* Clean up name trimming

Hopefully done this right

* Bring back the ellipsis

Oops once again
This commit is contained in:
eros71 2024-12-12 05:58:29 +01:00 • committed by GitHub
parent 27aca61adf
commit ccdb94042e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/pc/djui/djui_panel_controls.c
View file

@ -28,18 +28,50 @@ void djui_panel_controls_create(struct DjuiBase* caller) {
int numJoys = SDL_NumJoysticks();
if (numJoys == 0) { numJoys = 1; }
if (numJoys > 10) { numJoys = 10; }
int strSize = numJoys * 2;
char* gamepadChoices[numJoys];
char gamepadChoicesLong[strSize];
// Get the names of all connected gamepads, if none is provided, use "Unknown"
for (int i = 0; i < numJoys; i++) {
int index = i * 2;
if (i > 9) {
index += (i - 9);
const char* joystickName = SDL_JoystickNameForIndex(i);
if (joystickName == NULL) {
joystickName = "Unknown";
}
sprintf(&gamepadChoicesLong[index], "%d", i);
gamepadChoices[i] = &gamepadChoicesLong[index];
gamepadChoices[i] = strdup(joystickName);
}
// Check for repeated names and append a number if necessary
for (int i = 0; i < numJoys; i++) {
int count = 1;
for (int j = 0; j < i; j++) {
if (strcmp(gamepadChoices[i], gamepadChoices[j]) == 0) {
count++;
char newName[256];
// If the name is bigger than 9 characters, we need to truncate it first
// Then we can append the number so it fits in the slot
// Should we look into making scrolling text for this?
if (strlen(gamepadChoices[i]) > 9) {
snprintf(newName, sizeof(newName), "%.9s... (%d)", gamepadChoices[i], count);
} else {
snprintf(newName, sizeof(newName), "%s (%d)", gamepadChoices[i], count);
}
// Remove the old string and replace it with the new one
free(gamepadChoices[i]);
gamepadChoices[i] = strdup(newName);
}
}
}
// Create the button
djui_selectionbox_create(body, DLANG(CONTROLS, GAMEPAD), gamepadChoices, numJoys, &configGamepadNumber, NULL);
// Free the memory we don't need anymore
for (int i = 0; i < numJoys; i++) {
free(gamepadChoices[i]);
}
#endif
djui_slider_create(body, DLANG(CONTROLS, DEADZONE), &configStickDeadzone, 0, 100, djui_panel_controls_value_change);