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

When using RawInput - Fixed UI selection of Gun axis so Gun 1 is not always selected with the desired gun.

Browse Source
This commit is contained in:
Derrick Renaud 2009-04-20 02:01:38 +00:00
parent 8a940a2ef8
commit 36a7c1ffc9
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/osd/windows/input.c
View File

@ -1425,10 +1425,9 @@ static BOOL CALLBACK dinput_mouse_enum(LPCDIDEVICEINSTANCE instance, LPVOID ref)
const char *name = dinput_device_item_name(devinfo, offset, default_button_name(butnum), NULL); const char *name = dinput_device_item_name(devinfo, offset, default_button_name(butnum), NULL);
// add to the mouse device and optionally to the gun device as well // add to the mouse device and optionally to the gun device as well
// note that the gun device points to the mouse buttons rather than its own
input_device_item_add(devinfo->device, name, &devinfo->mouse.state.rgbButtons[butnum], (input_item_id)(ITEM_ID_BUTTON1 + butnum), generic_button_get_state); input_device_item_add(devinfo->device, name, &devinfo->mouse.state.rgbButtons[butnum], (input_item_id)(ITEM_ID_BUTTON1 + butnum), generic_button_get_state);
if (guninfo != NULL) if (guninfo != NULL)
input_device_item_add(guninfo->device, name, &devinfo->mouse.state.rgbButtons[butnum], (input_item_id)(ITEM_ID_BUTTON1 + butnum), generic_button_get_state); input_device_item_add(guninfo->device, name, &guninfo->mouse.state.rgbButtons[butnum], (input_item_id)(ITEM_ID_BUTTON1 + butnum), generic_button_get_state);
free((void *)name); free((void *)name);
} }
@ -1788,8 +1787,8 @@ static TCHAR *rawinput_device_improve_name(TCHAR *name)
// The RAW name received is formatted as: // The RAW name received is formatted as:
// \??\type-id#hardware-id#instance-id#{DeviceClasses-id} // \??\type-id#hardware-id#instance-id#{DeviceClasses-id}
// XP starts with \??\ // XP starts with "\??\"
// Vista64 starts with \\?\ // Vista64 starts with "\\?\"
// ensure the name is something we can handle // ensure the name is something we can handle
if (_tcsncmp(name, TEXT("\\\\?\\"), 4) != 0 && _tcsncmp(name, TEXT("\\??\\"), 4) != 0) if (_tcsncmp(name, TEXT("\\\\?\\"), 4) != 0 && _tcsncmp(name, TEXT("\\??\\"), 4) != 0)
@ -2015,7 +2014,7 @@ static void rawinput_mouse_enum(running_machine *machine, PRAWINPUTDEVICELIST de
if (guninfo != NULL) if (guninfo != NULL)
{ {
guninfo->device = input_device_add(machine, DEVICE_CLASS_LIGHTGUN, guninfo->name, guninfo); guninfo->device = input_device_add(machine, DEVICE_CLASS_LIGHTGUN, guninfo->name, guninfo);
guninfo->poll = (guninfo == lightgun_list) ? win32_lightgun_poll : NULL; guninfo->poll = NULL;
} }
// populate the axes // populate the axes
@ -2075,9 +2074,6 @@ static void rawinput_mouse_update(HANDLE device, RAWMOUSE *data)
{ {
devinfo->mouse.state.lX = normalize_absolute_axis(data->lLastX, 0, 0xffff); devinfo->mouse.state.lX = normalize_absolute_axis(data->lLastX, 0, 0xffff);
devinfo->mouse.state.lY = normalize_absolute_axis(data->lLastY, 0, 0xffff); devinfo->mouse.state.lY = normalize_absolute_axis(data->lLastY, 0, 0xffff);
// also clear the polling function so win32_lightgun_poll isn't called
devinfo->poll = NULL;
} }
// update the button states; always update the corresponding mouse buttons // update the button states; always update the corresponding mouse buttons