Changeset 835 for trunk/src/gui/util/qsystemtrayicon_pm.cpp

Timestamp:

Mar 18, 2011, 2:10:26 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Extracted xsystray API from Qt and put it to a separate DLL dynamically loaded at runtime (see #99 for details).

File:

• trunk/src/gui/util/qsystemtrayicon_pm.cpp (modified) (3 diffs)

trunk/src/gui/util/qsystemtrayicon_pm.cpp

@@ -48 +48 @@
 #include "qapplication.h"
 #include "qdesktopwidget.h"
+#include "qlibrary.h"
 #include "qt_os2.h"
 
-#include "xsystray_api.h"
+// for dynamic linking to xsystray DLL
+#define xstQuerySysTrayVersion (*_xstQuerySysTrayVersion)
+#define xstAddSysTrayIcon (*_xstAddSysTrayIcon)
+#define xstReplaceSysTrayIcon (*_xstReplaceSysTrayIcon)
+#define xstRemoveSysTrayIcon (*_xstRemoveSysTrayIcon)
+#define xstSetSysTrayIconToolTip (*_xstSetSysTrayIconToolTip)
+#define xstQuerySysTrayIconRect (*_xstQuerySysTrayIconRect)
+#define xstGetSysTrayCreatedMsgId (*_xstGetSysTrayCreatedMsgId)
+#define xstGetSysTrayMaxTextLen (*_xstGetSysTrayMaxTextLen)
+
+#include "xsystray.h"
 
 QT_BEGIN_NAMESPACE
@@ -56 +67 @@
 #define WM_XST_MYNOTIFY     (WM_USER + 1000)
 
-static ULONG WM_XST_CREATED = xstGetSysTrayCreatedMsgId();
-static ULONG MaxTextLen = xstGetSysTrayMaxTextLen();
+static ULONG WM_XST_CREATED = 0;
+static ULONG MaxTextLen = 0;
 
 class QSystemTrayIconSys : QWidget
@@ -307 +318 @@
 bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
 {
+    static bool tried = false;
+    if (!tried) {
+        tried = true;
+
+        // link to the xsystray DLL at runtime
+        QLibrary xsystray(QLatin1String("xsystray"));
+
+        #define R(f) if ((*((void **)&_##f) = xsystray.resolve(#f)) == NULL) return false
+
+        R(xstQuerySysTrayVersion);
+        R(xstAddSysTrayIcon);
+        R(xstReplaceSysTrayIcon);
+        R(xstRemoveSysTrayIcon);
+        R(xstSetSysTrayIconToolTip);
+        R(xstQuerySysTrayIconRect);
+        R(xstGetSysTrayCreatedMsgId);
+        R(xstGetSysTrayMaxTextLen);
+
+        #undef R
+
+        // initialize some constants
+        WM_XST_CREATED = xstGetSysTrayCreatedMsgId();
+        MaxTextLen = xstGetSysTrayMaxTextLen();
+    }
+
     return xstQuerySysTrayVersion(0, 0, 0);
 }