Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4862 from kiall/multi-lightgun

Browse Source 
Linux X11 Input: Fix multiple lightgun support
This commit is contained in:
R. Belmont 2019-04-05 16:41:25 -04:00 committed by GitHub
commit e97a88bb37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/osd/modules/input/input_x11.cpp
View File

@ -533,10 +533,34 @@ public:
void handle_event(XEvent &xevent) override void handle_event(XEvent &xevent) override
{ {
devicelist()->for_each_device([&xevent](auto device) XID deviceid;
if (xevent.type == motion_type)
{ {
downcast<x11_input_device*>(device)->queue_events(&xevent, 1); XDeviceMotionEvent *motion = reinterpret_cast<XDeviceMotionEvent *>(&xevent);
deviceid = motion->deviceid;
}
else if (xevent.type == button_press_type || xevent.type == button_release_type)
{
XDeviceButtonEvent *button = reinterpret_cast<XDeviceButtonEvent *>(&xevent);
deviceid = button->deviceid;
}
else
{
return;
}
// Figure out which lightgun this event id destined for
auto target_device = std::find_if(devicelist()->begin(), devicelist()->end(), [deviceid](auto &device)
{
std::unique_ptr<device_info> &ptr = device;
return downcast<x11_input_device*>(ptr.get())->x11_state.deviceid == deviceid;
}); });
// If we find a matching lightgun, dispatch the event to the lightgun
if (target_device != devicelist()->end())
{
downcast<x11_input_device*>((*target_device).get())->queue_events(&xevent, 1);
}
} }
private: private: