Attachment 213727 Details for Bug 245854 – Patch for x11-servers/xorg-server

[patch] Patch for x11-servers/xorg-server

xorg-server.patch (text/plain), 2.12 KB, created by Christian Weisgerber on 2020-04-23 15:20:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Weisgerber

Created: 2020-04-23 15:20:53 UTC

Size: 2.12 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 532682)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME?=	xorg-server
> PORTVERSION?=	1.20.8
>+PORTREVISION=	1
> PORTEPOCH?=	1
> CATEGORIES=	x11-servers
> MASTER_SITES=	XORG/individual/xserver
>Index: files/patch-dix_events.c
>===================================================================
>--- files/patch-dix_events.c	(nonexistent)
>+++ files/patch-dix_events.c	(working copy)
>@@ -0,0 +1,27 @@
>+* 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;
>
>Property changes on: files/patch-dix_events.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 245854: 213727