QPA: fix systemMoveResize, cleanup mouse code

Author: threedeyes

platforms/qhaikuplatform/haiku/qhaikuview.cpp

@@ -75,19 +75,6 @@ QHaikuSurfaceView::QHaikuSurfaceView(BRect rect)
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
 	lastMouseMoveTime = system_time();
-	mousePreventTime = system_time();
-}
-
-QHaikuSurfaceView::~QHaikuSurfaceView()
-{	
-}
-
-void
-QHaikuSurfaceView::PreventMouse(void)
-{
-	if (Window()->Look() == B_NO_BORDER_WINDOW_LOOK)
-		return;
-	mousePreventTime = system_time();
 }
 
 void
@@ -164,15 +151,12 @@ QHaikuSurfaceView::MouseDown(BPoint point)
 	if (isSizeGripperContains(point))
 		return;
 
-	if (system_time() - mousePreventTime < Q_HAIKU_MOUSE_PREVENT_TIME)
-		return;
-
 	uint32 buttons = Window()->CurrentMessage()->FindInt32("buttons");
 
 	QHaikuWindow *wnd = ((QtHaikuWindow*)Window())->fQWindow;
 
-	SetMouseEventMask(B_POINTER_EVENTS, B_NO_POINTER_HISTORY);
-	
+	SetMouseEventMask(B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS | B_NO_POINTER_HISTORY);
+
 	if (wnd->window()->flags() & Qt::FramelessWindowHint) {
 		Window()->Activate();
 	}
@@ -182,8 +166,6 @@ QHaikuSurfaceView::MouseDown(BPoint point)
 
 	Q_EMIT mouseEvent(localPoint, globalPoint, lastMouseState, lastMouseButton, QEvent::MouseButtonPress,
 		hostToQtModifiers(modifiers()), Qt::MouseEventNotSynthesized);
-
-	BView::MouseDown(point);
 }
 
 void 
@@ -196,9 +178,6 @@ QHaikuSurfaceView::MouseUp(BPoint point)
 	if (isSizeGripperContains(point))
 		return;
 
-	if (system_time() - mousePreventTime < Q_HAIKU_MOUSE_PREVENT_TIME)
-		return;
-
 	BPoint pointer;
 	uint32 buttons;
 	GetMouse(&pointer, &buttons);
@@ -207,18 +186,13 @@ QHaikuSurfaceView::MouseUp(BPoint point)
 
 	Q_EMIT mouseEvent(localPoint, globalPoint, state, lastMouseButton, QEvent::MouseButtonRelease,
 		hostToQtModifiers(modifiers()), Qt::MouseEventNotSynthesized);
-
-	BView::MouseUp(point);
 }
 
 void 
 QHaikuSurfaceView::MouseMoved(BPoint point, uint32 transit, const BMessage *msg)
 {
 	bool isTabletEvent = Window()->CurrentMessage()->HasFloat("be:tablet_x");
 
-	if (system_time() - mousePreventTime < Q_HAIKU_MOUSE_PREVENT_TIME)
-		return;
-
 	switch (transit) {
 		case B_INSIDE_VIEW:
 			break;
@@ -295,5 +269,4 @@ QHaikuSurfaceView::MouseMoved(BPoint point, uint32 transit, const BMessage *msg)
 
 		lastMouseMoveTime = timeNow;
 	}
-	BView::MouseMoved(point, transit, msg);
 }

platforms/qhaikuplatform/haiku/qhaikuview.h

@@ -54,22 +54,19 @@
 #include <Rect.h>
 
 #define Q_HAIKU_MOUSE_EVENTS_TIME 10000
