Changeset 48

Timestamp:

Mar 14, 2001, 7:57:34 PM (24 years ago)

Author:

umoeller

Message:

misc changes

Location:

trunk

Files:

• include/helpers/cnrh.h (modified) (1 diff)
• include/helpers/dosh.h (modified) (2 diffs)
• include/helpers/winh.h (modified) (2 diffs)
• src/helpers/cnrh.c (modified) (6 diffs)
• src/helpers/dosh.c (modified) (7 diffs)
• src/helpers/winh.c (modified) (2 diffs)

trunk/include/helpers/cnrh.h

@@ -502 +502 @@
                                         ULONG fl);
 
+    ULONG cnrhExpandFromRoot(HWND hwndCnr,
+                             PRECORDCORE prec);
+
     ULONG cnrhScrollToRecord(HWND hwndCnr,
                              PRECORDCORE pRec,

trunk/include/helpers/dosh.h

@@ -237 +237 @@
      *
      *@@added V0.9.7 (2000-12-02) [umoeller]
+     *@@changed V0.9.9 (2001-03-14) [umoeller]: added interrupt load
      */
 
@@ -246 +247 @@
         PLONG       palLoads;
 
+        // output: one CPU interrupt load for each CPU
+        PLONG       palIntrs;
+
         // each of the following ptrs points to an array of cProcessors items
         PCPUUTIL    paCPUUtils;     // CPUUTIL structures
         double      *padBusyPrev;   // previous "busy" calculations
         double      *padTimePrev;   // previous "time" calculations
+        double      *padIntrPrev;   // previous "intr" calculations
 
         // private stuff

trunk/include/helpers/winh.h

@@ -105 +105 @@
     /* ******************************************************************
      *
+     *   Rectangle helpers
+     *
+     ********************************************************************/
+
+    VOID XWPENTRY winhOffsetRect(PRECTL prcl, LONG lx, LONG ly);
+
+    /* ******************************************************************
+     *
      *   Menu helpers
      *
@@ -689 +697 @@
                                       PHWND phwndClient);
 
-    HWND winhCreateObjectWindow(const char *pcszWindowClass,
-                                PVOID pvCreateParam);
+    HWND XWPENTRY winhCreateObjectWindow(const char *pcszWindowClass,
+                                         PVOID pvCreateParam);
+
+    HWND XWPENTRY winhCreateControl(HWND hwndParentAndOwner,
+                                    const char *pcszClass,
+                                    const char *pcszText,
+                                    ULONG ulStyle,
+                                    ULONG ulID);
 
     VOID XWPENTRY winhRepaintWindows(HWND hwndParent);

trunk/src/helpers/cnrh.c

@@ -947 +947 @@
 
 /*
+ *@@ cnrhExpandFromRoot:
+ *      expands prec and climbs up all parent
+ *      records and expands them all as well.
+ *
+ *      Returns the no. of records expanded.
+ *
+ *@@added V0.9.9 (2001-03-13) [umoeller]
+ */
+
+ULONG cnrhExpandFromRoot(HWND hwndCnr,
+                         PRECORDCORE prec)
+{
+    ULONG ul = 0;
+    PRECORDCORE preccParent = prec;
+    while (preccParent)
+    {
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, (MPARAM)preccParent, MPNULL);
+        ul++;
+
+        preccParent = (PRECORDCORE)WinSendMsg(hwndCnr,
+                                              CM_QUERYRECORD,
+                                              (MPARAM)preccParent,
+                                              MPFROM2SHORT(CMA_PARENT,
+                                                           CMA_ITEMORDER));
+
+        if (preccParent == (PRECORDCORE)-1)
+            preccParent = NULL;
+    }
+
+    return (ul);
+}
+
+/*
  *@@ cnrhScrollToRecord:
  *      scrolls a given container control to make a given
@@ -957 +990 @@
  *      --  3:       record is already visible (scrolling not necessary)
  *      --  4:       cnrinfo query failed (error)
- *      --  5:       parent record rectangle query failed (error)
  *
  *      Note: All messages are _sent_ to the container, not posted.
@@ -968 +1000 @@
  *
  *@@changed V0.9.4 (2000-08-07) [umoeller]: now posting scroll messages to avoid sync errors
- *@@changed V0.9.9 (2001-03-12) [umoeller]: this never worked for root records in tree view if KeepParent == TRUE, fixed
+ *@@changed V0.9.9 (2001-03-12) [umoeller]: this never scrolled for root records in tree view if KeepParent == TRUE, fixed
+ *@@changed V0.9.9 (2001-03-13) [umoeller]: largely rewritten; this now scrolls x properly too and is faster
  */
 
