Tweaks for Mips Irix compilers.

[flightgear.git] / src / Cockpit / panel.hxx

diff --git a/src/Cockpit/panel.hxx b/src/Cockpit/panel.hxx
index 70ff5c2a67e5c38addd45e52b7e43c411f83296c..1adc9e811569859c14e7cdf5e909cea6bfed5f24 100644 (file)
--- a/src/Cockpit/panel.hxx
+++ b/src/Cockpit/panel.hxx
@@ -40,11 +40,15 @@
 #include <plib/ssg.h>
 
 #include <simgear/misc/props.hxx>
+#include <simgear/timing/timestamp.hxx>
 
 #include <vector>
 #include <map>
 #include <plib/fnt.h>
 
+#include <Main/fgfs.hxx>
+
+
 FG_USING_STD(vector);
 FG_USING_STD(map);
 
@@ -117,19 +121,22 @@ private:
 // the appropriate instruments for processing.
 ////////////////////////////////////////////////////////////////////////
 
-class FGPanel
+class FGPanel : public FGSubsystem
 {
 public:
 
-  FGPanel (int x, int y, int w, int h);
+  FGPanel (int window_x, int window_y, int window_w, int window_h);
   virtual ~FGPanel ();
 
+                               // Update the panel (every frame).
+  virtual void init ();
+  virtual void bind ();
+  virtual void unbind ();
+  virtual void update ();
+
                                // transfer pointer ownership!!!
   virtual void addInstrument (FGPanelInstrument * instrument);
 
-                               // Update the panel (every frame).
-  virtual void update () const;
-
                                // Background texture.
   virtual void setBackground (ssgTexture * texture);
 
@@ -137,6 +144,26 @@ public:
   virtual bool getVisibility () const;
   virtual void setVisibility (bool visibility);
 
+                               // Full width of panel.
+  virtual void setWidth (int width) { _width = width; }
+  virtual int getWidth () const { return _width; }
+
+                               // Full height of panel.
+  virtual void setHeight (int height) { _height = height; }
+  virtual int getHeight () const { return _height; }
+
+                               // X-offset
+  virtual void setXOffset (int offset);
+  virtual int getXOffset () const { return _x_offset; }
+
+                               // Y-offset.
+  virtual void setYOffset (int offset);
+  virtual int getYOffset () const { return _y_offset; }
+
+                               // View height.
+  virtual void setViewHeight (int height) { _view_height = height; }
+  virtual int getViewHeight () const { return _view_height; }
+
                                // Handle a mouse click.
   virtual bool doMouseAction (int button, int updown, int x, int y);
 
@@ -147,8 +174,13 @@ private:
   mutable int _mouseDelay;
   mutable FGPanelInstrument * _mouseInstrument;
   typedef vector<FGPanelInstrument *> instrument_list_type;
-  int _x, _y, _w, _h;
-  int _panel_h;
+  int _winx, _winy, _winw, _winh;
+  int _width;
+  int _height;
+  int _x_offset;
+  int _y_offset;
+  int _view_height;
+  
   ssgTexture * _bg;
                                // List of instruments in panel.
   instrument_list_type _instruments;
@@ -343,9 +375,6 @@ public:
   };
 
   FGPanelTransformation ();
-  FGPanelTransformation (Type type, const SGValue * value,
-                        float min, float max,
-                        float factor, float offset);
   virtual ~FGPanelTransformation ();
 
   Type type;
@@ -413,7 +442,6 @@ protected:
 class FGLayeredInstrument : public FGPanelInstrument
 {
 public:
-  typedef vector<FGInstrumentLayer *> layer_list;
   FGLayeredInstrument (int x, int y, int w, int h);
   virtual ~FGLayeredInstrument ();
 
@@ -427,6 +455,7 @@ public:
   virtual void addTransformation (FGPanelTransformation * transformation);
 
 protected:
+  typedef vector<FGInstrumentLayer *> layer_list;
   layer_list _layers;
 };
 
@@ -460,34 +489,6 @@ private:
 };
 
 
-\f
-////////////////////////////////////////////////////////////////////////
-// A moving window on a texture.
-//
-// This layer automatically recrops a cropped texture based on
-// property values, creating a moving window over the texture.
-////////////////////////////////////////////////////////////////////////
-
-class FGWindowLayer : public FGTexturedLayer
-{
-public:
-  FGWindowLayer (int w = -1, int h = -1);
-  FGWindowLayer (const FGCroppedTexture &texture, int w = -1, int h = -1);
-  virtual ~FGWindowLayer ();
-
-  virtual void draw ();
-
-  virtual const SGValue * getXValue () const { return _xValue; }
-  virtual void setXValue (const SGValue * value) { _xValue = value; }
-  virtual const SGValue * getYValue () const { return _yValue; }
-  virtual void setYValue (const SGValue * value) { _yValue = value; }
-
-private:
-  const SGValue * _xValue;
-  const SGValue * _yValue;
-};
-
-
 \f
 ////////////////////////////////////////////////////////////////////////
 // A text layer of an instrument.
@@ -522,8 +523,7 @@ public:
     mutable char _buf[1024];
   };
 
-  FGTextLayer (int w = -1, int h = -1, Chunk * chunk1 = 0, Chunk * chunk2 = 0,
-              Chunk * chunk3 = 0);
+  FGTextLayer (int w = -1, int h = -1);
   virtual ~FGTextLayer ();
 
   virtual void draw ();
@@ -535,13 +535,18 @@ public:
   virtual void setFont (fntFont * font);
 
 private:
+
+  void recalc_value () const;
+
   typedef vector<Chunk *> chunk_list;
   chunk_list _chunks;
   float _color[4];
 
   float _pointSize;
-                               // FIXME: need only one globally
-  mutable fntRenderer _renderer;
+
+  mutable string _value;
+  mutable SGTimeStamp _then;
+  mutable SGTimeStamp _now;
 };
 
 
@@ -567,6 +572,14 @@ private:
 };
 
 
+\f
+////////////////////////////////////////////////////////////////////////
+// Functions.
+////////////////////////////////////////////////////////////////////////
+
+bool fgPanelVisible ();
+
+
 \f
 ////////////////////////////////////////////////////////////////////////
 // The current panel, if any.