Changeset 276 for trunk/src

Timestamp:

Nov 2, 2009, 2:56:14 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Implemented the client-side notification message interception and delivery to the target window (experimental, needs some tuning, see @todo).

File:

• trunk/src/3rdparty/os2/xsystray/xsystray_api.c (modified) (5 diffs)

trunk/src/3rdparty/os2/xsystray/xsystray_api.c

@@ -20 +20 @@
 #define INCL_WINATOM
 #define INCL_WINPOINTERS
+#define INCL_WINHOOKS
 #include <os2.h>
 
@@ -27 +28 @@
 #include <string.h>
 #include <sys/builtin.h>        // atomics
+
+static ULONG WM_XST_CREATED = 0;
+             // identity of the WM_XST_CREATED message taken from the atom table
+static ULONG WM_XST_NOTIFY = 0;
+             // identity of the WM_XST_NOTIFY message taken from the atom table
 
 static
@@ -170 +176 @@
 
 /*
+ *@@ InputHook:
+ *      This is used to intercept posted XST_NOTIFY messages and apply special
+ *      processing to them (compose a client window-specific notification
+ *      message, free the NOTIFYDATA structure and post the composed message to
+ *      the target window).
+ */
+
+static BOOL EXPENTRY InputHook(HAB hab, PQMSG pQmsg, ULONG fs)
+{
+    if (pQmsg->msg == WM_XST_NOTIFY)
+    {
+        PNOTIFYDATA pNotifyData = (PNOTIFYDATA)pQmsg->mp1;
+        PVOID pvMemoryPool = (PVOID)pQmsg->mp2;
+
+        // copy NOTIFYDATA and free it
+        NOTIFYDATA NotifyData = *pNotifyData;
+        FreeNotifyDataPtr(pvMemoryPool, pQmsg->hwnd, pNotifyData);
+
+        // start with a copy of the message and change the fields we need
+        QMSG newMsg = *pQmsg;
+        newMsg.msg = NotifyData.msg;
+        newMsg.mp1 = NotifyData.mp1;
+        newMsg.mp2 = NotifyData.mp2;
+
+        // deliver the message
+        WinDispatchMsg(hab, &newMsg);
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+/*
  *@@ xstQuerySysTrayVersion:
  *
@@ -262 +302 @@
         return FALSE;
 
+    // install the message hook if not already done so
+    // @todo the code is temporary and incorrect, it's just for testing
+    // (we should use an array of HMQ to check if we already installed the filter)
+    if (WM_XST_NOTIFY == 0)
+    {
+        WM_XST_NOTIFY = WinAddAtom(WinQuerySystemAtomTable(),
+                                   WM_XST_NOTIFY_ATOM);
+
+        brc = WinSetHook(WinQueryAnchorBlock(hwnd),
+                         HMQ_CURRENT, HK_INPUT, (PFN)InputHook, NULLHANDLE);
+        if (!brc)
+            return FALSE;
+    }
+
     // give all processes temporary access to hIcon
     brc = WinSetPointerOwner(hIcon, 0, FALSE);
@@ -400 +454 @@
 ULONG xstGetSysTrayCreatedMsgId()
 {
-    static ULONG WM_XST_CREATED = 0;
     if (WM_XST_CREATED == 0)
         WM_XST_CREATED = WinAddAtom(WinQuerySystemAtomTable(),