moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-06-17 14:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for multiple controllers

Browse Source
This commit is contained in:
Iwan Timmer
2015-05-11 12:43:37 +02:00
parent e30bd107c4
commit 54bcaf47bb
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input.c
+16 -1
View File
@@ -46,6 +46,7 @@ struct input_device {
struct mapping map; struct mapping map;
int fd; int fd;
__s32 mouseDeltaX, mouseDeltaY, mouseScroll; __s32 mouseDeltaX, mouseDeltaY, mouseScroll;
short controllerId;
int buttonFlags; int buttonFlags;
short leftTrigger, rightTrigger; short leftTrigger, rightTrigger;
short leftStickX, leftStickY; short leftStickX, leftStickY;
@@ -58,6 +59,7 @@ struct input_device {
static struct pollfd* fds = NULL; static struct pollfd* fds = NULL;
static struct input_device* devices = NULL; static struct input_device* devices = NULL;
static int numDevices = 0; static int numDevices = 0;
static int assignedControllerIds = 0;
static short* currentKey; static short* currentKey;
static short* currentAbs; static short* currentAbs;
@@ -102,6 +104,7 @@ void input_create(char* device, char* mapFile) {
if (mapFile != NULL) if (mapFile != NULL)
mapping_load(mapFile, &(devices[dev].map)); mapping_load(mapFile, &(devices[dev].map));
devices[dev].controllerId = -1;
input_init_parms(&devices[dev], &(devices[dev].xParms), devices[dev].map.abs_x); input_init_parms(&devices[dev], &(devices[dev].xParms), devices[dev].map.abs_x);
input_init_parms(&devices[dev], &(devices[dev].yParms), devices[dev].map.abs_y); input_init_parms(&devices[dev], &(devices[dev].yParms), devices[dev].map.abs_y);
input_init_parms(&devices[dev], &(devices[dev].zParms), devices[dev].map.abs_z); input_init_parms(&devices[dev], &(devices[dev].zParms), devices[dev].map.abs_z);
@@ -160,7 +163,19 @@ static bool input_handle_event(struct input_event *ev, struct input_device *dev)
dev->mouseScroll = 0; dev->mouseScroll = 0;
} }
if (dev->gamepadModified) { if (dev->gamepadModified) {
LiSendControllerEvent(dev->buttonFlags, dev->leftTrigger, dev->rightTrigger, dev->leftStickX, dev->leftStickY, dev->rightStickX, dev->rightStickY); if (dev->controllerId < 0) {
for (int i = 0; i < 4; i++) {
if ((assignedControllerIds & (1 << i)) == 0) {
assignedControllerIds |= (1 << i);
dev->controllerId = i;
break;
}
}
//Use id 0 when too many gamepads are connected
if (dev->controllerId < 0)
dev->controllerId = 0;
}
LiSendMultiControllerEvent(dev->controllerId, dev->buttonFlags, dev->leftTrigger, dev->rightTrigger, dev->leftStickX, dev->leftStickY, dev->rightStickX, dev->rightStickY);
dev->gamepadModified = false; dev->gamepadModified = false;
} }
break; break;