One more Mac helper moved into CocoaHelpers.mm

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

diff --git a/src/Main/fg_os.hxx b/src/Main/fg_os.hxx
index 86710b680621e8d1a2d93ea664c71504cefa5842..6913e817a620453ce26f1edaa437a6d6ff417b40 100644 (file)
--- a/src/Main/fg_os.hxx
+++ b/src/Main/fg_os.hxx
@@ -24,7 +24,16 @@ enum { MOUSE_CURSOR_NONE,
        MOUSE_CURSOR_POINTER,
        MOUSE_CURSOR_WAIT,
        MOUSE_CURSOR_CROSSHAIR,
-       MOUSE_CURSOR_LEFTRIGHT };
+       MOUSE_CURSOR_LEFTRIGHT,
+       MOUSE_CURSOR_TOPSIDE,
+       MOUSE_CURSOR_BOTTOMSIDE,
+       MOUSE_CURSOR_LEFTSIDE,
+       MOUSE_CURSOR_RIGHTSIDE,
+       MOUSE_CURSOR_TOPLEFT,
+       MOUSE_CURSOR_TOPRIGHT,
+       MOUSE_CURSOR_BOTTOMLEFT,
+       MOUSE_CURSOR_BOTTOMRIGHT,
+};
 
 enum { KEYMOD_NONE     = 0,
        KEYMOD_RELEASED = 1, // Not a mod key, indicates "up" action
@@ -50,9 +59,11 @@ enum { KEYMOD_NONE     = 0,
 
 void fgOSInit(int* argc, char** argv);
 void fgOSOpenWindow(bool stencil);
+void fgOSCloseWindow();
 void fgOSFullScreen();
-void fgOSMainLoop();
+int fgOSMainLoop();
 void fgOSExit(int code);
+void fgOSResetProperties();
 
 void fgSetMouseCursor(int cursor);
 int  fgGetMouseCursor();
@@ -60,8 +71,6 @@ void fgWarpMouse(int x, int y);
 
 int  fgGetKeyModifiers();
 
-void fgRequestRedraw();
-
 //
 // Callbacks and registration API
 //
@@ -75,7 +84,7 @@ typedef void (*fgWindowResizeHandler)(int w, int h);
 
 typedef void (*fgKeyHandler)(int key, int keymod, int mousex, int mousey);
 typedef void (*fgMouseClickHandler)(int button, int updown, int x, int y, bool mainWindow, const osgGA::GUIEventAdapter*);
-typedef void (*fgMouseMotionHandler)(int x, int y);
+typedef void (*fgMouseMotionHandler)(int x, int y, const osgGA::GUIEventAdapter*);
 
 void fgRegisterIdleHandler(fgIdleHandler func);
 void fgRegisterDrawHandler(fgDrawHandler func);