X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FGUI%2Fgui.cxx;h=1ae94dbb093a925eea17b7c2490d07a0232424f3;hb=0a5e86f4e61a80ff19b78de011852a7b60250b7a;hp=48deee30cd54fa5ac836d0b3b20391e99f7830fb;hpb=e322c70f529eacbfa0460f8f10419657eee00675;p=flightgear.git

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 48deee30c..1ae94dbb0 100644
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -18,7 +18,7 @@
  *
  * 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$
  **************************************************************************/
@@ -30,9 +30,7 @@
 
 #include <simgear/compiler.h>
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
+#include <string>
 
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -41,89 +39,81 @@
 
 #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 "preset_dlg.hxx"
-
+#include "layout.hxx"
 
-extern void initDialog (void);
-extern void mkDialogInit (void);
-extern void ConfirmExitDialogInit(void);
+#include <osg/GraphicsContext>
 
+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(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();
-
-    // Set up our Dialog Boxes
-    ConfirmExitDialogInit();
-    fgPresetInit();
-	
-    mkDialogInit();
+};
+
+osg::ref_ptr<GUIInitOperation> initOp;
+}
+
+void guiStartInit(osg::GraphicsContext* gc)
+{
+    if (gc) {
+        initOp = new GUIInitOperation;
+        gc->add(initOp.get());
+    }
 }
+
+bool guiFinishInit()
+{
+    if (!initOp.valid())
+        return true;
+    if (!initOp->isFinished())
+        return false;
+    initOp = 0;
+    return true;
+}
+