Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-12-03 22:58:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] spice: create and use platform agnostic grab/ungrab methods

Browse Source
This commit is contained in:
Geoffrey McRae
2021-01-10 15:26:33 +11:00
parent 8982493239
commit 76ed75f871
4 changed files with 179 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
client/src/main.c
View File

@@ -54,6 +54,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include "utils.h"
#include "kb.h"
#include "ll.h"
#include "wm.h"
#define RESIZE_TIMEOUT (10 * 1000) // 10ms
@@ -964,17 +965,7 @@ static void handleMouseNormal(double ex, double ey)
g_cursor.redraw = true;
g_cursor.warpState = WARP_STATE_ON;
XGrabPointer(
g_state.wminfo.info.x11.display,
g_state.wminfo.info.x11.window,
true,
None,
GrabModeAsync,
GrabModeAsync,
g_state.wminfo.info.x11.window,
None,
CurrentTime);
wmGrabPointer();
}
struct DoublePoint guest =
@@ -1040,7 +1031,7 @@ static void handleMouseNormal(double ex, double ey)
g_cursor.inWindow = false;
/* ungrab the pointer and move the local cursor to the exit point */
XUngrabPointer(g_state.wminfo.info.x11.display, CurrentTime);
wmUngrabPointer();
warpMouse(tx, ty, true);
return;
}
@@ -1140,14 +1131,7 @@ static void keyboardGrab()
return;
// grab the keyboard so we can intercept WM keys
XGrabKeyboard(
g_state.wminfo.info.x11.display,
g_state.wminfo.info.x11.window,
true,
GrabModeAsync,
GrabModeAsync,
CurrentTime
);
wmGrabKeyboard();
}
// only called for X11
@@ -1157,10 +1141,7 @@ static void keyboardUngrab()
return;
// ungrab the keyboard
XUngrabKeyboard(
g_state.wminfo.info.x11.display,
CurrentTime
);
wmUngrabKeyboard();
}
static void setGrab(bool enable)
@@ -1184,42 +1165,22 @@ static void setGrabQuiet(bool enable)
g_cursor.grab = enable;
if (g_state.wminfo.subsystem != SDL_SYSWM_X11)
SDL_SetWindowGrab(g_state.window, enable);
if (enable)
{
wmGrabPointer();
if (params.grabKeyboard)
wmGrabKeyboard();
}
else
{
if (enable)
if (params.grabKeyboard)
{
XGrabPointer(
g_state.wminfo.info.x11.display,
g_state.wminfo.info.x11.window,
true,
None,
GrabModeAsync,
GrabModeAsync,
g_state.wminfo.info.x11.window,
None,
CurrentTime);
if (params.grabKeyboard)
XGrabKeyboard(
g_state.wminfo.info.x11.display,
g_state.wminfo.info.x11.window,
true,
GrabModeAsync,
GrabModeAsync,
CurrentTime);
if (!g_state.focused || !params.grabKeyboardOnFocus)
wmUngrabKeyboard();
}
else
{
if (params.grabKeyboard)
{
if (!g_state.focused || !params.grabKeyboardOnFocus)
XUngrabKeyboard(g_state.wminfo.info.x11.display, CurrentTime);
}
XUngrabPointer(g_state.wminfo.info.x11.display, CurrentTime);
}
wmUngrabPointer();
}
// if exiting capture when input on capture only, we want to show the cursor