Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Only 9.13, 9.14. and 9.19 fail on windows. Debug output included. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | bug-22349fc78a-v2 |
Files: | files | file ages | folders |
SHA3-256: |
32b38d0b5bef4a61eb671bcc80d555f2 |
User & Date: | culler 2024-05-21 22:42:45.449 |
Original User & Date: | marcc 2024-05-21 22:42:45.449 |
Context
2024-05-22
| ||
02:44 | All event tests now pass on Windows check-in: 34f66244 user: culler tags: bug-22349fc78a-v2 | |
2024-05-21
| ||
22:42 | Only 9.13, 9.14. and 9.19 fail on windows. Debug output included. check-in: 32b38d0b user: culler tags: bug-22349fc78a-v2 | |
2024-05-20
| ||
23:04 | Restore the call to TkPointerDeadWindow - Windows needs it; probably macOS does too. check-in: d5924536 user: culler tags: bug-22349fc78a-v2 | |
Changes
Changes to generic/tkGrab.c.
︙ | ︙ | |||
994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 | * being entered (EnterNotify or FocusIn). 0 * means don't generate enter events. */ Tcl_QueuePosition position) /* Position at which events are added to the * system event queue. */ { TkWindow *winPtr; int upLevels, downLevels, i, j, focus; /* * There are four possible cases to deal with: * * 1. SourcePtr and destPtr are the same. There's nothing to do in this * case. * 2. SourcePtr is an ancestor of destPtr in the same top-level window. | > > > > | 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 | * being entered (EnterNotify or FocusIn). 0 * means don't generate enter events. */ Tcl_QueuePosition position) /* Position at which events are added to the * system event queue. */ { TkWindow *winPtr; int upLevels, downLevels, i, j, focus; #define NAME(w) (w ? Tk_PathName(w) : "NULL") fprintf(stderr, "TkInOutEvents: %s -> %s\n", NAME(sourcePtr), NAME(destPtr)); /* * There are four possible cases to deal with: * * 1. SourcePtr and destPtr are the same. There's nothing to do in this * case. * 2. SourcePtr is an ancestor of destPtr in the same top-level window. |
︙ | ︙ | |||
1025 1026 1027 1028 1029 1030 1031 | focus = 0; } FindCommonAncestor(sourcePtr, destPtr, &upLevels, &downLevels); /* * Generate enter/leave events and add them to the grab event queue. */ | | > > > > > > > > > > | > > > | 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 | focus = 0; } FindCommonAncestor(sourcePtr, destPtr, &upLevels, &downLevels); /* * Generate enter/leave events and add them to the grab event queue. */ #define QUEUE(w, t, d) \ if (w->window != None) { \ eventPtr->type = t; \ if (focus) { \ eventPtr->xfocus.window = w->window; \ eventPtr->xfocus.detail = d; \ } else { \ eventPtr->xcrossing.detail = d; \ TkChangeEventWindow(eventPtr, w); \ } \ Tk_QueueWindowEvent(eventPtr, position); \ } #define DBGEV(w, t, d) fprintf(stderr, " Queueing %s %s for %s\n", t, d, NAME(w)) if (downLevels == 0) { /* * SourcePtr is an inferior of destPtr. */ if (leaveType != 0) { DBGEV(sourcePtr, "<Leave>", "NotifyAncestor"); QUEUE(sourcePtr, leaveType, NotifyAncestor); for (winPtr = sourcePtr->parentPtr, i = upLevels-1; i > 0; winPtr = winPtr->parentPtr, i--) { DBGEV(winPtr, "<Leave>", "NotifyVirtual"); QUEUE(winPtr, leaveType, NotifyVirtual); } } if ((enterType != 0) && (destPtr != NULL)) { DBGEV(destPtr, "<Enter>", "NotifyVirtual"); QUEUE(destPtr, enterType, NotifyInferior); } } else if (upLevels == 0) { /* * DestPtr is an inferior of sourcePtr. */ if ((leaveType != 0) && (sourcePtr != NULL)) { DBGEV(sourcePtr, "<Leave>", "NotifyInferior"); QUEUE(sourcePtr, leaveType, NotifyInferior); } if (enterType != 0) { for (i = downLevels-1; i > 0; i--) { for (winPtr = destPtr->parentPtr, j = 1; j < i; winPtr = winPtr->parentPtr, j++) { /* empty */ } DBGEV(winPtr, "<Enter>", "NotifyVirtual"); QUEUE(winPtr, enterType, NotifyVirtual); } if (destPtr != NULL) { DBGEV(winPtr, "<Enter>", "NotifyVirtual"); QUEUE(destPtr, enterType, NotifyAncestor); } } } else { /* * Non-linear: neither window is an inferior of the other. */ if (leaveType != 0) { DBGEV(sourcePtr, "<Leave>", "NotifyNonlinear"); QUEUE(sourcePtr, leaveType, NotifyNonlinear); for (winPtr = sourcePtr->parentPtr, i = upLevels-1; i > 0; winPtr = winPtr->parentPtr, i--) { DBGEV(winPtr, "<Leave>", "NotifyNonlinearVirtual"); QUEUE(winPtr, leaveType, NotifyNonlinearVirtual); } } if (enterType != 0) { for (i = downLevels-1; i > 0; i--) { for (winPtr = destPtr->parentPtr, j = 1; j < i; winPtr = winPtr->parentPtr, j++) { } DBGEV(winPtr, "<Enter>", "NotifyNonlinearVirtual"); QUEUE(winPtr, enterType, NotifyNonlinearVirtual); } if (destPtr != NULL) { DBGEV(destPtr, "<Enter>", "NotifyNonlinear"); QUEUE(destPtr, enterType, NotifyNonlinear); } } } fflush(stderr); } /* *---------------------------------------------------------------------- * * MovePointer2 -- * |
︙ | ︙ |
Changes to generic/tkPointer.c.
︙ | ︙ | |||
224 225 226 227 228 229 230 | TkWindow *winPtr = (TkWindow *)tkwin; TkWindow *targetWinPtr; XPoint pos; XEvent event; unsigned changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS; int type, b; unsigned mask; | | > > > | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | TkWindow *winPtr = (TkWindow *)tkwin; TkWindow *targetWinPtr; XPoint pos; XEvent event; unsigned changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS; int type, b; unsigned mask; fprintf(stderr, "TkUpdatePointer: %s -> %s\n", tsdPtr->lastWinPtr ? Tk_PathName(tsdPtr->lastWinPtr) : "NULL", tkwin ? Tk_PathName(tkwin) : "NULL"); fflush(stderr); pos.x = x; pos.y = y; /* * Use the current keyboard state, but the old mouse button state since we * haven't generated the button events yet. */ |
︙ | ︙ | |||
489 490 491 492 493 494 495 | void TkPointerDeadWindow( TkWindow *winPtr) { ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); | | > > > > | 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 | void TkPointerDeadWindow( TkWindow *winPtr) { ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); fprintf(stderr, "TkPointerDeadWindow: %s\n", winPtr ? Tk_PathName(winPtr) : "NULL"); if (winPtr == tsdPtr->lastWinPtr) { //This fails on Windows because the windows version of TkWnDeadWindow //does not (yet) call TkUpdatePointer when a dead toplevel contains the //pointer. tsdPtr->lastWinPtr = TkGetContainer(winPtr); } if (winPtr == tsdPtr->grabWinPtr) { tsdPtr->grabWinPtr = NULL; } if (winPtr == tsdPtr->restrictWinPtr) { tsdPtr->restrictWinPtr = NULL; } if (!(tsdPtr->restrictWinPtr || tsdPtr->grabWinPtr)) { /* * Release mouse capture only if the dead window is the capturing * window. */ if (winPtr == (TkWindow *)TkpGetCapture()) { TkpSetCapture(NULL); } } fflush(stderr); } /* *---------------------------------------------------------------------- * * UpdateCursor -- * |
︙ | ︙ |
Changes to generic/tkWindow.c.
︙ | ︙ | |||
1324 1325 1326 1327 1328 1329 1330 | */ static void SendEnterLeaveForDestroy( Tk_Window tkwin) { #if defined(MAC_OSX_TK) || defined(_WIN32) int x, y; | | | < | 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 | */ static void SendEnterLeaveForDestroy( Tk_Window tkwin) { #if defined(MAC_OSX_TK) || defined(_WIN32) int x, y; unsigned int state = TkWinGetModifierState(); Tk_Window pointerWin; TkWindow *containerPtr; TkGetPointerCoords(NULL, &x, &y); pointerWin = Tk_CoordsToWindow(x, y, tkwin); if (pointerWin == tkwin) { if (!Tk_IsTopLevel(tkwin)) { containerPtr = TkGetContainer((TkWindow *)pointerWin); Tk_UpdatePointer((Tk_Window) containerPtr, x, y, state); } else if (pointerWin) { |
︙ | ︙ |
Changes to tests/event.test.
︙ | ︙ | |||
869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 | # with configured scheduling priorities for processes, etc ... # Waiting for the corresponding window events evades the trouble that is # associated with the alternative: waiting or halting the Tk process for a # fixed amount of time (using "after ms"). With the latter strategy it's # always a gamble how much waiting time is enough on an end user's system. # It also leads to long fixed waiting times in order to be on the safe side. variable _windowEvent # Use counter as a unique ID to prevent subsequent waits # from interfering with each other. set counter [incr _windowEvent(counter)] set _windowEvent($counter) 1 set savedBinding [bind $w $event] bind $w $event [list +waitForWindowEvent.signal $counter] set afterID [after $timeout [list set _windowEvent($counter) -1]] vwait _windowEvent($counter) set late [expr {$_windowEvent($counter) == -1}] bind $w $event $savedBinding unset _windowEvent($counter) if {$late} { puts stderr "wait for $event event on $w timed out (> $timeout ms)" } else { after cancel $afterID } } proc waitForWindowEvent.signal {counter} { # Helper proc that records the triggering of a window event. incr ::_windowEvent($counter) } | > > | 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 | # with configured scheduling priorities for processes, etc ... # Waiting for the corresponding window events evades the trouble that is # associated with the alternative: waiting or halting the Tk process for a # fixed amount of time (using "after ms"). With the latter strategy it's # always a gamble how much waiting time is enough on an end user's system. # It also leads to long fixed waiting times in order to be on the safe side. puts stderr "Waiting for $event on $w" variable _windowEvent # Use counter as a unique ID to prevent subsequent waits # from interfering with each other. set counter [incr _windowEvent(counter)] set _windowEvent($counter) 1 set savedBinding [bind $w $event] bind $w $event [list +waitForWindowEvent.signal $counter] set afterID [after $timeout [list set _windowEvent($counter) -1]] vwait _windowEvent($counter) set late [expr {$_windowEvent($counter) == -1}] bind $w $event $savedBinding unset _windowEvent($counter) if {$late} { puts stderr "wait for $event event on $w timed out (> $timeout ms)" } else { after cancel $afterID puts stderr "Event received" } } proc waitForWindowEvent.signal {counter} { # Helper proc that records the triggering of a window event. incr ::_windowEvent($counter) } |
︙ | ︙ | |||
977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 | bind all <Leave> {} bind all <Enter> {} destroy .one unset result } -result {|<Enter> NotifyNonlinearVirtual .one.f1|<Enter> NotifyNonlinear .one.f1.f2|} test event-9.13 {pointer window is a toplevel, toplevel destination} -setup { setup_win_mousepointer .one toplevel .two wm geometry .two 300x300+150+150 wm withdraw .two wm deiconify .two waitForWindowEvent .two <Enter> bind all <Leave> {append result "<Leave> %d %W|"} bind all <Enter> {append result "<Enter> %d %W|"} | > | > > > > > > | 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 | bind all <Leave> {} bind all <Enter> {} destroy .one unset result } -result {|<Enter> NotifyNonlinearVirtual .one.f1|<Enter> NotifyNonlinear .one.f1.f2|} test event-9.13 {pointer window is a toplevel, toplevel destination} -setup { puts stderr "9.13 setup started" setup_win_mousepointer .one toplevel .two wm geometry .two 300x300+150+150 wm withdraw .two wm deiconify .two waitForWindowEvent .two <Enter> bind all <Leave> {append result "<Leave> %d %W|"} bind all <Enter> {append result "<Enter> %d %W|"} set result | puts stderr "9.13 setup done" } -body { puts stderr "9.13 body started - destroying .two" destroy .two waitForWindowEvent .one <Enter> set result puts stderr "9.13 body finished" } -cleanup { bind all <Leave> {} bind all <Enter> {} destroy .one unset result } -result {|<Enter> NotifyNonlinear .one|} test event-9.14 {pointer window is a toplevel, tk internal destination} -setup { puts stderr "9.14 setup" setup_win_mousepointer .one wm withdraw .one create_and_pack_frames .one toplevel .two wm geometry .two 300x300+150+150 wm withdraw .two wm deiconify .one wm deiconify .two waitForWindowEvent .two <Enter> bind all <Leave> {append result "<Leave> %d %W|"} bind all <Enter> {append result "<Enter> %d %W|"} set result "|" } -body { puts stderr "9.14 body" destroy .two waitForWindowEvent .one.f1.f2 <Enter> set result puts stderr "9.14 body finished" } -cleanup { bind all <Leave> {} bind all <Enter> {} destroy .one unset result } -result {|<Enter> NotifyNonlinearVirtual .one|<Enter> NotifyNonlinearVirtual .one.f1|<Enter> NotifyNonlinear .one.f1.f2|} |
︙ | ︙ |
Changes to win/tkWinWm.c.
︙ | ︙ | |||
2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 | * None. * * Side effects: * The WmInfo structure for winPtr gets freed up. * *-------------------------------------------------------------- */ void TkWmDeadWindow( TkWindow *winPtr) /* Top-level window that's being deleted. */ { WmInfo *wmPtr = winPtr->wmInfoPtr; WmInfo *wmPtr2; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 | * None. * * Side effects: * The WmInfo structure for winPtr gets freed up. * *-------------------------------------------------------------- */ static void CheckForPointer(TkWindow *winPtr) { Display *display = Tk_Display(winPtr); POINT mouse; unsigned int state = TkWinGetModifierState(); TkWindow **windows = TkWmStackorderToplevel(winPtr->mainPtr->winPtr); TkWindow **w; TkGetPointerCoords(NULL, &mouse.x, &mouse.y); fprintf(stderr, "CheckForPointer: %s with mouse @(%d, %d)\n", Tk_PathName(winPtr), mouse.x, mouse.y); if (windows != NULL) { for (w = windows; *w ; w++) { RECT windowRect; HWND hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) *w)); fprintf(stderr, " Checking %s\n", Tk_PathName(*w)); if (GetWindowRect(hwnd, &windowRect) == 0) { continue; } if (winPtr != *w && PtInRect(&windowRect, mouse)) { fprintf(stderr, "Pointer is in %s. Calling Tk_UpdatePointer\n", Tk_PathName(*w)); Tk_UpdatePointer((Tk_Window) *w, mouse.x, mouse.y, state); break; } } ckfree(windows); } fflush(stderr); } void TkWmDeadWindow( TkWindow *winPtr) /* Top-level window that's being deleted. */ { WmInfo *wmPtr = winPtr->wmInfoPtr; WmInfo *wmPtr2; |
︙ | ︙ | |||
2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 | * after destroying the decorative frame, because the decorative frame * is using this icon. */ DecrIconRefCount(wmPtr->iconPtr); } ckfree(wmPtr); winPtr->wmInfoPtr = NULL; } /* *-------------------------------------------------------------- * | > > > > > > > > > | 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 | * after destroying the decorative frame, because the decorative frame * is using this icon. */ DecrIconRefCount(wmPtr->iconPtr); } /* * Check if the dead window is a toplevel containing the pointer. If so, * find the window which will inherit the pointer and call * TkUpdatePointer. */ CheckForPointer(winPtr); //TkPointerDeadWindow(winPtr); ckfree(wmPtr); winPtr->wmInfoPtr = NULL; } /* *-------------------------------------------------------------- * |
︙ | ︙ |