mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-17 16:30:30 +02:00
Remove legacy key mapping and associate devices with keys (DInput has been left behind for now, will be fixed up soon). Saving is broken, will be fixed soon.
This commit is contained in:
Henrik Rydgard committed
1 parent
ab6133e419
commit
cc58e34cf8
30 files changed
+671
-1193
No files matched your search
+1
-229
@@ -15,235 +15,7 @@
|
||||
// Official git repository and contact information can be found at
|
||||
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
|
||||
|
||||
#include "Common/KeyMap.h"
|
||||
#include "ControlMapping.h"
|
||||
#include "DinputDevice.h"
|
||||
#include "XinputDevice.h"
|
||||
|
||||
extern unsigned int key_pad_map[];
|
||||
extern unsigned short analog_ctrl_map[];
|
||||
extern unsigned int dinput_ctrl_map[];
|
||||
extern unsigned int xinput_ctrl_map[];
|
||||
|
||||
inline UINT* ControlMapping::GetDeviceButtonsMap(UINT curDevice)
|
||||
{
|
||||
switch (curDevice)
|
||||
{
|
||||
case CONTROLS_KEYBOARD_INDEX:
|
||||
return pButtonsMap;
|
||||
case CONTROLS_DIRECT_INPUT_INDEX:
|
||||
return pButtonsMap + buttonsCount;
|
||||
case CONTROLS_XINPUT_INDEX:
|
||||
return pButtonsMap + (buttonsCount * 2);
|
||||
case CONTROLS_KEYBOARD_ANALOG_INDEX:
|
||||
return pButtonsMap + (buttonsCount * 3);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ControlMapping * ControlMapping::CreateInstance(UINT nButtons)
|
||||
{
|
||||
if (nButtons != (key_pad_map_size / sizeof(key_pad_map[0]) / 2))
|
||||
return FALSE;
|
||||
if (nButtons != (dinput_ctrl_map_size / sizeof(dinput_ctrl_map[0]) / 2))
|
||||
return FALSE;
|
||||
if (nButtons != (xinput_ctrl_map_size / sizeof(xinput_ctrl_map[0]) / 2))
|
||||
return FALSE;
|
||||
if (4 != (analog_ctrl_map_size / sizeof(analog_ctrl_map[0]) / 2))
|
||||
return FALSE;
|
||||
auto inst = new ControlMapping(nButtons);
|
||||
if (!inst->pButtonsMap)
|
||||
return FALSE;
|
||||
return inst;
|
||||
}
|
||||
|
||||
ControlMapping::ControlMapping(UINT nButtons) :
|
||||
currentDevicePage(-1),
|
||||
currentButtonIndex(-1),
|
||||
pButtonsMap(0),
|
||||
buttonsCount(nButtons),
|
||||
dinput(0),
|
||||
xinput(0)
|
||||
{
|
||||
dinput = std::shared_ptr<DinputDevice>(new DinputDevice());
|
||||
xinput = std::shared_ptr<XinputDevice>(new XinputDevice());
|
||||
|
||||
pButtonsMap = new UINT[CONTROLS_DEVICE_NUM * nButtons];
|
||||
ZeroMemory(pButtonsMap, sizeof(UINT) * CONTROLS_DEVICE_NUM * nButtons);
|
||||
for (UINT i = 0; i < nButtons; i++) {
|
||||
*(GetDeviceButtonsMap(CONTROLS_KEYBOARD_INDEX) + i) = key_pad_map[i * 2];
|
||||
*(GetDeviceButtonsMap(CONTROLS_DIRECT_INPUT_INDEX) + i) = dinput_ctrl_map[i * 2];
|
||||
*(GetDeviceButtonsMap(CONTROLS_XINPUT_INDEX) + i) = xinput_ctrl_map[i * 2];
|
||||
}
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
*(GetDeviceButtonsMap(CONTROLS_KEYBOARD_ANALOG_INDEX) + i) = (UINT)analog_ctrl_map[i * 2];
|
||||
}
|
||||
}
|
||||
|
||||
ControlMapping::~ControlMapping()
|
||||
{
|
||||
if (pButtonsMap) {
|
||||
delete [] pButtonsMap;
|
||||
pButtonsMap = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void ControlMapping::UpdateState()
|
||||
{
|
||||
rawState.button = -1;
|
||||
switch(currentDevicePage)
|
||||
{
|
||||
case CONTROLS_KEYBOARD_INDEX:
|
||||
case CONTROLS_KEYBOARD_ANALOG_INDEX:
|
||||
{
|
||||
; // leave it to KeyboardProc.
|
||||
}
|
||||
break;
|
||||
case CONTROLS_DIRECT_INPUT_INDEX:
|
||||
{
|
||||
|
||||
dinput->UpdateRawStateSingle(rawState);
|
||||
UINT newButton = (rawState.button != rawState.prevButton && rawState.prevButton == -1)
|
||||
? rawState.button : -1;
|
||||
if (newButton != -1) {
|
||||
SetBindCode(newButton);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case CONTROLS_XINPUT_INDEX:
|
||||
{
|
||||
xinput->UpdateRawStateSingle(rawState);
|
||||
UINT newButton = (rawState.button != rawState.prevButton && rawState.prevButton == -1)
|
||||
? rawState.button : -1;
|
||||
if (newButton != -1) {
|
||||
SetBindCode(newButton);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
rawState.prevButton = rawState.button;
|
||||
}
|
||||
|
||||
void ControlMapping::BindToDevices()
|
||||
{
|
||||
for (UINT i = 0; i < buttonsCount; i++) {
|
||||
key_pad_map[i * 2] = *(GetDeviceButtonsMap(CONTROLS_KEYBOARD_INDEX) + i);
|
||||
dinput_ctrl_map[i * 2] = *(GetDeviceButtonsMap(CONTROLS_DIRECT_INPUT_INDEX) + i);
|
||||
xinput_ctrl_map[i * 2] = *(GetDeviceButtonsMap(CONTROLS_XINPUT_INDEX) + i);
|
||||
}
|
||||
for (UINT i = 0; i < 4; i++) {
|
||||
analog_ctrl_map[i * 2] = (USHORT)*(GetDeviceButtonsMap(CONTROLS_KEYBOARD_ANALOG_INDEX) + i);
|
||||
}
|
||||
}
|
||||
|
||||
void ControlMapping::SetBindCode(UINT newCode)
|
||||
{
|
||||
SetBindCode(newCode, currentDevicePage, currentButtonIndex);
|
||||
}
|
||||
|
||||
void ControlMapping::SetBindCode(UINT newCode, UINT buttonIdx)
|
||||
{
|
||||
SetBindCode(newCode, currentDevicePage, buttonIdx);
|
||||
}
|
||||
|
||||
void ControlMapping::SetBindCode(UINT newCode, UINT deviceIdx, UINT buttonIdx)
|
||||
{
|
||||
if (deviceIdx < CONTROLS_DEVICE_NUM && buttonIdx < buttonsCount)
|
||||
*(GetDeviceButtonsMap(deviceIdx) + buttonIdx) = newCode;
|
||||
}
|
||||
|
||||
UINT ControlMapping::GetBindCode(UINT deviceIdx, UINT buttonIdx)
|
||||
{
|
||||
if (deviceIdx < CONTROLS_DEVICE_NUM && buttonIdx < buttonsCount)
|
||||
return *(GetDeviceButtonsMap(deviceIdx) + buttonIdx);
|
||||
return -1;
|
||||
}
|
||||
|
||||
UINT ControlMapping::GetBindCode(UINT buttonIdx)
|
||||
{
|
||||
return GetBindCode(currentDevicePage, buttonIdx);
|
||||
}
|
||||
|
||||
UINT ControlMapping::GetBindCode()
|
||||
{
|
||||
return GetBindCode(currentDevicePage, currentButtonIndex);
|
||||
}
|
||||
|
||||
void ControlMapping::SetDisableBind(UINT deviceIdx, UINT buttonIdx)
|
||||
{
|
||||
u32 disableCode = 0;
|
||||
if (deviceIdx == CONTROLS_DIRECT_INPUT_INDEX) {
|
||||
disableCode = 0xFFFFFFFF;
|
||||
}
|
||||
SetBindCode(disableCode, deviceIdx, buttonIdx);
|
||||
}
|
||||
|
||||
void ControlMapping::SetDisableBind(UINT buttonIdx)
|
||||
{
|
||||
SetDisableBind(currentDevicePage, buttonIdx);
|
||||
}
|
||||
|
||||
void ControlMapping::SetDisableBind()
|
||||
{
|
||||
SetDisableBind(currentDevicePage, currentButtonIndex);
|
||||
}
|
||||
|
||||
UINT ControlMapping::GetTargetDevice()
|
||||
{
|
||||
return currentDevicePage;
|
||||
}
|
||||
|
||||
void ControlMapping::SetTargetDevice(UINT deviceIdx)
|
||||
{
|
||||
rawState.prevButton = -1;
|
||||
currentDevicePage = deviceIdx;
|
||||
}
|
||||
|
||||
UINT ControlMapping::GetTargetButton()
|
||||
{
|
||||
return currentButtonIndex;
|
||||
}
|
||||
|
||||
void ControlMapping::SetTargetButton(UINT buttonIdx)
|
||||
{
|
||||
currentButtonIndex = buttonIdx;
|
||||
}
|
||||
|
||||
bool saveControlsToFile() {
|
||||
FILE *wfp = fopen("PPSSPPControls.dat", "wb");
|
||||
if (!wfp)
|
||||
return false;
|
||||
|
||||
fwrite(key_pad_map, 1, key_pad_map_size, wfp);
|
||||
fwrite(analog_ctrl_map, 1, analog_ctrl_map_size, wfp);
|
||||
fwrite(dinput_ctrl_map, 1, dinput_ctrl_map_size, wfp);
|
||||
fwrite(xinput_ctrl_map, 1, xinput_ctrl_map_size, wfp);
|
||||
fclose(wfp);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool loadControlsFromFile() {
|
||||
FILE *rfp = fopen("PPSSPPControls.dat", "rb");
|
||||
if (!rfp)
|
||||
return false;
|
||||
|
||||
fseek(rfp, 0, SEEK_END);
|
||||
fpos_t fsize = 0;
|
||||
fgetpos(rfp, &fsize);
|
||||
|
||||
if (fsize != (key_pad_map_size + analog_ctrl_map_size + dinput_ctrl_map_size + xinput_ctrl_map_size))
|
||||
{
|
||||
fclose(rfp);
|
||||
return false;
|
||||
}
|
||||
|
||||
fseek(rfp, 0, SEEK_SET);
|
||||
fread(key_pad_map, 1, key_pad_map_size, rfp);
|
||||
fread(analog_ctrl_map, 1, analog_ctrl_map_size, rfp);
|
||||
fread(dinput_ctrl_map, 1, dinput_ctrl_map_size, rfp);
|
||||
fread(xinput_ctrl_map, 1, xinput_ctrl_map_size, rfp);
|
||||
fclose(rfp);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user