Basic cursor demand system implementation (#943)

src/xrGame/ui/UIDialogWnd.h

@@ -33,7 +33,7 @@ class CUIDialogWnd : public CUIWindow
     CUIFocusSystem* GetCurrentFocusSystem() const override { return GetHolder(); }
 
     virtual bool StopAnyMove() { return true; }
-    virtual bool NeedCursor() const { return true; }
+    virtual bool NeedCursor() const { return pInput->IsCurrentInputTypeKeyboardMouse(); }
     virtual bool NeedCenterCursor() const { return true; }
     virtual bool WorkInPause() const { return m_bWorkInPause; }
     virtual bool Dispatch(int cmd, int param) { return true; }

src/xrGame/ui/UIPdaWnd.cpp

@@ -362,6 +362,14 @@ void CUIPdaWnd::DrawHint()
     m_hint_wnd->Draw();
 }
 
+bool CUIPdaWnd::NeedCursor() const
+{
+    if (m_pActiveDialog && m_pActiveDialog->IsUsingCursorRightNow())
+       return true;
+
+    return CUIDialogWnd::NeedCursor();
+}
+
 void CUIPdaWnd::UpdatePda()
 {
     if (pUILogsWnd)

src/xrGame/ui/UIPdaWnd.h

@@ -84,7 +84,8 @@ class CUIPdaWnd final : public CUIDialogWnd
     void SetActiveSubdialog(const shared_str& section);
     CUITabControl* GetTabControl() const { return UITabControl; }
 
-    virtual bool StopAnyMove() { return false; }
+    bool StopAnyMove() override { return false; }
+    bool NeedCursor() const override;
     void UpdatePda();
     void UpdateRankingWnd();
 

src/xrGame/ui/UIScriptWnd_script.cpp

@@ -73,6 +73,18 @@ struct CUIDialogWndExWrapperBase final : public CUIDialogWndEx, public luabind::
         return ptr->self_type::inherited::Dispatch(cmd, param);
     }
 
+    bool NeedCursor() const override
+    {
+        if (luabind::call_member<bool>(this, "NeedCursor"))
+            return true;
+        return inherited::NeedCursor();
+    }
+
+    static bool NeedCursor_static(inherited* ptr)
+    {
+        return ptr->self_type::inherited::NeedCursor();
+    }
+
     pcstr GetDebugType() override { return "CUIScriptWnd"; }
 
     bool FillDebugTree(const CUIDebugState& debugState) override
@@ -222,6 +234,8 @@ SCRIPT_EXPORT(CUIDialogWndEx, (CUIDialogWnd, IFactoryObject),
             .def("Dispatch",        &BaseType::Dispatch, &WrapType::Dispatch_static)
             .def("Load",            &BaseType::Load)
 
+            .def("NeedCursor",      &BaseType::NeedCursor, &WrapType::NeedCursor_static)
+
             .def("GetButton",       &BaseType::GetControl<CUIButton>)
             .def("GetMessageBox",   &BaseType::GetControl<CUIMessageBox>)
             .def("GetPropertiesBox",&BaseType::GetControl<CUIPropertiesBox>)

src/xrGame/ui/UITaskWnd.cpp

@@ -321,6 +321,11 @@ void CUITaskWnd::Show_TaskListWnd(bool status) const
     m_task_wnd->Show(status);
 }
 
+bool CUITaskWnd::IsUsingCursorRightNow() const
+{
+    return m_pKeyboardCapturer == &m_filters;
+}
+
 void CUITaskWnd::TaskSetTargetMap(CGameTask* task) const
 {
     if (!task || !IsSecondaryTasksEnabled())

src/xrGame/ui/UITaskWnd.h

@@ -77,6 +77,8 @@ class CUITaskWnd final : public CUIWindow, public CUIWndCallback
     void SecondaryTasksEnabled(bool enable) { m_filters.SetFilterEnabled(CUIMapFilters::SecondaryTasks, enable); }
     void PrimaryObjectsEnabled(bool enable) { m_filters.SetFilterEnabled(CUIMapFilters::PrimaryObjects, enable); }
 
+    bool IsUsingCursorRightNow() const override;
+
 private:
     void TaskSetTargetMap(CGameTask* task) const;
     void TaskShowMapSpot(CGameTask* task, bool show) const;

src/xrUICore/Cursor/UICursor.cpp

@@ -130,6 +130,9 @@ void CUICursor::WarpToWindow(CUIWindow* wnd, bool change_visibility /*= true*/)
     if (change_visibility)
         Show();
 
+    if (!IsVisible())
+        return;
+
     Fvector2 pos;
     wnd->GetAbsolutePos(pos);
     Fvector2 size = wnd->GetWndSize();

src/xrUICore/Windows/UIWindow.h

@@ -169,6 +169,9 @@ class XRUICORE_API CUIWindow : public CUISimpleWindow, public CUIDebuggable
 
     CUIWindow* FindChild(const shared_str name);
 
+    [[nodiscard]]
+    virtual bool IsUsingCursorRightNow() const { return false; }
+
     [[nodiscard]]
     IC bool CursorOverWindow() const { return m_bCursorOverWindow; }
 

src/xrUICore/Windows/UIWindow_script.cpp

@@ -165,6 +165,7 @@ SCRIPT_EXPORT(CUIWindow, (),
             .def("IsAutoDelete", &CUIWindow::IsAutoDelete)
 
             .def("IsCursorOverWindow", &CUIWindow::CursorOverWindow)
+            .def("IsUsingCursorRightNow", &CUIWindow::IsUsingCursorRightNow)
             .def("FocusReceiveTime", &CUIWindow::FocusReceiveTime)
             .def("GetAbsoluteRect", &CUIWindow::GetAbsoluteRect)