Support horizontal mouse wheel scroll

Xottab-DUTY · Xottab-DUTY · commit 9a8eccb32601 · 2018-07-21T21:36:32.000+05:00
diff --git a/src/xrEngine/IInputReceiver.h b/src/xrEngine/IInputReceiver.h
@@ -17,6 +17,7 @@ using Ivector2 = _vector2<int>;
 class ENGINE_API IInputReceiver
 {
 public:
+    virtual ~IInputReceiver() = default;
     static void IR_GetLastMouseDelta(Ivector2& p);
     static void IR_GetMousePosScreen(Ivector2& p);
     static void IR_GetMousePosReal(SDL_Window* m_sdlWnd, Ivector2& p);
@@ -31,16 +32,16 @@ class ENGINE_API IInputReceiver
     virtual void IR_OnDeactivate(void);
     virtual void IR_OnActivate(void);
 
-    virtual void IR_OnMousePress(int /*btn*/){};
-    virtual void IR_OnMouseRelease(int /*btn*/){};
-    virtual void IR_OnMouseHold(int /*btn*/){};
-    virtual void IR_OnMouseWheel(int /*direction*/){};
-    virtual void IR_OnMouseMove(int /*x*/, int /*y*/){};
-    virtual void IR_OnMouseStop(int /*x*/, int /*y*/){};
+    virtual void IR_OnMousePress(int /*btn*/) {}
+    virtual void IR_OnMouseRelease(int /*btn*/) {}
+    virtual void IR_OnMouseHold(int /*btn*/) {}
+    virtual void IR_OnMouseWheel(int /*x*/, int /*y*/) {}
+    virtual void IR_OnMouseMove(int /*x*/, int /*y*/) {}
+    virtual void IR_OnMouseStop(int /*x*/, int /*y*/) {}
 
-    virtual void IR_OnKeyboardPress(int /*dik*/){};
-    virtual void IR_OnKeyboardRelease(int /*dik*/){};
-    virtual void IR_OnKeyboardHold(int /*dik*/){};
+    virtual void IR_OnKeyboardPress(int /*dik*/) {}
+    virtual void IR_OnKeyboardRelease(int /*dik*/) {}
+    virtual void IR_OnKeyboardHold(int /*dik*/) {}
 };
 
 ENGINE_API extern float psMouseSens;
diff --git a/src/xrEngine/xr_input.cpp b/src/xrEngine/xr_input.cpp
@@ -125,6 +125,7 @@ void CInput::MouseUpdate()
             cbStack.back()->IR_OnMousePress(event.button.button - 1);
             break;
         case SDL_MOUSEWHEEL:
+            mouseMoved = true;
             timeStamp[2] = dwCurTime + event.wheel.timestamp;
             timeStamp[3] = dwCurTime + event.wheel.timestamp;
             offs[2] += event.wheel.y;
@@ -152,8 +153,8 @@ void CInput::MouseUpdate()
     {
         if (offs[0] || offs[1])
             cbStack.back()->IR_OnMouseMove(offs[0], offs[1]);
-        if (offs[2])
-            cbStack.back()->IR_OnMouseWheel(offs[2]);
+        if (offs[2] || offs[3])
+            cbStack.back()->IR_OnMouseWheel(offs[2], offs[3]);
     }
     else
     {
diff --git a/src/xrGame/Actor.h b/src/xrGame/Actor.h
@@ -431,7 +431,7 @@ class CActor : public CEntityAlive,
     virtual void IR_OnKeyboardPress(int dik);
     virtual void IR_OnKeyboardRelease(int dik);
     virtual void IR_OnKeyboardHold(int dik);
-    virtual void IR_OnMouseWheel(int direction);
+    virtual void IR_OnMouseWheel(int x, int y);
     virtual float GetLookFactor();
 
 public:
diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -199,18 +199,18 @@ void CActor::IR_OnKeyboardPress(int cmd)
     }
 }
 
