From 074fa64a3bb159fd8289a2580b94beaa99010563 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Wed, 17 Mar 2004 18:05:22 +0000
Subject: [PATCH] Still bug fix in new focus code

(Old svn revision: 11643)
---
 src/client.c | 2 +-
 src/events.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/client.c b/src/client.c
index 88512563c..9ed248c7a 100644
--- a/src/client.c
+++ b/src/client.c
@@ -4738,7 +4738,7 @@ clientAcceptFocus (Client * c)
     {
         return FALSE;
     }
-    if (!FLAG_TEST (c->wm_flags, WM_FLAG_INPUT))
+    if (!FLAG_TEST (c->wm_flags, WM_FLAG_INPUT | WM_FLAG_TAKEFOCUS))
     {
         return FALSE;
     }
diff --git a/src/events.c b/src/events.c
index b7233ed99..ce279136e 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1263,10 +1263,6 @@ handleFocusIn (XFocusChangeEvent * ev)
         {
             clientSetFocus (c, FOCUS_FORCE);
         }
-        else
-        {
-            clientPassFocus (NULL);
-        }
         return;
     }
     else if ((ev->mode == NotifyGrab) || (ev->mode == NotifyUngrab) ||
-- 
GitLab