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

(X11) Mouse input is no longer registered when we are on the

Browse Source 
titlebar of the window or we are no longer inside the window
This commit is contained in:
twinaphex 2016-10-03 06:50:00 +02:00
parent 7f1c9b33ef
commit 91b1889873
3 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/common/x11_common.c
View File

@ -56,6 +56,7 @@ static bool g_x11_has_focus;
static XIM g_x11_xim; static XIM g_x11_xim;
static XIC g_x11_xic; static XIC g_x11_xic;
static bool g_x11_true_full; static bool g_x11_true_full;
bool g_x11_entered = false;
unsigned g_x11_screen; unsigned g_x11_screen;
@ -647,6 +648,14 @@ bool x11_alive(void *data)
} }
break; break;
case EnterNotify:
g_x11_entered = true;
break;
case LeaveNotify:
g_x11_entered = false;
break;
case ButtonRelease: case ButtonRelease:
break; break;

1
gfx/drivers_context/x_ctx.c
View File

@ -481,6 +481,7 @@ static bool gfx_ctx_x_set_video_mode(void *data,
swa.colormap = g_x11_cmap = XCreateColormap(g_x11_dpy, swa.colormap = g_x11_cmap = XCreateColormap(g_x11_dpy,
RootWindow(g_x11_dpy, vi->screen), vi->visual, AllocNone); RootWindow(g_x11_dpy, vi->screen), vi->visual, AllocNone);
swa.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask | swa.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask |
LeaveWindowMask | EnterWindowMask |
ButtonReleaseMask | ButtonPressMask; ButtonReleaseMask | ButtonPressMask;
swa.override_redirect = fullscreen ? True : False; swa.override_redirect = fullscreen ? True : False;

47
input/drivers/x11_input.c
View File

@ -300,6 +300,8 @@ static void x_input_free(void *data)
free(x11); free(x11);
} }
extern bool g_x11_entered;
static void x_input_poll_mouse(x11_input_t *x11) static void x_input_poll_mouse(x11_input_t *x11)
{ {
unsigned mask; unsigned mask;
@ -316,31 +318,34 @@ static void x_input_poll_mouse(x11_input_t *x11)
&win_x, &win_y, &win_x, &win_y,
&mask); &mask);
x11->mouse_x = win_x; if (g_x11_entered)
x11->mouse_y = win_y;
x11->mouse_l = mask & Button1Mask;
x11->mouse_m = mask & Button2Mask;
x11->mouse_r = mask & Button3Mask;
/* Somewhat hacky, but seem to do the job. */
if (x11->grab_mouse && video_driver_is_focused())
{ {
int mid_w, mid_h; x11->mouse_x = win_x;
struct video_viewport vp = {0}; x11->mouse_y = win_y;
x11->mouse_l = mask & Button1Mask;
x11->mouse_m = mask & Button2Mask;
x11->mouse_r = mask & Button3Mask;
video_driver_get_viewport_info(&vp); /* Somewhat hacky, but seem to do the job. */
if (x11->grab_mouse && video_driver_is_focused())
mid_w = vp.full_width >> 1;
mid_h = vp.full_height >> 1;
if (x11->mouse_x != mid_w || x11->mouse_y != mid_h)
{ {
XWarpPointer(x11->display, None, int mid_w, mid_h;
x11->win, 0, 0, 0, 0, struct video_viewport vp = {0};
mid_w, mid_h);
video_driver_get_viewport_info(&vp);
mid_w = vp.full_width >> 1;
mid_h = vp.full_height >> 1;
if (x11->mouse_x != mid_w || x11->mouse_y != mid_h)
{
XWarpPointer(x11->display, None,
x11->win, 0, 0, 0, 0,
mid_w, mid_h);
}
x11->mouse_last_x = mid_w;
x11->mouse_last_y = mid_h;
} }
x11->mouse_last_x = mid_w;
x11->mouse_last_y = mid_h;
} }
} }