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

Timestamp:

Aug 11, 2002, 7:07:59 PM (23 years ago)

Author:

umoeller

Message:

Major work on textview control and dialogs.

File:

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

trunk/src/helpers/textview.c

@@ -243 +243 @@
 
 #include "helpers\textview.h"
+#include "helpers\textv_html.h"
 
 #pragma hdrstop
@@ -418 +419 @@
  *
  *@@added V0.9.3 (2000-05-07) [umoeller]
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: now stripping \xFF too
  */
 
@@ -423 +425 @@
                        ULONG ulTabSize)
 {
-    PSZ pSource = *ppszText;
-    ULONG cbNew = 1000;
-    PSZ pszNew = (PSZ)malloc(cbNew);
-    PSZ pTarget = pszNew;
+    PSZ     pSource = *ppszText;
+    ULONG   cbNew = 1000;
+    PSZ     pszNew = (PSZ)malloc(cbNew);
+    PSZ     pTarget = pszNew;
+    ULONG   ul;
 
     while (*pSource)
     {
-        if (*pSource == '\r')
-            pSource++;
-        else if (*pSource == '\t')
-        {
-            ULONG ul;
-            for (ul = 0;
-                 ul < ulTabSize;
-                 ul++)
+        switch (*pSource)
+        {
+            case '\r':
+                pSource++;
+            break;
+
+            case '\t':
+                for (ul = 0;
+                     ul < ulTabSize;
+                     ul++)
+                    AppendCharNoCheck(&pszNew,
+                                      &cbNew,
+                                      &pTarget,
+                                      ' ');
+
+                // skip the tab
+                pSource++;
+            break;
+
+            case '\xFF':        // V0.9.20 (2002-08-10) [umoeller]
                 AppendCharNoCheck(&pszNew,
                                   &cbNew,
                                   &pTarget,
                                   ' ');
-
-            // skip the tab
-            pSource++;
+                pSource++;
+            break;
+
+            default:
+                AppendCharNoCheck(&pszNew,
+                                  &cbNew,
+                                  &pTarget,
+                                  *pSource++);
         }
-        else
-            AppendCharNoCheck(&pszNew,
-                              &cbNew,
-                              &pTarget,
-                              *pSource++);
     }
+
     AppendCharNoCheck(&pszNew,
                       &cbNew,
@@ -542 +558 @@
     //      of the next line or points to the \0 character
 
-    return (prc);
+    return prc;
 }
 
@@ -551 +567 @@
 #define TXVFRECTF_ENDOFTEXT              0x0010
    */
+
 /*
  *@@ FORMATLINEBUF:
@@ -577 +594 @@
 
     // current anchor
-    USHORT          usCurrentAnchor;
-                        // this is > 0 if we're currently in an anchor block
+    PSZ             pszCurrentLink;
+                        // this is != NULL if we're currently in a link block
+                        // and points to an item in XFORMATDATA.llLinks
+                        // (simply copied to the word structs that are created)
 
     // data copied to TXVWORD
     LONG            lcid;
     LONG            lPointSize;
-    ULONG           flOptions;  // any combination of CHS_UNDERSCORE and CHS_STRIKEOUT
+    ULONG           flChar;     // any combination of CHS_UNDERSCORE and CHS_STRIKEOUT
 
     // counters, ...
@@ -611 +630 @@
  *
  *@@added V0.9.3 (2000-05-14) [umoeller]
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: rewrote link implementation
  */
 
@@ -709 +729 @@
         pWord->lcid = pflbuf->pfmtf->lcid;
         pWord->lPointSize = pflbuf->lPointSize;
-        pWord->flOptions = pflbuf->flOptions;
-
-        pWord->usAnchor = pflbuf->usCurrentAnchor; // 0 if none
+        pWord->flChar = pflbuf->flChar;
+
+        pWord->pszLinkTarget = pflbuf->pszCurrentLink; // 0 if none
     }
 
-    return (pWord);
+    return pWord;
 }
 
@@ -756 +776 @@
     // an escape character was found; txvCreateRectangle
     // then sets pCurrent to the escape character (\xFF)
-    CHAR    cCode1 = *((*ppCurrent)+1);
-    CHAR    cCode2 = *((*ppCurrent)+2);
+    CHAR    cCode1 = *((*ppCurrent) + 1);
+    CHAR    cCode2 = *((*ppCurrent) + 2);
     ULONG   ulSkip = 3; // per default, skip \xFF plus two
     CHAR    szDecimal[10];
@@ -769 +789 @@
         case 1:     // change font:
             // three decimals follow specifying the font
-            memcpy(szDecimal, (*ppCurrent)+2, 3);
+            memcpy(szDecimal, (*ppCurrent) + 2, 3);
             szDecimal[3] = 0;
             lDecimal = atoi(szDecimal);
@@ -795 +815 @@
         case 4:     // U or /U
             if (cCode2 == 1)
-                pflbuf->flOptions |= CHS_UNDERSCORE;
+                pflbuf->flChar |= CHS_UNDERSCORE;
             else
-                pflbuf->flOptions &= ~CHS_UNDERSCORE;
+                pflbuf->flChar &= ~CHS_UNDERSCORE;
         break;
 
         case 5:     // STRIKE or /STRIKE
             if (cCode2 == 1)
-                pflbuf->flOptions |= CHS_STRIKEOUT;
+                pflbuf->flChar |= CHS_STRIKEOUT;
             else
