Merge branch 'lighthouse' of scm.dev.nokia.troll.no:qt/qt-lighthouse into lighthouse

5 files changed, 34 insertions, 22 deletions

diff --git a/src/gui/kernel/qapplication_lite.cpp b/src/gui/kernel/qapplication_lite.cpp
index 061ac5bf08..f2be5c7c27 100644
--- a/src/gui/kernel/qapplication_lite.cpp
+++ b/src/gui/kernel/qapplication_lite.cpp
@@ -56,7 +56,8 @@
 #include <qdesktopwidget.h>
 
 #include <qinputcontext.h>
-
+#include "private/qgraphicssystem_p.h"
+#include "qgraphicssystemcursor.h"
 #include <qdebug.h>
 
 
@@ -354,19 +355,14 @@ void QApplication::restoreOverrideCursor()
 
 QWidget *QApplication::topLevelAt(const QPoint &pos)
 {
-//### We have to implement a windowsystem-aware way to do this
-
-    //fallback implementation assuming widgets are in stacking order
-
-    QWidgetList list = topLevelWidgets();
-    for (int i = list.size()-1; i >= 0; --i) {
-        QWidget *w = list[i];
-        //### mask is ignored
-        if (w != QApplication::desktop() && w->isVisible() && w->geometry().contains(pos))
-            return w;
-    }
-
-    return 0;
+    QGraphicsSystem *gs = QApplicationPrivate::graphicsSystem();
+    if (!gs)
+        return 0;
+    QGraphicsSystemScreen *screen = gs->screens().first();
+    if (!screen)
+        return 0;
+    QWidget *w = screen->topLevelAt(pos);
+    return w;
 }
 
 void QApplication::beep()
@@ -530,6 +526,9 @@ void QApplicationPrivate::handleMouseEvent(QWidget *tlw, const QMouseEvent &ev)
 
     static QWidget *implicit_mouse_grabber=0;
 
+    if (QGraphicsSystemCursor::instance)
+        QGraphicsSystemCursor::instance->pointerEvent(ev);
+
     QPoint localPoint = ev.pos();
     QPoint globalPoint = ev.globalPos();
     QWidget *mouseWindow = tlw;
diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp
index 2071127fcb..948223d3b3 100644
--- a/src/gui/painting/qgraphicssystem.cpp
+++ b/src/gui/painting/qgraphicssystem.cpp
@@ -85,6 +85,19 @@ QPixmapData *QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixelType typ
 }
 
 #ifdef Q_WS_LITE
+QWidget *QGraphicsSystemScreen::topLevelAt(const QPoint & pos) const
+{
+    QWidgetList list = QApplication::topLevelWidgets();
+    for (int i = list.size()-1; i >= 0; --i) {
+        QWidget *w = list[i];
+        //### mask is ignored
+        if (w != QApplication::desktop() && w->isVisible() && w->geometry().contains(pos))
+            return w;
+    }
+
+    return 0;
+}
+
 QList<QGraphicsSystemScreen *> QGraphicsSystem::screens() const
 {
     return QList<QGraphicsSystemScreen *>();
diff --git a/src/gui/painting/qgraphicssystem_p.h b/src/gui/painting/qgraphicssystem_p.h
index ddba22d149..0b0dfb58fc 100644
--- a/src/gui/painting/qgraphicssystem_p.h
+++ b/src/gui/painting/qgraphicssystem_p.h
@@ -56,6 +56,8 @@
 #include "private/qpixmapdata_p.h"
 #include "private/qwindowsurface_p.h"
 
+#include <qdebug.h>
+
 QT_BEGIN_NAMESPACE
 
 class QPixmapFilter;
@@ -73,8 +75,8 @@ public:
     virtual int depth() const = 0;
     virtual QImage::Format format() const = 0;
     virtual QSize physicalSize() const = 0;
-    virtual void setDirty(QRect) { }
-    virtual void pointerEvent(QMouseEvent &) { }
+    virtual void setDirty(const QRect &) {}
+    virtual QWidget *topLevelAt(const QPoint &point) const;
 };
 #endif // Q_WS_LITE
 
diff --git a/src/gui/painting/qgraphicssystemcursor.cpp b/src/gui/painting/qgraphicssystemcursor.cpp
index 08dcbbe505..6aef76c1c1 100644
--- a/src/gui/painting/qgraphicssystemcursor.cpp
+++ b/src/gui/painting/qgraphicssystemcursor.cpp
@@ -57,8 +57,7 @@ QGraphicsSystemCursor::QGraphicsSystemCursor(QGraphicsSystemScreen *scr )
 {
     graphic = new QGraphicsSystemCursorImage(0, 0, 0, 0, 0, 0);
     instance = this;
-    QWidget * widget = QApplication::widgetAt(QCursor::pos());
-    changeCursor(widget);
+    setCursor(Qt::ArrowCursor);
 }
 
 QGraphicsSystemCursor::~QGraphicsSystemCursor()
@@ -95,13 +94,12 @@ QRect QGraphicsSystemCursor::drawCursor(QPainter & painter)
     return prevRect;
 }
 
-void QGraphicsSystemCursor::pointerEvent(QMouseEvent & e)
+void QGraphicsSystemCursor::pointerEvent(const QMouseEvent & e)
 {
     currentRect = graphic->image()->rect().translated(-graphic->hotspot().x(),
                                                       -graphic->hotspot().y());
     currentRect.translate(e.pos());
-
-    screen->pointerEvent(e);
+    screen->setDirty(QRect(QRect(e.pos(), QSize(1, 1))));
 }
 
 void QGraphicsSystemCursor::changeCursor(QCursor * widgetCursor)
diff --git a/src/gui/painting/qgraphicssystemcursor.h b/src/gui/painting/qgraphicssystemcursor.h
index eab72037ce..de7ce84858 100644
--- a/src/gui/painting/qgraphicssystemcursor.h
+++ b/src/gui/painting/qgraphicssystemcursor.h
@@ -73,7 +73,7 @@ public:
     // input methods
     virtual void setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY);
     virtual void setCursor(Qt::CursorShape shape);
-    virtual void pointerEvent(QMouseEvent & event);
+    virtual void pointerEvent(const QMouseEvent & event);
     virtual void changeCursor(QWidget * widget);
     virtual void changeCursor(QCursor * widgetCursor);