Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-09-20 09:21:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] spice: better x11 grab/ungrab behaviour

Browse Source
This commit is contained in:
Geoffrey McRae 2021-01-10 00:55:31 +11:00
parent 4334912e01
commit 18f9d936c6
1 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
client/src/main.c
View File

@ -1133,36 +1133,6 @@ static void handleWindowEnter()
g_cursor.redraw = true; g_cursor.redraw = true;
} }
// only called for X11
static void keyboardGrab()
{
if (!params.grabKeyboardOnFocus)
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
);
}
// only called for X11
static void keyboardUngrab()
{
if (!params.grabKeyboardOnFocus)
return;
// ungrab the keyboard
XUngrabKeyboard(
g_state.wminfo.info.x11.display,
CurrentTime
);
}
static void setGrab(bool enable) static void setGrab(bool enable)
{ {
setGrabQuiet(enable); setGrabQuiet(enable);
@ -1227,7 +1197,10 @@ static void setGrabQuiet(bool enable)
alignToGuest(); alignToGuest();
if (g_cursor.grab) if (g_cursor.grab)
{
g_cursor.inView = true; g_cursor.inView = true;
g_cursor.draw = true;
}
} }
int eventFilter(void * userdata, SDL_Event * event) int eventFilter(void * userdata, SDL_Event * event)
@ -1445,34 +1418,45 @@ int eventFilter(void * userdata, SDL_Event * event)
g_cursor.pos.x = x; g_cursor.pos.x = x;
g_cursor.pos.y = y; g_cursor.pos.y = y;
handleWindowLeave(); handleWindowLeave();
/* ungrab to avoid bad behaviour */
if (g_cursor.grab)
setGrab(false);
else
XUngrabKeyboard(g_state.wminfo.info.x11.display, CurrentTime);
break; break;
} }
case FocusIn: case FocusIn:
g_state.focused = true; if (xe.xfocus.mode == NotifyGrab)
if (!inputEnabled())
break; break;
if (xe.xfocus.mode == NotifyNormal || g_state.focused = true;
xe.xfocus.mode == NotifyUngrab)
keyboardGrab(); if (params.grabKeyboardOnFocus)
XGrabKeyboard(
g_state.wminfo.info.x11.display,
g_state.wminfo.info.x11.window,
true,
GrabModeAsync,
GrabModeAsync,
CurrentTime
);
break; break;
case FocusOut: case FocusOut:
g_state.focused = false; g_state.focused = false;
if (xe.xfocus.mode != NotifyNormal)
if (!inputEnabled())
break; break;
if (xe.xfocus.mode == NotifyNormal || /* ungrab to avoid bad behaviour */
xe.xfocus.mode == NotifyWhileGrabbed) if (g_cursor.grab)
{ setGrab(false);
if (g_cursor.grab) else
setGrab(false); XUngrabKeyboard(g_state.wminfo.info.x11.display, CurrentTime);
else
keyboardUngrab();
}
break; break;
} }
} }
@ -1677,6 +1661,8 @@ static bool try_renderer(const int index, const LG_RendererParams lgrParams, Uin
static void toggle_fullscreen(SDL_Scancode key, void * opaque) static void toggle_fullscreen(SDL_Scancode key, void * opaque)
{ {
/* first move the local mouse to the screen center so that we don't get a
* leave event breaking focus */
SDL_SetWindowFullscreen(g_state.window, params.fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP); SDL_SetWindowFullscreen(g_state.window, params.fullscreen ? 0 : SDL_WINDOW_FULLSCREEN_DESKTOP);
params.fullscreen = !params.fullscreen; params.fullscreen = !params.fullscreen;
} }