Changeset 25 for trunk/src/helpers/textview.c

Timestamp:

Jan 17, 2001, 6:34:55 PM (25 years ago)

Author:

umoeller

Message:

Misc. changes for V0.9.7.

File:

• trunk/src/helpers/textview.c (modified) (21 diffs)

trunk/src/helpers/textview.c

@@ -1493 +1493 @@
                                        // can be NULL to paint all
                   LONG lViewXOfs,      // in: x offset to paint; 0 means rightmost
-                  PLONG plViewYOfs,    // in: y offset to paint; 0 means _top_most;
+                  PULONG pulViewYOfs,  // in: y offset to paint; 0 means _top_most;
                                        // out: y offset which should be passed to next call
                                        // (if TRUE is returned and fPaintHalfLines == FALSE)
@@ -1505 +1505 @@
             fAnyLinesPainted = FALSE;
     ULONG   ulCurrentLineIndex = *pulLineIndex;
-    // LONG    lViewYOfsSaved = *plViewYOfs;
+    // LONG    lViewYOfsSaved = *pulViewYOfs;
     PLISTNODE pRectNode = lstNodeFromIndex(&pxfd->llRectangles,
                                            ulCurrentLineIndex);
@@ -1521 +1521 @@
         rclLine.xLeft = pLineRcl->rcl.xLeft - lViewXOfs;
         rclLine.xRight = pLineRcl->rcl.xRight - lViewXOfs;
-        rclLine.yBottom = pLineRcl->rcl.yBottom + *plViewYOfs;
-        rclLine.yTop = pLineRcl->rcl.yTop + *plViewYOfs;
+        rclLine.yBottom = pLineRcl->rcl.yBottom + *pulViewYOfs;
+        rclLine.yTop = pLineRcl->rcl.yTop + *pulViewYOfs;
 
         /* if (pmpf)
@@ -1682 +1682 @@
                     // return TRUE
                     brc = TRUE;
-                    // and set *plViewYOfs to the top of
+                    // and set *pulViewYOfs to the top of
                     // the next line, which wasn't visible
                     // on the page any more
-                    *plViewYOfs = pLineRcl2->rcl.yTop + *plViewYOfs;
+                    *pulViewYOfs = pLineRcl2->rcl.yTop + *pulViewYOfs;
                 }
                 break;
@@ -1844 +1844 @@
             rclViewText;        // same as rclViewPaint, but excluding cdata borders
 
-    LONG    lViewXOfs,          // pixels that we have scrolled to the RIGHT; 0 means very left
-            lViewYOfs;          // pixels that we have scrolled to the BOTTOM; 0 means very top
+    ULONG   ulViewXOfs,         // pixels that we have scrolled to the RIGHT; 0 means very left
+            ulViewYOfs;         // pixels that we have scrolled to the BOTTOM; 0 means very top
 
     BOOL    fAcceptsPresParamsNow; // TRUE after first WM_PAINT
@@ -2009 +2009 @@
     ulWinCY = (ptxvd->rclViewText.yTop - ptxvd->rclViewText.yBottom);
 
-    if (ptxvd->lViewYOfs < 0)
-        ptxvd->lViewYOfs = 0;
-    if (ptxvd->lViewYOfs > ((LONG)ptxvd->xfd.ulViewportCY - ulWinCY))
-        ptxvd->lViewYOfs = (LONG)ptxvd->xfd.ulViewportCY - ulWinCY;
+    if (ptxvd->ulViewYOfs < 0)
+        ptxvd->ulViewYOfs = 0;
+    if (ptxvd->ulViewYOfs > ((LONG)ptxvd->xfd.ulViewportCY - ulWinCY))
+        ptxvd->ulViewYOfs = (LONG)ptxvd->xfd.ulViewportCY - ulWinCY;
 
     // vertical scroll bar enabled at all?
@@ -2020 +2020 @@
                                             ulWinCY,
                                             ptxvd->xfd.ulViewportCY,
-                                            ptxvd->lViewYOfs,
+                                            ptxvd->ulViewYOfs,
                                             (ptxvd->cdata.flStyle & XTXF_AUTOVHIDE));
         // is auto-hide on?
@@ -2051 +2051 @@
                                             ulWinCX,
                                             ptxvd->xfd.ulViewportCX,
-                                            ptxvd->lViewXOfs,
+                                            ptxvd->ulViewXOfs,
                                             (ptxvd->cdata.flStyle & XTXF_AUTOHHIDE));
         // is auto-hide on?
@@ -2084 +2084 @@
 {
     ULONG   ulLineIndex = 0;
-    LONG    lYOfs = ptxvd->lViewYOfs;
+    ULONG   ulYOfs = ptxvd->ulViewYOfs;
     txvPaintText(ptxvd->hab,
                  ptxvd->hps,        // paint PS: screen
                  &ptxvd->xfd,       // formatting data
                  prcl2Paint,        // update rectangle given to us
-                 ptxvd->lViewXOfs,  // current X scrolling offset
-                 &lYOfs,            // current Y scrolling offset
+                 ptxvd->ulViewXOfs,  // current X scrolling offset
+                 &ulYOfs,            // current Y scrolling offset
                  TRUE,              // draw even partly visible lines
                  &ulLineIndex);
@@ -2140 +2140 @@
 
     RECTL           rclLine;
-    rclLine.xLeft = pLineRcl->rcl.xLeft - ptxvd->lViewXOfs;
-    rclLine.xRight = pLineRcl->rcl.xRight - ptxvd->lViewXOfs;
-    rclLine.yBottom = pLineRcl->rcl.yBottom + ptxvd->lViewYOfs;
-    rclLine.yTop = pLineRcl->rcl.yTop + ptxvd->lViewYOfs;
+    rclLine.xLeft = pLineRcl->rcl.xLeft - ptxvd->ulViewXOfs;
+    rclLine.xRight = pLineRcl->rcl.xRight - ptxvd->ulViewXOfs;
+    rclLine.yBottom = pLineRcl->rcl.yBottom + ptxvd->ulViewYOfs;
+    rclLine.yTop = pLineRcl->rcl.yTop + ptxvd->ulViewYOfs;
 
     if (pWordThis->usAnchor)
@@ -2149 +2149 @@
 
     // x start: this word's X coordinate
-    ptlStart.x = pWordThis->lX - ptxvd->lViewXOfs;
+    ptlStart.x = pWordThis->lX - ptxvd->ulViewXOfs;
     // y start: bottom line of rectangle plus highest
     // base line offset found in all words (format step 2)
@@ -2175 +2175 @@
                        &rclLine,
                        pWordThis,
-                       ptxvd->lViewXOfs);
+                       ptxvd->ulViewXOfs);
 }
 
@@ -2399 +2399 @@
                             pwndParams->pszText,
                             0);
-                    ptxvd->lViewXOfs = 0;
-                    ptxvd->lViewYOfs = 0;
+                    ptxvd->ulViewXOfs = 0;
+                    ptxvd->ulViewYOfs = 0;
                     /* ptxvd->fVScrollVisible = FALSE;
                     ptxvd->fHScrollVisible = FALSE; */
