Changeset 846 for trunk/src/gui/util/qsystemtrayicon_win.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/util/qsystemtrayicon_win.cpp (modified) (21 diffs)

trunk/src/gui/util/qsystemtrayicon_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -42 +42 @@
 #include "qsystemtrayicon_p.h"
 #ifndef QT_NO_SYSTEMTRAYICON
-#define _WIN32_IE 0x0600 //required for NOTIFYICONDATA_V2_SIZE
-
-//missing defines for MINGW :
-#ifndef NIN_BALLOONTIMEOUT
-#define NIN_BALLOONTIMEOUT  (WM_USER + 4)
-#endif
-#ifndef NIN_BALLOONUSERCLICK
-#define NIN_BALLOONUSERCLICK (WM_USER + 5)
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+
+#ifndef _WIN32_IE
+#define _WIN32_IE 0x600
 #endif
 
 #include <qt_windows.h>
+#include <windowsx.h>
 #include <commctrl.h>
-#include <shlwapi.h>
-#include <QBitmap>
-#include <QLibrary>
+
+#include <private/qsystemlibrary_p.h>
 #include <QApplication>
-#include <QToolTip>
-#include <QDesktopWidget>
 #include <QSettings>
 
@@ -76 +73 @@
 };
 
+#ifndef NOTIFYICON_VERSION_4
+#define NOTIFYICON_VERSION_4 4
+#endif
+
+#ifndef NIN_SELECT
+#define NIN_SELECT (WM_USER + 0)
+#endif
+
+#ifndef NIN_KEYSELECT
+#define NIN_KEYSELECT (WM_USER + 1)
+#endif
+
+#ifndef NIN_BALLOONTIMEOUT
+#define NIN_BALLOONTIMEOUT (WM_USER + 4)
+#endif
+
+#ifndef NIN_BALLOONUSERCLICK
+#define NIN_BALLOONUSERCLICK (WM_USER + 5)
+#endif
+
+#ifndef NIF_SHOWTIP
+#define NIF_SHOWTIP 0x00000080
+#endif
+
 #define Q_MSGFLT_ALLOW 1
 
@@ -89 +110 @@
     bool winEvent( MSG *m, long *result );
     bool trayMessage(DWORD msg);
-    bool iconDrawItem(LPDRAWITEMSTRUCT lpdi);
     void setIconContents(NOTIFYICONDATA &data);
     bool showMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon type, uint uSecs);
-    bool allowsMessages();
-    bool supportsMessages();
     QRect findIconGeometry(const int a_iButtonID);
     void createIcon();
@@ -102 +120 @@
     uint notifyIconSize;
     int maxTipLength;
+    int version;
     bool ignoreNextMouseRelease;
 };
 
-bool QSystemTrayIconSys::allowsMessages()
+static bool allowsMessages()
 {
 #ifndef QT_NO_SETTINGS
@@ -116 +135 @@
 }
 
-bool QSystemTrayIconSys::supportsMessages()
-{
-    return allowsMessages();
-}
-
 QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object)
     : hIcon(0), q(object), ignoreNextMouseRelease(false)
 
 {
-    notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE;
+    if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) {
+        notifyIconSize = sizeof(NOTIFYICONDATA);
+        version = NOTIFYICON_VERSION_4;
+    } else {
+        notifyIconSize = NOTIFYICONDATA_V2_SIZE;
+        version = NOTIFYICON_VERSION;
+    }
+
     maxTipLength = 128;
 
@@ -135 +156 @@
     // Allow the WM_TASKBARCREATED message through the UIPI filter on Windows Vista and higher
     static PtrChangeWindowMessageFilterEx pChangeWindowMessageFilterEx =