-                pflbuf->flOptions &= ~CHS_STRIKEOUT;
+                pflbuf->flChar &= ~CHS_STRIKEOUT;
         break;
 
-        case 6:     // A or /A HREF= (link)
-            // four characters with hex anchor index (>=1)
-            // or "####"
-            if (  *( (*ppCurrent)+2 )
-                  == '#'
-               )
-                pflbuf->usCurrentAnchor = 0;
-            else
+        case 6:     // A HREF= (link)
+                    // changed implementation V0.9.20 (2002-08-10) [umoeller]
+        {
+            // this is variable in length and terminated with
+            // another 0xFF char; what's in between is the
+            // link target name and gets appended to
+            // XFORMATDATA.llLinks
+            PSZ pEnd;
+            if (pEnd = strchr((*ppCurrent) + 2, 0xFF))
             {
-                PSZ pEnd;
-                memcpy(szDecimal, (*ppCurrent)+2, 4);
-                szDecimal[4] = 0;
-                lDecimal = strtol(szDecimal, &pEnd, 16);
-                pflbuf->usCurrentAnchor = lDecimal;
+                pflbuf->pszCurrentLink = strhSubstr((*ppCurrent) + 2, pEnd);
+                ulSkip = pEnd - *ppCurrent + 1;
+
+                lstAppendItem(&pxfd->llLinks,
+                              pflbuf->pszCurrentLink);
             }
-
-            ulSkip = 6;
+        }
         break;
 
-        case 7:     // A NAME= (anchor name)
+        case 7:     // /A HREF (end of link)
+            pflbuf->pszCurrentLink = NULL;
+            ulSkip = 2;
+        break;
+
+        case 8:     // A NAME= (anchor name)
         {
             // this is variable in length and terminated with
@@ -834 +859 @@
             // searches the buffer
             PSZ pEnd;
-            if (pEnd = strchr((*ppCurrent)+2, 0xFF))
+            if (pEnd = strchr((*ppCurrent) + 2, 0xFF))
             {
                 ulSkip = pEnd - *ppCurrent + 1;
@@ -849 +874 @@
             // three characters follow specifying the
             // percentage
-            memcpy(szDecimal, (*ppCurrent)+2, 3);
+            memcpy(szDecimal, (*ppCurrent) + 2, 3);
             szDecimal[3] = 0;
             lDecimal = atoi(szDecimal);
@@ -858 +883 @@
 
         case 0x20: // left margin changed:
-            memcpy(szDecimal, (*ppCurrent)+2, 4);   // four decimals xxxx
+            memcpy(szDecimal, (*ppCurrent) + 2, 4);   // four decimals xxxx
             szDecimal[4] = 0;
             lDecimal = atoi(szDecimal);
@@ -871 +896 @@
 
         case 0x21: // first line margin changed:
-            memcpy(szDecimal, (*ppCurrent)+2, 4);   // +xxx, -xxx
+            memcpy(szDecimal, (*ppCurrent) + 2, 4);   // +xxx, -xxx
             szDecimal[4] = 0;
             lDecimal = atoi(szDecimal);
@@ -899 +924 @@
         case 0x30:  // spacing before paragraph:
             // four chars follow with either "####" or decimal spacing
-            memcpy(szDecimal, (*ppCurrent)+2, 4);
+            memcpy(szDecimal, (*ppCurrent) + 2, 4);
             szDecimal[4] = 0;
             if (memcmp(szDecimal, "####", 4) == 0)
@@ -915 +940 @@
         case 0x31:  // spacing before paragraph:
             // four chars follow with either "####" or decimal spacing
-            memcpy(szDecimal, (*ppCurrent)+2, 4);
+            memcpy(szDecimal, (*ppCurrent) + 2, 4);
             szDecimal[4] = 0;
             if (memcmp(szDecimal, "####", 4) == 0)
@@ -949 +974 @@
             pEscapeWord->cEscapeCode = *(*ppCurrent + 1);
             pEscapeWord->fPaintEscapeWord = fPaintEscapeWord;
-            pEscapeWord->usAnchor = pflbuf->usCurrentAnchor; // 0 if none
+            pEscapeWord->pszLinkTarget = pflbuf->pszCurrentLink;
+                    // V0.9.20 (2002-08-10) [umoeller]
+                    // NULL if none
             if (fPaintEscapeWord)
             {
@@ -955 +982 @@
                 pEscapeWord->lcid = pflbuf->pfmtf->lcid;
                 pEscapeWord->lPointSize = pflbuf->lPointSize;
-                pEscapeWord->flOptions = pflbuf->flOptions;
+                pEscapeWord->flChar = pflbuf->flChar;
             }
             lstAppendItem(&pxfd->llWords, pEscapeWord);
@@ -965 +992 @@
         *ppCurrent += ulSkip;
 
-    return (pEscapeWord);
+    return pEscapeWord;
 }
 
@@ -1055 +1082 @@
  *         to paint rectangles.
  *
- *      -- XFORMATDATA.ulViewportCX, ulViewportCY: total width
- *         and height of the "viewport", i.e. the total space
+ *      -- XFORMATDATA.szlWorkspace: total width
+ *         and height of the "workspace", i.e. the total space
  *         needed to display the text (in pels). This might
  *         be smaller, the same, or larger than prclView,
@@ -1062 +1089 @@
  *
  *         When displaying text, you should display scroll bars
- *         if the viewport is larger than the window (prclView).
- *
- *         When printing, if the viewport is larger than the
+ *         if the workspace is larger than the window (prclView).
+ *
+ *         When printing, if the workspace is larger than the
  *         printer page (prclView), you will need to call
  *         txvPaintText several times for each page.
@@ -1087 +1114 @@
         lstClear(&pxfd->llWords);
 
-    pxfd->ulViewportCX = 0;
-    pxfd->ulViewportCY = 0;
+    pxfd->szlWorkspace.cx = 0;
+    pxfd->szlWorkspace.cy = 0;
 
     if (pxfd->strViewText.cbAllocated)
@@ -1366 +1393 @@
 
                                 // update x extents
-                                if (pRect->rcl.xRight > pxfd->ulViewportCX)
-                                    pxfd->ulViewportCX = pRect->rcl.xRight;
+                                if (pRect->rcl.xRight > pxfd->szlWorkspace.cx)
+                                    pxfd->szlWorkspace.cx = pRect->rcl.xRight;
 
                                 // and quit the inner loop
@@ -1392 +1419 @@
 
                 // lCurrentYTop now has the bottommost point we've used;
-                // store this as viewport (this might be negative)
-                pxfd->ulViewportCY = lOrigYTop - lCurrentYTop;
+                // store this as workspace (this might be negative)
+                pxfd->szlWorkspace.cy = lOrigYTop - lCurrentYTop;
             }
         }
