Fixed a problem with autodetecting if we need to draw our own mouse cursor

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

diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 85c0ab926f573f02dc620600d60760f8313c4575..fc1c52184b33894c1142725e8c1c811f5d66368b 100644 (file)
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -24,6 +24,11 @@
 #ifndef _GLOBALS_HXX
 #define _GLOBALS_HXX
 
+#include <simgear/compiler.h>
+
+#include <vector>
+#include STL_STRING
+
 
 #include <simgear/ephemeris/ephemeris.hxx>
 #include <simgear/magvar/magvar.hxx>
@@ -31,9 +36,13 @@
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/misc/props.hxx>
 
-#include "options.hxx"
 #include "viewmgr.hxx"
 
+FG_USING_STD( vector );
+FG_USING_STD( string );
+
+typedef vector<string> string_list;
+
 
 class FGGlobals {
 
@@ -68,18 +77,16 @@ private:
     // Global autopilot "route"
     SGRoute *route;
 
-    // options
-    class FGOptions *options;
-
     // viewer maneger
     FGViewMgr *viewmgr;
     FGViewer *current_view;
 
     // properties
     SGPropertyNode *props;
+    SGPropertyNode *initial_state;
 
     // list of serial port-like configurations
-    string_list channel_options_list;
+    string_list *channel_options_list;
 
 public:
 
@@ -117,9 +124,6 @@ public:
     inline SGRoute *get_route() const { return route; }
     inline void set_route( SGRoute *r ) { route = r; }
 
-    inline FGOptions *get_options() const { return options; }
-    inline void set_options( FGOptions *o ) { options = o; }
-
     inline FGViewMgr *get_viewmgr() const { return viewmgr; }
     inline void set_viewmgr( FGViewMgr *vm ) { viewmgr = vm; }
     inline FGViewer *get_current_view() const { return current_view; }
@@ -128,10 +132,25 @@ public:
     inline SGPropertyNode *get_props () { return props; }
     inline void set_props( SGPropertyNode *n ) { props = n; }
 
-    inline string_list get_channel_options_list () {
-      return channel_options_list;
+    inline string_list *get_channel_options_list () {
+       return channel_options_list;
     }
-    
+    inline void set_channel_options_list( string_list *l ) {
+       channel_options_list = l;
+    }
+
+
+    /**
+     * Save the current state as the initial state.
+     */
+    void saveInitialState ();
+
+
+    /**
+     * Restore the saved initial state, if any.
+     */
+    void restoreInitialState ();
+
 };