Move current_panel to globals

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

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 19a2672028b3fbdbda227ef6810907a74194cb89..1be381486bb961b4d0b3d8dd16e3b97f7b65f673 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -80,9 +80,9 @@ get_aspect_adjust (int xsize, int ysize)
 bool
 fgPanelVisible ()
 {
-     if(current_panel == 0)
+     if(globals->get_current_panel() == 0)
        return false;
-     if(current_panel->getVisibility() == 0)
+     if(globals->get_current_panel()->getVisibility() == 0)
        return false;
      if(globals->get_viewmgr()->get_current() != 0)
        return false;
@@ -163,7 +163,6 @@ FGCroppedTexture::getTexture ()
 // Implementation of FGPanel.
 ////////////////////////////////////////////////////////////////////////
 
-FGPanel * current_panel = NULL;
 static fntRenderer text_renderer;
 static fntTexFont *default_font = 0;
 static fntTexFont *led_font = 0;
@@ -300,7 +299,7 @@ void FGPanel::updateMouseDelay()
     if (_mouseDown) {
         _mouseDelay--;
         if (_mouseDelay < 0) {
-            _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
+            _mouseInstrument->doMouseAction(_mouseButton, 0, _mouseX, _mouseY);
             _mouseDelay = 2;
         }
     }
@@ -370,7 +369,7 @@ FGPanel::draw()
   // of an existing polygon.  Use an offset to prevent z-fighting.  In
   // 2D mode, this is a no-op.
   glEnable(GL_POLYGON_OFFSET_FILL);
-  glPolygonOffset(0, -POFF_UNITS);
+  glPolygonOffset(-1, -POFF_UNITS);
 
   // save some state
   glPushAttrib( GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_LIGHTING_BIT
@@ -436,6 +435,21 @@ FGPanel::draw()
     glPopMatrix();
   }
 
+  // Draw yellow "hotspots" if directed to.  This is a panel authoring
+  // feature; not intended to be high performance or to look good.
+  if(fgGetBool("/sim/panel-hotspots")) {
+    glPushAttrib(GL_ALL_ATTRIB_BITS);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_TEXTURE_2D);
+    glColor3f(1, 1, 0);
+    
+    for(int i=0; i<_instruments.size(); i++)
+      _instruments[i]->drawHotspots();
+
+    glPopAttrib();
+  }
+
+
   // restore some original state
   glPopAttrib();
   glPolygonOffset(0, 0);
@@ -512,6 +526,8 @@ FGPanel::doLocalMouseAction(int button, int updown, int x, int y)
 {
   // Note a released button and return
   if (updown == 1) {
+    if (_mouseInstrument != 0)
+        _mouseInstrument->doMouseAction(_mouseButton, 1, _mouseX, _mouseY);
     _mouseDown = false;
     _mouseInstrument = 0;
     return false;
@@ -532,7 +548,8 @@ FGPanel::doLocalMouseAction(int button, int updown, int x, int y)
       _mouseX = x - ix;
       _mouseY = y - iy;
       // Always do the action once.
-      return _mouseInstrument->doMouseAction(_mouseButton, _mouseX, _mouseY);
+      return _mouseInstrument->doMouseAction(_mouseButton, 0,
+                                             _mouseX, _mouseY);
     }
   }
   return false;
@@ -564,7 +581,7 @@ FGPanel::doMouseAction (int button, int updown, int x, int y)
 
   // Having fixed up the coordinates, fall through to the local
   // coordinate handler.
-  doLocalMouseAction(button, updown, x, y);
+  return doLocalMouseAction(button, updown, x, y);
 } 
 
 
@@ -577,11 +594,14 @@ FGPanelAction::FGPanelAction ()
 {
 }
 
-FGPanelAction::FGPanelAction (int button, int x, int y, int w, int h)
-  : _button(button), _x(x), _y(y), _w(w), _h(h)
+FGPanelAction::FGPanelAction (int button, int x, int y, int w, int h,
+                              bool repeatable)
+    : _button(button), _x(x), _y(y), _w(w), _h(h), _repeatable(repeatable)
 {
-  for (unsigned int i = 0; i < _bindings.size(); i++)
-    delete _bindings[i];
+  for (unsigned int i = 0; i < 2; i++) {
+      for (unsigned int j = 0; j < _bindings[i].size(); j++)
+          delete _bindings[i][j];
+  }
 }
 
 FGPanelAction::~FGPanelAction ()
