Changeset 268 for trunk/src

Timestamp:

Oct 30, 2009, 1:06:49 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

3rdparty: os2/xsystray: Fixed vertical centering and added support for the "Frame around statics" XCenter style option.

File:

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

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

@@ -152 +152 @@
 
 #define TID_CHECKALIVE          1
-         // check alive timer
-#define TID_CHECKALIVE_TIMEOUT  1000 // ms
-         // how often to check if windows associated with icons are still alive
+         // timer that checks if windows associated with icons are still alive
+#define TID_CHECKALIVE_TIMEOUT  2000 // ms
+         // how often to perform alive checks
 
 /* ******************************************************************
@@ -210 +210 @@
  */
 
+// @todo the function declarations should become not necessary when we move into
+// XWorkplace. Let's hope the prototypes will not change until then. Let's also
+// pray that XFLDRxxx.DLL has the _Optlink calling convention for exports and
+// not the default __cdecl (which happens if it builds with GCC according to the
+// XWPENTRY definition in the current xwphelpers sources)
+
+#define XWPENTRY _Optlink
+
+typedef VOID XWPENTRY GPIHDRAW3DFRAME(HPS hps,
+                                      PRECTL prcl,
+                                      USHORT usWidth,
+                                      LONG lColorLeft,
+                                      LONG lColorRight);
+typedef GPIHDRAW3DFRAME *PGPIHDRAW3DFRAME;
+PGPIHDRAW3DFRAME pgpihDraw3DFrame = NULL;
+
+typedef struct _RESOLVEFUNCTION
+{
+    const char  *pcszFunctionName;
+    PFN         *ppFuncAddress;
+} RESOLVEFUNCTION, *PRESOLVEFUNCTION;
+RESOLVEFUNCTION G_aImports[] =
+{
+    { "gpihDraw3DFrame", (PFN*)&pgpihDraw3DFrame },
+};
+
 /* ******************************************************************
  *
@@ -255 +281 @@
  ********************************************************************/
 
+/*
+ *@@ FreeIconData:
+ *      Frees all members of the ICONDATA structure and resets them to 0.
+ */
+
+static
 VOID FreeIconData(PICONDATA pData)
 {
@@ -271 +303 @@
         pData->pszToolTip = NULL;
     }
+}
+
+/*
+ *@@ DrawPointer:
+ *      Draws a pointer in a presentation space.
+ */
+
+static
+BOOL DrawPointer(HPS hps, LONG lx, LONG ly, HPOINTER hptrPointer, BOOL bMini)
+{
+    return WinDrawPointer(hps, lx, ly, hptrPointer, bMini ? DP_MINI : DP_NORMAL);
+    // @todo: for icons with real alpha, do manual alpha blending
 }
 
@@ -334 +378 @@
 }
 
-static
-BOOL DrawPointer(HPS hps, LONG lx, LONG ly, HPOINTER hptrPointer, BOOL bMini)
-{
-    return WinDrawPointer(hps, lx, ly, hptrPointer, bMini ? DP_MINI : DP_NORMAL);
-    // @todo:
-    // 1) for icons w/o real alpha, draw them manually by correctly selecting
-    //    the normal or mini HBITMAP (WinDrawPointer fails to do so);
-    // 2) for icons with real alpha, do manual alpha blending
-}
-
 /*
  *@@ WgtPaint:
@@ -365 +399 @@
         RECTL   rcl;
         BOOL    bLeftToRight;
-        LONG    x, lTotalWidth;
+        LONG    x, y, lTotalWidth;
         size_t  i;
 
@@ -383 +417 @@
 
         LOGF(("rclPaint %d,%d-%d,%d\n",
-              rclPaint.xLeft, rclPaint.xRight, rclPaint.yBottom, rclPaint.yTop));
+              rclPaint.xLeft, rclPaint.yBottom, rclPaint.xRight, rclPaint.yTop));
 
         // switch HPS to RGB mode
@@ -394 +428 @@
         WinFillRect(hps, &rclPaint,
                     WinQuerySysColor(HWND_DESKTOP, SYSCLR_DIALOGBACKGROUND, 0));
+
+        if ((pWidget->pGlobals->flDisplayStyle & XCS_SUNKBORDERS))
+        {
+            rcl.xLeft = 0;
+            rcl.yBottom = 0;
+            rcl.xRight = swp.cx - 1;
+            rcl.yTop = swp.cy - 1;
+            pgpihDraw3DFrame(hps, &rcl, 1,
+                             pWidget->pGlobals->lcol3DDark,
+                             pWidget->pGlobals->lcol3DLight);
+        }
+
+        // always center the icon vertically (we may be given more height than
+        // we requested)
+        y = (swp.cy - pSysTrayData->lIconWidth) / 2;
 
         if (bLeftToRight)
@@ -420 +469 @@
                 break;
 
-            DrawPointer(hps, x, pSysTrayData->lIconPad,
-                        pSysTrayData->pIcons[i].hIcon, DP_MINI);
+            DrawPointer(hps, x, y, pSysTrayData->pIcons[i].hIcon, DP_MINI);
             if (bLeftToRight)
                 x += lTotalWidth;
@@ -845 +893 @@
                              PSZ pszErrorMsg)       // if 0 is returned, 500 bytes of error msg
 {
-    ULONG       ulrc = 0;
+    ULONG       ulrc = 0, ul = 0;
     CLASSINFO   ClassInfo;
 
@@ -852 +900 @@
     do
     {
+        // resolve imports from XFLDR.DLL (this is basically
+        // a copy of the doshResolveImports code, but we can't
+        // use that before resolving...)
+        for (ul = 0;
+             ul < sizeof(G_aImports) / sizeof(G_aImports[0]);
+             ul++)
+        {
+            APIRET arc;
+            if ((arc = DosQueryProcAddr(hmodXFLDR,
+                                        0,               // ordinal, ignored
+                                        (PSZ)G_aImports[ul].pcszFunctionName,
+                                        G_aImports[ul].ppFuncAddress))
+                        != NO_ERROR)
+            {
+                snprintf(pszErrorMsg, 500,
+                         "Import %s failed with %ld.",
+                         G_aImports[ul].pcszFunctionName, arc);
+                break;
+            }
+        }
+        if (ul < sizeof(G_aImports) / sizeof(G_aImports[0]))
+            break;
+
         // register our PM window class
         if (!WinRegisterClass(hab,
@@ -861 +932 @@
             )
         {
-            LOG(("WinRegisterClass(%s) failed with %lX",
-                 WNDCLASS_WIDGET_XSYSTRAY, WinGetLastError(hab)));
+            snprintf(pszErrorMsg, 500,
+                     "WinRegisterClass(%s) failed with %lX.",
+                     WNDCLASS_WIDGET_XSYSTRAY, WinGetLastError(hab));
             break;
         }
@@ -882 +954 @@
         {
             // error registering class: report error then
-            snprintf(pszErrorMsg, 500, "WinRegisterClass(%s) failed with %lX",
+            snprintf(pszErrorMsg, 500,
+                     "WinRegisterClass(%s) failed with %lX",
                      WNDCLASS_WIDGET_XSYSTRAY_SERVER, WinGetLastError(hab));
             break;
@@ -896 +969 @@
     while (0);
 
-    LOGF(("pszErrorMsg %s\n", pszErrorMsg));
+    LOGF(("pszErrorMsg '%s'\n", pszErrorMsg));
     LOGF(("ulrc %d\n", ulrc));