Changeset 111 for trunk/src

Timestamp:

Aug 13, 2009, 9:16:52 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: More QCursor bits.

Location:

trunk/src/gui/kernel

Files:

• qcursor_p.h (modified) (1 diff)
• qcursor_pm.cpp (modified) (8 diffs)

trunk/src/gui/kernel/qcursor_p.h

@@ -94 +94 @@
     HCURSOR hcurs;
 #elif defined (Q_WS_PM)
-    HPOINTER hcurs;
+    HPOINTER hptr;
+    bool isSysPtr;
 #elif defined (Q_WS_X11)
     XColor fg, bg;

trunk/src/gui/kernel/qcursor_pm.cpp

@@ -49 +49 @@
 
 #include <qimage.h>
+#include <qapplication.h>
+#include <qdesktopwidget.h>
 #include <qt_os2.h>
 
@@ -60 +62 @@
 
 QCursorData::QCursorData(Qt::CursorShape s)
-  : cshape(s), bm(0), bmm(0), hx(0), hy(0), hcurs(NULLHANDLE)
+  : cshape(s), bm(0), bmm(0), hx(0), hy(0), hptr(NULLHANDLE), isSysPtr(false)
 {
     ref = 1;
@@ -69 +71 @@
     delete bm;
     delete bmm;
-    // @todo
-//  if (hcurs)
-//      delete it...
+    if (hptr && !isSysPtr)
+        WinDestroyPointer(hptr);
 }
 
@@ -77 +78 @@
 QCursorData *QCursorData::setBitmap(const QBitmap &bitmap, const QBitmap &mask, int hotX, int hotY)
 {
-    // @todo implement
-    return 0;
+    if (!QCursorData::initialized)
+        QCursorData::initialize();
+    if (bitmap.depth() != 1 || mask.depth() != 1 || bitmap.size() != mask.size()) {
+        qWarning("QCursor: Cannot create bitmap cursor; invalid bitmap(s)");
+        QCursorData *c = qt_cursorTable[0];
+        c->ref.ref();
+        return c;
+    }
+    QCursorData *d = new QCursorData;
+    d->bm  = new QBitmap(bitmap);
+    d->bmm = new QBitmap(mask);
+    d->hptr = NULLHANDLE;
+    d->cshape = Qt::BitmapCursor;
+    d->hx = hotX >= 0 ? hotX : bitmap.width()/2;
+    d->hy = hotY >= 0 ? hotY : bitmap.height()/2;
+    return d;
 }
 
@@ -85 +100 @@
     if (!QCursorData::initialized)
         QCursorData::initialize();
-    if (!d->hcurs)
+    if (d->hptr == NULLHANDLE)
         d->update();
-    return d->hcurs;
+    return d->hptr;
 }
 
@@ -93 +108 @@
 {
     d = new QCursorData(Qt::CustomCursor);
-    d->hcurs = handle;
+    d->hptr = handle;
 }
 
@@ -100 +115 @@
 QPoint QCursor::pos()
 {
-    // @todo implement
-    return QPoint();
+    POINTL p;
+    WinQueryPointerPos(HWND_DESKTOP, &p);
+    // flip y coordinate
+    p.y = QApplication::desktop()->height() - (p.y + 1);
+    return QPoint(p.x, p.y);
 }
 
 void QCursor::setPos(int x, int y)
 {
-    // @todo implement
+    // flip y coordinate
+    y = QApplication::desktop()->height() - (y + 1);
+    WinSetPointerPos(HWND_DESKTOP, x, y);
 }
 
@@ -115 +135 @@
     if (!QCursorData::initialized)
         QCursorData::initialize();
-    // @todo implement
+    // @todo we depend on QPixmap vs HBITMAP integration here
 }
 
+#endif // QT_NO_CURSOR
+
 QT_END_NAMESPACE
-#endif // QT_NO_CURSOR