From b12ee9e166ceb5bd2753b809c90e12396dbc7572 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Sat, 8 Sep 2001 05:43:52 +0000
Subject: [PATCH] unmap and re-map the window with the correct attributes for
 the current setting of vid_fullscreen

---
 libs/video/targets/context_x11.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/libs/video/targets/context_x11.c b/libs/video/targets/context_x11.c
index aaf38e7c8..c5bfdd3ea 100644
--- a/libs/video/targets/context_x11.c
+++ b/libs/video/targets/context_x11.c
@@ -166,7 +166,6 @@ X11_ProcessEvent (void)
 
 	XNextEvent (x_disp, &x_event);
 	if (x_event.type >= LASTEvent) {
-		// FIXME: KLUGE!!!!!!
 		if (x_event.type == x_shmeventtype)
 			oktodraw = 1;
 		return;
@@ -373,22 +372,38 @@ X11_SetVidMode (int width, int height)
 
 void X11_UpdateFullscreen (cvar_t *fullscreen)
 {
+	XSetWindowAttributes attr;
+	unsigned long mask = CWOverrideRedirect;
+
 	if (!vid_context_created) {
 		return;
 	}
-	
+
 	if (!fullscreen->int_val) {
-		if (in_grab) {
-			in_grab->flags &= ~CVAR_ROM;
-		}
 		X11_RestoreVidMode ();
 	} else {
+		X11_SetVidMode (scr_width, scr_height);
+	}
+
+	XUnmapWindow (x_disp, x_win);
+	attr.override_redirect = vidmode_active != 0;
+	XChangeWindowAttributes (x_disp, x_win, mask, &attr);
+	XMoveWindow(x_disp, x_win, 0, 0);
+	XMapWindow (x_disp, x_win);
+	XRaiseWindow (x_disp, x_win);
+
+	if (vidmode_active) {
+		X11_ForceViewPort ();
 		if (in_grab) {
 			in_grab->flags &= ~CVAR_ROM;
 			Cvar_Set (in_grab, "1");
 			in_grab->flags |= CVAR_ROM;
 		}
-		X11_SetVidMode (scr_width, scr_height);
+		IN_LL_Grab_Input ();
+	} else {
+		if (in_grab) {
+			in_grab->flags &= ~CVAR_ROM;
+		}
 	}
 }