-void CActor::IR_OnMouseWheel(int direction)
+void CActor::IR_OnMouseWheel(int x, int y)
 {
     if (hud_adj_mode)
     {
-        g_player_hud->tune(Ivector().set(0, 0, direction));
+        g_player_hud->tune(Ivector().set(0, 0, x));
         return;
     }
 
-    if (inventory().Action((direction > 0) ? (u16)kWPN_ZOOM_DEC : (u16)kWPN_ZOOM_INC, CMD_START))
+    if (inventory().Action((x > 0) ? (u16)kWPN_ZOOM_DEC : (u16)kWPN_ZOOM_INC, CMD_START))
         return;
 
-    if (direction > 0)
+    if (x > 0)
         OnNextWeaponSlot();
     else
         OnPrevWeaponSlot();
diff --git a/src/xrGame/Level.h b/src/xrGame/Level.h
@@ -298,7 +298,7 @@ class CLevel : public IGame_Level, public IPureClient
     virtual void IR_OnMouseHold(int btn);
     virtual void IR_OnMouseMove(int, int);
     virtual void IR_OnMouseStop(int, int);
-    virtual void IR_OnMouseWheel(int direction);
+    virtual void IR_OnMouseWheel(int x, int y);
     virtual void IR_OnActivate(void);
     int get_RPID(LPCSTR name);
     // Game
diff --git a/src/xrGame/Level_input.cpp b/src/xrGame/Level_input.cpp
@@ -43,18 +43,18 @@ extern float g_fTimeFactor;
 
 #define CURRENT_ENTITY() (game ? ((GameID() == eGameIDSingle) ? CurrentEntity() : CurrentControlEntity()) : NULL)
 
-void CLevel::IR_OnMouseWheel(int direction)
+void CLevel::IR_OnMouseWheel(int x, int y)
 {
     if (g_bDisableAllInput)
         return;
 
 #ifdef INPUT_CALLBACKS
     /* avo: script callback */
     if (g_actor)
-        g_actor->callback(GameObject::eMouseWheel)(direction);
+        g_actor->callback(GameObject::eMouseWheel)(x);
     /* avo: end */
 #endif
-    if (CurrentGameUI()->IR_UIOnMouseWheel(direction))
+    if (CurrentGameUI()->IR_UIOnMouseWheel(x, y))
         return;
     if (Device.Paused()
 #ifdef DEBUG
@@ -67,7 +67,7 @@ void CLevel::IR_OnMouseWheel(int direction)
     {
         IInputReceiver* IR = smart_cast<IInputReceiver*>(smart_cast<CGameObject*>(CURRENT_ENTITY()));
         if (IR)
-            IR->IR_OnMouseWheel(direction);
+            IR->IR_OnMouseWheel(x, y);
     }
 }
 
diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -371,12 +371,12 @@ void CMainMenu::IR_OnKeyboardHold(int dik)
     CDialogHolder::IR_UIOnKeyboardHold((SDL_Scancode)dik);
 };
 
-void CMainMenu::IR_OnMouseWheel(int direction)
+void CMainMenu::IR_OnMouseWheel(int x, int y)
 {
     if (!IsActive())
         return;
 
-    CDialogHolder::IR_UIOnMouseWheel(direction);
+    CDialogHolder::IR_UIOnMouseWheel(x, y);
 }
 
 bool CMainMenu::OnRenderPPUI_query() { return IsActive() && !m_Flags.test(flGameSaveScreenshot) && b_shniaganeed_pp; }
diff --git a/src/xrGame/MainMenu.h b/src/xrGame/MainMenu.h
@@ -150,7 +150,7 @@ class CMainMenu : public IMainMenu,
     virtual void IR_OnKeyboardRelease(int dik);
     virtual void IR_OnKeyboardHold(int dik);
 
-    virtual void IR_OnMouseWheel(int direction);
+    virtual void IR_OnMouseWheel(int x, int y);
 
     bool OnRenderPPUI_query();
     void OnRenderPPUI_main();
diff --git a/src/xrGame/UIDialogHolder.cpp b/src/xrGame/UIDialogHolder.cpp
@@ -339,7 +339,7 @@ bool CDialogHolder::IR_UIOnKeyboardHold(SDL_Scancode dik)
     return true;
 }
 