@@ -980 +1013 @@
                                  // -- CMA_TEXT: the record text
                                  // -- CMA_TREEICON: the "+" sign in tree view
-                         BOOL KeepParent)
+                         BOOL fKeepParent)
                                  // for tree views only: whether to keep
                                  // the parent record of pRec visible when scrolling.
@@ -989 +1022 @@
 
 {
-    QUERYRECORDRECT qRect, qRect2;
-    RECTL           rclRecord, rclParentRecord, rclCnr, rclCnr2;
-    POINTL          ptlRecord, ptlParentRecord;
-    CNRINFO         CnrInfo;
-    HAB             hab = WinQueryAnchorBlock(hwndCnr);
-    BOOL            KeepParent2;
-    LONG            lYOfs;
+    QUERYRECORDRECT qRect;
+    RECTL           rclRecord,
+                    rclCnr;
+    LONG            lXOfs = 0,
+                    lYOfs = 0;
 
     qRect.cb = sizeof(qRect);
     qRect.pRecord = (PRECORDCORE)pRec;
     qRect.fsExtent = fsExtent;
+
+    if (fKeepParent)
+    {
+        CNRINFO         CnrInfo;
+        // this is only valid in tree view, so check
+        if (!WinSendMsg(hwndCnr,
+                        CM_QUERYCNRINFO,
+                        (MPARAM)&CnrInfo,
+                        (MPARAM)sizeof(CnrInfo)))
+            return 4;
+        else
+            // disable if not tree view
+            fKeepParent = ((CnrInfo.flWindowAttr & CV_TREE) != 0);
+    }
 
     // query record location and size of container
@@ -1011 +1056 @@
                     CM_QUERYVIEWPORTRECT,
                     &rclCnr,
-                    MPFROM2SHORT(CMA_WINDOW, FALSE)) )
+                    MPFROM2SHORT(CMA_WINDOW,
+                                    // returns the client area rectangle
+                                    // in container window coordinates
+                                 FALSE)) )
         return 2;
 
     // check if left bottom point of pRec is currently visible in container
