Changeset 282 for trunk/src/3rdparty/os2/xsystray

Timestamp:

Nov 3, 2009, 2:39:49 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Added new xstReplaceSysTrayIcon() API call, implemented xstSetSysTrayIconToolTip() API call.

Location:

trunk/src/3rdparty/os2/xsystray

Files:

• xsystray.c (modified) (15 diffs)
• xsystray.h (modified) (3 diffs)
• xsystray_api.c (modified) (8 diffs)
• xsystray_api.h (modified) (1 diff)

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

@@ -75 +75 @@
 #pragma hdrstop                     // VAC++ keeps crashing otherwise
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // primitive debug logging to a file
 #if 0
@@ -123 +147 @@
     PSZ         pszToolTip;
                 // icon tooltip (NULL if none)
+
+
     BOOL        bMemoryPoolGiven;
                 // TRUE if SYSTRAYDATA::pvMemoryPool is already given to
@@ -150 +176 @@
     size_t      cIconsMax;
                 // maximum number of icons pIcons can fit
+
+
     PVOID       pvMemoryPool;
                 // memory pool for NOTIFYDATA structures
@@ -207 +235 @@
         INTCLASS_WIDGET_XSYSTRAY,   // internal widget class name
         HUMANSTR_WIDGET_XSYSTRAY,   // widget class name displayed to user
-        WGTF_UNIQUEGLOBAL,          // widget class flags
+        WGTF_UNIQUEGLOBAL |         // widget class flags
+        WGTF_TOOLTIP,
         NULL                        // no settings dialog
     }
@@ -360 +389 @@
         *pIdx = i;
     return NULL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -558 +674 @@
             break;
 
-        } // end switch (usNotifyCode)
-    } // end if (usID == ID_XCENTER_CLIENT)
+        }
+    }
+    else if (usID == ID_XCENTER_TOOLTIP)
+    {
+        PICONDATA pIconData;
+        POINTL ptl;
+
+        WinQueryMsgPos(pWidget->habWidget, &ptl);
+        // make the coordinates systray-relative
+        WinMapWindowPoints(HWND_DESKTOP, pWidget->hwndWidget, &ptl, 1);
+
+        pIconData = FindIconDataAtPt(pWidget, &ptl, NULL);
+
+        switch (usNotifyCode)
+        {
+            case TTN_NEEDTEXT:
+            {
+                LOGF(("TTN_NEEDTEXT\n"));
+
+                PTOOLTIPTEXT pttt = (PTOOLTIPTEXT)mp2;
+                pttt->ulFormat = TTFMT_PSZ;
+
+                if (!pIconData || !pIconData->pszToolTip)
+                    pttt->pszText = NULL;
+                else
+                {
+                    strncpy(pSysTrayData->szToolTip, pIconData->pszToolTip,
+                            sizeof(pSysTrayData->szToolTip) - 1);
+                    // be on the safe side
+                    pSysTrayData->szToolTip[sizeof(pSysTrayData->szToolTip) - 1] = '\0';
+
+                    pttt->pszText = pSysTrayData->szToolTip;
+                }
+
+                LOGF((" pszText '%s'\n", pttt->pszText));
+            }
+            break;
+
+            case TTN_SHOW:
+                if (pIconData)
+                    pIconData->bIsToolTipShowing = TRUE;
+            break;
+
+            case TTN_POP:
+                if (pIconData)
+                    pIconData->bIsToolTipShowing = FALSE;
+            break;
+        }
+    }
 
     return brc;
@@ -571 +734 @@
  *      the XCenter's center, icons go left to right. Otherwise, they go right
  *      to left.
