From: James Turner <zakalawe@mac.com>
Date: Sun, 10 Mar 2013 12:05:14 +0000 (+0000)
Subject: New cursor shapes.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ead479532bf648f8688bec87835a8772c3b77c8f;p=flightgear.git

New cursor shapes.

Unfortunately OSG lacks the 'closed hand' (aka 'grab') cursor, really time to get platform cursor working reliably.
---

diff --git a/src/GUI/CocoaMouseCursor.mm b/src/GUI/CocoaMouseCursor.mm
index 03798d4f0..8858ff52a 100644
--- a/src/GUI/CocoaMouseCursor.mm
+++ b/src/GUI/CocoaMouseCursor.mm
@@ -45,9 +45,11 @@ NSCursor* cocoaCursorForKey(FGMouseCursor::Cursor aKey)
     case FGMouseCursor::CURSOR_HAND: return [NSCursor pointingHandCursor];
     case FGMouseCursor::CURSOR_CROSSHAIR: return [NSCursor crosshairCursor];
     case FGMouseCursor::CURSOR_IBEAM: return [NSCursor IBeamCursor];
-    
+    case FGMouseCursor::CURSOR_CLOSED_HAND: return [NSCursor closedHandCursor];
+            
     // FIXME - use a proper left-right cursor here.
     case FGMouseCursor::CURSOR_LEFT_RIGHT: return [NSCursor resizeLeftRightCursor];
+    case FGMouseCursor::CURSOR_UP_DOWN: return [NSCursor resizeUpDownCursor];
             
     case FGMouseCursor::CURSOR_SPIN_CW:
         path = [path stringByAppendingPathComponent:@"cursor-spin-cw.png"];
diff --git a/src/GUI/MouseCursor.cxx b/src/GUI/MouseCursor.cxx
index 7dc6fbc53..5d8bff6ac 100644
--- 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;  
         }
@@ -223,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 }
 };
 
diff --git a/src/GUI/MouseCursor.hxx b/src/GUI/MouseCursor.hxx
index 94b7d3032..077504cf1 100644
--- a/src/GUI/MouseCursor.hxx
+++ b/src/GUI/MouseCursor.hxx
@@ -33,7 +33,8 @@ public:
     enum Cursor
     {
         CURSOR_ARROW,
-        CURSOR_HAND,
+        CURSOR_HAND, ///< the browser 'link' cursor
+        CURSOR_CLOSED_HAND,
         CURSOR_CROSSHAIR,
         CURSOR_IBEAM, ///< for editing text
         CURSOR_IN_OUT, ///< arrow pointing into / out of the screen