From 301ba45f0f8a68b88ed3bf3e7b5259008656e4e7 Mon Sep 17 00:00:00 2001
From: Geoffrey McRae <geoff@hostfission.com>
Date: Tue, 1 Dec 2020 10:03:20 +1100
Subject: [PATCH] [client] don't grab keyboard if spice input is disabled

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

diff --git a/client/src/main.c b/client/src/main.c
index d21b7cd0..513f19db 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -1030,12 +1030,18 @@ int eventFilter(void * userdata, SDL_Event * event)
             break;
 
           case FocusIn:
+            if (!params.useSpiceInput)
+              break;
+
             if (xe.xfocus.mode == NotifyNormal ||
                 xe.xfocus.mode == NotifyUngrab)
               keyboardGrab();
             break;
 
           case FocusOut:
+            if (!params.useSpiceInput)
+              break;
+
             if (xe.xfocus.mode == NotifyNormal ||
                 xe.xfocus.mode == NotifyWhileGrabbed)
               keyboardUngrab();
@@ -1854,7 +1860,7 @@ int main(int argc, char * argv[])
   if (!config_load(argc, argv))
     return -1;
 
-  if (params.grabKeyboard)
+  if (params.useSpiceInput && params.grabKeyboard)
     SDL_SetHint(SDL_HINT_GRAB_KEYBOARD, "1");
 
   const int ret = lg_run();