From 9d6e73267dd9914290919d37a08ed135a10c3462 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 25 Feb 2024 20:27:08 +0000
Subject: Fix [47d4f29159]: Ignored binding scripts for events with detail
 field NotifyInferior. Patch from Erik Leunissen.

---
 generic/tkBind.c | 19 ++-----------------
 tests/bind.test  |  4 ++--
 tests/event.test | 33 ---------------------------------
 3 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 0e46a74..5a42826 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2198,14 +2198,8 @@ Tk_BindEvent(
     curEvent = bindPtr->eventInfo + eventPtr->type;
 
     /*
-     * Ignore the event completely if it is an Enter, Leave, FocusIn, or
-     * FocusOut event with detail NotifyInferior. The reason for ignoring
-     * these events is that we don't want transitions between a window and its
-     * children to be visible to bindings on the parent: this would cause
-     * problems for mega-widgets, since the internal structure of a
-     * mega-widget isn't supposed to be visible to people watching the parent.
-     *
-     * Furthermore we have to compute current time, needed for "event generate".
+     * Compute current time needed for "event generate",
+     * and reset counters for Key and Button events.
      */
 
     switch (eventPtr->type) {
@@ -2215,15 +2209,6 @@ Tk_BindEvent(
 	    bindInfoPtr->lastCurrentTime = CurrentTimeInMilliSecs();
 	    bindInfoPtr->lastEventTime = eventPtr->xcrossing.time;
 	}
-	if (eventPtr->xcrossing.detail == NotifyInferior) {
-	    return;
-	}
-	break;
-    case FocusIn:
-    case FocusOut:
-	if (eventPtr->xfocus.detail == NotifyInferior) {
-	    return;
-	}
 	break;
     case KeyPress:
     case KeyRelease: {
diff --git a/tests/bind.test b/tests/bind.test
index 17b1fec..2d0cf97 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -574,7 +574,7 @@ test bind-13.9 {Tk_BindEvent procedure} -setup {
 } -cleanup {
     destroy .t.f
 } -result {{.t.f z (.t.f <Button-1> binding)} {.t.f z (.t.f <Button> binding)}}
-test bind-13.10 {Tk_BindEvent procedure: ignore NotifyInferior} -setup {
+test bind-13.10 {Tk_BindEvent procedure: don't ignore NotifyInferior - bug 47d4f29159} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
@@ -590,7 +590,7 @@ test bind-13.10 {Tk_BindEvent procedure: ignore NotifyInferior} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {Enter100 Leave102}
+} -result {Enter100 Enter101 Leave102 Leave103}
 test bind-13.11 {Tk_BindEvent procedure: collapse Motions} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
diff --git a/tests/event.test b/tests/event.test
index 18af2e1..015720e 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -861,39 +861,6 @@ test event-8 {event generate with keysyms corresponding to
     deleteWindows
 } -result {OK}
 
-test event-9 {no <Enter> event is generated for the container window when its
-              managed window in which the mouse pointer was inside gets
-              destroyed - bug 9e1312f32c} -setup {
-    set res [list ]
-    set iconified false
-    if {[winfo ismapped .]} {
-        wm iconify .
-        update
-        set iconified true
-    }
-} -body {
-    toplevel .top
-    pack propagate .top 0
-    bind .top <Enter> {lappend res %W}
-    pack [frame .top.f -bg green -width 50 -height 50] -anchor se -side bottom
-    tkwait visibility .top.f
-    after 50
-    update
-    focus -force .top.f
-    event generate .top.f <Motion> -warp 1 -x 25 -y 25  ; # <Enter> sent to .top and .top.f
-    controlPointerWarpTiming
-    update  ; # idletasks not enough
-    destroy .top.f  ; # no <Enter> event sent
-    update
-    set res
-} -cleanup {
-    deleteWindows
-    if {$iconified} {
-        wm deiconify .
-        update
-    }
-} -result {.top .top.f}
-
 test event-9.1 {enter . window by destroying a toplevel - bug b1d115fa60} -setup {
     set EnterBind [bind . <Enter>]
 } -body {
-- 
cgit v0.12


From 0c90a55a84147688f9c0534a31674f7a8ec585e7 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 25 Feb 2024 21:27:02 +0000
Subject: Let this bugfix branch build and test at Github Actions.

---
 .github/workflows/linux-build.yml | 1 +
 .github/workflows/mac-build.yml   | 1 +
 .github/workflows/win-build.yml   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 9414037..2801f55 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -5,6 +5,7 @@ on:
     - "main"
     - "core-8-branch"
     - "core-8-6-branch"
+    - "bug-47d4f29159"
     tags:
     - "core-**"
 permissions:
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 9fd297a..b601805 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -5,6 +5,7 @@ on:
     - "main"
     - "core-8-branch"
     - "core-8-6-branch"
+    - "bug-47d4f29159"
     tags:
     - "core-**"
 permissions:
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index a0af658..efd93b5 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -5,7 +5,8 @@ on:
     - "main"
     - "core-8-branch"
     - "core-8-6-branch"
-    tags:
+     - "bug-47d4f29159"
+   tags:
     - "core-**"
 permissions:
   contents: read
-- 
cgit v0.12


From 3117d5acfcc8f9c20668dfa822fcf9081224bff1 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 25 Feb 2024 21:29:02 +0000
Subject: Fix spaces.

---
 .github/workflows/win-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index efd93b5..119c9cb 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -5,7 +5,7 @@ on:
     - "main"
     - "core-8-branch"
     - "core-8-6-branch"
-     - "bug-47d4f29159"
+    - "bug-47d4f29159"
    tags:
     - "core-**"
 permissions:
-- 
cgit v0.12


From ec0943c5b829397e413608eeeded796e9381a7d4 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 25 Feb 2024 21:29:34 +0000
Subject: Again...

---
 .github/workflows/win-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 119c9cb..0814236 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -6,7 +6,7 @@ on:
     - "core-8-branch"
     - "core-8-6-branch"
     - "bug-47d4f29159"
-   tags:
+    tags:
     - "core-**"
 permissions:
   contents: read
-- 
cgit v0.12