Changeset 270 for trunk/src/3rdparty/os2/xsystray/xsystray.c

Timestamp:

Oct 30, 2009, 2:12:10 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Broadcast a special message to let interested parties re-add their icons when the system tray restarts (especially useful after a WPS/XCenter crash, etc).

File:

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

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

@@ -162 +162 @@
          // how often to perform alive checks
 
+
+
+
 /* ******************************************************************
  *
@@ -531 +534 @@
 MRESULT EXPENTRY fnwpXSysTray(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    MRESULT mrc = 0;
     // get widget data from QWL_USER (stored there by WM_CREATE)
     PXCENTERWIDGET pWidget = (PXCENTERWIDGET)WinQueryWindowPtr(hwnd, QWL_USER);
@@ -557 +559 @@
         case WM_CREATE:
         {
+
+
             PSYSTRAYDATA pSysTrayData = NULL;
-
-            mrc = (MPARAM)TRUE; // being pessimistic gives more compact code
 
             WinSetWindowPtr(hwnd, QWL_USER, mp1);
@@ -566 +568 @@
                )
                 // shouldn't happen... stop window creation!!
-                break;
+                ;
 
             pSysTrayData = malloc(sizeof(*pSysTrayData));
             if (pSysTrayData == NULL)
-                break;
+                ;
 
             // initialize the SYSTRAYDATA structure
@@ -582 +584 @@
             {
                 free(pSysTrayData);
-                break;
+                ;
             }
             pSysTrayData->cIcons = 0;
@@ -598 +600 @@
                 free(pSysTrayData->pIcons);
                 free(pSysTrayData);
-                break;
+                ;
             }
 
             pWidget->pUser = pSysTrayData;
 
-            mrc = FALSE; // confirm success
+            // inform all interested parties that we are fired up
+            // (NOTE: keep in sync with xstGetSysTrayCreatedMsgId())
+            WinBroadcastMsg(HWND_DESKTOP,
+                            WinAddAtom(WinQuerySystemAtomTable(),
+                                       "ExtendedSysTray.WM_XST_CREATED"),
+                            NULL, NULL,
+                            BMSG_POST);
+
+            return FALSE; // confirm success
+        }
+        break;
+
+        /*
+         * WM_DESTROY:
+         *      clean up. This _must_ be passed on to
+         *      ctrDefWidgetProc.
+         */
+
+        case WM_DESTROY:
+        {
+            LOGF(("WM_DESTROY\n"));
+
+            PSYSTRAYDATA pSysTrayData = (PSYSTRAYDATA)pWidget->pUser;
+            size_t i;
+
+            // destroy the server
+            WinDestroyWindow(pSysTrayData->hwndServer);
+            pSysTrayData->hwndServer = NULLHANDLE;
+
+            // free all system tray data
+            for (i = 0; i < pSysTrayData->cIcons; ++i)
+                FreeIconData(&pSysTrayData->pIcons[i]);
+            pSysTrayData->cIcons = 0;
+            free(pSysTrayData->pIcons);
+            pSysTrayData->pIcons = NULL;
+
+            // make sure we remove the check alive timer
+            WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
+
+            free(pSysTrayData);
+            pWidget->pUser = NULL;
+
+            // We _MUST_ pass this on, or the default widget proc
+            // cannot clean up, so break
         }
         break;
@@ -613 +658 @@
 
         case WM_CONTROL:
-            mrc = (MPARAM)WgtControl(pWidget, mp1, mp2);
+             (MPARAM)WgtControl(pWidget, mp1, mp2);
         break;
 
@@ -623 +668 @@
         case WM_PAINT:
             WgtPaint(hwnd, pWidget);
+
         break;
 
@@ -634 +680 @@
         break; */
 
-        /*
-         * WM_DESTROY:
-         *      clean up. This _must_ be passed on to
-         *      ctrDefWidgetProc.
-         */
-
-        case WM_DESTROY:
-        {
-            // free all system tray data
-            PSYSTRAYDATA pSysTrayData = (PSYSTRAYDATA)pWidget->pUser;
-            size_t i;
-            for (i = 0; i < pSysTrayData->cIcons; ++i)
-                FreeIconData(&pSysTrayData->pIcons[i]);
-            free(pSysTrayData->pIcons);
-            free(pSysTrayData);
-            pWidget->pUser = NULL;
-            // We _MUST_ pass this on, or the default widget proc
-            // cannot clean up.
-            mrc = pWidget->pfnwpDefWidgetProc(hwnd, msg, mp1, mp2);
-        }
-        break;
-
         default:
-            mrc = pWidget->pfnwpDefWidgetProc(hwnd, msg, mp1, mp2);
+            ;
 
     } // end switch(msg)
 
-    return mrc;
+    return ;
 }
 
@@ -689 +713 @@
     }
 
-    // ask XCenter to take our new size into account
-    // (this will also invalidate us)
-    WinPostMsg(pWidget->pGlobals->hwndClient,
-               XCM_REFORMAT,
-               (MPARAM)XFMF_GETWIDGETSIZES,
-               0);
+    if (pSysTrayData->pIcons != NULL)
+    {
+        // ask XCenter to take our new size into account (this will also
+        // invalidate us). If pIcons is NULL it means that we are in WM_DESTROY,
+        // in which case XCenter will do everything for us
+        WinPostMsg(pWidget->pGlobals->hwndClient,
+                   XCM_REFORMAT,
+                   (MPARAM)XFMF_GETWIDGETSIZES,
+                   0);
+    }
 }
 
@@ -927 +955 @@
 MRESULT EXPENTRY fnwpXSysTrayServer(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    MRESULT mrc = 0;
     // get widget data from QWL_USER_SERVER_DATA (stored there by WM_CREATE)
     PXCENTERWIDGET pWidget =
@@ -936 +963 @@
     {
         case WM_CREATE:
+
             WinSetWindowPtr(hwnd, QWL_USER_SERVER_DATA, mp1);
+
+
+
+
+
         break;
 
@@ -947 +980 @@
 
         case WM_XST_CONTROL:
-            mrc = (MRESULT)WgtXSysTrayControl(hwnd, pWidget,
-                                              (PSYSTRAYCTLDATA)mp1);
+             (MRESULT)WgtXSysTrayControl(hwnd, pWidget,
+                                              (PSYSTRAYCTLDATA)mp1);
         break;
 
@@ -958 +991 @@
         case WM_TIMER:
             WgtXSysTrayTimer(hwnd, pWidget, SHORT1FROMMP(mp1));
+
         break;
 
         default:
-            mrc = WinDefWindowProc(hwnd, msg, mp1, mp2);
+            ;
     } // end switch(msg)
 
-    return mrc;
+    return ;
 }
 
@@ -1123 +1157 @@
 VOID EXPENTRY WgtUnInitModule(VOID)
 {
+
 }