+
+
+
  */
 /*
@@ -695 +861 @@
 
     POINTL  ptl;
-    SWP     swp;
-    RECTL   rcl;
-    BOOL    bLeftToRight;
-    LONG    y, lIconStep;
-    size_t  i;
 
     PICONDATA   pIconData;
@@ -709 +870 @@
     LOGF(("msg %x ptl %ld,%ld\n", msg, ptl.x, ptl.y));
 
-    WinQueryWindowPos(hwnd, &swp);
-    WinQueryWindowRect(pWidget->pGlobals->hwndClient, &rcl);
-
-    y = (swp.cy - pSysTrayData->lIconHeight) / 2;
-    if (ptl.y < y || ptl.y >= y + pSysTrayData->lIconHeight)
+    pIconData = FindIconDataAtPt(pWidget, &ptl, NULL);
+    if (!pIconData)
         return FALSE; // hit pad space
-
-    // detect the direction
-    bLeftToRight = swp.x + swp.cx / 2 < (rcl.xRight / 2);
-
-    lIconStep = pSysTrayData->lIconWidth + pSysTrayData->lIconPad;
-
-    // which icon is that?
-    if (bLeftToRight)
-    {
-        i = ptl.x / lIconStep;
-        if (ptl.x % lIconStep < pSysTrayData->lIconPad)
-            return FALSE; // hit pad space
-    }
-    else
-    {
-        i = (swp.cx - ptl.x - 1) / lIconStep;
-        if ((swp.cx - ptl.x - 1) % lIconStep < pSysTrayData->lIconPad)
-            return FALSE; // hit pad space
-    }
-    if (i >= pSysTrayData->cIcons)
-        return FALSE; // hit pad space
-
-    pIconData = &pSysTrayData->pIcons[i];
 
     LOGF(("hwnd  %x\n", pIconData->hwnd));
@@ -785 +920 @@
 
     return TRUE;
-}
-
-static
-VOID FreeSysTrayData(PSYSTRAYDATA pSysTrayData)
-{
-    // destroy the server
-    if (pSysTrayData->hwndServer != NULLHANDLE)
-    {
-        WinDestroyWindow(pSysTrayData->hwndServer);
-        pSysTrayData->hwndServer = NULLHANDLE;
-    }
-
-    // free all system tray data
-    if (pSysTrayData->pvMemoryPool)
-    {
-        DosFreeMem(pSysTrayData->pvMemoryPool);
-    }
-    if (pSysTrayData->pIcons)
-    {
-        size_t i;
-        for (i = 0; i < pSysTrayData->cIcons; ++i)
-            FreeIconData(&pSysTrayData->pIcons[i]);
-        pSysTrayData->cIcons = 0;
-        free(pSysTrayData->pIcons);
-        pSysTrayData->pIcons = NULL;
-    }
-
-    free(pSysTrayData);
 }
 
@@ -1101 +1208 @@
 
             LOGF(("SYSTRAYCMD_ADDICON\n"));
-            LOGF((" hwnd  %x\n", pCtlData->hwndSender));
-            LOGF((" usId  %d\n", pCtlData->u.icon.usId));
-            LOGF((" hIcon %x\n", pCtlData->u.icon.hIcon));
+            LOGF((" hwnd       %x\n", pCtlData->hwndSender));
+            LOGF((" usId       %d\n", pCtlData->u.icon.usId));
+            LOGF((" hIcon      %x\n", pCtlData->u.icon.hIcon));
+            LOGF((" szToolTip  '%s'\n", pCtlData->u.icon.szToolTip));
 
             pCtlData->bAcknowledged = TRUE;
@@ -1120 +1228 @@
             if (pData)
             {
-                LOGF((" Updating hIcon %x\n", hIcon));
-
+                LOGF((" Replacing with hIcon %x\n", hIcon));
+
+                // try update the tooltip first
+                free(pData->pszToolTip);
+                pData->pszToolTip = NULL;
+                if (pCtlData->u.icon.szToolTip[0] != '\0')
+                {
+                    pData->pszToolTip = strdup(pCtlData->u.icon.szToolTip);
+                    if (!pData->pszToolTip)
+                    {
+                        WinDestroyPointer(hIcon);
+                        break;
+                    }
+                }
+
+                if (pData->bIsToolTipShowing)
+                {
+                    if (pData->pszToolTip)
+                        // update the tooltip on screen
+                        WinSendMsg(pWidget->pGlobals->hwndTooltip,
+                                   TTM_UPDATETIPTEXT,
+                                   (MPARAM)pData->pszToolTip, 0);
+                    else
+                        // hide the tooltip
+                        WinSendMsg(pWidget->pGlobals->hwndTooltip,
+                                   TTM_SHOWTOOLTIPNOW,
+                                   (MPARAM)FALSE, 0);
+                }
+
+                // now update the icon
                 WinDestroyPointer(pData->hIcon);
                 pData->hIcon = hIcon;
@@ -1156 +1292 @@
 
                 i = pSysTrayData->cIcons;
-                ++pSysTrayData->cIcons;
 
                 pData = &pSysTrayData->pIcons[i];
@@ -1166 +1301 @@
                 pData->ulMsgId = pCtlData->u.icon.ulMsgId;
 
+
+
+
+
+
+
+
+
+
+
                 WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
+
+
 
                 xrc = XST_OK;
             }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         }
         break;
@@ -1201 +1390 @@
 
                 WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
                 xrc = XST_OK;

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

@@ -47 +47 @@
     SYSTRAYCMD_GETVERSION,
     SYSTRAYCMD_ADDICON,
+
     SYSTRAYCMD_REMOVEICON,
     SYSTRAYCMD_SETTOOLTIP,
@@ -74 +75 @@
                 // command to execute, must always be set
     HWND        hwndSender;
-                // sender window, a must for SYSTRAYCMD_ADDICON, REMOVEICON,
-                // SETTOOLTIP, SHOWBALLOON, HIDEBALLOON
+                // sender window, a must for SYSTRAYCMD_ADDICON, EICON,
+                // HIDEBALLOON
     union
     {
@@ -90 +91 @@
             USHORT      usId;
             HPOINTER    hIcon;
+
             ULONG       ulMsgId;
         } icon;
-          // used by SYSTRAYCMD_ADDICON, SYSTRAYCMD_REMOVEICON
-
-        struct
-        {
-            USHORT  usId;
-            CHAR    szText[512];
-        } tooltip;
-
+          // used by SYSTRAYCMD_ADDICON, _CHANGEICON, _REMOVEICON, _SETTOOLTIP
     } u;
 

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

@@ -316 +316 @@
  *              Mouse wheel event in the icon area. param2 is a pointer to the
  *              XSTWHEELTMSG structure containing full message details.
+
+
+
+
  */
 
