From 9071e4e92738e8eb23df35a2e58bce30ab59b4c9 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun, 30 Nov 2003 16:47:13 +0000
Subject: xfree86 merge

---
 src/events.c | 8 +-------
 src/twm.c    | 1 -
 src/twm.h    | 1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/events.c b/src/events.c
index d08dab1..77d8bad 100644
--- a/src/events.c
+++ b/src/events.c
@@ -350,7 +350,7 @@ Bool DispatchEvent ()
 void
 HandleEvents()
 {
-    while (!TimeToYield)
+    while (TRUE)
     {
 	if (enter_flag && !QLength(dpy)) {
 	    if (enter_win && enter_win != raise_win) {
@@ -369,12 +369,6 @@ HandleEvents()
 	else
 	    XtDispatchEvent (&Event);
     }
-    if (dpy)
-    {
-	Reborder (CurrentTime);
-	XCloseDisplay(dpy);
-    }
-    exit(0);
 }
 
 
diff --git a/src/twm.c b/src/twm.c
index 7710f6a..88c5c0a 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -100,7 +100,6 @@ ScreenInfo **ScreenList;	/* structures for each screen */
 ScreenInfo *Scr = NULL;		/* the cur and prev screens */
 int PreviousScreen;		/* last screen that we were on */
 int FirstScreen;		/* TRUE ==> first screen of display */
-volatile Bool TimeToYield = FALSE;	/* TRUE ==> exit requested */
 Bool PrintErrorMessages = False;	/* controls error messages */
 static int RedirectError;	/* TRUE ==> another window manager running */
 static int TwmErrorHandler ( Display *dpy, XErrorEvent *event );	/* for settting RedirectError */
diff --git a/src/twm.h b/src/twm.h
index 56c7258..47364e8 100644
--- a/src/twm.h
+++ b/src/twm.h
@@ -399,7 +399,6 @@ extern void NewBitmapCursor ( Cursor *cp, char *source, char *mask );
 extern Pixmap CreateMenuIcon ( int height, unsigned int *widthp, unsigned int *heightp );
 
 extern Bool ErrorOccurred;
-extern volatile Bool TimeToYield;
 extern XErrorEvent LastErrorEvent;
 
 #define ResetError() (ErrorOccurred = False)
-- 
cgit v1.2.3