-        (PtrChangeWindowMessageFilterEx)QLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilterEx");
+        (PtrChangeWindowMessageFilterEx)QSystemLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilterEx");
 
     if (pChangeWindowMessageFilterEx) {
@@ -142 +163 @@
     } else {
         static PtrChangeWindowMessageFilter pChangeWindowMessageFilter =
-            (PtrChangeWindowMessageFilter)QLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilter");
+            (PtrChangeWindowMessageFilter)QSystemLibrary::resolve(QLatin1String("user32"), "ChangeWindowMessageFilter");
 
         if (pChangeWindowMessageFilter) {
@@ -159 +180 @@
 void QSystemTrayIconSys::setIconContents(NOTIFYICONDATA &tnd)
 {
-    tnd.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
+    tnd.uFlags |= NIF_MESSAGE | NIF_ICON | NIF_TIP;
     tnd.uCallbackMessage = MYWM_NOTIFYICON;
     tnd.hIcon = hIcon;
@@ -172 +193 @@
 static int iconFlag( QSystemTrayIcon::MessageIcon icon )
 {
-#if NOTIFYICON_VERSION >= 3
     switch (icon) {
         case QSystemTrayIcon::Information:
@@ -186 +206 @@
             return NIIF_NONE;
     }
-#else
-    Q_UNUSED(icon);
-    return 0;
-#endif
 }
 
 bool QSystemTrayIconSys::showMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon type, uint uSecs)
 {
-#if NOTIFYICON_VERSION >= 3
     NOTIFYICONDATA tnd;
     memset(&tnd, 0, notifyIconSize);
-    Q_ASSERT(testAttribute(Qt::WA_WState_Created));
-
-    setIconContents(tnd);
+
     memcpy(tnd.szInfo, message.utf16(), qMin(message.length() + 1, 256) * sizeof(wchar_t));
     memcpy(tnd.szInfoTitle, title.utf16(), qMin(title.length() + 1, 64) * sizeof(wchar_t));
@@ -208 +221 @@
     tnd.hWnd = winId();
     tnd.uTimeout = uSecs;
-    tnd.uFlags = NIF_INFO;
+    tnd.uFlags = NIF_INFO | NIF_SHOWTIP;
+
+    Q_ASSERT(testAttribute(Qt::WA_WState_Created));
 
     return Shell_NotifyIcon(NIM_MODIFY, &tnd);
-#else
-    Q_UNUSED(title);
-    Q_UNUSED(message);
-    Q_UNUSED(type);
-    Q_UNUSED(uSecs);
-    return false;
-#endif
 }
 
@@ -224 +232 @@
     NOTIFYICONDATA tnd;
     memset(&tnd, 0, notifyIconSize);
+
     tnd.uID = q_uNOTIFYICONID;
     tnd.cbSize = notifyIconSize;
     tnd.hWnd = winId();
+    tnd.uFlags = NIF_SHOWTIP;
+    tnd.uVersion = version;
 
     Q_ASSERT(testAttribute(Qt::WA_WState_Created));
 
-    if (msg != NIM_DELETE) {
+    if (msg == NIM_ADD || msg == NIM_MODIFY) {
         setIconContents(tnd);
     }
 
-    return Shell_NotifyIcon(msg, &tnd);
-}
-
-bool QSystemTrayIconSys::iconDrawItem(LPDRAWITEMSTRUCT lpdi)
-{
-    if (!hIcon)
-        return false;
-
-    DrawIconEx(lpdi->hDC, lpdi->rcItem.left, lpdi->rcItem.top, hIcon, 0, 0, 0, 0, DI_NORMAL);
-    return true;
+    bool success = Shell_NotifyIcon(msg, &tnd);
+
+    if (msg == NIM_ADD)
+        return success && Shell_NotifyIcon(NIM_SETVERSION, &tnd);
+    else
+        return success;
 }
 
@@ -266 +273 @@
 {
     switch(m->message) {
-    case WM_CREATE:
-#ifdef GWLP_USERDATA
-        SetWindowLongPtr(winId(), GWLP_USERDATA, (LONG_PTR)((CREATESTRUCTW*)m->lParam)->lpCreateParams);
-#else
-        SetWindowLong(winId(), GWL_USERDATA, (LONG)((CREATESTRUCTW*)m->lParam)->lpCreateParams);
-#endif
-        break;
-
-    case WM_DRAWITEM:
-        return iconDrawItem((LPDRAWITEMSTRUCT)m->lParam);
-
     case MYWM_NOTIFYICON:
         {
-            RECT r;
-            GetWindowRect(winId(), &r);
-            QEvent *e = 0;
-            Qt::KeyboardModifiers keys = QApplication::keyboardModifiers();
-            QPoint gpos = QCursor::pos();
-
-            switch (m->lParam) {
-            case WM_LBUTTONUP:
+            int message = 0;
+            QPoint gpos;
+
+            if (version == NOTIFYICON_VERSION_4) {
+                Q_ASSERT(q_uNOTIFYICONID == HIWORD(m->lParam));
+                message = LOWORD(m->lParam);
+                gpos = QPoint(GET_X_LPARAM(m->wParam), GET_Y_LPARAM(m->wParam));
+            } else {
+                Q_ASSERT(q_uNOTIFYICONID == m->wParam);
+                message = m->lParam;
+                gpos = QCursor::pos();
+            }
+
+            switch (message) {
+            case NIN_SELECT:
+            case NIN_KEYSELECT:
                 if (ignoreNextMouseRelease)
                     ignoreNextMouseRelease = false;
@@ -299 +303 @@
                 break;
 
-            case WM_RBUTTONUP:
+            case WM_CONTEXTMENU:
                 if (q->contextMenu()) {
                     q->contextMenu()->popup(gpos);
-                    q->contextMenu()->activateWindow();
-                    //Must be activated for proper keyboardfocus and menu closing on windows:
                 }
                 emit q->activated(QSystemTrayIcon::Context);
@@ -315 +317 @@
                 emit q->activated(QSystemTrayIcon::MiddleClick);
                 break;
+
             default:
-                        break;
-            }
-            if (e) {
-                bool res = QApplication::sendEvent(q, e);
-                delete e;
-                return res;
+                break;
             }
             break;
@@ -353 +351 @@
 {
     static PtrShell_NotifyIconGetRect Shell_NotifyIconGetRect =
-        (PtrShell_NotifyIconGetRect)QLibrary::resolve(QLatin1String("shell32"), "Shell_NotifyIconGetRect");
+        (PtrShell_NotifyIconGetRect)QSystemLibrary::resolve(QLatin1String("shell32"), "Shell_NotifyIconGetRect");
 
     if (Shell_NotifyIconGetRect) {
@@ -445 +443 @@
 void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon type, int timeOut)
 {
-    if (!sys || !sys->allowsMessages())
+    if (!sys || !allowsMessages())
         return;
 
@@ -463 +461 @@
     QString titleString = title.left(63) + QChar();
 
-    if (sys->supportsMessages()) {
-        sys->showMessage(titleString, messageString, type, (unsigned int)uSecs);
-    } else {
-        //use fallback
-        QRect iconPos = sys->findIconGeometry(q_uNOTIFYICONID);
-        if (iconPos.isValid()) {
-            QBalloonTip::showBalloon(type, title, message, sys->q, iconPos.center(), uSecs, true);
-        }
-    }
+    sys->showMessage(titleString, messageString, type, uSecs);
 }
 
@@ -478 +468 @@
     if (!sys)
         return QRect();
+
     return sys->findIconGeometry(q_uNOTIFYICONID);
 }
@@ -523 +514 @@
 }
 
+bool QSystemTrayIconPrivate::supportsMessages_sys()
+{
+    return allowsMessages();
+}
+
 QT_END_NAMESPACE