@@ -589,19 +609,24 @@ FGPanelAction::~FGPanelAction ()
 }
 
 void
-FGPanelAction::addBinding (FGBinding * binding)
+FGPanelAction::addBinding (FGBinding * binding, int updown)
 {
-  _bindings.push_back(binding);
+  _bindings[updown].push_back(binding);
 }
 
-void
-FGPanelAction::doAction ()
+bool
+FGPanelAction::doAction (int updown)
 {
   if (test()) {
-    int nBindings = _bindings.size();
-    for (int i = 0; i < nBindings; i++) {
-      _bindings[i]->fire();
+    if ((updown != _last_state) || (updown == 0 && _repeatable)) {
+        int nBindings = _bindings[updown].size();
+        for (int i = 0; i < nBindings; i++)
+            _bindings[updown][i]->fire();
     }
+    _last_state = updown;
+    return true;
+  } else {
+    return false;
   }
 }
 
@@ -650,6 +675,25 @@ FGPanelInstrument::~FGPanelInstrument ()
   }
 }
 
+void
+FGPanelInstrument::drawHotspots()
+{
+  for(int i=0; i<_actions.size(); i++) {
+    FGPanelAction* a = _actions[i];
+    float x1 = getXPos() + a->getX();
+    float x2 = x1 + a->getWidth();
+    float y1 = getYPos() + a->getY();
+    float y2 = y1 + a->getHeight();
+
+    glBegin(GL_LINE_LOOP);
+    glVertex2f(x1, y1);
+    glVertex2f(x1, y2);
+    glVertex2f(x2, y2);
+    glVertex2f(x2, y1);
+    glEnd();
+  }
+}
+
 void
 FGPanelInstrument::setPosition (int x, int y)
 {
@@ -696,16 +740,15 @@ FGPanelInstrument::addAction (FGPanelAction * action)
 
                                // Coordinates relative to centre.
 bool
-FGPanelInstrument::doMouseAction (int button, int x, int y)
+FGPanelInstrument::doMouseAction (int button, int updown, int x, int y)
 {
   if (test()) {
     action_list_type::iterator it = _actions.begin();
     action_list_type::iterator last = _actions.end();
     for ( ; it != last; it++) {
-      if ((*it)->inArea(button, x, y)) {
-       (*it)->doAction();
-       return true;
-      }
+      if ((*it)->inArea(button, x, y) &&
+          (*it)->doAction(updown))
+        return true;
     }
   }
   return false;
@@ -803,11 +846,15 @@ FGInstrumentLayer::transform () const
     FGPanelTransformation *t = *it;
     if (t->test()) {
       float val = (t->node == 0 ? 0.0 : t->node->getFloatValue());
+
+      if (t->has_mod)
+          val = fmod(val, t->mod);
       if (val < t->min) {
        val = t->min;
       } else if (val > t->max) {
        val = t->max;
       }
+
       if(t->table==0) {
        val = val * t->factor + t->offset;
       } else {
@@ -856,6 +903,7 @@ void
 FGGroupLayer::draw ()
 {
   if (test()) {
+    transform();
     int nLayers = _layers.size();
     for (int i = 0; i < nLayers; i++)
       _layers[i]->draw();
@@ -1086,28 +1134,22 @@ FGTextLayer::Chunk::getValue () const
 // Implementation of FGSwitchLayer.
 ////////////////////////////////////////////////////////////////////////
 
-FGSwitchLayer::FGSwitchLayer (int w, int h, const SGPropertyNode * node,
-                             FGInstrumentLayer * layer1,
-                             FGInstrumentLayer * layer2)
-  : FGInstrumentLayer(w, h), _node(node), _layer1(layer1), _layer2(layer2)
+FGSwitchLayer::FGSwitchLayer ()
+  : FGGroupLayer()
 {
 }
 
-FGSwitchLayer::~FGSwitchLayer ()
-{
-  delete _layer1;
-  delete _layer2;
-}
-
 void
 FGSwitchLayer::draw ()
 {
   if (test()) {
     transform();
-    if (_node->getBoolValue()) {
-      _layer1->draw();
-    } else {
-      _layer2->draw();
+    int nLayers = _layers.size();
+    for (int i = 0; i < nLayers; i++) {
+      if (_layers[i]->test()) {
+          _layers[i]->draw();
+          return;
+      }
     }
   }
 }