X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui.cxx;h=2e8305ba419b6b9adf25aba261b78b8224c6a06d;hb=4c7fb6c91bbf17119407748d4d49d627748ad037;hp=a114bf9927bc4cf75a4366631f45cf8a68918e5f;hpb=c9813d1b5d79b4aad13c263690a0223086af25ac;p=flightgear.git diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx index a114bf992..2e8305ba4 100644 --- a/src/GUI/gui.cxx +++ b/src/GUI/gui.cxx @@ -30,9 +30,7 @@ #include -#ifdef HAVE_WINDOWS_H -# include -#endif +#include #include #include @@ -45,78 +43,78 @@ #include
#include
#include
+#include
+#include #include "gui.h" -#include "gui_local.hxx" -#include "preset_dlg.hxx" #include "layout.hxx" +#include + +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_SHADED ); //PUSTYLE_DEFAULT - puSetDefaultColourScheme (0.8, 0.8, 0.9, 1); - - // 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(); - - LayoutWidget::setDefaultFont(&GuiFont, 15); + void run(osg::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 + } 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(); +}; + +osg::ref_ptr initOp; +} + +void guiStartInit(osg::GraphicsContext* gc) +{ + if (gc) { + initOp = new GUIInitOperation; + gc->add(initOp.get()); + } +} - // Set up our Dialog Boxes - fgPresetInit(); +bool guiFinishInit() +{ + if (!initOp.valid()) + return true; + if (!initOp->isFinished()) + return false; + initOp = 0; + return true; } +