TIP #47 "Modifying Tk to Allow Writing X Window managers"

(patch from Neil McKay).
* Add CirculateRequest, Create, MapRequest, ResizeRequest,
  and ConfigureRequest event types;
* Split TK_TOPLEVEL flag into TK_TOPLEVEL, TK_HAS_WRAPPER,
  TK_WIN_MANAGED, and TK_TOP_HIERARCHY.

1 files changed, 8 insertions, 8 deletions

diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 8c16927..fb32642 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGrab.c,v 1.7 2002/01/17 05:13:11 dgp Exp $
+ * RCS: @(#) $Id: tkGrab.c,v 1.8 2002/06/14 22:25:12 jenglish Exp $
  */
 
 #include "tkPort.h"
@@ -742,7 +742,7 @@ TkPointerEvent(eventPtr, winPtr)
 
 	if (eventPtr->xcrossing.send_event != GENERATED_EVENT_MAGIC) {
 	    if ((eventPtr->type == LeaveNotify) &&
-		    (winPtr->flags & TK_TOP_LEVEL)) {
+		    (winPtr->flags & TK_TOP_HIERARCHY)) {
 		dispPtr->serverWinPtr = NULL;
 	    } else {
 		dispPtr->serverWinPtr = winPtr;
@@ -941,7 +941,7 @@ TkChangeEventWindow(eventPtr, winPtr)
 	eventPtr->xmotion.subwindow = None;
 	for (childPtr = winPtr->childList; childPtr != NULL;
 		childPtr = childPtr->nextPtr) {
-	    if (childPtr->flags & TK_TOP_LEVEL) {
+	    if (childPtr->flags & TK_TOP_HIERARCHY) {
 		continue;
 	    }
 	    x = eventPtr->xmotion.x - childPtr->changes.x;
@@ -1226,7 +1226,7 @@ TkGrabDeadWindow(winPtr)
 	ReleaseButtonGrab(dispPtr);
     }
     if (dispPtr->serverWinPtr == winPtr) {
-	if (winPtr->flags & TK_TOP_LEVEL) {
+	if (winPtr->flags & TK_TOP_HIERARCHY) {
 	    dispPtr->serverWinPtr = NULL;
 	} else {
 	    dispPtr->serverWinPtr = winPtr->parentPtr;
@@ -1451,7 +1451,7 @@ FindCommonAncestor(winPtr1, winPtr2, countPtr1, countPtr2)
     if (winPtr1 != NULL) {
 	for (winPtr = winPtr1; winPtr != NULL; winPtr = winPtr->parentPtr) {
 	    winPtr->flags |= TK_GRAB_FLAG;
-	    if (winPtr->flags & TK_TOP_LEVEL) {
+	    if (winPtr->flags & TK_TOP_HIERARCHY) {
 		break;
 	    }
 	}
@@ -1471,7 +1471,7 @@ FindCommonAncestor(winPtr1, winPtr2, countPtr1, countPtr2)
 		ancestorPtr = winPtr;
 		break;
 	    }
-	    if (winPtr->flags & TK_TOP_LEVEL)  {
+	    if (winPtr->flags & TK_TOP_HIERARCHY)  {
 		count2++;
 		break;
 	    }
@@ -1493,7 +1493,7 @@ FindCommonAncestor(winPtr1, winPtr2, countPtr1, countPtr2)
 	    if (winPtr == ancestorPtr) {
 		count1 = i;
 	    }
-	    if (winPtr->flags & TK_TOP_LEVEL) {
+	    if (winPtr->flags & TK_TOP_HIERARCHY) {
 		if (count1 == -1) {
 		    count1 = i+1;
 		}
@@ -1543,7 +1543,7 @@ TkPositionInTree(winPtr, treePtr)
 		if (winPtr2 == winPtr) {
 		    return TK_GRAB_ANCESTOR;
 		}
-		if (winPtr2->flags & TK_TOP_LEVEL) {
+		if (winPtr2->flags & TK_TOP_HIERARCHY) {
 		    break;
 		}
 	    }