From ce96c77098c51f754bedd0a24eb476069d2b5e82 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Fri, 8 Jan 2021 23:15:48 +1100
Subject: [PATCH] [client] spice: fixed grabKeyboardOnFocus regression

---
 client/src/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/main.c b/client/src/main.c
index 755852d1..e59b0790 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -1162,7 +1162,10 @@ static void setGrab(bool enable)
     else
     {
       if (params.grabKeyboard)
-        XUngrabKeyboard(g_state.wminfo.info.x11.display, CurrentTime);
+      {
+        if (!g_state.focused || !params.grabKeyboardOnFocus)
+          XUngrabKeyboard(g_state.wminfo.info.x11.display, CurrentTime);
+      }
 
       XUngrabPointer(g_state.wminfo.info.x11.display,  CurrentTime);
     }