@@ -2581 +2581 @@
                 winhHandleScrollMsg(hwndTextView,
                                     ptxvd->hwndVScroll,
-                                    &ptxvd->lViewYOfs,
+                                    &ptxvd->ulViewYOfs,
                                     &ptxvd->rclViewText,
                                     ptxvd->xfd.ulViewportCY,
@@ -2601 +2601 @@
                 winhHandleScrollMsg(hwndTextView,
                                     ptxvd->hwndHScroll,
-                                    &ptxvd->lViewXOfs,
+                                    &ptxvd->ulViewXOfs,
                                     &ptxvd->rclViewText,
                                     ptxvd->xfd.ulViewportCX,
@@ -2657 +2657 @@
             PLISTNODE pWordNodeClicked = NULL;
 
-            ptlPos.x = SHORT1FROMMP(mp1) + ptxvd->lViewXOfs;
-            ptlPos.y = SHORT2FROMMP(mp1) - ptxvd->lViewYOfs;
+            ptlPos.x = SHORT1FROMMP(mp1) + ptxvd->ulViewXOfs;
+            ptlPos.y = SHORT2FROMMP(mp1) - ptxvd->ulViewYOfs;
 
             if (hwndTextView != WinQueryFocus(HWND_DESKTOP))
@@ -2721 +2721 @@
             HWND        hwndOwner = NULLHANDLE;
 
-            ptlPos.x = SHORT1FROMMP(mp1) + ptxvd->lViewXOfs;
-            ptlPos.y = SHORT2FROMMP(mp1) - ptxvd->lViewYOfs;
+            ptlPos.x = SHORT1FROMMP(mp1) + ptxvd->ulViewXOfs;
+            ptlPos.y = SHORT2FROMMP(mp1) - ptxvd->ulViewYOfs;
             WinSetCapture(HWND_DESKTOP, NULLHANDLE);
 
@@ -3037 +3037 @@
                         // and then have lower y coordinates down to way in the negatives,
                         // to get the y offset, we must...
-                        ptxvd->lViewYOfs = (-pRect->rcl.yTop) - ulWinCY;
-
-                        if (ptxvd->lViewYOfs < 0)
-                            ptxvd->lViewYOfs = 0;
-                        if (ptxvd->lViewYOfs > ((LONG)ptxvd->xfd.ulViewportCY - ulWinCY))
-                            ptxvd->lViewYOfs = (LONG)ptxvd->xfd.ulViewportCY - ulWinCY;
+                        ptxvd->ulViewYOfs = (-pRect->rcl.yTop) - ulWinCY;
+
+                        if (ptxvd->ulViewYOfs < 0)
+                            ptxvd->ulViewYOfs = 0;
+                        if (ptxvd->ulViewYOfs > ((LONG)ptxvd->xfd.ulViewportCY - ulWinCY))
+                            ptxvd->ulViewYOfs = (LONG)ptxvd->xfd.ulViewportCY - ulWinCY;
 
                         // vertical scroll bar enabled at all?
@@ -3050 +3050 @@
                                                                 ulWinCY,
                                                                 ptxvd->xfd.ulViewportCY,
-                                                                ptxvd->lViewYOfs,
+                                                                ptxvd->ulViewYOfs,
                                                                 (ptxvd->cdata.flStyle & XTXF_AUTOVHIDE));
                             WinInvalidateRect(hwndTextView, NULL, FALSE);
@@ -3440 +3440 @@
     ULONG       ulCurrentLineIndex = 0,
                 ulCurrentPage = 1;
-    LONG        lCurrentYOfs = 0;
+    ULONG       ulCurrentYOfs = 0;
 
     /* MATRIXLF    matlf;
@@ -3510 +3510 @@
                                     &rclPageWorld,
                                     0,
-                                    &lCurrentYOfs,
+                                    &ulCurrentYOfs,
                                     FALSE,      // draw only fully visible lines
                                     &ulCurrentLineIndex); // in/out: line to start with