mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Cleanup ps3_mouse_device_state

Browse Source
This commit is contained in:
twinaphex 2014-10-05 18:14:40 +02:00
parent f6d04ff01e
commit e5877e887b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
input/ps3_input.c
View File

@ -71,20 +71,21 @@ static int16_t ps3_mouse_device_state(ps3_input_t *ps3,
{ {
CellMouseData mouse_state; CellMouseData mouse_state;
cellMouseGetData(id, &mouse_state); cellMouseGetData(id, &mouse_state);
if (!ps3->mice_connected)
return 0;
switch (id) switch (id)
{ {
/* TODO: mouse wheel up/down */ /* TODO: mouse wheel up/down */
case RETRO_DEVICE_ID_MOUSE_LEFT: case RETRO_DEVICE_ID_MOUSE_LEFT:
return (!ps3->mice_connected ? 0 : return (mouse_state.buttons & CELL_MOUSE_BUTTON_1);
mouse_state.buttons & CELL_MOUSE_BUTTON_1);
case RETRO_DEVICE_ID_MOUSE_RIGHT: case RETRO_DEVICE_ID_MOUSE_RIGHT:
return (!ps3->mice_connected ? 0 : return (mouse_state.buttons & CELL_MOUSE_BUTTON_2);
mouse_state.buttons & CELL_MOUSE_BUTTON_2);
case RETRO_DEVICE_ID_MOUSE_X: case RETRO_DEVICE_ID_MOUSE_X:
return (!ps3->mice_connected ? 0 : mouse_state.x_axis); return (mouse_state.x_axis);
case RETRO_DEVICE_ID_MOUSE_Y: case RETRO_DEVICE_ID_MOUSE_Y:
return (!ps3->mice_connected ? 0 : mouse_state.y_axis); return (mouse_state.y_axis);
} }
return 0; return 0;
@ -92,7 +93,8 @@ static int16_t ps3_mouse_device_state(ps3_input_t *ps3,
#endif #endif
static int16_t ps3_input_state(void *data, const struct retro_keybind **binds, static int16_t ps3_input_state(void *data,
const struct retro_keybind **binds,
unsigned port, unsigned device, unsigned port, unsigned device,
unsigned index, unsigned id) unsigned index, unsigned id)
{ {