Support for multiple data dirs.

[flightgear.git] / src / GUI / MouseCursor.cxx

diff --git a/src/GUI/MouseCursor.cxx b/src/GUI/MouseCursor.cxx
index aad589d64c0ce4b441cd69f917f9a745a7287888..5d8bff6acce7ab316291a145084921a3574bf6a8 100644 (file)
--- a/src/GUI/MouseCursor.cxx
+++ b/src/GUI/MouseCursor.cxx
@@ -105,10 +105,11 @@ private:
         switch (aCursor) {
                case CURSOR_ARROW: return osgViewer::GraphicsWindow::RightArrowCursor;
         case CURSOR_HAND: return osgViewer::GraphicsWindow::HandCursor;
+        case CURSOR_CLOSED_HAND: return osgViewer::GraphicsWindow::HandCursor;
         case CURSOR_CROSSHAIR: return osgViewer::GraphicsWindow::CrosshairCursor;
         case CURSOR_IBEAM: return osgViewer::GraphicsWindow::TextCursor;
         case CURSOR_LEFT_RIGHT: return osgViewer::GraphicsWindow::LeftRightCursor;
-                    
+        case CURSOR_UP_DOWN: return osgViewer::GraphicsWindow::UpDownCursor;
         default:
                        return osgViewer::GraphicsWindow::RightArrowCursor;  
         }
@@ -165,8 +166,12 @@ FGMouseCursor* FGMouseCursor::instance()
             gw->setCursor(osgViewer::GraphicsWindow::InheritCursor);
         }
 
+        // Windows native curosr disabled while interaction with OSG
+        // is resolved - right now NCHITs (non-client-area hits)
+        // overwire the InheritCursor value above, and hence our cursor
+        // get stuck.
        // and create our real implementation
-               static_instance = new WindowsMouseCursor;
+       //      static_instance = new WindowsMouseCursor;
        #endif
         
         // X11
@@ -219,7 +224,12 @@ const MouseCursorMap mouse_cursor_map[] = {
     { "crosshair", FGMouseCursor::CURSOR_CROSSHAIR },
     { "left-right", FGMouseCursor::CURSOR_LEFT_RIGHT },
     { "hand", FGMouseCursor::CURSOR_HAND },
+    { "closed-hand", FGMouseCursor::CURSOR_CLOSED_HAND },
     { "text", FGMouseCursor::CURSOR_IBEAM },
+    
+// aliases
+    { "drag-horizontal", FGMouseCursor::CURSOR_LEFT_RIGHT },
+    { "drag-vertical", FGMouseCursor::CURSOR_UP_DOWN },
     { 0, FGMouseCursor::CURSOR_ARROW }
 };