Properly discard xfc->appWindow on focus loss

(cherry picked from commit 34e5504bcc1734fd767572a262dec94e551e4c30)

diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index 3f7d872..3127f2f 100644 (file)
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -600,15 +600,10 @@ static BOOL xf_event_EnterNotify(xfContext* xfc, const XEnterWindowEvent* event,
        }
        else
        {
-               xfAppWindow* appWindow;
-               appWindow = xf_AppWindowFromX11Window(xfc, event->window);
+               xfAppWindow* appWindow = xf_AppWindowFromX11Window(xfc, event->window);
 
                /* keep track of which window has focus so that we can apply pointer updates */
-
-               if (appWindow)
-               {
-                       xfc->appWindow = appWindow;
-               }
+               xfc->appWindow = appWindow;
        }
 
        return TRUE;
@@ -616,14 +611,19 @@ static BOOL xf_event_EnterNotify(xfContext* xfc, const XEnterWindowEvent* event,
 
 static BOOL xf_event_LeaveNotify(xfContext* xfc, const XLeaveWindowEvent* event, BOOL app)
 {
-       WINPR_UNUSED(event);
-
        if (!app)
        {
                xfc->mouse_active = FALSE;
                XUngrabKeyboard(xfc->display, CurrentTime);
        }
+       else
+       {
+               xfAppWindow* appWindow = xf_AppWindowFromX11Window(xfc, event->window);
 
+               /* keep track of which window has focus so that we can apply pointer updates */
+               if (xfc->appWindow == appWindow)
+                       xfc->appWindow = NULL;
+       }
        return TRUE;
 }
 

diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c
index d14655d..55ea712 100644 (file)
--- a/client/X11/xf_window.c
+++ b/client/X11/xf_window.c
@@ -1079,6 +1079,9 @@ void xf_DestroyWindow(xfContext* xfc, xfAppWindow* appWindow)
        if (!appWindow)
                return;
 
+       if (xfc->appWindow == appWindow)
+               xfc->appWindow = NULL;
+
        if (appWindow->gc)
                XFreeGC(xfc->display, appWindow->gc);