Changeset 269 for trunk/src

Timestamp:

Oct 30, 2009, 2:27:42 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Implemented adding and removing icons.

File:

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

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

@@ -133 +133 @@
 typedef struct
 {
+    HWND        hwndServer;
+                // systtem tray server window handle
     LONG        lIconWidth;
                 // system icon width in px
@@ -148 +150 @@
 } SYSTRAYDATA, *PSYSTRAYDATA;
 
+#define ICONARRAY_GROW  4
+        // number of element the icon array is increased by when there is no
+        // space for the newly added icon
+
 static ULONG QWL_USER_SERVER_DATA = 0;
              // offset to the PXCENTERWIDGET pointer in the widget data array
@@ -303 +309 @@
         pData->pszToolTip = NULL;
     }
+}
+
+/*
+ *@@ FindIconData:
+ *      Searches for the icon with the given identity. Returns NULL if not
+ *      found.
+ */
+
+static
+PICONDATA FindIconData(PSYSTRAYDATA pSysTrayData,
+                       HWND hwnd,       // in: associated window handle
+                       ULONG ulId,      // in: icon ID
+                       size_t *pIdx)    // out: index of the icon in the icon array
+                                        // (optional, may be NULL)
+{
+    size_t i;
+    for (i = 0; i < pSysTrayData->cIcons; ++i)
+    {
+        if (pSysTrayData->pIcons[i].hwnd == hwnd &&
+            pSysTrayData->pIcons[i].ulId == ulId)
+        {
+            if (pIdx)
+                *pIdx = i;
+            return &pSysTrayData->pIcons[i];
+        }
+    }
+
+    if (pIdx)
+        *pIdx = i;
+    return NULL;
 }
 
@@ -492 +528 @@
  */
 
+static
 MRESULT EXPENTRY fnwpXSysTray(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
@@ -539 +576 @@
             pSysTrayData->lIconHeight = WinQuerySysValue(HWND_DESKTOP, SV_CYICON) / 2;
             pSysTrayData->lIconPad = pSysTrayData->lIconHeight / 8;
-            pSysTrayData->cIconsMax = 4;
+            pSysTrayData->cIconsMax = ICONARRAY_GROW;
             pSysTrayData->pIcons = malloc(sizeof(*pSysTrayData->pIcons) *
                                           pSysTrayData->cIconsMax);
@@ -548 +585 @@
             }
             pSysTrayData->cIcons = 0;
-            pWidget->pUser = pSysTrayData;
 
             // create the "server" window (note that we pass the XCENTERWIDGET
             // pointer on to it)
-            HWND hwndServer =
+            pSysTrayData->hwndServer =
                 WinCreateWindow(HWND_DESKTOP, WNDCLASS_WIDGET_XSYSTRAY_SERVER,
                                 NULL, WS_MINIMIZED,
@@ -558 +594 @@
                                 HWND_DESKTOP, HWND_BOTTOM,
                                 0, mp1, NULL);
-            if (hwndServer == NULLHANDLE)
+            if (pSysTrayData->hwndServer == NULLHANDLE)
+            {
+                free(pSysTrayData->pIcons);
+                free(pSysTrayData);
                 break;
+            }
+
+            pWidget->pUser = pSysTrayData;
 
             mrc = FALSE; // confirm success
