mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make mouse relative again.

Browse Source
This commit is contained in:
Tatsuya79 2017-03-31 17:28:49 +02:00
parent 3da08c9d9e
commit 5649f084e3
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
input/drivers/dinput.c
View File

@ -84,10 +84,10 @@ struct dinput_input
int window_pos_x; int window_pos_x;
int window_pos_y; int window_pos_y;
int mouse_rel_x;
int mouse_rel_y;
int mouse_x; int mouse_x;
int mouse_last_x;
int mouse_y; int mouse_y;
int mouse_last_y;
bool mouse_l, mouse_r, mouse_m, mouse_wu, mouse_wd, mouse_hwu, mouse_hwd; bool mouse_l, mouse_r, mouse_m, mouse_wu, mouse_wd, mouse_hwu, mouse_hwd;
struct pointer_status pointer_head; /* dummy head for easier iteration */ struct pointer_status pointer_head; /* dummy head for easier iteration */
}; };
@ -182,10 +182,7 @@ static void *dinput_init(const char *joypad_driver)
if (di->mouse) if (di->mouse)
{ {
DIDATAFORMAT c_dfDIMouse2_custom = c_dfDIMouse2; IDirectInputDevice8_SetDataFormat(di->mouse, &c_dfDIMouse2);
c_dfDIMouse2_custom.dwFlags = DIDF_ABSAXIS;
IDirectInputDevice8_SetDataFormat(di->mouse, &c_dfDIMouse2_custom);
IDirectInputDevice8_SetCooperativeLevel(di->mouse, (HWND)video_driver_window_get(), IDirectInputDevice8_SetCooperativeLevel(di->mouse, (HWND)video_driver_window_get(),
DISCL_NONEXCLUSIVE | DISCL_FOREGROUND); DISCL_NONEXCLUSIVE | DISCL_FOREGROUND);
IDirectInputDevice8_Acquire(di->mouse); IDirectInputDevice8_Acquire(di->mouse);
@ -242,11 +239,8 @@ static void dinput_poll(void *data)
memset(&mouse_state, 0, sizeof(mouse_state)); memset(&mouse_state, 0, sizeof(mouse_state));
} }
di->mouse_last_x = di->mouse_x; di->mouse_rel_x = mouse_state.lX;
di->mouse_last_y = di->mouse_y; di->mouse_rel_y = mouse_state.lY;
di->mouse_x = di->window_pos_x;
di->mouse_y = di->window_pos_y;
if (!mouse_state.rgbButtons[0]) if (!mouse_state.rgbButtons[0])
@ -334,9 +328,9 @@ static int16_t dinput_lightgun_state(struct dinput_input *di, unsigned id)
switch (id) switch (id)
{ {
case RETRO_DEVICE_ID_LIGHTGUN_X: case RETRO_DEVICE_ID_LIGHTGUN_X:
return di->mouse_x - di->mouse_last_x; return di->mouse_rel_x;
case RETRO_DEVICE_ID_LIGHTGUN_Y: case RETRO_DEVICE_ID_LIGHTGUN_Y:
return di->mouse_y - di->mouse_last_y; return di->mouse_rel_y;
case RETRO_DEVICE_ID_LIGHTGUN_TRIGGER: case RETRO_DEVICE_ID_LIGHTGUN_TRIGGER:
return di->mouse_l; return di->mouse_l;
case RETRO_DEVICE_ID_LIGHTGUN_CURSOR: case RETRO_DEVICE_ID_LIGHTGUN_CURSOR:
@ -359,9 +353,9 @@ static int16_t dinput_mouse_state(struct dinput_input *di, unsigned id)
switch (id) switch (id)
{ {
case RETRO_DEVICE_ID_MOUSE_X: case RETRO_DEVICE_ID_MOUSE_X:
return di->mouse_x - di->mouse_last_x; return di->mouse_rel_x;
case RETRO_DEVICE_ID_MOUSE_Y: case RETRO_DEVICE_ID_MOUSE_Y:
return di->mouse_y - di->mouse_last_y; return di->mouse_rel_y;
case RETRO_DEVICE_ID_MOUSE_LEFT: case RETRO_DEVICE_ID_MOUSE_LEFT:
return di->mouse_l; return di->mouse_l;
case RETRO_DEVICE_ID_MOUSE_RIGHT: case RETRO_DEVICE_ID_MOUSE_RIGHT: