remove all the FX and XMESA cruft relating to Glide support.

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 3675fb6d8169162ef9f8cc361f0733f7e7e779d4..09fc0f782b258f7c72ff1bd60046180cc24d6015 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -90,22 +90,7 @@ public:
         LayoutWidget::setDefaultFont(GuiFont, 15);
   
         if (!fgHasNode("/sim/startup/mouse-pointer")) {
-            // no preference specified for mouse pointer, attempt to autodetect...
-            // Determine if we need to render the cursor, or if the windowing
-            // system will do it.  First test if we are rendering with
-            // glide.
-            // XXX Not bloody likely in 2008...
-            if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
-                // Test for the MESA_GLX_FX env variable
-                char *mesa_win_state = getenv( "MESA_GLX_FX" );
-                if (mesa_win_state  != NULL) {
-                    // test if we are fullscreen mesa/glide
-                    if ( (mesa_win_state[0] == 'f') ||
-                         (mesa_win_state[0] == 'F') ) {
-                        puShowCursor ();
-                    }
-                }
-            }
+            // no preference specified for mouse pointer
         } else if ( !fgGetBool("/sim/startup/mouse-pointer") ) {
             // don't show pointer
         } else {

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 5b462db68b12a2e6170a6edc68ea94fe42853f9a..3d089161c1b38a774dc2e993740e0675a6681153 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -38,10 +38,6 @@
 
 #include SG_GL_H
 
-#if defined(FX) && defined(XMESA)
-#  include <GL/xmesa.h>
-#endif
-
 #include <fstream>
 #include <string>
 
@@ -193,15 +189,6 @@ void helpCb ()
 {
     string command;
        
-#if defined(FX) && !defined(WIN32)
-#  if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
-    if ( globals->get_fullscreen() ) {
-        globals->set_fullscreen(false);
-        XMesaSetFXmode( XMESA_FX_WINDOW );
-    }
-#  endif
-#endif
-       
     SGPath path( globals->get_fg_root() );
     path.append( "Docs/index.html" );
        

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index de12a666e579588e2ce4696dac87fe223032935a..d39599cecc1f2d67aa5d9ea654bc95377c69bf26 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -36,10 +36,6 @@
 
 #include <Main/fg_os.hxx>
 
-#if defined(FX) && defined(XMESA)
-#  include <GL/xmesa.h>
-#endif
-
 #include <string>
 
 #include <stdlib.h>

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index f60846a9004c04fa884446db3d74f2bf6fba93be..a16407454ce7f64973e130fa5fa4d7b641313f6e 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -123,10 +123,6 @@
 #include "viewmgr.hxx"
 #include "main.hxx"
 
-#if defined(FX) && defined(XMESA)
-#include <GL/xmesa.h>
-#endif
-
 SG_USING_STD(string);
 
 
@@ -1353,10 +1349,6 @@ bool fgInitPosition() {
 bool fgInitGeneral() {
     string root;
 
-#if defined(FX) && defined(XMESA)
-    char *mesa_win_state;
-#endif
-
     SG_LOG( SG_GENERAL, SG_INFO, "General Initialization" );
     SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
 
@@ -1372,21 +1364,6 @@ bool fgInitGeneral() {
 
     globals->set_browser(fgGetString("/sim/startup/browser-app", "firefox %u"));
 
-#if defined(FX) && defined(XMESA)
-    // initialize full screen flag
-    globals->set_fullscreen(false);
-    if ( strstr ( general.get_glRenderer(), "Glide" ) ) {
-        // Test for the MESA_GLX_FX env variable
-        if ( (mesa_win_state = getenv( "MESA_GLX_FX" )) != NULL) {
-            // test if we are fullscreen mesa/glide
-            if ( (mesa_win_state[0] == 'f') ||
-                 (mesa_win_state[0] == 'F') ) {
-                globals->set_fullscreen(true);
-            }
-        }
-    }
-#endif
-
     char buf[512], *cwd = getcwd(buf, 511);
     buf[511] = '\0';
     SGPropertyNode *curr = fgGetNode("/sim", true);

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 3d7fe4422dee418374f154faf8de225a8a2956c3..957cd9c3baefaf23859ceee056bf9a3b1fc037ca 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -395,27 +395,6 @@ setWindingCCW (bool state)
     glFrontFace ( GL_CW );
 }
 
-static bool
-getFullScreen ()
-{
-#if defined(FX) && !defined(WIN32)
-  return globals->get_fullscreen();
-#else
-  return false;
-#endif
-}
-
-static void
-setFullScreen (bool state)
-{
-#if defined(FX) && !defined(WIN32)
-  globals->set_fullscreen(state);
-#  if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
-  XMesaSetFXmode( state ? XMESA_FX_FULLSCREEN : XMESA_FX_WINDOW );
-#  endif
-#endif
-}
-
 static bool
 getFDMDataLogging ()
 {
@@ -544,7 +523,6 @@ FGProperties::bind ()
 
                                // Misc. Temporary junk.
   fgTie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
-  fgTie("/sim/temp/full-screen", getFullScreen, setFullScreen);
   fgTie("/sim/temp/fdm-data-logging", getFDMDataLogging, setFDMDataLogging);
 }
 

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index c956180a8888646d40f7565289a9ba9bd30ac931..ac4e72541b28710e621c6ee9188d3f2f64a97ac7 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -69,9 +69,6 @@ FGGlobals::FGGlobals() :
     event_mgr( new SGEventMgr ),
     sim_time_sec( 0.0 ),
     fg_root( "" ),
-#if defined(FX) && defined(XMESA)
-    fullscreen( true ),
-#endif
     warp( 0 ),
     warp_delta( 0 ),
     time_params( NULL ),

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index fa0c810a275590ac4a2a56f52000a826a92a7df0..7fec6d02b5813b0d6f5bb762e91a13ddf6b342d6 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -118,11 +118,6 @@ private:
 
     string browser;
 
-    // Fullscreen mode for old 3DFX cards.
-#if defined(FX) && defined(XMESA)
-    bool fullscreen;
-#endif
-
     // An offset in seconds from the true time.  Allows us to adjust
     // the effective time of day.
     long int warp;
@@ -243,11 +238,6 @@ public:
     inline const string &get_browser () const { return browser; }
     void set_browser (const string &b) { browser = b; }
 
-#if defined(FX) && defined(XMESA)
-    inline bool get_fullscreen() const { return fullscreen; }
-    inline bool set_fullscreen( bool f ) { fullscreen = f; }
-#endif
-
     inline long int get_warp() const { return warp; }
     inline void set_warp( long int w ) { warp = w; }
     inline void inc_warp( long int w ) { warp += w; }