Changeset 285 for trunk/src

Timestamp:

Nov 3, 2009, 3:58:20 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Implemented xstQuerySysTrayIconRect() API call. Fixed the regression of the previous checkin (icons wouldn't be removed when the associated application crashed).

Location:

trunk/src/3rdparty/os2/xsystray

Files:

• xsystray.c (modified) (3 diffs)
• xsystray.h (modified) (3 diffs)
• xsystray_api.c (modified) (2 diffs)

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

@@ -735 +735 @@
  *      to left.
  *
- *      NOTE: This function must be keept in sync with FindIconDataAtPt() in
- *      terms of system tray geometry.
+ *      NOTE: This function must be keept in sync with FindIconDataAtPt() and
+ *      SYSTRAYCMD_QUERYRECT in terms of system tray geometry.
  */
 /*
@@ -1311 +1311 @@
                 }
 
+                ++pSysTrayData->cIcons;
+
                 WgtXSysTrayUpdateAfterIconAddRemove(pWidget);
-
-                ++pSysTrayData->cIcons;
 
                 xrc = XST_OK;
@@ -1439 +1439 @@
                 }
 
+                xrc = XST_OK;
+            }
+            else
+                LOGF((" Icon not found!\n"));
+        }
+        break;
+
+        case SYSTRAYCMD_QUERYRECT:
+        {
+            size_t i;
+            PICONDATA pData;
+
+            LOGF(("SYSTRAYCMD_QUERYRECT\n"));
+            LOGF((" hwnd  %x\n", pCtlData->hwndSender));
+            LOGF((" usId  %d\n", pCtlData->u.icon.usId));
+
+            pCtlData->bAcknowledged = TRUE;
+
+            pData = FindIconData(pSysTrayData, pCtlData->hwndSender,
+                                 pCtlData->u.icon.usId, &i);
+            if (pData)
+            {
+                // Refer to FindIconDataAtPt() for details
+
+                SWP     swp;
+                RECTL   rcl;
+                BOOL    bLeftToRight;
+                LONG    y, lIconStep;
+
+                WinQueryWindowPos(pWidget->hwndWidget, &swp);
+                WinQueryWindowRect(pWidget->pGlobals->hwndClient, &rcl);
+
+                y = (swp.cy - pSysTrayData->lIconHeight) / 2;
+
+                // detect the direction
+                bLeftToRight = swp.x + swp.cx / 2 < (rcl.xRight / 2);
+
+                lIconStep = pSysTrayData->lIconWidth + pSysTrayData->lIconPad;
+
+                pCtlData->u.rect.rclIcon.yBottom = y;
+                pCtlData->u.rect.rclIcon.yTop = y + pSysTrayData->lIconHeight;
+
+                if (bLeftToRight)
+                {
+                    pCtlData->u.rect.rclIcon.xLeft =
+                        pSysTrayData->lIconPad + (lIconStep) * i;
+                    pCtlData->u.rect.rclIcon.xRight =
+                        pCtlData->u.rect.rclIcon.xLeft +
+                        pSysTrayData->lIconWidth;
+                }
+                else
+                {
+                    pCtlData->u.rect.rclIcon.xLeft =
+                        swp.cx - (lIconStep) * (i + 1);
+                    pCtlData->u.rect.rclIcon.xRight =
+                        pCtlData->u.rect.rclIcon.xLeft +
+                        pSysTrayData->lIconWidth;
+                }
+
+                // convert to screen coordinates
+                WinMapWindowPoints(pWidget->hwndWidget, HWND_DESKTOP,
+                                   (PPOINTL)&pCtlData->u.rect.rclIcon, 2);
                 xrc = XST_OK;
             }

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

@@ -52 +52 @@
     SYSTRAYCMD_SHOWBALLOON,
     SYSTRAYCMD_HIDEBALLOON,
+    SYSTRAYCMD_QUERYRECT,
 } SYSTRAYCMD;
 
@@ -76 +77 @@
     HWND        hwndSender;
                 // sender window, a must for SYSTRAYCMD_ADDICON, _CHANGEICON,
-                // _REMOVEICON, _SETTOOLTIP, _SHOWBALLOON, _HIDEBALLOON
+                // _REMOVEICON, _SETTOOLTIP, _SHOWBALLOON, _HIDEBALLOON,
+                // _QUERYRECT
     union
     {
@@ -95 +97 @@
         } icon;
           // used by SYSTRAYCMD_ADDICON, _CHANGEICON, _REMOVEICON, _SETTOOLTIP
+
+        struct
+        {
+            RECTL rclIcon;
+        } rect;
+          // used by SYSTRAYCMD_QUERYRECT
     } u;
 

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

@@ -569 +569 @@
     pData->u.icon.usId = usId;
 
-
     if (!pcszToolTip)
         pData->u.icon.szToolTip[0] = '\0';
@@ -610 +609 @@
 BOOL xstQuerySysTrayIconRect(HWND hwnd, USHORT usId, PRECTL prclRect)
 {
-    // @todo implement
-    return FALSE;
+    BOOL brc;
+    PSYSTRAYCTLDATA pData = AllocSysTrayCtlDataPtr();
+    if (!pData)
+        return FALSE;
+
+    pData->ulCommand = SYSTRAYCMD_QUERYRECT;
+    pData->hwndSender = hwnd;
+    pData->u.icon.usId = usId;
+
+    brc = SendSysTrayCtlMsg(pData) == XST_OK;
+    if (brc)
+    {
+        *prclRect = pData->u.rect.rclIcon;
+    }
+
+    FreeSysTrayCtlDataPtr(pData);
+
+    return brc;
 }