Changeset 479 for trunk/src/gui/kernel

Timestamp:

Jan 27, 2010, 8:49:14 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: QCursor: Added missing cursor shapes and implemented support for custom cursor shapes (#73).

File:

• trunk/src/gui/kernel/qcursor_pm.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qcursor_pm.cpp

@@ -48 +48 @@
 #ifndef QT_NO_CURSOR
 
-#include <qimage.h>
+#include <qicon.h>
 #include <qapplication.h>
 #include <qdesktopwidget.h>
@@ -131 +131 @@
 #ifndef QT_NO_CURSOR
 
+enum { cursor_uparrow_x = 11, cursor_uparrow_y = 1 };
+static char const * const cursor_uparrow_xpm[] = {
+"24 24 3 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF",
+"                        ",
+"           ++           ",
+"          +..+          ",
+"         +....+         ",
+"        +......+        ",
+"       +........+       ",
+"        +++..+++        ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"          +..+          ",
+"           ++           ",
+"                        ",
+"                        "};
+
+enum { cursor_cross_x = 11, cursor_cross_y = 11 };
+static char const * const cursor_cross_xpm[] = {
+"24 24 3 1",
+"       c None",
+".      c #FFFFFF",
+"+      c #000000",
+"                        ",
+"           ..           ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"  ........   ........   ",
+" .++++++++   ++++++++.  ",
+" .++++++++   ++++++++.  ",
+"  ........   ........   ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"          .++.          ",
+"           ..           ",
+"                        "};
+
+enum { cursor_vsplit_x = 11, cursor_vsplit_y = 11 };
+static char const * const cursor_vsplit_xpm[] = {
+"24 24 3 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF",
+"                        ",
+"           ++           ",
+"          +..+          ",
+"         +....+         ",
+"        +......+        ",
+"       +........+       ",
+"        +++..+++        ",
+"          +..+          ",
+"  +++++++++..+++++++++  ",
+" +....................+ ",
+" +....................+ ",
+"  ++++++++++++++++++++  ",
+"  ++++++++++++++++++++  ",
+" +....................+ ",
+" +....................+ ",
+"  +++++++++..+++++++++  ",
+"          +..+          ",
+"        +++..+++        ",
+"       +........+       ",
+"        +......+        ",
+"         +....+         ",
+"          +..+          ",
+"           ++           ",
+"                        "};
+
+enum { cursor_hsplit_x = 11, cursor_hsplit_y = 11 };
+static char const * const cursor_hsplit_xpm[] = {
+"24 24 3 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF",
+"                        ",
+"         ++++++         ",
+"        +..++..+        ",
+"        +..++..+        ",
+"        +..++..+        ",
+"        +..++..+        ",
+"        +..++..+        ",
+"     +  +..++..+  +     ",
+"    +.+ +..++..+ +.+    ",
+"   +..+ +..++..+ +..+   ",
+"  +...+++..++..+++...+  ",
+" +.........++.........+ ",
+" +.........++.........+ ",
+"  +...+++..++..+++...+  ",
+"   +..+ +..++..+ +..+   ",
+"    +.+ +..++..+ +.+    ",
+"     +  +..++..+  +     ",
+"        +..++..+        ",
+"        +..++..+        ",
+"        +..++..+        ",
+"        +..++..+        ",
+"        +..++..+        ",
+"         ++++++         ",
+"                        "};
+
+enum { cursor_blank_x = 0, cursor_blank_y = 0 };
+static char const * const cursor_blank_xpm[] = {
+"1 1 1 1",
+"       c None",
+" "};
+
+enum { cursor_hand_x = 9, cursor_hand_y = 0 };
+static char const * const cursor_hand_xpm[] = {
+"24 24 3 1",
+"       c None",
+".      c #FFFFFF",
+"+      c #000000",
+"         ++             ",
+"        +..+            ",
+"        +..+            ",
+"        +..+            ",
+"        +..+            ",
+"        +..+            ",
+"        +..+++          ",
+"        +..+..+++       ",
+"        +..+..+..++     ",
+"     ++ +..+..+..+.+    ",
+"    +..++..+..+..+.+    ",
+"    +...+..........+    ",
+"     +.............+    ",
+"      +............+    ",
+"      +............+    ",
+"       +..........+     ",
+"       +..........+     ",
+"        +........+      ",
+"        +........+      ",
+"        ++++++++++      ",
+"        ++++++++++      ",
+"        ++++++++++      ",
+"                        ",
+"                        "};
+
+enum { cursor_whatsthis_x = 9, cursor_whatsthis_y = 0 };
+static char const * const cursor_whatsthis_xpm[] = {
+"24 24 3 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF",
+".                       ",
+"..          ++++++      ",
+".+.        +......+     ",
+".++.      +........+    ",
+".+++.    +....++....+   ",
+".++++.   +...+  +...+   ",
+".+++++.  +...+  +...+   ",
+".++++++.  +.+  +....+   ",
+".+++++++.  +  +....+    ",
+".++++++++.   +....+     ",
+".+++++.....  +...+      ",
+".++.++.      +...+      ",
+".+. .++.     +...+      ",
+"..  .++.      +++       ",
+".    .++.    +...+      ",
+"     .++.    +...+      ",
+"      .++.   +...+      ",
+"      .++.    +++       ",
+"       ..               ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
+
+enum { cursor_openhand_x = 7, cursor_openhand_y = 7 };
+static char const * const cursor_openhand_xpm[] = {
+"16 16 3 1",
+"       g None",
+".      g #000000",
+"+      g #FFFFFF",
+"       ..       ",
+"   .. .++...    ",
+"  .++..++.++.   ",
+"  .++..++.++. . ",
+"   .++.++.++..+.",
+"   .++.++.++.++.",
+" ..+.+++++++.++.",
+".++..++++++++++.",
+".+++.+++++++++. ",
+" .++++++++++++. ",
+"  .+++++++++++. ",
+"  .++++++++++.  ",
+"   .+++++++++.  ",
+"    .+++++++.   ",
+"     .++++++.   ",
+"                "};
+
+enum { cursor_closedhand_x = 7, cursor_closedhand_y = 7 };
+static char const * const cursor_closedhand_xpm[] = {
+"16 16 3 1",
+"       g None",
+".      g #000000",
+"+      g #FFFFFF",
+"                ",
+"                ",
+"                ",
+"    .. .. ..    ",
+"   .++.++.++..  ",
+"   .++++++++.+. ",
+"    .+++++++++. ",
+"   ..+++++++++. ",
+"  .+++++++++++. ",
+"  .++++++++++.  ",
+"   .+++++++++.  ",
+"    .+++++++.   ",
+"     .++++++.   ",
+"     .++++++.   ",
+"                ",
+"                "};
+
 void QCursorData::update()
 {
     if (!QCursorData::initialized)
         QCursorData::initialize();
-    // @todo we depend on QPixmap vs HBITMAP integration here
+
+    if (cshape == Qt::BitmapCursor) {
+        QPixmap pm = pixmap;
+        if (pm.isNull()) {
+            Q_ASSERT(bm && bmm);
+            pm = *bm;
+            pm.setMask(*bmm);
+        }
+        hptr = QPixmap::toPmHPOINTER(QIcon(pm), true, hx, hy);
+        Q_ASSERT(hptr);
+        isSysPtr = false;
+        return;
+    }
 
     LONG id = 0;
-    const uchar *bits = 0;
-    const uchar *mask = 0;
-    bool isbitmap = false;
+    char const * const * xpm = 0;
+    int xpm_hx = 0;
+    int xpm_hy = 0;
 
     switch (cshape) { // map to OS/2 cursor
     case Qt::ArrowCursor:
-    case Qt::UpArrowCursor: // @todo what's this?
-    case Qt::CrossCursor: // @todo what's this?
         id = SPTR_ARROW;
+        break;
+    case Qt::UpArrowCursor:
+        xpm = cursor_uparrow_xpm;
+        xpm_hx = cursor_uparrow_x;
+        xpm_hy = cursor_uparrow_y;
+        break;
+    case Qt::CrossCursor:
+        xpm = cursor_cross_xpm;
+        xpm_hx = cursor_cross_x;
+        xpm_hy = cursor_cross_y;
             break;
     case Qt::WaitCursor:
@@ -169 +427 @@
         id = SPTR_MOVE;
         break;
+    case Qt::BlankCursor:
+        xpm = cursor_blank_xpm;
+        xpm_hx = cursor_blank_x;
+        xpm_hy = cursor_blank_y;
+        break;
+    case Qt::SplitVCursor:
+        xpm = cursor_vsplit_xpm;
+        xpm_hx = cursor_vsplit_x;
+        xpm_hy = cursor_vsplit_y;
+        break;
+    case Qt::SplitHCursor:
+        xpm = cursor_hsplit_xpm;
+        xpm_hx = cursor_hsplit_x;
+        xpm_hy = cursor_hsplit_y;
+        break;
+    case Qt::PointingHandCursor:
+        xpm = cursor_hand_xpm;
+        xpm_hx = cursor_hand_x;
+        xpm_hy = cursor_hand_y;
+        break;
     case Qt::ForbiddenCursor:
         id = SPTR_ILLEGAL;
         break;
+    case Qt::WhatsThisCursor:
+        xpm = cursor_whatsthis_xpm;
+        xpm_hx = cursor_whatsthis_x;
+        xpm_hy = cursor_whatsthis_y;
+        break;
+    case Qt::BusyCursor:
+        id = SPTR_WAIT;
+        break;
+    case Qt::OpenHandCursor:
+        xpm = cursor_openhand_xpm;
+        xpm_hx = cursor_openhand_x;
+        xpm_hy = cursor_openhand_y;
+        break;
+    case Qt::ClosedHandCursor:
+        xpm = cursor_closedhand_xpm;
+        xpm_hx = cursor_closedhand_x;
+        xpm_hy = cursor_closedhand_y;
+        break;
     default:
-        // @temporary
+        qWarning("QCursor::update: Invalid cursor shape %d", cshape);
+        return;
+    }
+
+    if (!id) {
+#ifndef QT_NO_IMAGEFORMAT_XPM
+        QPixmap pm(xpm);
+        hptr = QPixmap::toPmHPOINTER(QIcon(pm), true, xpm_hx, xpm_hy);
+        Q_ASSERT(hptr);
+        isSysPtr = false;
+        return;
+#else
         id = SPTR_ARROW;
-        break;
-        // @todo later here will be this:
-//      qWarning("QCursor::update: Invalid cursor shape %d", cshape);
-//      return;
+#endif
     }
 
-
-    if ((bits && mask) || isbitmap) {
-        // @todo later
-        hptr = 0;
-        isSysPtr = false;
-    } else {
-        hptr = WinQuerySysPointer(HWND_DESKTOP, id, FALSE);
-        isSysPtr = true;
-    }
+    Q_ASSERT(id);
+
+    hptr = WinQuerySysPointer(HWND_DESKTOP, id, FALSE);
+    Q_ASSERT(hptr);
+    isSysPtr = true;
 }