*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $Id$
**************************************************************************/
# include <windows.h>
#endif
-#include <simgear/misc/props.hxx>
-#include <simgear/misc/props_io.hxx>
-#include <simgear/misc/exception.hxx>
+#include <string>
+
+#include <simgear/structure/exception.hxx>
#include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
#include <plib/pu.h>
#include <Include/general.hxx>
+#include <Main/main.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
+#include <Main/WindowSystemAdapter.hxx>
+#include <GUI/new_gui.hxx>
#include "gui.h"
#include "gui_local.hxx"
-#include "net_dlg.hxx"
-#include "preset_dlg.hxx"
-
-
-// main.cxx hack, should come from an include someplace
-extern void fgInitVisuals( void );
-extern void fgRenderFrame( void );
-
-extern void initDialog (void);
-extern void mkDialogInit (void);
-extern void ConfirmExitDialogInit(void);
+#include "layout.hxx"
+using namespace osg;
+using namespace flightgear;
puFont guiFnt = 0;
-fntTexFont *guiFntHandle = 0;
/* -------------------------------------------------------------------------
init the gui
_____________________________________________________________________*/
-
-void guiInit()
+namespace
+{
+class GUIInitOperation : public GraphicsContextOperation
{
- char *mesa_win_state;
-
- // Initialize PUI
- puInit();
- puSetDefaultStyle ( PUSTYLE_SMALL_BEVELLED ); //PUSTYLE_DEFAULT
- puSetDefaultColourScheme (0.8, 0.8, 0.9, 0.8);
-
- initDialog();
-
- // Next check home directory
- SGPath fntpath;
- char* envp = ::getenv( "FG_FONTS" );
- if ( envp != NULL ) {
- fntpath.set( envp );
- } else {
- fntpath.set( globals->get_fg_root() );
- fntpath.append( "Fonts" );
+public:
+ GUIInitOperation() : GraphicsContextOperation(std::string("GUI init"))
+ {
}
-
- // Install our fast fonts
- SGPropertyNode *locale = globals->get_locale();
- fntpath.append(locale->getStringValue("font", "typewriter.txf"));
- guiFntHandle = new fntTexFont ;
- guiFntHandle -> load ( (char *)fntpath.c_str() ) ;
- puFont GuiFont ( guiFntHandle, 15 ) ;
- puSetDefaultFonts( GuiFont, GuiFont ) ;
- guiFnt = puGetDefaultLabelFont();
+ void run(GraphicsContext* gc)
+ {
+ WindowSystemAdapter* wsa = WindowSystemAdapter::getWSA();
+ wsa->puInitialize();
+ puSetDefaultStyle ( PUSTYLE_SMALL_SHADED ); //PUSTYLE_DEFAULT
+ puSetDefaultColourScheme (0.8, 0.8, 0.9, 1);
+
+ FGFontCache *fc = globals->get_fontcache();
+ fc->initializeFonts();
+ puFont *GuiFont
+ = fc->get(globals->get_locale()->getStringValue("font",
+ "typewriter.txf"),
+ 15);
+ puSetDefaultFonts(*GuiFont, *GuiFont);
+ guiFnt = puGetDefaultLabelFont();
+
+ 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.
- 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') ) {
- puShowCursor ();
+ 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 ();
+ }
}
}
+ } else if ( !fgGetBool("/sim/startup/mouse-pointer") ) {
+ // don't show pointer
+ } else {
+ // force showing pointer
+ puShowCursor();
}
-// mouse_active = ~mouse_active;
- } else if ( !fgGetBool("/sim/startup/mouse-pointer") ) {
- // don't show pointer
- } else {
- // force showing pointer
- puShowCursor();
-// mouse_active = ~mouse_active;
}
-
- // MOUSE_VIEW mode stuff
- initMouseQuat();
-
- // Set up our Dialog Boxes
- ConfirmExitDialogInit();
- fgPresetInit();
-
-#ifdef FG_NETWORK_OLK
- NewNetIdInit();
- NewNetFGDInit();
-#endif
+};
- mkDialogInit();
+ref_ptr<GUIInitOperation> initOp;
}
+
+void guiStartInit()
+{
+ initOp = new GUIInitOperation;
+ WindowSystemAdapter* wsa = WindowSystemAdapter::getWSA();
+ GraphicsContext* gc = wsa->getGUIGraphicsContext();
+ gc->add(initOp.get());
+}
+
+bool guiFinishInit()
+{
+ if (!initOp.valid())
+ return false;
+ if (!initOp->isFinished())
+ return false;
+ initMouseQuat();
+ initOp = 0;
+ return true;
+}
+