mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

dinput: only support hardware mouse index 0

Browse Source
This commit is contained in:
David Walters 2017-11-26 15:40:27 +00:00
parent 59812e9509
commit cdb5a656f2
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
input/drivers/dinput.c
View File

@ -49,6 +49,7 @@
#include "../../gfx/video_driver.h"
#include "../../configuration.h"
#include "../../verbosity.h"
/* Keep track of which pad indexes are 360 controllers.
@ -267,9 +268,18 @@ static bool dinput_keyboard_pressed(struct dinput_input *di, unsigned key)
return di->state[sym] & 0x80;
}
static bool dinput_mbutton_pressed(struct dinput_input *di, unsigned key)
static bool dinput_mbutton_pressed(struct dinput_input *di, unsigned port, unsigned key)
{
bool result;
settings_t *settings = config_get_ptr();
if (port >= MAX_USERS)
return false;
/* the driver only supports one mouse */
if ( settings->uints.input_mouse_index[ port ] != 0 ) {
return false;
}
switch ( key )
{
@ -321,7 +331,7 @@ static bool dinput_is_pressed(struct dinput_input *di,
return true;
if (binds && binds[id].valid)
{
if (dinput_mbutton_pressed(di, bind->mbutton))
if (dinput_mbutton_pressed(di, port, bind->mbutton))
return true;
if (input_joypad_pressed(di->joypad, joypad_info, port, binds, id))
return true;
@ -382,10 +392,20 @@ static int16_t dinput_lightgun_state(struct dinput_input *di, unsigned id)
return 0;
}
static int16_t dinput_mouse_state(struct dinput_input *di, unsigned id)
static int16_t dinput_mouse_state(struct dinput_input *di, unsigned port, unsigned id)
{
int16_t state = 0;
settings_t *settings = config_get_ptr();
if (port >= MAX_USERS)
return false;
/* the driver only supports one mouse */
if ( settings->uints.input_mouse_index[ port ] != 0 ) {
return 0;
}
switch (id)
{
case RETRO_DEVICE_ID_MOUSE_X:
@ -427,8 +447,18 @@ static int16_t dinput_mouse_state(struct dinput_input *di, unsigned id)
return 0;
}
static int16_t dinput_mouse_state_screen(struct dinput_input *di, unsigned id)
static int16_t dinput_mouse_state_screen(struct dinput_input *di, unsigned port, unsigned id)
{
settings_t *settings = config_get_ptr();
if (port >= MAX_USERS)
return false;
/* the driver only supports one mouse */
if ( settings->uints.input_mouse_index[ port ] != 0 ) {
return 0;
}
switch (id)
{
case RETRO_DEVICE_ID_MOUSE_X:
@ -439,7 +469,7 @@ static int16_t dinput_mouse_state_screen(struct dinput_input *di, unsigned id)
break;
}
return dinput_mouse_state(di, id);
return dinput_mouse_state(di, port, id);
}
static int16_t dinput_pointer_state(struct dinput_input *di,
@ -542,10 +572,10 @@ static int16_t dinput_input_state(void *data,
return 0;
case RETRO_DEVICE_MOUSE:
return dinput_mouse_state(di, id);
return dinput_mouse_state(di, port, id);
case RARCH_DEVICE_MOUSE_SCREEN:
return dinput_mouse_state_screen(di, id);
return dinput_mouse_state_screen(di, port, id);
case RETRO_DEVICE_POINTER:
case RARCH_DEVICE_POINTER_SCREEN: