Merge branch 'jt/runway' into next

[flightgear.git] / src / Main / fg_os.hxx

diff --git a/src/Main/fg_os.hxx b/src/Main/fg_os.hxx
index 43bea933a8e98e6c0a213840ca3d48b4dc188cae..86710b680621e8d1a2d93ea664c71504cefa5842 100644 (file)
--- a/src/Main/fg_os.hxx
+++ b/src/Main/fg_os.hxx
@@ -1,13 +1,17 @@
 #ifndef _FG_OS_HXX
 #define _FG_OS_HXX
 
-// Plib pui needs to know at compile time what toolkit is in use.
-// Change this when we move to something other than glut.
-// #define PU_USE_GLUT -- moved to configure.ac -- EMH
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
+#include <string>
+#include <vector>
+
+#include <osg/ref_ptr>
+#include <osg/Camera>
+#include <osg/GraphicsContext>
+
 
 enum { MOUSE_BUTTON_LEFT,
        MOUSE_BUTTON_MIDDLE,
@@ -29,7 +33,8 @@ enum { KEYMOD_NONE     = 0,
        KEYMOD_ALT      = 8,
        KEYMOD_META     = 16,
        KEYMOD_SUPER    = 32,
-       KEYMOD_MAX      = 64 };
+       KEYMOD_HYPER    = 64,
+       KEYMOD_MAX      = 128 };
 
 // A note on key codes: none are defined here.  FlightGear has no
 // hard-coded interpretations of codes other than modifier keys, so we
@@ -44,8 +49,7 @@ enum { KEYMOD_NONE     = 0,
 //
 
 void fgOSInit(int* argc, char** argv);
-void fgOSOpenWindow(int w, int h, int bpp, bool alpha, bool stencil,
-                    bool fullscreen);
+void fgOSOpenWindow(bool stencil);
 void fgOSFullScreen();
 void fgOSMainLoop();
 void fgOSExit(int code);
@@ -80,10 +84,4 @@ void fgRegisterWindowResizeHandler(fgWindowResizeHandler func);
 void fgRegisterKeyHandler(fgKeyHandler func);
 void fgRegisterMouseClickHandler(fgMouseClickHandler func);
 void fgRegisterMouseMotionHandler(fgMouseMotionHandler func);
-
-void fgMakeCurrent();
-
-bool fgOSIsMainCamera(const osg::Camera* camera);
-bool fgOSIsMainContext(const osg::GraphicsContext* context);
-
 #endif // _FG_OS_HXX