Corrected a bug w.r.t. display and joystick events. When getting ready

[freeglut] / src / freeglut_window.c

diff --git a/src/freeglut_window.c b/src/freeglut_window.c
index 3d86269..14733e2 100644 (file)
--- a/src/freeglut_window.c
+++ b/src/freeglut_window.c
@@ -64,8 +64,6 @@
  */
 #if TARGET_HOST_UNIX_X11
 
-#include "mwmborder.c" /* Brian Paul's decoration-zapping code. */
-
 XVisualInfo* fgChooseVisual( void )
 {
     int bufferSize[] = { 16, 12, 8, 4, 2, 1 };
@@ -308,6 +306,8 @@ GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, unsigned
 void fgSetWindow ( SFG_Window *window )
 {
 #if TARGET_HOST_UNIX_X11
+  if ( window )
+  {
     /*
         * Make the selected window's GLX context the current one
      */
@@ -316,7 +316,7 @@ void fgSetWindow ( SFG_Window *window )
         window->Window.Handle,
         window->Window.Context
     );
-
+  }
 #elif TARGET_HOST_WIN32
        /*
         * Release the previous' context's device context
@@ -397,6 +397,10 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i
          */
         fgState.DisplayMode |= GLUT_DOUBLE ;
         window->Window.VisualInfo = fgChooseVisual();
+       /* OK, we got a double-buffered window, but we only wanted
+        * single-buffered.  Clear the double-buffer flag now.
+        */
+       fgState.DisplayMode &= ~GLUT_DOUBLE ;
       }
 
       /*
@@ -435,6 +439,15 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i
     mask = CWBackPixmap | CWBorderPixel | CWColormap | CWEventMask;
 
     /*
+     * If this is a menu window we want the window manager to ignore it.
+     */
+    if ( fgState.BuildingAMenu )
+    {
+        winAttr.override_redirect = True;
+       mask |= CWOverrideRedirect;
+    }
+
+    /*
      * Have the window created now
      */
     window->Window.Handle = XCreateWindow(
@@ -558,46 +571,6 @@ void fgOpenWindow( SFG_Window* window, const char* title, int x, int y, int w, i
      */
     XMapWindow( fgDisplay.Display, window->Window.Handle );
 
-    /*
-     * If we're a menu, then we need to ask the WM to remove decorations.
-     * This is stolen shamelessly from Brian Paul
-     * (19 Sep 1995   brianp@ssec.wisc.edu)
-     */
-    if ( window->IsMenu ) {
-      set_mwm_border(fgDisplay.Display, window->Window.Handle, 0);
-    }
-
-    /*
-     * In game mode, move the viewport a bit to hide the decorations.
-     * This code depends on the XFree86 video mode extensions.
-     */
-    if( gameMode == TRUE )
-    {
-        /*
-         * This somehow fixes the glutGet() GLUT_WINDOW_X and GLUT_WINDOW_Y problem...
-         */
-        XMoveWindow( fgDisplay.Display, window->Window.Handle, x, y );
-
-#       ifdef X_XF86VidModeSetViewPort
-
-        /*
-         * Set the newly created window as the current one...
-         */
-        fgSetWindow( window );
-
-        /*
-         * Move the viewport a bit down and right from top-left corner to hide the decorations
-         */
-        XF86VidModeSetViewPort(
-            fgDisplay.Display,
-            fgDisplay.Screen,
-            glutGet( GLUT_WINDOW_X ),
-            glutGet( GLUT_WINDOW_Y )
-        );
-
-#       endif
-    }
-
 #elif TARGET_HOST_WIN32
 
        WNDCLASS wc;