-bool CDialogHolder::IR_UIOnMouseWheel(int direction)
+bool CDialogHolder::IR_UIOnMouseWheel(int x, int y)
 {
     CUIDialogWnd* TIR = TopInputReceiver();
     if (!TIR)
@@ -349,7 +349,18 @@ bool CDialogHolder::IR_UIOnMouseWheel(int direction)
 
     Fvector2 pos = GetUICursor().GetCursorPosition();
 
-    TIR->OnMouseAction(pos.x, pos.y, (direction > 0) ? WINDOW_MOUSE_WHEEL_UP : WINDOW_MOUSE_WHEEL_DOWN);
+    // Vertical scroll is in higher priority
+    EUIMessages wheelMessage;
+    if (x > 0)
+        wheelMessage = WINDOW_MOUSE_WHEEL_UP;
+    else if (x < 0)
+        wheelMessage = WINDOW_MOUSE_WHEEL_DOWN;
+    else if (y > 0)
+        wheelMessage = WINDOW_MOUSE_WHEEL_RIGHT;
+    else
+        wheelMessage = WINDOW_MOUSE_WHEEL_LEFT;
+
+    TIR->OnMouseAction(pos.x, pos.y, wheelMessage);
     return true;
 }
 
diff --git a/src/xrGame/UIDialogHolder.h b/src/xrGame/UIDialogHolder.h
@@ -62,6 +62,6 @@ class CDialogHolder : public pureFrame
     virtual bool IR_UIOnKeyboardPress(SDL_Scancode dik);
     virtual bool IR_UIOnKeyboardRelease(SDL_Scancode dik);
     virtual bool IR_UIOnMouseMove(int dx, int dy);
-    virtual bool IR_UIOnMouseWheel(int direction);
+    virtual bool IR_UIOnMouseWheel(int x, int y);
     virtual bool IR_UIOnKeyboardHold(SDL_Scancode dik);
 };
diff --git a/src/xrGame/ui/UIGameTutorial.cpp b/src/xrGame/ui/UIGameTutorial.cpp
@@ -387,10 +387,10 @@ void CUISequencer::IR_OnKeyboardHold(int dik)
         m_pStoredInputReceiver->IR_OnKeyboardHold(dik);
 }
 
-void CUISequencer::IR_OnMouseWheel(int direction)
+void CUISequencer::IR_OnMouseWheel(int x, int y)
 {
     if (!GrabInput() && m_pStoredInputReceiver)
-        m_pStoredInputReceiver->IR_OnMouseWheel(direction);
+        m_pStoredInputReceiver->IR_OnMouseWheel(x, y);
 }
 
 void CUISequencer::IR_OnKeyboardPress(int dik)
diff --git a/src/xrGame/ui/UIGameTutorial.h b/src/xrGame/ui/UIGameTutorial.h
@@ -47,7 +47,7 @@ class CUISequencer : public pureFrame, public pureRender, public IInputReceiver
     virtual void IR_OnKeyboardRelease(int dik);
     virtual void IR_OnKeyboardHold(int dik);
 
-    virtual void IR_OnMouseWheel(int direction);
+    virtual void IR_OnMouseWheel(int x, int y);
     virtual void IR_OnActivate(void);
     bool Persistent() { return !!m_flags.test(etsPersistent); }
     fastdelegate::FastDelegate0<> m_on_destroy_event;
diff --git a/src/xrGame/ui/UIMessages.h b/src/xrGame/ui/UIMessages.h
@@ -16,6 +16,8 @@ enum EUIMessages
     WINDOW_MOUSE_MOVE,
     WINDOW_MOUSE_WHEEL_UP,
     WINDOW_MOUSE_WHEEL_DOWN,
+    WINDOW_MOUSE_WHEEL_LEFT,
+    WINDOW_MOUSE_WHEEL_RIGHT,
     WINDOW_LBUTTON_DB_CLICK,
     WINDOW_KEY_PRESSED,
     WINDOW_KEY_RELEASED,
