Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-12-20 19:50:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] wm/wayland: bypass SDL loop for pointer events

Browse Source
This commit is contained in:
Tudor Brindus
2021-01-11 21:18:17 -05:00
committed by Geoffrey McRae
parent 96c10c2c2d
commit fd009c6392
3 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/main.c
View File

@@ -88,9 +88,6 @@ struct AppParams params = { 0 };
static void setGrab(bool enable);
static void setGrabQuiet(bool enable);
void handleMouseGrabbed(double ex, double ey);
static void handleMouseNormal(double ex, double ey);
static void lgInit()
{
g_state.state = APP_STATE_RUNNING;
@@ -940,7 +937,7 @@ static void handleMouseWayland()
DEBUG_ERROR("failed to send mouse motion message");
}
static void handleMouseNormal(double ex, double ey)
void handleMouseNormal(double ex, double ey)
{
/* if we don't have the current cursor pos just send cursor movements */
if (!g_cursor.guest.valid)
@@ -1489,15 +1486,17 @@ int eventFilter(void * userdata, SDL_Event * event)
g_cursor.pos.x = event->motion.x;
g_cursor.pos.y = event->motion.y;
if (g_cursor.grab)
if (g_state.wminfo.subsystem != SDL_SYSWM_WAYLAND)
{
// On Wayland, wm.c calls handleMouseGrabbed, bypassing the SDL event
// loop.
if (g_state.wminfo.subsystem != SDL_SYSWM_WAYLAND)
handleMouseGrabbed(event->motion.xrel, event->motion.yrel);
// On Wayland, wm.c calls these functions, bypassing the SDL event loop.
if (g_cursor.grab)
{
if (g_state.wminfo.subsystem != SDL_SYSWM_WAYLAND)
handleMouseGrabbed(event->motion.xrel, event->motion.yrel);
}
else
handleMouseNormal(event->motion.xrel, event->motion.yrel);
}
else
handleMouseNormal(event->motion.xrel, event->motion.yrel);
break;
}