@@ -1586 +1613 @@
             {
                 PTXVWORD pWordThis = (PTXVWORD)pWordNode->pItemData;
-                ULONG flOptions = pWordThis->flOptions;
-
-                if (pWordThis->usAnchor)
-                    flOptions |= CHS_UNDERSCORE;
+                ULONG flChar = pWordThis->flChar;
+
+                if (pWordThis->pszLinkTarget)       // V0.9.20 (2002-08-10) [umoeller]
+                    flChar |= CHS_UNDERSCORE;
 
                 // x start: this word's X coordinate
@@ -1621 +1648 @@
                                         &ptlStart,
                                         &rclLine,
-                                        flOptions,
+                                        flChar,
                                         pWordThis->cChars,
                                         (PSZ)pWordThis->pStart);
@@ -1749 +1776 @@
     }
 
-    return (pWordNodeFound);
+    return pWordNodeFound;
 }
 
@@ -1802 +1829 @@
     }
 
-    return (pNodeFound);
+    return pNodeFound;
 }
 
@@ -1810 +1837 @@
  *
  ********************************************************************/
+
+#define QWL_PRIVATE     4               // V0.9.20 (2002-08-10) [umoeller]
 
 /*
  *@@ TEXTVIEWWINDATA:
  *      view control-internal structure, stored in
- *      QWL_USER at fnwpTextView.
+ *      QWL_PRIVATE at fnwpTextView.
  *      This is device-dependent on the text view
  *      window.
@@ -1826 +1855 @@
     HPS     hps;
 
+    ULONG   flStyle;            // window style flags copied on WM_CREATE
+                                // V0.9.20 (2002-08-10) [umoeller]
+
     LONG    lBackColor,
             lForeColor;
@@ -1840 +1872 @@
 
     RECTL   rclViewReal,        // window rect as returned by WinQueryWindowRect
-                                // (top right point is inclusive!!)
+                                // (top right point is inclusive!)
             rclViewPaint,       // same as rclViewReal, but excluding scroll bars
             rclViewText;        // same as rclViewPaint, but excluding cdata borders
@@ -1851 +1883 @@
     // anchor clicking
     PLISTNODE   pWordNodeFirstInAnchor;  // points to first word which belongs to anchor
-    USHORT      usLastAnchorClicked;    // last anchor which was clicked (1-0xFFFF)
+    // USHORT      usLastAnchorClicked;    // last anchor which was clicked (1-0xFFFF)
+    PSZ         pszLastLinkClicked;     // last link that was clicked (points into llLinks)
+
 } TEXTVIEWWINDATA, *PTEXTVIEWWINDATA;
 
@@ -1953 +1987 @@
     // if either the vertical or horizontal scroll bar has
     // popped up or been hidden
-    if (ptxvd->cdata.flStyle & XTXF_VSCROLL)
+    if (ptxvd->flStyle & XS_VSCROLL)
     {
         // vertical scroll bar enabled:
@@ -1968 +2002 @@
     }
 
-    if (ptxvd->cdata.flStyle & XTXF_HSCROLL)
+    if (ptxvd->flStyle & XS_HSCROLL)
     {
         ulOfs = 0;
@@ -2011 +2045 @@
     if (ptxvd->ulViewYOfs < 0)
         ptxvd->ulViewYOfs = 0;
-    if (ptxvd->ulViewYOfs > ((LONG)ptxvd->xfd.ulViewportCY - ulWinCY))
-        ptxvd->ulViewYOfs = (LONG)ptxvd->xfd.ulViewportCY - ulWinCY;
+    if (ptxvd->ulViewYOfs > ((LONG)ptxvd->xfd.szlWorkspace.cy - ulWinCY))
+        ptxvd->ulViewYOfs = (LONG)ptxvd->xfd.szlWorkspace.cy - ulWinCY;
 
     // vertical scroll bar enabled at all?
-    if (ptxvd->cdata.flStyle & XTXF_VSCROLL)
+    if (ptxvd->flStyle & XS_VSCROLL)
     {
         BOOL fEnabled = winhUpdateScrollBar(ptxvd->hwndVScroll,
                                             ulWinCY,
-                                            ptxvd->xfd.ulViewportCY,
+                                            ptxvd->xfd.szlWorkspace.cy,
                                             ptxvd->ulViewYOfs,
-                                            (ptxvd->cdata.flStyle & XTXF_AUTOVHIDE));
+                                            (ptxvd->flStyle & XS_AUTOVHIDE));
         // is auto-hide on?
-        if (ptxvd->cdata.flStyle & XTXF_AUTOVHIDE)
+        if (ptxvd->flStyle & XS_AUTOVHIDE)
         {
             // yes, auto-hide on: did visibility change?
@@ -2046 +2080 @@
 
     // horizontal scroll bar enabled at all?
-    if (ptxvd->cdata.flStyle & XTXF_HSCROLL)
+    if (ptxvd->flStyle & XS_HSCROLL)
     {
         BOOL fEnabled = winhUpdateScrollBar(ptxvd->hwndHScroll,
                                             ulWinCX,
-                                            ptxvd->xfd.ulViewportCX,
+                                            ptxvd->xfd.szlWorkspace.cx,
                                             ptxvd->ulViewXOfs,
-                                            (ptxvd->cdata.flStyle & XTXF_AUTOHHIDE));
+                                            (ptxvd->flStyle & XS_AUTOHHIDE));
         // is auto-hide on?
-        if (ptxvd->cdata.flStyle & XTXF_AUTOHHIDE)
+        if (ptxvd->flStyle & XS_AUTOHHIDE)
         {
             // yes, auto-hide on: did visibility change?
@@ -2071 +2105 @@
 
     WinInvalidateRect(hwndTextView, NULL, FALSE);
+}
+
+/*
+ *@@ SetWindowText:
+ *      implementation for WM_SETWINDOWPARAMS and
+ *      also WM_CREATE to set the window text.
+ *
+ *@@added V0.9.20 (2002-08-10) [umoeller]
+ */
+
+VOID SetWindowText(HWND hwndTextView,
+                   PTEXTVIEWWINDATA ptxvd,
+                   PCSZ pcszText)
+{
+    if (pcszText && *pcszText)
+    {
+        PXSTRING pstr = &ptxvd->xfd.strViewText;
+        PSZ p;
+
+        switch (ptxvd->flStyle & XS_FORMAT_MASK)
+        {
+            case XS_PLAINTEXT:          // 0x0100
+                xstrcpy(pstr,
+                        pcszText,
+                        0);
+                xstrConvertLineFormat(pstr,
+                                      CRLF2LF);
+                p = pstr->psz;
+                while (p = strchr(p, '\xFF'))
+                    *p = ' ';
+            break;
+
+            case XS_HTML:               // 0x0200
+                if (p = strdup(pcszText))
+                {
+                    PSZ p2 = p;
+                    while (p2 = strchr(p2, '\xFF'))
+                        *p2 = ' ';
+                    txvConvertFromHTML(&p, NULL, NULL, NULL);
+                    xstrset(pstr, p);
+                    xstrConvertLineFormat(pstr,
+                                          CRLF2LF);
+                }
+            break;
+
+            default: // case XS_PREFORMATTED:       // 0x0000
+                // no conversion (default)
+                xstrcpy(pstr,
+                        pcszText,
+                        0);
+            break;
+        }
+
+        // if the last character of the window text is not "\n",
+        // add it explicitly here, or our lines processing
+        // is being funny
+        // V0.9.20 (2002-08-10) [umoeller]
+        if (pstr->psz[pstr->ulLength - 1] != '\n')
+            xstrcatc(pstr, '\n');
+
+        ptxvd->ulViewXOfs = 0;
+        ptxvd->ulViewYOfs = 0;
+        AdjustViewRects(hwndTextView,
+                        ptxvd);
+        FormatText2Screen(hwndTextView,
+                          ptxvd,
+                          FALSE,
+                          TRUE);        // full format
+    }
 }
 
