- Added ultra-light traffic is now a separate traffic class that can have its

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

diff --git a/src/Main/fg_os.cxx b/src/Main/fg_os.cxx
index 5d14659aa90349d53c02ae4a7e7e9e0247599249..a9fcf86c9ad358e5188fc6c2a40bc66f922b0eff 100644 (file)
--- a/src/Main/fg_os.cxx
+++ b/src/Main/fg_os.cxx
@@ -28,6 +28,13 @@ static fgKeyHandler KeyHandler = 0;
 static fgMouseClickHandler MouseClickHandler = 0;
 static fgMouseMotionHandler MouseMotionHandler = 0;
 
+// We need to flush all pending mouse move events past a mouse warp to avoid
+// a race condition ending in warping twice and having huge increments for the
+// second warp.
+// I am not aware of such a flush function in glut. So we emulate that by
+// ignoring mouse move events between a warp mouse and the next frame.
+static bool mouseWarped = false;
+
 void fgRegisterIdleHandler(fgIdleHandler func)
 {
     IdleHandler = func;
@@ -75,13 +82,15 @@ static void callKeyHandler(int k, int mods, int x, int y)
 
 static void GLUTmotion (int x, int y)
 {
+    if (mouseWarped)
+        return;
     if(MouseMotionHandler) (*MouseMotionHandler)(x, y);
 }
 
 static void GLUTmouse (int button, int updown, int x, int y)
 {
     GlutModifiers = glutGetModifiers();
-    if(MouseClickHandler) (*MouseClickHandler)(button, updown, x, y);
+    if(MouseClickHandler) (*MouseClickHandler)(button, updown, x, y, true, 0);
 }
 
 static void GLUTspecialkeyup(int k, int x, int y)
@@ -111,12 +120,14 @@ static void GLUTkey(unsigned char k, int x, int y)
 static void GLUTidle()
 {
     if(IdleHandler) (*IdleHandler)();
+    mouseWarped = false;
 }
 
 static void GLUTdraw()
 {
     if(DrawHandler) (*DrawHandler)();
     glutSwapBuffers();
+    mouseWarped = false;
 }
 
 static void GLUTreshape(int w, int h)
@@ -169,6 +180,7 @@ void fgSetMouseCursor(int cursor)
 
 void fgWarpMouse(int x, int y)
 {
+    mouseWarped = true;
     glutWarpPointer(x, y);
 }
 
@@ -198,8 +210,14 @@ void fgOSOpenWindow(int w, int h, int bpp, bool alpha,
     if(!fgGetBool("/sim/startup/game-mode")) {
         glutCreateWindow("FlightGear");
     } else {
-        char game_mode_str[256];
-        sprintf(game_mode_str, "width=%d height=%d bpp=%d", w, h, bpp);
+        char game_mode_str[20];
+        SGPropertyNode *p = fgGetNode("/sim/frame-rate-throttle-hz", false);
+        if (p) {
+            int hz = p->getIntValue();
+            snprintf(game_mode_str, 20, "%dx%d:%d@%d", w, h, bpp, hz);
+        } else {
+            snprintf(game_mode_str, 20, "%dx%d:%d", w, h, bpp);
+        }
         glutGameModeString( game_mode_str );
         glutEnterGameMode();
     }
@@ -216,5 +234,19 @@ void fgOSOpenWindow(int w, int h, int bpp, bool alpha,
     glutIdleFunc(GLUTidle);
     glutDisplayFunc(GLUTdraw);
     glutReshapeFunc(GLUTreshape);
+}
+
+// Noop; the graphics context is always current
+void fgMakeCurrent()
+{
+}
 
+bool fgOSIsMainCamera(const osg::Camera*)
+{
+  return true;
+}
+
+bool fgOSIsMainContext(const osg::GraphicsContext*)
+{
+  return true;
 }