@@ -623 +665 @@
 
 /*
+ *@@ WgtXSysTrayUpdateAfterIconAddRemove:
+ *      Name says it all.
+ */
+
+static
+VOID WgtXSysTrayUpdateAfterIconAddRemove(PXCENTERWIDGET pWidget)
+{
+    PSYSTRAYDATA pSysTrayData = (PSYSTRAYDATA)pWidget->pUser;
+
+    if (pSysTrayData->cIcons == 1)
+    {
+        // start a timer to perform "is window alive" checks
+        WinStartTimer(pWidget->habWidget, pSysTrayData->hwndServer,
+                      TID_CHECKALIVE,
+                      TID_CHECKALIVE_TIMEOUT);
+    }
+    else
+    if (pSysTrayData->cIcons == 0)
+    {
+        // stop the check alive timer
+        WinStopTimer(pWidget->habWidget, pSysTrayData->hwndServer,
+                     TID_CHECKALIVE);
+    }
+
+    // ask XCenter to take our new size into account
+    // (this will also invalidate us)
+    WinPostMsg(pWidget->pGlobals->hwndClient,
+               XCM_REFORMAT,
+               (MPARAM)XFMF_GETWIDGETSIZES,
+               0);
+}
+
+/*
  *@@ WgtXSysTrayControl:
  *      implementation for WM_XST_CONTROL in fnwpXSysTrayServer.
@@ -659 +734 @@
             POINTERINFO Info;
             HPOINTER hIcon = NULLHANDLE;
+            size_t i;
+            PICONDATA pData;
 
             LOGF(("SYSTRAYCMD_ADDICON\n"));
-            LOGF(("hIcon %x\n", pCtlData->u.icon.hIcon));
+            LOGF((" hwnd  %x\n", pCtlData->hwndSender));
+            LOGF((" ulId  %ld\n", pCtlData->u.icon.ulId));
+            LOGF((" hIcon %x\n", pCtlData->u.icon.hIcon));
 
             pCtlData->bAcknowledged = TRUE;
@@ -677 +756 @@
             }
 
-            // @todo just testing....
-            if (pSysTrayData->pIcons[0].hIcon != NULLHANDLE)
-                WinDestroyPointer(pSysTrayData->pIcons[0].hIcon);
-            pSysTrayData->cIcons = 1;
-            pSysTrayData->pIcons[0].hwnd = pCtlData->hwndSender;
-            pSysTrayData->pIcons[0].ulId = pCtlData->u.icon.ulId;
-            pSysTrayData->pIcons[0].hIcon = hIcon;
-            pSysTrayData->pIcons[0].ulMsgId = pCtlData->u.icon.ulMsgId;
-
-            // 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->cIcons == 1)
+            pData = FindIconData(pSysTrayData, pCtlData->hwndSender,
+                                 pCtlData->u.icon.ulId, &i);
+            if (pData)
             {
-                // start a timer to perform "is window alive" checks
-                WinStartTimer(pWidget->habWidget, hwnd,
-                              TID_CHECKALIVE,
-                              TID_CHECKALIVE_TIMEOUT);
+                LOGF((" Updating hIcon %x\n", hIcon));
+
+                WinDestroyPointer(pData->hIcon);
+                pData->hIcon = hIcon;
+                pData->ulMsgId = pCtlData->u.icon.ulMsgId;
+
+                // we didn't change the number of icons so simply invalidate
+                WinInvalidateRect(pWidget->hwndWidget, NULL, FALSE);
             }
+            else
+            {
+                LOGF((" Adding new hIcon %x\n", hIcon));
+
+                if (pSysTrayData->cIcons == pSysTrayData->cIconsMax)
+                {
+                    PICONDATA pNewIcons;
+
+                    LOGF((" Allocating more memory (new icon count is %u)!\n",
+                          pSysTrayData->cIcons + 1));
+
+                    pNewIcons = realloc(pSysTrayData->pIcons,
+                                        sizeof(*pSysTrayData->pIcons) *
+                                        pSysTrayData->cIconsMax + ICONARRAY_GROW);
+                    if (pNewIcons == NULL)
+                    {
+                        WinDestroyPointer(hIcon);
+                        break;
+                    }
+
+                    pSysTrayData->pIcons = pNewIcons;
+                    pSysTrayData->cIconsMax += ICONARRAY_GROW;
+                }
+
+                i = pSysTrayData->cIcons;
+                ++pSysTrayData->cIcons;
+
+                pData = &pSysTrayData->pIcons[i];
+                pData->hwnd = pCtlData->hwndSender;
+                pData->ulId = pCtlData->u.icon.ulId;
+                pData->hIcon = hIcon;
+                pData->ulMsgId = pCtlData->u.icon.ulMsgId;
+
+                WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
+            }
 
             brc = TRUE;
         }
+        break;
+
+        case SYSTRAYCMD_REMOVEICON:
+        {
+            size_t i;
+            PICONDATA pData;
+
+            LOGF(("SYSTRAYCMD_REMOVEICON\n"));
+            LOGF((" hwnd  %x\n", pCtlData->hwndSender));
+            LOGF((" ulId  %ld\n", pCtlData->u.icon.ulId));
+
+            pCtlData->bAcknowledged = TRUE;
+
+            pData = FindIconData(pSysTrayData, pCtlData->hwndSender,
+                                 pCtlData->u.icon.ulId, &i);
+            if (pData)
+            {
+                LOGF((" Removing hIcon %x\n", pData->hIcon));
+
+                FreeIconData(pData);
+
+                --pSysTrayData->cIcons;
+                if (pSysTrayData->cIcons > 0)
+                {
+                    memcpy(&pSysTrayData->pIcons[i],
+                           &pSysTrayData->pIcons[i + 1],
+                           sizeof(*pSysTrayData->pIcons) * (pSysTrayData->cIcons - i));
+                }
+
+                WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
+
+                brc = TRUE;
+            }
+            else
+                LOGF((" Icon not found!\n"));
+        }
+        break;
 
         default:
@@ -735 +876 @@
             if (!WinIsWindow(pWidget->habWidget, pSysTrayData->pIcons[i].hwnd))
             {
+                LOGF(("Removing icon of dead window!\n"));
+                LOGF((" hwnd  %x\n", pSysTrayData->pIcons[i].hwnd));
+                LOGF((" ulId  %ld\n", pSysTrayData->pIcons[i].ulId));
+                LOGF((" hIcon %x\n", pSysTrayData->pIcons[i].hIcon));
+
                 bAnyDead = TRUE;
                 FreeIconData(&pSysTrayData->pIcons[i]);
@@ -761 +907 @@
             }
 
-            if (pSysTrayData->cIcons == 0)
-            {
-                // stop the check alive timer
-                WinStopTimer(pWidget->habWidget, hwnd,
-                              TID_CHECKALIVE);
-            }
-
-            // ask XCenter to take our new size into account
-            // (this will also invalidate us)
-            WinPostMsg(pWidget->pGlobals->hwndClient,
-                       XCM_REFORMAT,
-                       (MPARAM)XFMF_GETWIDGETSIZES,
-                       0);
+            WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
         }
     }