@@ -2136 +2239 @@
 {
     POINTL ptlStart;
-    ULONG flOptions = pWordThis->flOptions;
+    ULONG flChar = pWordThis->flChar;
     PTXVRECTANGLE pLineRcl = pWordThis->pRectangle;
 
@@ -2145 +2248 @@
     rclLine.yTop = pLineRcl->rcl.yTop + ptxvd->ulViewYOfs;
 
-    if (pWordThis->usAnchor)
-        flOptions |= CHS_UNDERSCORE;
+    if (pWordThis->pszLinkTarget)
+        flChar |= CHS_UNDERSCORE;
 
     // x start: this word's X coordinate
@@ -2164 +2267 @@
 
     if (!pWordThis->cEscapeCode)
+    {
         gpihCharStringPosAt(ptxvd->hps,
                             &ptlStart,
                             &rclLine,
-                            flOptions,
+                            flChar,
                             pWordThis->cChars,
                             (PSZ)pWordThis->pStart);
+    }
     else
         // escape to be painted:
@@ -2188 +2293 @@
 {
     PLISTNODE pNode = ptxvd->pWordNodeFirstInAnchor;
-    USHORT usAnchor = 0;
+    PSZ     pszLinkTarget = NULL;
     while (pNode)
     {
         PTXVWORD pWordThis = (PTXVWORD)pNode->pItemData;
-        if (usAnchor == 0)
+        if (!pszLinkTarget)
             // first loop:
-            usAnchor = pWordThis->usAnchor;
+            pszLinkTarget = pWordThis->pszLinkTarget;
         else
-            if (pWordThis->usAnchor != usAnchor)
+            if (pWordThis->pszLinkTarget != pszLinkTarget)
                 // first word with different anchor:
                 break;
@@ -2211 +2316 @@
  *      window procedure for the text view control. This is
  *      registered with the WC_XTEXTVIEW class in txvRegisterTextView.
- *      We have a TEXTVIEWWINDATA structure in QWL_USER where we
- *      store all information we need.
  *
  *      The text view control is not a subclassed whatever control,
@@ -2236 +2339 @@
  *
  *      -- WM_CHAR: if we have the focus, the user can move the
- *         visible part within the viewport using the usual
+ *         visible part within the workspace using the usual
  *         cursor and HOME/END keys.
  *
@@ -2251 +2354 @@
  *      should be speedier.
  *
+ *      The text view control uses a private window word for storing
+ *      its own data. The client is free to use QWL_USER of the
+ *      text view control.
+ *
  *@@changed V0.9.3 (2000-05-05) [umoeller]: removed TXM_NEWTEXT; now supporting WinSetWindowText
  *@@changed V0.9.3 (2000-05-07) [umoeller]: crashed if create param was NULL; fixed
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: no longer using QWL_USER, which is free now
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: setting text on window creation never worked, fixed
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: added TXN_ANCHORCLICKED owner notify for anchors
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: converted private style flags to XS_* window style flags
+ *@@changed V0.9.20 (2002-08-10) [umoeller]: added support for formatting HTML and plain text automatically
  */
 
@@ -2259 +2371 @@
     MRESULT mrc = 0;
 
-    PTEXTVIEWWINDATA ptxvd = (PTEXTVIEWWINDATA)WinQueryWindowPtr(hwndTextView, QWL_USER);
+    PTEXTVIEWWINDATA ptxvd = (PTEXTVIEWWINDATA)WinQueryWindowPtr(hwndTextView, QWL_PRIVATE);
 
     switch (msg)
@@ -2277 +2389 @@
             mrc = (MPARAM)TRUE;     // error
 
-            // allocate TEXTVIEWWINDATA for QWL_USER
+            // allocate TEXTVIEWWINDATA for QWL_PRIVATE
             if (ptxvd = (PTEXTVIEWWINDATA)malloc(sizeof(TEXTVIEWWINDATA)))
             {
                 SIZEL   szlPage = {0, 0};
                 BOOL    fShow = FALSE;
-                // LONG    lcid = 0;
 
                 // query message queue
@@ -2290 +2401 @@
 
                 memset(ptxvd, 0, sizeof(TEXTVIEWWINDATA));
-                WinSetWindowPtr(hwndTextView, QWL_USER, ptxvd);
+                WinSetWindowPtr(hwndTextView, QWL_PRIVATE, ptxvd);
 
                 ptxvd->hab = WinQueryAnchorBlock(hwndTextView);
@@ -2299 +2410 @@
                                          &szlPage, // use same page size as device
                                          PU_PELS | GPIT_MICRO | GPIA_ASSOC);
+
+                // copy window style flags V0.9.20 (2002-08-10) [umoeller]
+                ptxvd->flStyle = pcs->flStyle;
 
                 gpihSwitchToRGB(ptxvd->hps);
@@ -2345 +2459 @@
                                                      &sbcd,
                                                      0);
-                fShow = ((ptxvd->cdata.flStyle & XTXF_VSCROLL) != 0);
+                fShow = ((ptxvd->flStyle & XS_VSCROLL) != 0);
                 WinShowWindow(ptxvd->hwndVScroll, fShow);
                 ptxvd->fVScrollVisible = fShow;
@@ -2360 +2474 @@
                                                      &sbcd,
                                                      0);
-                fShow = ((ptxvd->cdata.flStyle & XTXF_HSCROLL) != 0);
+                fShow = ((ptxvd->flStyle & XS_HSCROLL) != 0);
                 WinShowWindow(ptxvd->hwndHScroll, fShow);
                 ptxvd->fHScrollVisible = fShow;
 
+                if (ptxvd->flStyle & XS_WORDWRAP)
+                    // word-wrapping should be enabled from the start:
+                    // V0.9.20 (2002-08-10) [umoeller]
+                    ptxvd->xfd.fmtpStandard.fWordWrap = TRUE;
+
                 // set "code" format
                 SetFormatFont(ptxvd->hps,
-                                 &ptxvd->xfd.fmtcCode,
-                                 6,
-                                 "System VIO");
+                              &ptxvd->xfd.fmtcCode,
+                              6,
+                              "System VIO");
 
                 // get colors from presparams/syscolors
