ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better mouse handling on X11

This commit is contained in:
Flyinghead 2018-09-26 02:00:50 +02:00
parent 3ff14dd2b3
commit 4547973561
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/hw/maple/maple_devs.cpp
View File

@ -1084,7 +1084,7 @@ struct maple_mouse : maple_base
{
static u16 mo_cvt(f32 delta)
{
delta+=0x200;
delta+=0x200 + 0.5;
if (delta<=0)
delta=0;
else if (delta>0x3FF)

45
core/linux-dist/x11.cpp
View File

@ -294,9 +294,14 @@ void input_x11_handle()
return;
//Handle X11
static int prev_x = -1;
static int prev_y = -1;
bool mouse_moved = false;
XEvent e;
while (XCheckWindowEvent((Display*)x11_disp, (Window)x11_win,
Display *display = (Display*)x11_disp;
while (XCheckWindowEvent(display, (Window)x11_win,
KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask
| PointerMotionMask | FocusChangeMask,
&e))
@ -470,33 +475,27 @@ void input_x11_handle()
// FALL THROUGH
case MotionNotify:
if (settings.input.DCMouse)
{
static int prev_x = -1;
static int prev_y = -1;
if (settings.input.DCMouse)
{
if (prev_x != -1)
mo_x_delta += (f32)(e.xmotion.x - prev_x) * settings.input.MouseSensitivity / 1000.f;
if (prev_y != -1)
mo_y_delta += (f32)(e.xmotion.y - prev_y) * settings.input.MouseSensitivity / 1000.f;
if (capturing_mouse && (abs(x11_width / 2 - e.xmotion.x) > 10 || abs(x11_height / 2 - e.xmotion.y) > 10))
{
prev_x = x11_width / 2;
prev_y = x11_height / 2;
XWarpPointer((Display*)x11_disp, None, (Window)x11_win, 0, 0, 0, 0,
prev_x, prev_y);
}
else
{
prev_x = e.xmotion.x;
prev_y = e.xmotion.y;
}
}
mouse_moved = true;
if (prev_x != -1)
mo_x_delta += (f32)(e.xmotion.x - prev_x) * settings.input.MouseSensitivity / 100.f;
if (prev_y != -1)
mo_y_delta += (f32)(e.xmotion.y - prev_y) * settings.input.MouseSensitivity / 100.f;
prev_x = e.xmotion.x;
prev_y = e.xmotion.y;
}
break;
}
}
if (capturing_mouse && mouse_moved)
{
prev_x = x11_width / 2;
prev_y = x11_height / 2;
XWarpPointer(display, None, (Window)x11_win, 0, 0, 0, 0,
prev_x, prev_y);
XSync(display, true);
}
}
void input_x11_init()