-#define Q_HAIKU_MOUSE_PREVENT_TIME 300000
 
 class QHaikuSurfaceView : public QObject, public BView
 {
 		Q_OBJECT
  public:
 		QHaikuSurfaceView(BRect rect);
-		~QHaikuSurfaceView();
+		~QHaikuSurfaceView() {};
 
 		virtual void Draw(BRect rect);
 		virtual void MouseDown(BPoint p);
 		virtual void MouseUp(BPoint p);
 		virtual void MouseMoved(BPoint point, uint32 transit, const BMessage *msg);
 
-		void PreventMouse(void);
-
 		Qt::MouseButton hostToQtButton(uint32 buttons) const;
 		Qt::MouseButtons hostToQtButtons(uint32 buttons) const;
 		Qt::KeyboardModifiers hostToQtModifiers(uint32 keyState) const;
@@ -82,7 +79,6 @@ class QHaikuSurfaceView : public QObject, public BView
 		Qt::MouseButtons lastMouseState;
 		Qt::MouseButton lastMouseButton;
 		bigtime_t lastMouseMoveTime;
-		bigtime_t mousePreventTime;
  Q_SIGNALS:
 		void mouseEvent(const QPoint &localPosition,
 			const QPoint &globalPosition,

platforms/qhaikuplatform/haiku/qhaikuwindow.cpp

@@ -257,7 +257,6 @@ void QtHaikuWindow::Zoom(BPoint origin, float w, float h)
 	Q_UNUSED(origin);
 	Q_UNUSED(w);
 	Q_UNUSED(h);
-	fView->PreventMouse();
 	Q_EMIT windowZoomed();
 }
 
@@ -269,14 +268,12 @@ void QtHaikuWindow::Minimize(bool minimized)
 
 void QtHaikuWindow::FrameResized(float width, float height)
 {
-	fView->PreventMouse();
 	Q_EMIT windowResized(QSize(static_cast<int>(width), static_cast<int>(height)));
 }
 
 
 void QtHaikuWindow::FrameMoved(BPoint point)
 {
-	fView->PreventMouse();
 	Q_EMIT windowMoved(QPoint(point.x, point.y));
 }
 
@@ -1019,12 +1016,25 @@ void QHaikuWindow::platformMouseEvent(const QPoint &localPosition,
 			globalPosition, state, button, type, modifiers, source);
 			QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0,0), window()->size()));
 	} else {
-		if (type == QEvent::MouseButtonRelease && m_systemMoveResizeEnabled) {
-			m_systemMoveResizeEnabled = false;
+		QWindowSystemInterface::handleMouseEvent(window(),
+			localPosition, globalPosition, state, button, type, modifiers, source);
+		if (window()->cursor().shape() == Qt::BitmapCursor || window()->cursor().shape() == Qt::CustomCursor) {
+			QPoint hotSpot = window()->cursor().hotSpot();
+			QPoint pos = window()->mapFromGlobal(m_lastMousePos);
+			QRect rect = window()->cursor().bitmap()->rect().translated(pos.x() - hotSpot.x(), pos.y() - hotSpot.y());
+			QWindowSystemInterface::handleExposeEvent(window(), QRegion(rect.adjusted(-1, -1, 1, 1)));
+
+			pos = window()->mapFromGlobal(window()->cursor().pos());
+			rect = window()->cursor().bitmap()->rect().translated(pos.x() - hotSpot.x(), pos.y() - hotSpot.y());
+			QWindowSystemInterface::handleExposeEvent(window(), QRegion(rect.adjusted(-1, -1, 1, 1)));
 		}
+		if (type == QEvent::MouseButtonRelease && m_systemMoveResizeEnabled)
+			m_systemMoveResizeEnabled = false;
+
 		if (type == QEvent::MouseMove && m_systemMoveResizeEnabled) {
 			if (m_systemResizeEdges == 0) {
 				window()->setFramePosition(m_systemMoveWindowGeometry.topLeft() + (globalPosition - m_lastMousePos));
+				QWindowSystemInterface::handleGeometryChange(window(), m_systemMoveWindowGeometry);
 				return;
 			}
 			QRect newGeometry = m_systemMoveWindowGeometry;
@@ -1040,18 +1050,6 @@ void QHaikuWindow::platformMouseEvent(const QPoint &localPosition,
 			QWindowSystemInterface::handleGeometryChange(window(), newGeometry);
 			return;
 		}
-		QWindowSystemInterface::handleMouseEvent(window(),
-			localPosition, globalPosition, state, button, type, modifiers, source);
-		if (window()->cursor().shape() == Qt::BitmapCursor || window()->cursor().shape() == Qt::CustomCursor) {
-			QPoint hotSpot = window()->cursor().hotSpot();
-			QPoint pos = window()->mapFromGlobal(m_lastMousePos);
-			QRect rect = window()->cursor().bitmap()->rect().translated(pos.x() - hotSpot.x(), pos.y() - hotSpot.y());
-			QWindowSystemInterface::handleExposeEvent(window(), QRegion(rect.adjusted(-1, -1, 1, 1)));
-
-			pos = window()->mapFromGlobal(window()->cursor().pos());
-			rect = window()->cursor().bitmap()->rect().translated(pos.x() - hotSpot.x(), pos.y() - hotSpot.y());
-			QWindowSystemInterface::handleExposeEvent(window(), QRegion(rect.adjusted(-1, -1, 1, 1)));
-		}
 	}
 	m_lastMousePos = globalPosition;
 }