-    ptlRecord.x = (rclRecord.xLeft);
-    ptlRecord.y = (rclRecord.yBottom);
-    // ptlRecord.x = (rclRecord.xLeft + rclRecord.xRight) / 2;
-    // ptlRecord.y = (rclRecord.yBottom + rclRecord.yTop) / 2;
-    if (WinPtInRect(hab, &rclCnr, &ptlRecord))
-         return 3;
-
-    if (KeepParent)
-    {
-        if (!WinSendMsg(hwndCnr,
-                        CM_QUERYCNRINFO,
-                        (MPARAM)&CnrInfo,
-                        (MPARAM)sizeof(CnrInfo)))
-            return 4;
-        else
-            KeepParent2 = (CnrInfo.flWindowAttr & CV_TREE);
-    }
-    else
-        KeepParent2 = FALSE;
-
-    // calculate offset to scroll to make pRec visible
-    lYOfs = (rclCnr.yBottom - rclRecord.yBottom)    // this would suffice
-          + (rclRecord.yTop - rclRecord.yBottom);  // but we make the next rcl visible too
-
-    if (KeepParent2)
-    {
-        qRect2.cb = sizeof(qRect2);
-        qRect2.pRecord = (PRECORDCORE)WinSendMsg(hwndCnr,
-                                                 CM_QUERYRECORD,
-                                                 (MPARAM)pRec,
-                                                 MPFROM2SHORT(CMA_PARENT,
-                                                              CMA_ITEMORDER));
-        if (qRect2.pRecord)     // V0.9.9 (2001-03-12) [umoeller]
+
+    #define IS_BETWEEN(a, b, c) (((a) >= (b)) && ((a) <= (c)))
+
+    // 1) set lXOfs if we need to scroll horizontally
+    if (!IS_BETWEEN(rclRecord.xLeft, rclCnr.xLeft, rclCnr.xRight))
+        // record xLeft is outside viewport:
+        // scroll horizontally so that xLeft is exactly on left of viewport
+        lXOfs = (rclRecord.xLeft - rclCnr.xLeft);
+    else if (!IS_BETWEEN(rclRecord.xRight, rclCnr.xLeft, rclCnr.xRight))
+        // record xRight is outside viewport:
+        // scroll horizontally so that xRight is exactly on right of viewport
+        lXOfs = (rclRecord.xRight - rclCnr.xRight);
+
+    // 2) set lYOfs if we need to scroll vertically
+    if (!IS_BETWEEN(rclRecord.yBottom, rclCnr.yBottom, rclCnr.yTop))
+        // record yBottom is outside viewport:
+        // scroll horizontally so that yBottom is exactly on bottom of viewport
+        lYOfs =   (rclCnr.yBottom - rclRecord.yBottom)    // this would suffice
+                + (rclRecord.yTop - rclRecord.yBottom);
+                            // but we make the next rcl visible too
+    else if (!IS_BETWEEN(rclRecord.yTop, rclCnr.yBottom, rclCnr.yTop))
+        // record yTop is outside viewport:
+        // scroll horizontally so that yTop is exactly on top of viewport
+        lYOfs = (rclRecord.yTop - rclCnr.yTop);
+
+    if (fKeepParent && (lXOfs || lYOfs))
+    {
+        // keep parent enabled, and we're scrolling:
+        // find the parent record then
+        qRect.cb = sizeof(qRect);
+        qRect.pRecord = (PRECORDCORE)WinSendMsg(hwndCnr,
+                                                CM_QUERYRECORD,
+                                                (MPARAM)pRec,
+                                                MPFROM2SHORT(CMA_PARENT,
+                                                             CMA_ITEMORDER));
+        if (qRect.pRecord)     // V0.9.9 (2001-03-12) [umoeller]
         {
-            qRect2.fsExtent = fsExtent;
-
-            // now query PARENT record location and size of container
-            if (!WinSendMsg(hwndCnr, CM_QUERYRECORDRECT, &rclParentRecord, &qRect2))
-                return 5;
-
-            ptlParentRecord.x = (rclParentRecord.xLeft);
-            ptlParentRecord.y = (rclParentRecord.yTop);
-            // ptlParentRecord.x = (rclParentRecord.xLeft + rclParentRecord.xRight) / 2;
-            // ptlParentRecord.y = (rclParentRecord.yBottom + rclParentRecord.yTop) / 2;
-            rclCnr2 = rclCnr;
-            WinOffsetRect(hab, &rclCnr2, 0, -lYOfs);
-            // if ( (rclParentRecord.yBottom - rclRecord.yBottom) > (rclCnr.yTop - rclCnr.yBottom) )
-            if (!(WinPtInRect(hab, &rclCnr2, &ptlParentRecord)))
+            // parent exists:
+            // get PARENT record rectangle then
+            RECTL rclParentRecord;
+            qRect.fsExtent = fsExtent;
+            if (WinSendMsg(hwndCnr,
+                           CM_QUERYRECORDRECT,
+                           &rclParentRecord,
+                           &qRect))
             {
-                lYOfs = (rclCnr.yTop - rclParentRecord.yTop) // this would suffice
-                      - (rclRecord.yTop - rclRecord.yBottom);  // but we make the previous rcl visible too
+                // check if parent record WOULD still be visible
+                // if we scrolled what we calculated above
+                RECTL rclCnr2;
+                memcpy(&rclCnr2, &rclCnr, sizeof(rclCnr2));
+                winhOffsetRect(&rclCnr2, lXOfs, -lYOfs);
+
+                if (    lXOfs
+                     && (!IS_BETWEEN(rclParentRecord.xLeft, rclCnr2.xLeft, rclCnr2.xRight))
+                   )
+                    // record xLeft is outside viewport:
+                    // scroll horizontally so that xLeft is exactly on left of viewport
+                    lXOfs = (rclParentRecord.xLeft - rclCnr.xLeft);
+
+                if (    lYOfs
+                     && (!IS_BETWEEN(rclParentRecord.yBottom, rclCnr2.yBottom, rclCnr2.yTop))
+                   )
+                    // record yBottom is outside viewport:
+                    // recalculate y ofs so that we scroll so
+                    // that parent record is on top of cnr viewport
+                    lYOfs =   (rclCnr.yTop - rclParentRecord.yTop) // this would suffice
+                            - (rclRecord.yTop - rclRecord.yBottom);  // but we make the previous rcl visible too
             }
         }
     }
 
-    if (!KeepParent2)
+    if (lXOfs)
         // scroll horizontally
         WinPostMsg(hwndCnr,
                    CM_SCROLLWINDOW,
                    (MPARAM)CMA_HORIZONTAL,
-                   (MPARAM)(rclRecord.xLeft - rclCnr.xLeft));
+                   (MPARAM)lXOfs);
 
     // scroll vertically
