Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/mpc-hc/MouseTouch.cpp')
-rw-r--r--src/mpc-hc/MouseTouch.cpp24
1 files changed, 11 insertions, 13 deletions
diff --git a/src/mpc-hc/MouseTouch.cpp b/src/mpc-hc/MouseTouch.cpp
index 0162ec5dd..1bb216088 100644
--- a/src/mpc-hc/MouseTouch.cpp
+++ b/src/mpc-hc/MouseTouch.cpp
@@ -22,6 +22,7 @@
#include "MouseTouch.h"
#include "MainFrm.h"
#include "FullscreenWnd.h"
+#include <mvrInterfaces.h>
#define CURSOR_HIDE_TIMEOUT 2000
@@ -229,27 +230,25 @@ void CMouse::EventCallback(MpcEvent ev)
// madVR compatibility layer for exclusive mode seekbar
bool CMouse::UsingMVR() const
{
- return !!m_pMainFrame->m_pMVRS;
+ return !!m_pMainFrame->m_pMVRSR;
}
void CMouse::MVRMove(UINT nFlags, const CPoint& point)
{
if (UsingMVR()) {
- CPoint mappedPoint(point);
- MapWindowPoints(GetWnd(), m_pMainFrame->m_hWnd, &mappedPoint, 1);
WPARAM wp = nFlags;
- LPARAM lp = MAKELPARAM(mappedPoint.x, mappedPoint.y);
- m_pMainFrame->SendMessage(WM_MOUSEMOVE, wp, lp);
+ LPARAM lp = MAKELPARAM(point.x, point.y);
+ LRESULT lr = 0;
+ m_pMainFrame->m_pMVRSR->ParentWindowProc(GetWnd(), WM_MOUSEMOVE, &wp, &lp, &lr);
}
}
bool CMouse::MVRDown(UINT nFlags, const CPoint& point)
{
bool ret = false;
if (UsingMVR()) {
- CPoint mappedPoint(point);
- MapWindowPoints(GetWnd(), m_pMainFrame->m_hWnd, &mappedPoint, 1);
WPARAM wp = nFlags;
- LPARAM lp = MAKELPARAM(mappedPoint.x, mappedPoint.y);
- ret = (m_pMainFrame->SendMessage(WM_LBUTTONDOWN, wp, lp) != 42);
+ LPARAM lp = MAKELPARAM(point.x, point.y);
+ LRESULT lr = 0;
+ ret = !!m_pMainFrame->m_pMVRSR->ParentWindowProc(GetWnd(), WM_LBUTTONDOWN, &wp, &lp, &lr);
}
return ret;
}
@@ -257,11 +256,10 @@ bool CMouse::MVRUp(UINT nFlags, const CPoint& point)
{
bool ret = false;
if (UsingMVR()) {
- CPoint mappedPoint(point);
- MapWindowPoints(GetWnd(), m_pMainFrame->m_hWnd, &mappedPoint, 1);
WPARAM wp = nFlags;
- LPARAM lp = MAKELPARAM(mappedPoint.x, mappedPoint.y);
- ret = (m_pMainFrame->SendMessage(WM_LBUTTONUP, wp, lp) != 42);
+ LPARAM lp = MAKELPARAM(point.x, point.y);
+ LRESULT lr = 0;
+ ret = !!m_pMainFrame->m_pMVRSR->ParentWindowProc(GetWnd(), WM_LBUTTONUP, &wp, &lp, &lr);
}
return ret;
}