diff --git a/src/xrGame/ui/UIWindow.cpp b/src/xrGame/ui/UIWindow.cpp
@@ -305,6 +305,8 @@ bool CUIWindow::OnMouseAction(float x, float y, EUIMessages mouse_action)
     case WINDOW_MOUSE_MOVE: OnMouseMove(); break;
     case WINDOW_MOUSE_WHEEL_DOWN: OnMouseScroll(WINDOW_MOUSE_WHEEL_DOWN); break;
     case WINDOW_MOUSE_WHEEL_UP: OnMouseScroll(WINDOW_MOUSE_WHEEL_UP); break;
+    case WINDOW_MOUSE_WHEEL_LEFT: OnMouseScroll(WINDOW_MOUSE_WHEEL_LEFT); break;
+    case WINDOW_MOUSE_WHEEL_RIGHT: OnMouseScroll(WINDOW_MOUSE_WHEEL_RIGHT); break;
     case WINDOW_LBUTTON_DOWN:
         if (OnMouseDown(MOUSE_1))
             return true;

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ void CInput::MouseUpdate()`
`125`	`125`	`cbStack.back()->IR_OnMousePress(event.button.button - 1);`
`126`	`126`	`break;`
`127`	`127`	`case SDL_MOUSEWHEEL:`
	`128`	`+ mouseMoved = true;`
`128`	`129`	`timeStamp[2] = dwCurTime + event.wheel.timestamp;`
`129`	`130`	`timeStamp[3] = dwCurTime + event.wheel.timestamp;`
`130`	`131`	`offs[2] += event.wheel.y;`
`@@ -152,8 +153,8 @@ void CInput::MouseUpdate()`
`152`	`153`	`{`
`153`	`154`	`if (offs[0] \|\| offs[1])`
`154`	`155`	`cbStack.back()->IR_OnMouseMove(offs[0], offs[1]);`
`155`		`- if (offs[2])`
`156`		`- cbStack.back()->IR_OnMouseWheel(offs[2]);`
	`156`	`+ if (offs[2] \|\| offs[3])`
	`157`	`+ cbStack.back()->IR_OnMouseWheel(offs[2], offs[3]);`
`157`	`158`	`}`
`158`	`159`	`else`
`159`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -199,18 +199,18 @@ void CActor::IR_OnKeyboardPress(int cmd)`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`		`-void CActor::IR_OnMouseWheel(int direction)`
	`202`	`+void CActor::IR_OnMouseWheel(int x, int y)`
`203`	`203`	`{`
`204`	`204`	`if (hud_adj_mode)`
`205`	`205`	`{`
`206`		`- g_player_hud->tune(Ivector().set(0, 0, direction));`
	`206`	`+ g_player_hud->tune(Ivector().set(0, 0, x));`
`207`	`207`	`return;`
`208`	`208`	`}`
`209`	`209`
`210`		`- if (inventory().Action((direction > 0) ? (u16)kWPN_ZOOM_DEC : (u16)kWPN_ZOOM_INC, CMD_START))`
	`210`	`+ if (inventory().Action((x > 0) ? (u16)kWPN_ZOOM_DEC : (u16)kWPN_ZOOM_INC, CMD_START))`
`211`	`211`	`return;`
`212`	`212`
`213`		`- if (direction > 0)`
	`213`	`+ if (x > 0)`
`214`	`214`	`OnNextWeaponSlot();`
`215`	`215`	`else`
`216`	`216`	`OnPrevWeaponSlot();`
Original file line number	Diff line number	Diff line change
`@@ -371,12 +371,12 @@ void CMainMenu::IR_OnKeyboardHold(int dik)`
`371`	`371`	`CDialogHolder::IR_UIOnKeyboardHold((SDL_Scancode)dik);`
`372`	`372`	`};`
`373`	`373`
`374`		`-void CMainMenu::IR_OnMouseWheel(int direction)`
	`374`	`+void CMainMenu::IR_OnMouseWheel(int x, int y)`
`375`	`375`	`{`
`376`	`376`	`if (!IsActive())`
`377`	`377`	`return;`
`378`	`378`
`379`		`- CDialogHolder::IR_UIOnMouseWheel(direction);`
	`379`	`+ CDialogHolder::IR_UIOnMouseWheel(x, y);`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`bool CMainMenu::OnRenderPPUI_query() { return IsActive() && !m_Flags.test(flGameSaveScreenshot) && b_shniaganeed_pp; }`