-    WinPostMsg(hwndCnr,
-               CM_SCROLLWINDOW,
-               (MPARAM)CMA_VERTICAL,
-               (MPARAM)lYOfs);
+    if (lYOfs)
+        WinPostMsg(hwndCnr,
+                   CM_SCROLLWINDOW,
+                   (MPARAM)CMA_VERTICAL,
+                   (MPARAM)lYOfs);
 
     return 0;

trunk/src/helpers/dosh.c

@@ -1661 +1661 @@
  *
  *@@added V0.9.7 (2000-12-02) [umoeller]
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: added interrupt loads; thanks phaller
  */
 
@@ -1720 +1721 @@
                                 else
                                 {
-                                    pPerfSys->palLoads = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
-                                    if (!pPerfSys->palLoads)
+                                    pPerfSys->padIntrPrev
+                                        = (double*)malloc(pPerfSys->cProcessors * sizeof(double));
+                                    if (!pPerfSys->padIntrPrev)
                                         arc = ERROR_NOT_ENOUGH_MEMORY;
                                     else
                                     {
-                                        for (ul = 0; ul < pPerfSys->cProcessors; ul++)
+                                        pPerfSys->palLoads = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
+                                        if (!pPerfSys->palLoads)
+                                            arc = ERROR_NOT_ENOUGH_MEMORY;
+                                        else
                                         {
-                                            pPerfSys->padBusyPrev[ul] = 0.0;
-                                            pPerfSys->padTimePrev[ul] = 0.0;
-                                            pPerfSys->palLoads[ul] = 0;
+            // **patrick, this was missing...
+            // wonder if you ever tested this, this crashes in
+            // doshPerfGet otherwise ;-)
+            /*   -----------> */            pPerfSys->palIntrs = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
+                                            if (!pPerfSys->palIntrs)
+                                                arc = ERROR_NOT_ENOUGH_MEMORY;
+                                            else
+                                            {
+                                                for (ul = 0; ul < pPerfSys->cProcessors; ul++)
+                                                {
+                                                    pPerfSys->padBusyPrev[ul] = 0.0;
+                                                    pPerfSys->padTimePrev[ul] = 0.0;
+                                                    pPerfSys->padIntrPrev[ul] = 0.0;
+                                                    pPerfSys->palLoads[ul] = 0;
+            /* and this one too */                  pPerfSys->palIntrs[ul] = 0;
+                                                }
+                                            }
                                         }
                                     }
@@ -1777 +1796 @@
  *
  *@@added V0.9.7 (2000-12-02) [umoeller]
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: added interrupt loads; thanks phaller
  */
 
@@ -1801 +1821 @@
                 double      dBusy = LL2F(pCPUUtilThis->ulBusyHigh,
                                          pCPUUtilThis->ulBusyLow);
+                double      dIntr = LL2F(pCPUUtilThis->ulIntrHigh,
+                                         pCPUUtilThis->ulIntrLow);
 
                 double      *pdBusyPrevThis = &pPerfSys->padBusyPrev[ul];
                 double      *pdTimePrevThis = &pPerfSys->padTimePrev[ul];
+                double      *pdIntrPrevThis = &pPerfSys->padIntrPrev[ul];
 
                 // avoid division by zero
                 double      dTimeDelta = (dTime - *pdTimePrevThis);
                 if (dTimeDelta)
+                {
                     pPerfSys->palLoads[ul]
                         = (LONG)( (double)(   (dBusy - *pdBusyPrevThis)
@@ -1814 +1838 @@
                                           )
                                 );
+                    pPerfSys->palIntrs[ul]
+                        = (LONG)( (double)(   (dIntr - *pdIntrPrevThis)
+                                            / dTimeDelta
+                                            * 1000.0
+                                          )
+                                );
+                }
                 else
+                {
+                    // no clear readings are available
                     pPerfSys->palLoads[ul] = 0;
+                    pPerfSys->palIntrs[ul] = 0;
+                }
 
                 *pdTimePrevThis = dTime;
                 *pdBusyPrevThis = dBusy;
+                *pdIntrPrevThis = dIntr;
             }
         }
