piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 15:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

begin work on multiple joystick support

Browse Source
This commit is contained in:
Arisotura
2019-06-11 18:55:04 +02:00
parent 543a40c7cb
commit b9183b8818
4 changed files with 115 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/libui_sdl/DlgInputConfig.cpp
View File

@ -29,8 +29,11 @@
#include "DlgInputConfig.h"
extern int JoystickID;
extern SDL_Joystick* Joystick;
extern void OpenJoystick();
namespace DlgInputConfig
{
@ -303,6 +306,13 @@ void OnJoyStartConfig(uiButton* btn, void* data)
}
void OnJoystickChanged(uiCombobox* cb, void* data)
{
JoystickID = uiComboboxSelected(cb);
OpenJoystick();
}
int OnCloseWindow(uiWindow* window, void* blarg)
{
InputDlgData* dlg = (InputDlgData*)(uiControl(window)->UserData);
@ -458,6 +468,36 @@ void Open(int type)
uiButtonOnClicked(btn, OnJoyStartConfig, (type==0) ? &dskeyorder[i] : &identity[i]);
uiControlSetMinSize(uiControl(btn), width, 1);
}
if (type == 0)
{
uiLabel* dummy = uiNewLabel(" ");
uiGridAppend(b_key, uiControl(dummy), 0, dlg->numkeys, 2, 1, 1, uiAlignFill, 1, uiAlignCenter);
uiCombobox* joycombo = uiNewCombobox();
uiGridAppend(b_joy, uiControl(joycombo), 0, dlg->numkeys, 2, 1, 1, uiAlignFill, 1, uiAlignCenter);
int numjoys = SDL_NumJoysticks();
if (numjoys < 1)
{
uiComboboxAppend(joycombo, "(no joysticks available)");
uiControlDisable(uiControl(joycombo));
}
else
{
for (int i = 0; i < numjoys; i++)
{
const char* joyname = SDL_JoystickNameForIndex(i);
char fullname[256];
snprintf(fullname, 256, "%d. %s", i, joyname);
uiComboboxAppend(joycombo, fullname);
}
uiComboboxSetSelected(joycombo, JoystickID);
uiComboboxOnSelected(joycombo, OnJoystickChanged, NULL);
}
}
}
uiLabel* filler = uiNewLabel("");