From 0a51685f4bf2ef83d5ef6e3a32be16f7f34d86aa Mon Sep 17 00:00:00 2001 From: culler Date: Thu, 23 May 2024 17:43:55 +0000 Subject: White space. --- generic/tkGrab.c | 5 ++--- generic/tkPointer.c | 3 ++- generic/tkWindow.c | 1 - macosx/tkMacOSXWindowEvent.c | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/generic/tkGrab.c b/generic/tkGrab.c index d4ecdb0..2232ba5 100644 --- a/generic/tkGrab.c +++ b/generic/tkGrab.c @@ -1029,7 +1029,7 @@ TkInOutEvents( /* * Generate enter/leave events and add them to the grab event queue. */ - + #define QUEUE(w, t, d) \ if (w->window != None) { \ eventPtr->type = t; \ @@ -1087,7 +1087,7 @@ TkInOutEvents( QUEUE(sourcePtr, leaveType, NotifyNonlinear); for (winPtr = sourcePtr->parentPtr, i = upLevels-1; i > 0; winPtr = winPtr->parentPtr, i--) { - QUEUE(winPtr, leaveType, NotifyNonlinearVirtual); + QUEUE(winPtr, leaveType, NotifyNonlinearVirtual); } } if (enterType != 0) { @@ -1167,7 +1167,6 @@ MovePointer2( TkInOutEvents(&event, sourcePtr, destPtr, (leaveEvents) ? LeaveNotify : 0, (enterEvents) ? EnterNotify : 0, TCL_QUEUE_MARK); } - /* *---------------------------------------------------------------------- diff --git a/generic/tkPointer.c b/generic/tkPointer.c index c2ba29f..905489a 100644 --- a/generic/tkPointer.c +++ b/generic/tkPointer.c @@ -45,7 +45,6 @@ static int GenerateEnterLeave(TkWindow *winPtr, int x, int y, static void InitializeEvent(XEvent *eventPtr, TkWindow *winPtr, int type, int x, int y, int state, int detail); static void UpdateCursor(TkWindow *winPtr); - /* *---------------------------------------------------------------------- @@ -184,6 +183,7 @@ GenerateEnterLeave( InitializeEvent(&event, targetPtr, LeaveNotify, x, y, state, NotifyNormal); + TkInOutEvents(&event, lastWinPtr, winPtr, LeaveNotify, EnterNotify, TCL_QUEUE_TAIL); crossed = 1; @@ -493,6 +493,7 @@ TkPointerDeadWindow( { ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); + if (winPtr == tsdPtr->lastWinPtr) { tsdPtr->lastWinPtr = TkGetContainer(winPtr); } diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 644fea3..44f27f7 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -1807,7 +1807,6 @@ Tk_MapWindow( TkWmMapWindow(winPtr); return; } - winPtr->flags |= TK_MAPPED; XMapWindow(winPtr->display, winPtr->window); event.type = MapNotify; diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index fc7acfd..68ec369 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -252,12 +252,12 @@ extern NSString *NSWindowDidOrderOffScreenNotification; - (void) windowMapped: (NSNotification *) notification { - NSWindow *w = [notification object]; - TkWindow *winPtr = TkMacOSXGetTkWindow(w); + NSWindow *w = [notification object]; + TkWindow *winPtr = TkMacOSXGetTkWindow(w); - if (winPtr) { + if (winPtr) { while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {} - } + } } - (void) windowLiveResize: (NSNotification *) notification -- cgit v0.12