@@ -1832 +1868 @@
  *@@added V0.9.7 (2000-12-02) [umoeller]
  *@@changed V0.9.9 (2001-02-06) [umoeller]: removed disable; this broke the WarpCenter
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: fixed memory leak
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: added interrupt loads; thanks phaller
  */
 
@@ -1852 +1890 @@
         if (pPerfSys->padTimePrev)
             free(pPerfSys->padTimePrev);
+        if (pPerfSys->padIntrPrev)
+            free(pPerfSys->padIntrPrev);
+        if (pPerfSys->palLoads)             // was missing V0.9.9 (2001-03-14) [umoeller]
+            free(pPerfSys->palLoads);
+        if (pPerfSys->palIntrs)
+            free(pPerfSys->palIntrs);
 
         if (pPerfSys->hmod)

trunk/src/helpers/winh.c

@@ -86 +86 @@
 #include "helpers\undoc.h"
 #include "helpers\xstring.h"            // extended string helpers
+
+/*
+ *@@category: Helpers\PM helpers\Rectangle helpers
+ */
+
+/* ******************************************************************
+ *
+ *   Rectangle helpers
+ *
+ ********************************************************************/
+
+/*
+ *@@ winhOffsetRect:
+ *      like WinOffsetRect, but doesn't require
+ *      an anchor block to be passed in. Why
+ *      the original would need an anchor block
+ *      for this awfully complicated task is
+ *      a mystery to me anyway.
+ *
+ *@@added V0.9.9 (2001-03-13) [umoeller]
+ */
+
+VOID winhOffsetRect(PRECTL prcl,
+                    LONG lx,
+                    LONG ly)
+{
+    prcl->xLeft += lx;
+    prcl->xRight += lx;
+    prcl->yBottom += ly;
+    prcl->yTop += ly;
+}
 
 /*
@@ -3682 +3713 @@
 
 /*
+ *@@ winhCreateControl:
+ *      creates a control with a size and position of 0.
+ *
+ *@@added V0.9.9 (2001-03-13) [umoeller]
+ */
+
+HWND winhCreateControl(HWND hwndParentAndOwner,     // in: owner and parent window
+                       const char *pcszClass,       // in: window class (e.g. WC_BUTTON)
+                       const char *pcszText,        // in: window title
+                       ULONG ulStyle,               // in: control style
+                       ULONG ulID)                  // in: control ID
+{
+    return (WinCreateWindow(hwndParentAndOwner,
+                            (PSZ)pcszClass,
+                            (PSZ)pcszText,
+                            ulStyle,
+                            0, 0, 0, 0,
+                            hwndParentAndOwner,
+                            HWND_TOP,
+                            ulID,
+                            NULL,
+                            NULL));
+}
+
+/*
  *@@ winhRepaintWindows:
  *      this repaints all children of hwndParent.