remove all the FX and XMESA cruft relating to Glide support.
This commit is contained in:
parent
5960442cc3
commit
46ae218672
7 changed files with 1 additions and 91 deletions
|
@ -90,22 +90,7 @@ public:
|
||||||
LayoutWidget::setDefaultFont(GuiFont, 15);
|
LayoutWidget::setDefaultFont(GuiFont, 15);
|
||||||
|
|
||||||
if (!fgHasNode("/sim/startup/mouse-pointer")) {
|
if (!fgHasNode("/sim/startup/mouse-pointer")) {
|
||||||
// no preference specified for mouse pointer, attempt to autodetect...
|
// no preference specified for mouse pointer
|
||||||
// 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 ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if ( !fgGetBool("/sim/startup/mouse-pointer") ) {
|
} else if ( !fgGetBool("/sim/startup/mouse-pointer") ) {
|
||||||
// don't show pointer
|
// don't show pointer
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -38,10 +38,6 @@
|
||||||
|
|
||||||
#include SG_GL_H
|
#include SG_GL_H
|
||||||
|
|
||||||
#if defined(FX) && defined(XMESA)
|
|
||||||
# include <GL/xmesa.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
@ -193,15 +189,6 @@ void helpCb ()
|
||||||
{
|
{
|
||||||
string command;
|
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() );
|
SGPath path( globals->get_fg_root() );
|
||||||
path.append( "Docs/index.html" );
|
path.append( "Docs/index.html" );
|
||||||
|
|
||||||
|
|
|
@ -36,10 +36,6 @@
|
||||||
|
|
||||||
#include <Main/fg_os.hxx>
|
#include <Main/fg_os.hxx>
|
||||||
|
|
||||||
#if defined(FX) && defined(XMESA)
|
|
||||||
# include <GL/xmesa.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -123,10 +123,6 @@
|
||||||
#include "viewmgr.hxx"
|
#include "viewmgr.hxx"
|
||||||
#include "main.hxx"
|
#include "main.hxx"
|
||||||
|
|
||||||
#if defined(FX) && defined(XMESA)
|
|
||||||
#include <GL/xmesa.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SG_USING_STD(string);
|
SG_USING_STD(string);
|
||||||
|
|
||||||
|
|
||||||
|
@ -1353,10 +1349,6 @@ bool fgInitPosition() {
|
||||||
bool fgInitGeneral() {
|
bool fgInitGeneral() {
|
||||||
string root;
|
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, "General Initialization" );
|
||||||
SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
|
SG_LOG( SG_GENERAL, SG_INFO, "======= ==============" );
|
||||||
|
|
||||||
|
@ -1372,21 +1364,6 @@ bool fgInitGeneral() {
|
||||||
|
|
||||||
globals->set_browser(fgGetString("/sim/startup/browser-app", "firefox %u"));
|
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);
|
char buf[512], *cwd = getcwd(buf, 511);
|
||||||
buf[511] = '\0';
|
buf[511] = '\0';
|
||||||
SGPropertyNode *curr = fgGetNode("/sim", true);
|
SGPropertyNode *curr = fgGetNode("/sim", true);
|
||||||
|
|
|
@ -395,27 +395,6 @@ setWindingCCW (bool state)
|
||||||
glFrontFace ( GL_CW );
|
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
|
static bool
|
||||||
getFDMDataLogging ()
|
getFDMDataLogging ()
|
||||||
{
|
{
|
||||||
|
@ -544,7 +523,6 @@ FGProperties::bind ()
|
||||||
|
|
||||||
// Misc. Temporary junk.
|
// Misc. Temporary junk.
|
||||||
fgTie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
|
fgTie("/sim/temp/winding-ccw", getWindingCCW, setWindingCCW, false);
|
||||||
fgTie("/sim/temp/full-screen", getFullScreen, setFullScreen);
|
|
||||||
fgTie("/sim/temp/fdm-data-logging", getFDMDataLogging, setFDMDataLogging);
|
fgTie("/sim/temp/fdm-data-logging", getFDMDataLogging, setFDMDataLogging);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -69,9 +69,6 @@ FGGlobals::FGGlobals() :
|
||||||
event_mgr( new SGEventMgr ),
|
event_mgr( new SGEventMgr ),
|
||||||
sim_time_sec( 0.0 ),
|
sim_time_sec( 0.0 ),
|
||||||
fg_root( "" ),
|
fg_root( "" ),
|
||||||
#if defined(FX) && defined(XMESA)
|
|
||||||
fullscreen( true ),
|
|
||||||
#endif
|
|
||||||
warp( 0 ),
|
warp( 0 ),
|
||||||
warp_delta( 0 ),
|
warp_delta( 0 ),
|
||||||
time_params( NULL ),
|
time_params( NULL ),
|
||||||
|
|
|
@ -118,11 +118,6 @@ private:
|
||||||
|
|
||||||
string browser;
|
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
|
// An offset in seconds from the true time. Allows us to adjust
|
||||||
// the effective time of day.
|
// the effective time of day.
|
||||||
long int warp;
|
long int warp;
|
||||||
|
@ -243,11 +238,6 @@ public:
|
||||||
inline const string &get_browser () const { return browser; }
|
inline const string &get_browser () const { return browser; }
|
||||||
void set_browser (const string &b) { browser = b; }
|
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 long int get_warp() const { return warp; }
|
||||||
inline void set_warp( long int w ) { warp = w; }
|
inline void set_warp( long int w ) { warp = w; }
|
||||||
inline void inc_warp( long int w ) { warp += w; }
|
inline void inc_warp( long int w ) { warp += w; }
|
||||||
|
|
Loading…
Reference in a new issue