PORTREVISION=	1

* Do not send focus event when grab actually does not change 

* https://gitlab.freedesktop.org/xorg/xserver/-/commit/364d64981549544213e2bca8de6ff8a5b2b5a69e

*

--- dix/events.c.orig	2020-03-29 20:21:15 UTC

+++ dix/events.c

@@ -1532,7 +1532,9 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,

                 mouse->spriteInfo->sprite->hotPhys.y = 0;

         ConfineCursorToWindow(mouse, grab->confineTo, FALSE, TRUE);

     }

-    DoEnterLeaveEvents(mouse, mouse->id, oldWin, grab->window, NotifyGrab);

+    if (! (grabinfo->grab && oldWin == grabinfo->grab->window

+			  && oldWin == grab->window))

+        DoEnterLeaveEvents(mouse, mouse->id, oldWin, grab->window, NotifyGrab);

     mouse->valuator->motionHintWindow = NullWindow;

     if (syncEvents.playingEvents)

         grabinfo->grabTime = syncEvents.time;

@@ -1642,7 +1644,9 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab,

         oldWin = keybd->focus->win;

     if (keybd->valuator)

         keybd->valuator->motionHintWindow = NullWindow;

-    if (oldWin)

+    if (oldWin &&

+	! (grabinfo->grab && oldWin == grabinfo->grab->window

+			  && oldWin == grab->window))

         DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);

     if (syncEvents.playingEvents)

         grabinfo->grabTime = syncEvents.time;