@@ -2375 +2494 @@
                 AdjustViewRects(hwndTextView,
                                 ptxvd);
+
+                if (ptxvd->flStyle & XS_HTML)
+                {
+                    // if we're operating in HTML mode, set a
+                    // different default paragraph format to
+                    // make things prettier
+                    // V0.9.20 (2002-08-10) [umoeller]
+                    ptxvd->xfd.fmtpStandard.lSpaceBefore = 5;
+                    ptxvd->xfd.fmtpStandard.lSpaceAfter = 5;
+                }
+
+                // setting the window text on window creation never
+                // worked V0.9.20 (2002-08-10) [umoeller]
+                if (pcs->pszText)
+                    SetWindowText(hwndTextView,
+                                  ptxvd,
+                                  pcs->pszText);
 
                 mrc = (MPARAM)FALSE;        // OK
@@ -2392 +2528 @@
         {
             WNDPARAMS *pwndParams;
-            if (pwndParams = (WNDPARAMS *)mp1)
+            if (    (pwndParams = (WNDPARAMS *)mp1)
+                 && (pwndParams->fsStatus & WPM_TEXT)
+               )
             {
-                if (pwndParams->fsStatus & WPM_TEXT)
-                {
-                    xstrcpy(&ptxvd->xfd.strViewText,
-                            pwndParams->pszText,
-                            0);
-                    ptxvd->ulViewXOfs = 0;
-                    ptxvd->ulViewYOfs = 0;
-                    /* ptxvd->fVScrollVisible = FALSE;
-                    ptxvd->fHScrollVisible = FALSE; */
-                    AdjustViewRects(hwndTextView,
-                                    ptxvd);
-                    FormatText2Screen(hwndTextView,
-                                      ptxvd,
-                                      FALSE,
-                                      TRUE);        // full format
-                }
+                SetWindowText(hwndTextView,
+                              ptxvd,
+                              pwndParams->pszText);
+                mrc = (MRESULT)TRUE;     // was missing V0.9.20 (2002-08-10) [umoeller]
             }
         }
