Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-23 14:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] mouse: centralize the cursor view state management

Browse Source
This commit is contained in:
Geoffrey McRae 2021-01-16 21:01:15 +11:00
parent ca5fc80af5
commit cebc728a67
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
client/src/main.c
View File

@ -81,7 +81,7 @@ struct AppParams params = { 0 };
static void setGrab(bool enable); static void setGrab(bool enable);
static void setGrabQuiet(bool enable); static void setGrabQuiet(bool enable);
static void setCursorInView(void); static void setCursorInView(bool enable);
static void lgInit(void) static void lgInit(void)
{ {
@ -909,14 +909,32 @@ static void cursorToInt(double ex, double ey, int *x, int *y)
*y = (int)ey; *y = (int)ey;
} }
static void setCursorInView(void) static void setCursorInView(bool enable)
{ {
g_cursor.inView = true; // if we don't have focus don't do anything
g_cursor.draw = true; if (enable && !g_state.focused)
return;
g_cursor.inView = enable;
g_cursor.draw = params.alwaysShowCursor ? true : enable;
g_cursor.redraw = true; g_cursor.redraw = true;
g_cursor.warpState = WARP_STATE_ON; g_cursor.warpState = enable ? WARP_STATE_ON : WARP_STATE_OFF;
if (enable)
{
if (params.hideMouse)
SDL_ShowCursor(SDL_DISABLE);
g_state.ds->grabPointer(); g_state.ds->grabPointer();
}
else
{
if (params.hideMouse)
SDL_ShowCursor(SDL_ENABLE);
g_state.ds->ungrabPointer();
}
} }
void app_handleMouseGrabbed(double ex, double ey) void app_handleMouseGrabbed(double ex, double ey)
@ -980,14 +998,7 @@ void app_handleMouseNormal(double ex, double ey)
if (inView) if (inView)
{ {
if (params.hideMouse) setCursorInView(true);
SDL_ShowCursor(SDL_DISABLE);
if (g_state.focused)
{
/* the cursor moved in, enable grab mode */
setCursorInView();
}
struct DoublePoint guest = struct DoublePoint guest =
{ {
@ -1037,17 +1048,9 @@ void app_handleMouseNormal(double ex, double ey)
g_state.windowPos.x + g_state.border.x + tx, g_state.windowPos.x + g_state.border.x + tx,
g_state.windowPos.y + g_state.border.y + ty)) g_state.windowPos.y + g_state.border.y + ty))
{ {
if (params.hideMouse) setCursorInView(false);
SDL_ShowCursor(SDL_ENABLE);
g_cursor.inView = false; /* preempt the window leave flag if the warp will leave our window */
if(!params.alwaysShowCursor)
g_cursor.draw = false;
g_cursor.redraw = true;
/* pre-empt the window leave flag if the warp will leave our window */
if (tx < 0 || ty < 0 || tx > g_state.windowW || ty > g_state.windowH) if (tx < 0 || ty < 0 || tx > g_state.windowW || ty > g_state.windowH)
g_cursor.inWindow = false; g_cursor.inWindow = false;
@ -1114,9 +1117,12 @@ void app_handleMouseBasic(double ex, double ey)
g_cursor.pos.y < g_state.dstRect.y + g_state.dstRect.h; g_cursor.pos.y < g_state.dstRect.y + g_state.dstRect.h;
if (params.hideMouse && inView != g_cursor.inView) if (params.hideMouse && inView != g_cursor.inView)
SDL_ShowCursor(inView ? SDL_DISABLE : SDL_ENABLE);
if (inView != g_cursor.inView)
{
g_cursor.inView = inView; g_cursor.inView = inView;
setCursorInView(inView);
}
if (g_cursor.guest.dpiScale == 0) if (g_cursor.guest.dpiScale == 0)
return; return;
@ -1219,7 +1225,7 @@ static void setGrabQuiet(bool enable)
if (enable) if (enable)
{ {
if (!g_cursor.inView) if (!g_cursor.inView)
setCursorInView(); setCursorInView(true);
if (params.grabKeyboard) if (params.grabKeyboard)
g_state.ds->grabKeyboard(); g_state.ds->grabKeyboard();