ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LilyPad: Add Device Select option 

Adds a device select option that hides bindings and disables binding new
inputs from all non-selected devices on the bindings list. This also
avoids input conflict issues when one controller is recognized as
several devices through different APIs.
This commit is contained in:
FlatOutPS2 2016-11-30 14:03:53 +01:00 committed by Jonathan Li
parent 872ab9d2b1
commit 947b6b5503
5 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
plugins/LilyPad/Config.cpp
View File

@ -496,7 +496,7 @@ void SelChanged(int port, int slot)
} }
} }
for (i = IDC_DPAD; i < IDC_CONFIGURE_ON_BIND; i++) { for (i = IDC_DPAD; i <= IDC_DEVICE_SELECT; i++) {
hWndTemp = GetDlgItem(hWnd, i); hWndTemp = GetDlgItem(hWnd, i);
if (hWndTemp) if (hWndTemp)
ShowWindow(hWndTemp, !ffb && !b); ShowWindow(hWndTemp, !ffb && !b);
@ -627,9 +627,10 @@ int GetItemIndex(int port, int slot, Device *dev, ForceFeedbackBinding *binding)
{ {
int count = 0; int count = 0;
int padtype = config.padConfigs[port][slot].type; int padtype = config.padConfigs[port][slot].type;
int selectedDevice = config.deviceSelect[port][slot];
for (int i = 0; i < dm->numDevices; i++) { for (int i = 0; i < dm->numDevices; i++) {
Device *dev2 = dm->devices[i]; Device *dev2 = dm->devices[i];
if (!dev2->enabled) if (!dev2->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev2)
continue; continue;
if (dev2 != dev) { if (dev2 != dev) {
count += dev2->pads[port][slot][padtype].numBindings + dev2->pads[port][slot][padtype].numFFBindings; count += dev2->pads[port][slot][padtype].numBindings + dev2->pads[port][slot][padtype].numFFBindings;
@ -643,9 +644,10 @@ int GetItemIndex(int port, int slot, Device *dev, Binding *binding)
{ {
int count = 0; int count = 0;
int padtype = config.padConfigs[port][slot].type; int padtype = config.padConfigs[port][slot].type;
int selectedDevice = config.deviceSelect[port][slot];
for (int i = 0; i < dm->numDevices; i++) { for (int i = 0; i < dm->numDevices; i++) {
Device *dev2 = dm->devices[i]; Device *dev2 = dm->devices[i];
if (!dev2->enabled) if (!dev2->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev2)
continue; continue;
if (dev2 != dev) { if (dev2 != dev) {
count += dev2->pads[port][slot][padtype].numBindings + dev2->pads[port][slot][padtype].numFFBindings; count += dev2->pads[port][slot][padtype].numBindings + dev2->pads[port][slot][padtype].numFFBindings;
@ -799,18 +801,18 @@ void Populate(int port, int slot, int padtype)
return; return;
HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST); HWND hWnd = GetDlgItem(hWnds[port][slot][padtype], IDC_BINDINGS_LIST);
ListView_DeleteAllItems(hWnd); ListView_DeleteAllItems(hWnd);
int i, j;
int multipleBinding = config.multipleBinding; int multipleBinding = config.multipleBinding;
config.multipleBinding = 1; config.multipleBinding = 1;
for (j = 0; j < dm->numDevices; j++) { int selectedDevice = config.deviceSelect[port][slot];
for (int j = 0; j < dm->numDevices; j++) {
Device *dev = dm->devices[j]; Device *dev = dm->devices[j];
if (!dev->enabled) if (!dev->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev)
continue; continue;
for (i = 0; i < dev->pads[port][slot][padtype].numBindings; i++) { for (int i = 0; i < dev->pads[port][slot][padtype].numBindings; i++) {
ListBoundCommand(port, slot, dev, dev->pads[port][slot][padtype].bindings + i); ListBoundCommand(port, slot, dev, dev->pads[port][slot][padtype].bindings + i);
} }
for (i = 0; i < dev->pads[port][slot][padtype].numFFBindings; i++) { for (int i = 0; i < dev->pads[port][slot][padtype].numFFBindings; i++) {
ListBoundEffect(port, slot, dev, dev->pads[port][slot][padtype].ffBindings + i); ListBoundEffect(port, slot, dev, dev->pads[port][slot][padtype].ffBindings + i);
} }
} }
@ -819,7 +821,7 @@ void Populate(int port, int slot, int padtype)
hWnd = GetDlgItem(hWnds[port][slot][padtype], IDC_FORCEFEEDBACK); hWnd = GetDlgItem(hWnds[port][slot][padtype], IDC_FORCEFEEDBACK);
SendMessage(hWnd, CB_RESETCONTENT, 0, 0); SendMessage(hWnd, CB_RESETCONTENT, 0, 0);
int added = 0; int added = 0;
for (i = 0; i < dm->numDevices; i++) { for (int i = 0; i < dm->numDevices; i++) {
Device *dev = dm->devices[i]; Device *dev = dm->devices[i];
if (dev->enabled && dev->numFFAxes && dev->numFFEffectTypes) { if (dev->enabled && dev->numFFAxes && dev->numFFEffectTypes) {
SendMessage(hWnd, CB_INSERTSTRING, added, (LPARAM)dev->displayName); SendMessage(hWnd, CB_INSERTSTRING, added, (LPARAM)dev->displayName);
@ -1256,9 +1258,10 @@ int GetBinding(int port, int slot, int index, Device *&dev, Binding *&b, ForceFe
ffb = 0; ffb = 0;
b = 0; b = 0;
int padtype = config.padConfigs[port][slot].type; int padtype = config.padConfigs[port][slot].type;
int selectedDevice = config.deviceSelect[port][slot];
for (int i = 0; i < dm->numDevices; i++) { for (int i = 0; i < dm->numDevices; i++) {
dev = dm->devices[i]; dev = dm->devices[i];
if (!dev->enabled) if (!dev->enabled || selectedDevice >= 0 && dm->devices[selectedDevice] != dev)
continue; continue;
if (index < dev->pads[port][slot][padtype].numBindings) { if (index < dev->pads[port][slot][padtype].numBindings) {
b = dev->pads[port][slot][padtype].bindings + index; b = dev->pads[port][slot][padtype].bindings + index;
@ -1546,6 +1549,7 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
CheckDlgButton(hWnd, IDC_CONFIGURE_ON_BIND, BST_CHECKED * config.configureOnBind); CheckDlgButton(hWnd, IDC_CONFIGURE_ON_BIND, BST_CHECKED * config.configureOnBind);
AddTooltip(IDC_BINDINGS_LIST, hWnd); AddTooltip(IDC_BINDINGS_LIST, hWnd);
AddTooltip(IDC_DEVICE_SELECT, hWnd);
AddTooltip(IDC_CONFIGURE_ON_BIND, hWnd); AddTooltip(IDC_CONFIGURE_ON_BIND, hWnd);
AddTooltip(ID_MOUSE, hWnd); AddTooltip(ID_MOUSE, hWnd);
AddTooltip(ID_ANALOG, hWnd); AddTooltip(ID_ANALOG, hWnd);
@ -1560,6 +1564,24 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
AddTooltip(IDC_SLIDER_SENSITIVITY, hWnd); AddTooltip(IDC_SLIDER_SENSITIVITY, hWnd);
config.bind = false; config.bind = false;
config.deviceSelect[port][slot] = -1;
HWND hWndDS = GetDlgItem(hWnds[port][slot][padtype], IDC_DEVICE_SELECT);
SendMessage(hWndDS, CB_RESETCONTENT, 0, 0);
int added = 0;
SendMessage(hWndDS, CB_INSERTSTRING, added, (LPARAM)L"Allow All Devices");
SendMessage(hWndDS, CB_SETITEMDATA, added, -1);
added++;
for (int i = 0; i < dm->numDevices; i++) {
Device *dev = dm->devices[i];
if (dev->enabled && dev->api != IGNORE_KEYBOARD) {
SendMessage(hWndDS, CB_INSERTSTRING, added, (LPARAM)dev->displayName);
SendMessage(hWndDS, CB_SETITEMDATA, added, i);
added++;
}
}
SendMessage(hWndDS, CB_SETCURSEL, 0, 0);
EnableWindow(hWndDS, added != 0);
Populate(port, slot, padtype); Populate(port, slot, padtype);
} break; } break;
case WM_DEVICECHANGE: case WM_DEVICECHANGE:
@ -1590,7 +1612,8 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
InitInfo info = {selected == 0x7F, 1, hWndProp, &hWndButtonProc}; InitInfo info = {selected == 0x7F, 1, hWndProp, &hWndButtonProc};
Device *dev = dm->GetActiveDevice(&info, &uid, &index, &value); Device *dev = dm->GetActiveDevice(&info, &uid, &index, &value);
if (dev) { int selectedDevice = config.deviceSelect[port][slot];
if (dev && (selectedDevice == -1 || dm->devices[selectedDevice] == dev)) {
int command = selected; int command = selected;
// Good idea to do this first, as BindCommand modifies the ListView, which will // Good idea to do this first, as BindCommand modifies the ListView, which will
// call it anyways, which is a bit funky. // call it anyways, which is a bit funky.
@ -1722,6 +1745,10 @@ INT_PTR CALLBACK DialogProc(HWND hWnd, unsigned int msg, WPARAM wParam, LPARAM l
} }
} }
} }
} else if (HIWORD(wParam) == CBN_SELCHANGE && LOWORD(wParam) == IDC_DEVICE_SELECT) {
int selectedDev = SendMessage(GetDlgItem(hWnd, IDC_DEVICE_SELECT), CB_GETCURSEL, 0, 0);
config.deviceSelect[port][slot] = SendMessage(GetDlgItem(hWnd, IDC_DEVICE_SELECT), CB_GETITEMDATA, selectedDev, 0);
RefreshEnabledDevicesAndDisplay(1, hWndGeneral, 1);
} else if (HIWORD(wParam) == CBN_SELCHANGE && LOWORD(wParam) == IDC_FF_EFFECT) { } else if (HIWORD(wParam) == CBN_SELCHANGE && LOWORD(wParam) == IDC_FF_EFFECT) {
int typeIndex = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); int typeIndex = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0);
if (typeIndex >= 0) if (typeIndex >= 0)
@ -2064,6 +2091,7 @@ void UpdatePadList(HWND hWnd)
item.iSubItem = 2; item.iSubItem = 2;
int count = 0; int count = 0;
int selectedDevice = config.deviceSelect[port][slot];
for (int i = 0; i < dm->numDevices; i++) { for (int i = 0; i < dm->numDevices; i++) {
Device *dev = dm->devices[i]; Device *dev = dm->devices[i];
if (!dev->enabled) if (!dev->enabled)

2
plugins/LilyPad/Config.h
View File

@ -33,6 +33,8 @@ struct GeneralConfig
public: public:
PadConfig padConfigs[2][4]; PadConfig padConfigs[2][4];
int deviceSelect[2][4];
u8 closeHacks; u8 closeHacks;
DeviceAPI keyboardApi; DeviceAPI keyboardApi;

4
plugins/LilyPad/LilyPad.rc
View File

@ -94,6 +94,7 @@ BEGIN
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14
// Special bindings and options: // Special bindings and options:
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15 CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15
COMBOBOX IDC_DEVICE_SELECT,259,250,72,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15 PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15
@ -170,6 +171,7 @@ BEGIN
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14
// Special bindings and options: // Special bindings and options:
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15 CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15
COMBOBOX IDC_DEVICE_SELECT,259,250,72,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15 PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15
@ -246,6 +248,7 @@ BEGIN
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14
// Special bindings and options: // Special bindings and options:
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15 CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15
COMBOBOX IDC_DEVICE_SELECT,259,250,72,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15 PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15
@ -318,6 +321,7 @@ BEGIN
PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14 PUSHBUTTON "Small Motor",ID_SMALL_MOTOR,347,226,64,14
// Special bindings and options: // Special bindings and options:
CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15 CONTROL "Configure on bind",IDC_CONFIGURE_ON_BIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,335,250,70,15
COMBOBOX IDC_DEVICE_SELECT,259,250,72,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15 PUSHBUTTON "Lock Input",ID_LOCK_ALL_INPUT,196,196,59,15
PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15 PUSHBUTTON "Lock Direction",ID_LOCK_DIRECTION,196,214,59,15
PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15 PUSHBUTTON "Lock Buttons",ID_LOCK_BUTTONS,196,232,59,15

3
plugins/LilyPad/Tooltips.cpp
View File

@ -69,6 +69,9 @@ LPWSTR dialog_message(int ID, bool *updateText)
L"Right-click and select \"Delete Selected\" to remove the selected input from the list.\n\n" L"Right-click and select \"Delete Selected\" to remove the selected input from the list.\n\n"
L"Right-click and select \"Clear All\" to remove all the inputs from the list.\n\n" L"Right-click and select \"Clear All\" to remove all the inputs from the list.\n\n"
L"Note: Use Shift/Ctrl + Left-click to select multiple bindings. Changing the displayed configuration will now copy it to all selected bindings."; L"Note: Use Shift/Ctrl + Left-click to select multiple bindings. Changing the displayed configuration will now copy it to all selected bindings.";
case IDC_DEVICE_SELECT:
return L"Select a single device to hide the bindings from other devices in the bindings list, and to only be able to add new bindings for the selected device.\n\n"
L"This can also avoid input conflict issues when one controller is recognized as several devices through different APIs.";
case IDC_CONFIGURE_ON_BIND: case IDC_CONFIGURE_ON_BIND:
return L"Immediately go to the configuration setup when you create a new binding."; return L"Immediately go to the configuration setup when you create a new binding.";
case ID_MOUSE: case ID_MOUSE:

1
plugins/LilyPad/resource.h
View File

@ -103,6 +103,7 @@
#define ID_SMALL_MOTOR 0x111D #define ID_SMALL_MOTOR 0x111D
#define ID_FORCEFEEDBACK_BOX 0x111E #define ID_FORCEFEEDBACK_BOX 0x111E
#define IDC_CONFIGURE_ON_BIND 0x111F #define IDC_CONFIGURE_ON_BIND 0x111F
#define IDC_DEVICE_SELECT 0x1120
#define IDC_BINDINGS_LIST 0x1200 #define IDC_BINDINGS_LIST 0x1200
#define ID_SAVE 0x1201 #define ID_SAVE 0x1201
#define ID_LOAD 0x1202 #define ID_LOAD 0x1202