@@ -2485 +2611 @@
                 // (in between scroll bars) if we have
                 // both vertical and horizontal scroll bars
-                if (    (ptxvd->cdata.flStyle & (XTXF_VSCROLL | XTXF_HSCROLL))
-                        == (XTXF_VSCROLL | XTXF_HSCROLL)
+                if (    (ptxvd->flStyle & (XS_VSCROLL | XS_HSCROLL))
+                        == (XS_VSCROLL | XS_HSCROLL)
                      && (ptxvd->fVScrollVisible)
                      && (ptxvd->fHScrollVisible)
@@ -2523 +2649 @@
                                      &rcl2Update);
 
-                if (WinQueryFocus(HWND_DESKTOP) == hwndTextView)
+                if (    (!(ptxvd->flStyle & XS_STATIC))
+                                // V0.9.20 (2002-08-10) [umoeller]
+                     && (WinQueryFocus(HWND_DESKTOP) == hwndTextView)
+                   )
                 {
                     // we have the focus:
@@ -2585 +2714 @@
                                     &ptxvd->ulViewYOfs,
                                     &ptxvd->rclViewText,
-                                    ptxvd->xfd.ulViewportCY,
+                                    ptxvd->xfd.szlWorkspace.cy,
                                     ptxvd->cdata.ulVScrollLineUnit,
                                     msg,
@@ -2604 +2733 @@
                                     &ptxvd->ulViewXOfs,
                                     &ptxvd->rclViewText,
-                                    ptxvd->xfd.ulViewportCX,
+                                    ptxvd->xfd.szlWorkspace.cx,
                                     ptxvd->cdata.ulHScrollLineUnit,
                                     msg,
@@ -2618 +2747 @@
         case WM_SETFOCUS:
         {
-            HPS hps = WinGetPS(hwndTextView);
-            gpihSwitchToRGB(hps);
-            PaintViewFocus(hps,
-                           ptxvd,
-                           (mp2 != 0));
-            WinReleasePS(hps);
+            if (ptxvd->flStyle & XS_STATIC)
+            {
+                if (mp2)
+                {
+                    // we're receiving the focus, but shouldn't have it:
+                    // then behave like the static control does, that is,
+                    // give focus to the next window in the dialog
+                    HWND    hwnd = hwndTextView,
+                            hwndStart = hwnd;
+
+                    while (TRUE)
+                    {
+                        ULONG flStyle;
+
+                        if (!(hwnd = WinQueryWindow(hwnd, QW_NEXT)))
+                            hwnd = WinQueryWindow(WinQueryWindow(hwndStart, QW_PARENT), QW_TOP);
+
+                        // avoid endless looping
+                        if (hwnd == hwndStart)
+                        {
+                            if (    (hwnd = WinQueryWindow(hwnd, QW_OWNER))
+                                 && (hwnd == hwndStart)
+                               )
+                                hwnd = NULLHANDLE;
+
+                            break;
+                        }
+
+                        if (    (flStyle = WinQueryWindowULong(hwnd, QWL_STYLE))
+                             && (flStyle & (WS_DISABLED | WS_TABSTOP | WS_VISIBLE)
+                                    == (WS_TABSTOP | WS_VISIBLE))
+                           )
+                        {
+                            WinSetFocus(HWND_DESKTOP, hwnd);
+                            break;
+                        }
+                    };
+                }
+            }
+            else
+            {
+                HPS hps = WinGetPS(hwndTextView);
+                gpihSwitchToRGB(hps);
+                PaintViewFocus(hps,
+                               ptxvd,
+                               (mp2 != 0));
+                WinReleasePS(hps);
+            }
         }
         break;
@@ -2663 +2834 @@
             ptlPos.y = SHORT2FROMMP(mp1) - ptxvd->ulViewYOfs;
 
-            if (hwndTextView != WinQueryFocus(HWND_DESKTOP))
+            if (    (!(ptxvd->flStyle & XS_STATIC))
+                            // V0.9.20 (2002-08-10) [umoeller]
+                 && (hwndTextView != WinQueryFocus(HWND_DESKTOP))
+               )
                 WinSetFocus(HWND_DESKTOP, hwndTextView);
 
-            ptxvd->usLastAnchorClicked = 0;
+            ptxvd->pszLastLinkClicked = NULL;
 
             if (pWordNodeClicked = txvFindWordFromPoint(&ptxvd->xfd,
@@ -2673 +2847 @@
                 PTXVWORD pWordClicked = (PTXVWORD)pWordNodeClicked->pItemData;
 
-                // store anchor (can be 0)
-                ptxvd->usLastAnchorClicked = pWordClicked->usAnchor;
-
-                if (pWordClicked->usAnchor)
+                // store link target (can be NULL)
+                if (ptxvd->pszLastLinkClicked = pWordClicked->pszLinkTarget)
                 {
-                    // word has an anchor:
+                    // word has a link target:
                     PLISTNODE   pNode = pWordNodeClicked;
 
@@ -2689 +2861 @@
                     {
                         PTXVWORD pWordThis = (PTXVWORD)pNode->pItemData;
-                        if (pWordThis->usAnchor == pWordClicked->usAnchor)
+                        if (pWordThis->pszLinkTarget == pWordClicked->pszLinkTarget)
                         {
                             // still has same anchor:
@@ -2727 +2899 @@
             WinSetCapture(HWND_DESKTOP, NULLHANDLE);
 
-            if (ptxvd->usLastAnchorClicked)
+            if (ptxvd->pszLastLinkClicked)
             {
                 RepaintAnchor(ptxvd,
@@ -2739 +2911 @@
                                                                  QWS_ID),
                                             TXVN_LINK),
-                               (MPARAM)(ULONG)(ptxvd->usLastAnchorClicked));
+                               (MPARAM)(ULONG)(ptxvd->pszLastLinkClicked));
             }
 
@@ -2803 +2975 @@
                         if (usFlags & KC_CTRL)
                         {
-                            sPos = ptxvd->xfd.ulViewportCY;
+                            sPos = ptxvd->xfd.szlWorkspace.cy;
                             usCmd = SB_SLIDERPOSITION;
                         }
@@ -2826 +2998 @@
                             // vertical:
                             ulMsg = WM_VSCROLL;
-                            sPos = ptxvd->xfd.ulViewportCY;
+                            sPos = ptxvd->xfd.szlWorkspace.cy;
                         }
                         else
                         {
                             ulMsg = WM_HSCROLL;
-                            sPos = ptxvd->xfd.ulViewportCX;
+                            sPos = ptxvd->xfd.szlWorkspace.cx;
                         }
 
@@ -2866 +3038 @@
          *      index specified in mp1.
          *
+         *      This must be sent, not posted, to the control.
+         *
          *      Parameters:
+         *
          *      -- ULONG mp1: index of format to query.
          *              Must be 0 currently for the standard
          *              paragraph format.
+         *
          *      -- PXFMTPARAGRAPH mp2: pointer to buffer
          *              which is to receive the formatting
@@ -2904 +3080 @@
          *      and such).
          *
+         *      This must be sent, not posted, to the control.
+         *
          *      Parameters:
+         *
          *      -- ULONG mp1: index of format to set.
          *              Must be 0 currently for the standard
          *              paragraph format.
+         *
          *      -- PXFMTPARAGRAPH mp2: pointer to buffer
          *              from which to copy formatting data.
@@ -2953 +3133 @@
          *      the word-wrapping style of the default
          *      paragraph formatting.
+         *
+         *      This may be sent or posted.
+         *
          *      (BOOL)mp1 determines whether word wrapping
          *      should be turned on or off.
@@ -2972 +3155 @@
          *@@ TXM_QUERYCDATA:
          *      copies the current XTEXTVIEWCDATA
-         *      into the specified buffer. This must
-         *      be sent to the control.
+         *      into the specified buffer.
+         *
+         *      This must be sent, not posted, to the control.
          *
          *      Parameters:
-         *      -- PXTEXTVIEWCDATA mp1: target buffer.
-         *         Before calling this, you MUST specify
-         *         XTEXTVIEWCDATA.cbData.
+         *
+         *      --  PXTEXTVIEWCDATA mp1: target buffer.
+         *          Before calling this, you MUST specify
+         *          XTEXTVIEWCDATA.cbData.
+         *
+         *      Returns: the bytes that were copied as
+         *      a ULONG.
          */
 
@@ -2985 +3173 @@
             {
                 PXTEXTVIEWCDATA pTarget = (PXTEXTVIEWCDATA)mp1;
-                memcpy(pTarget, &ptxvd->cdata, pTarget->cbData);
+                mrc = (MRESULT)min(pTarget->cbData, sizeof(XTEXTVIEWCDATA));
+                memcpy(pTarget,
+                       &ptxvd->cdata,
+                       (ULONG)mrc);
             }
         break;
@@ -2993 +3184 @@
          *      updates the current XTEXTVIEWCDATA
          *      with the data from the specified buffer.
-         *      This must be sent to the control.
+         *
+         *      This must be sent, not posted, to the control.
          *
          *      Parameters:
@@ -3016 +3208 @@
          *      of the control.
          *
-         *      This must be sent, not posted to the control
+         *      This must be sent, not posted, to the control.
          *
          *      Parameters:
@@ -3046 +3238 @@
                         if (ptxvd->ulViewYOfs < 0)
                             ptxvd->ulViewYOfs = 0;
-                        if (ptxvd->ulViewYOfs > ((LONG)ptxvd->xfd.ulViewportCY - ulWinCY))
-                            ptxvd->ulViewYOfs = (LONG)ptxvd->xfd.ulViewportCY - ulWinCY;
+                        if (ptxvd->ulViewYOfs > ((LONG)ptxvd->xfd.szlWorkspace.cy - ulWinCY))
+                            ptxvd->ulViewYOfs = (LONG)ptxvd->xfd.szlWorkspace.cy - ulWinCY;
 
                         // vertical scroll bar enabled at all?
-                        if (ptxvd->cdata.flStyle & XTXF_VSCROLL)
+                        if (ptxvd->flStyle & XS_VSCROLL)
                         {
                             /* BOOL fEnabled = */ winhUpdateScrollBar(ptxvd->hwndVScroll,
                                                                 ulWinCY,
-                                                                ptxvd->xfd.ulViewportCY,
+                                                                ptxvd->xfd.szlWorkspace.cy,
                                                                 ptxvd->ulViewYOfs,
-                                                                (ptxvd->cdata.flStyle & XTXF_AUTOVHIDE));
+                                                                (ptxvd->flStyle & XS_AUTOVHIDE));
                             WinInvalidateRect(hwndTextView, NULL, FALSE);
                         }
                     }
                 }
