Merge branch 'master' into xr-devxr-dev

1 files changed, 18 insertions, 2 deletions

diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cpp
index de7c5422d3f..db4d6c3bb71 100644
--- a/intern/ghost/intern/GHOST_Window.cpp
+++ b/intern/ghost/intern/GHOST_Window.cpp
@@ -23,6 +23,7 @@ GHOST_Window::GHOST_Window(uint32_t width,
     : m_drawingContextType(GHOST_kDrawingContextTypeNone),
       m_cursorVisible(true),
       m_cursorGrab(GHOST_kGrabDisable),
+      m_cursorGrabAxis(GHOST_kAxisNone),
       m_cursorShape(GHOST_kStandardCursorDefault),
       m_wantStereoVisual(wantStereoVisual),
       m_context(new GHOST_ContextNone(false))
@@ -164,7 +165,8 @@ GHOST_TSuccess GHOST_Window::getCursorGrabBounds(GHOST_Rect &bounds)
 
 void GHOST_Window::getCursorGrabState(GHOST_TGrabCursorMode &mode,
                                       GHOST_TAxisFlag &wrap_axis,
-                                      GHOST_Rect &bounds)
+                                      GHOST_Rect &bounds,
+                                      bool &use_software_cursor)
 {
   mode = m_cursorGrab;
   if (m_cursorGrab == GHOST_kGrabWrap) {
@@ -176,8 +178,16 @@ void GHOST_Window::getCursorGrabState(GHOST_TGrabCursorMode &mode,
     bounds.m_r = -1;
     bounds.m_t = -1;
     bounds.m_b = -1;
-    wrap_axis = GHOST_kGrabAxisNone;
+    wrap_axis = GHOST_kAxisNone;
   }
+  use_software_cursor = (m_cursorGrab != GHOST_kGrabDisable) ? getCursorGrabUseSoftwareDisplay() :
+                                                               false;
+}
+
+bool GHOST_Window::getCursorGrabUseSoftwareDisplay()
+{
+  /* Sub-classes may override, by default don't use software cursor. */
+  return false;
 }
 
 GHOST_TSuccess GHOST_Window::setCursorShape(GHOST_TStandardCursor cursorShape)
@@ -199,6 +209,12 @@ GHOST_TSuccess GHOST_Window::setCustomCursorShape(
   return GHOST_kFailure;
 }
 
+GHOST_TSuccess GHOST_Window::getCursorBitmap(GHOST_CursorBitmapRef * /*bitmap*/)
+{
+  /* Sub-classes may override. */
+  return GHOST_kFailure;
+}
+
 void GHOST_Window::setAcceptDragOperation(bool canAccept)
 {
   m_canAcceptDragOperation = canAccept;