@@ -321 +325 @@
                        USHORT usId,     // in: icon ID to add
                        HPOINTER hIcon,  // in: icon handle
+
                        ULONG ulMsgId,   // in: message ID for notifications
                        ULONG ulFlags)   // in: flags (not currently used, must be 0)
@@ -366 +371 @@
         pData->ulCommand = SYSTRAYCMD_ADDICON;
         pData->hwndSender = hwnd;
+
         pData->u.icon.usId = usId;
         pData->u.icon.hIcon = hIcon;
         pData->u.icon.ulMsgId = ulMsgId;
+
+
+
+
+
+
+
+
+
+
 
         xrc = SendSysTrayCtlMsg(pData);
@@ -425 +441 @@
 
 /*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  *@@ xstRemoveSysTrayIcon:
  *
@@ -498 +556 @@
  */
 
-BOOL xstSetSysTrayIconToolTip(HWND hwnd,    // in: window handle associated with the icon
-                              USHORT usId,  // in: icon ID to set the tooltip for
-                              PSZ pszText)  // in: tooltip text
+BOOL xstSetSysTrayIconToolTip(HWND hwnd,    // in: window handle associated with the icon
+                              USHORT usId,  // in: icon ID to set the tooltip for
+                              P // in: tooltip text
 {
     BOOL brc;
@@ -509 +567 @@
     pData->ulCommand = SYSTRAYCMD_SETTOOLTIP;
     pData->hwndSender = hwnd;
-    pData->u.tooltip.usId = usId;
-
-    if (pszText == NULL)
-        pData->u.tooltip.szText[0] = '\0';
+    pData->u.icon.usId = usId;
+
+
+    if (!pcszToolTip)
+        pData->u.icon.szToolTip[0] = '\0';
     else
     {
-        strncpy(pData->u.tooltip.szText, pszText,
-                sizeof(pData->u.tooltip.szText) - 1);
+        strncpy(pData->u.,
+                sizeof(pData->u.) - 1);
         // be on the safe side
-        pData->u.tooltip.szText[sizeof(pData->u.tooltip.szText) - 1] = '\0';
+        pData->u.) - 1] = '\0';
     }
 
@@ -528 +587 @@
 }
 
-BOOL xstShowSysTrayIconBalloon(HWND hwnd, USHORT usId, PSZ pszTitle, PSZ pszText,
-                               ULONG ulFlags, ULONG ulTimeout)
+BOOL xstShowSysTrayIconBalloon(HWND hwnd, USHORT usId, P,
+                               ULONG ulFlags, ULONG ulTimeout)
 {
     // @todo implement
@@ -595 +654 @@
 ULONG xstGetSysTrayMaxTextLen()
 {
-    return sizeof(((PSYSTRAYCTLDATA)0)->u.tooltip.szText);
-}
-
+    return sizeof(((PSYSTRAYCTLDATA)0)->u.);
+}
+

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

@@ -76 +76 @@
 
 BOOL xstQuerySysTrayVersion(PULONG pulMajor, PULONG pulMinor, PULONG pulRevision);
-BOOL xstAddSysTrayIcon(HWND hwnd, USHORT usId, HPOINTER hIcon, ULONG ulMsgId,
-                       ULONG ulFlags);
+BOOL xstAddSysTrayIcon(HWND hwnd, USHORT usId, HPOINTER hIcon, PCSZ pcszToolTip,
+                       ULONG ulMsgId, ULONG ulFlags);
+BOOL xstReplaceSysTrayIcon(HWND hwnd, USHORT usId, HPOINTER hIcon);
 BOOL xstRemoveSysTrayIcon(HWND hwnd, USHORT usId);
-BOOL xstSetSysTrayIconToolTip(HWND hwnd, USHORT usId, PSZ pszText);
-BOOL xstShowSysTrayIconBalloon(HWND hwnd, USHORT usId, PSZ pszTitle, PSZ pszText,
-                               ULONG ulFlags, ULONG ulTimeout);
+BOOL xstSetSysTrayIconToolTip(HWND hwnd, USHORT usId, P);
+BOOL xstShowSysTrayIconBalloon(HWND hwnd, USHORT usId, P,
+                               ULONG ulFlags, ULONG ulTimeout);
 BOOL xstHideSysTrayIconBalloon(HWND hwnd, USHORT usId);