+            }
+        break;
+
+        /*
+         *@@ TXM_QUERYTEXTEXTENT:
+         *      returns the extents of the currently set text,
+         *      that is, the width and height of the internal
+         *      work area, of which the current view rectangle
+         *      displays a subrectangle.
+         *
+         *      This must be sent, not posted, to the control.
+         *
+         *      Parameters:
+         *
+         *      --  PSIZEL mp1: pointer to a SIZEL buffer,
+         *          which receives the extent in the cx and
+         *          cy members. These will be set to null
+         *          values if the control currently has no
+         *          text.
+         *
+         *      Returns TRUE on success.
+         *
+         *@@added V0.9.20 (2002-08-10) [umoeller]
+         */
+
+        case TXM_QUERYTEXTEXTENT:
+            if (mp1)
+            {
+                memcpy((PSIZEL)mp1,
+                       &ptxvd->xfd.szlWorkspace,
+                       sizeof(SIZEL));
+                mrc = (MRESULT)TRUE;
             }
         break;
@@ -3093 +3317 @@
 BOOL txvRegisterTextView(HAB hab)
 {
-    return (WinRegisterClass(hab,
-                             WC_XTEXTVIEW,
-                             fnwpTextView,
-                             0,
-                             sizeof(PVOID)));     // QWL_USER
+    return WinRegisterClass(hab,
+                            WC_XTEXTVIEW,
+                            fnwpTextView,
+                            0,
+                            2 * sizeof(PVOID));     // QWL_USER and QWL_PRIVATE
 }
 
