From f01a74296a3dacd2a496b02eeae396d08bdf448b Mon Sep 17 00:00:00 2001
From: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Sun, 3 Jul 2022 16:38:51 -0400
Subject: [PATCH] Pass all focus events to clients

Ignoring some focus events can result in the client and server
disagreeing on which window is focused or which keys have been pressed.
The results are unpredictable and generally undesirable.  Furthermore,
it turns out that clients do care about the mode.  Therefore, pass all
focus events to clients, without clobbering the mode value.

Fixes QubesOS/qubes-issues#7599.
---
 gui-daemon/xside.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/gui-daemon/xside.c b/gui-daemon/xside.c
index 91669932..34765337 100644
--- a/gui-daemon/xside.c
+++ b/gui-daemon/xside.c
@@ -1941,15 +1941,25 @@ static void process_xevent_focus(Ghandles * g, const XFocusChangeEvent * ev)
     struct msg_focus k;
     CHECK_NONMANAGED_WINDOW(g, ev->window);
 
-    /* Ignore everything other than normal, non-temporary focus change. In
-     * practice it ignores NotifyGrab and NotifyUngrab. VM does not have any
-     * way to grab focus in dom0, so it shouldn't care about those events. Grab
-     * is used by window managers during task switching (either classic task
-     * switcher, or KDE "present windows" feature).
+    /* In the past, the GUI daemon ignored several such events.  The
+     * comment used to say:
+     *
+     * > Ignore everything other than normal, non-temporary focus change. In
+     * > practice it ignores NotifyGrab and NotifyUngrab. VM does not have any
+     * > way to grab focus in dom0, so it shouldn't care about those events. Grab
+     * > is used by window managers during task switching (either classic task
+     * > switcher, or KDE "present windows" feature).
+     *
+     * In particular, events with modes other than NotifyNormal and
+     * NotifyWhileGrabbed were ignored.
+     *
+     * This caused problems, though.  It turns out that some
+     * applications actually do care about these events, and ignoring
+     * them causes things to break.  In particular, this resulted in
+     * lost keymap updates and the agent and daemon no longer agreeing
+     * on which keys are pressed.  Therefore, the GUI daemon now sends
+     * such events to clients, and does not clobber the mode value.
      */
-    if (ev->mode != NotifyNormal && ev->mode != NotifyWhileGrabbed)
-        return;
-
     if (ev->type == FocusIn) {
         char keys[32];
         XQueryKeymap(g->display, keys);
@@ -1960,10 +1970,7 @@ static void process_xevent_focus(Ghandles * g, const XFocusChangeEvent * ev)
     hdr.type = MSG_FOCUS;
     hdr.window = vm_window->remote_winid;
     k.type = ev->type;
-    /* override NotifyWhileGrabbed with NotifyNormal b/c VM shouldn't care
-     * about window manager details during focus switching
-     */
-    k.mode = NotifyNormal;
+    k.mode = ev->mode;
     k.detail = ev->detail;
     write_message(g->vchan, hdr, k);
 }