@@ -3111 +3335 @@
                             USHORT usID,
                             ULONG flWinStyle,
-                            ULONG flStyle,
                             USHORT usBorder)
 {
@@ -3150 +3373 @@
         memset(&xtxCData, 0, sizeof(xtxCData));
         xtxCData.cbData = sizeof(xtxCData);
-        xtxCData.flStyle = flStyle;
         xtxCData.ulXBorder = usBorder;
         xtxCData.ulYBorder = usBorder;
@@ -3183 +3405 @@
                             &lForeClr);
     }
-    return (hwndTextView);
+    return hwndTextView;
 }
 
@@ -3240 +3462 @@
     }
 
-    return (pprq3);
+    return pprq3;
 }
 
@@ -3301 +3523 @@
                      palRes);   // buffer
 
-    return (hdc);
+    return hdc;
 }
 
@@ -3334 +3556 @@
     }
 
-    return (pahci);
+    return pahci;
 }
 
@@ -3362 +3584 @@
     sizel.cx = 0;
     sizel.cy = 0;
-    return (GpiCreatePS(hab,
-                        hdc,
-                        &sizel,
-                        ulUnits | GPIA_ASSOC | GPIT_NORMAL));
+    return GpiCreatePS(hab,
+                       hdc,
+                       &sizel,
+                       ulUnits | GPIA_ASSOC | GPIT_NORMAL);
 }
 
@@ -3529 +3751 @@
     prthEndDoc(hdc, hps);
 
-    return (TRUE);
+    return TRUE;
 }
 
@@ -3549 +3771 @@
     int     irc = 0;
 
-    PTEXTVIEWWINDATA ptxvd = (PTEXTVIEWWINDATA)WinQueryWindowPtr(hwndTextView, QWL_USER);
+    PTEXTVIEWWINDATA ptxvd = (PTEXTVIEWWINDATA)WinQueryWindowPtr(hwndTextView, QWL_PRIVATE);
 
     if (!ptxvd)
@@ -3646 +3868 @@
     }
 
-    return (irc);
+    return irc;
 }