Changeset 375 for branches/branch-1-0/src/helpers/textview.c

Timestamp:

Nov 30, 2008, 1:57:41 AM (17 years ago)

Author:

pr

Message:

Allow copy to clipboard from textview control. Bug 1116.

File:

• branches/branch-1-0/src/helpers/textview.c (modified) (10 diffs)

branches/branch-1-0/src/helpers/textview.c

@@ -270 +270 @@
     lstInit(&pxfd->llWords,
             TRUE);      // auto-free items
+    xstrInit(&pxfd->strOrigText, 0);  // WarpIN V1.0.18
     xstrInit(&pxfd->strViewText, 0);
 }
@@ -420 +421 @@
  *@@added V0.9.3 (2000-05-07) [umoeller]
  *@@changed V0.9.20 (2002-08-10) [umoeller]: now stripping \xFF too
+ *@@changed V1.0.18 (2008-11-24) [pr]: fixes \xFF stripping @@fixes 1116
  */
 
@@ -452 +454 @@
             break;
 
-            case '\xFF':        // V0.9.20 (2002-08-10) [umoeller]
+            case TXVESC_CHAR:        // V0.9.20 (2002-08-10) [umoeller]
                 AppendCharNoCheck(&pszNew,
                                   &cbNew,
                                   &pTarget,
                                   ' ');
-                pSource++;
+                pSource += 3;  // V1.0.18
             break;
 
@@ -2125 +2127 @@
  *
  *@@added V0.9.20 (2002-08-10) [umoeller]
+ *@@changed WarpIN V1.0.18 (2008-11-29) [pr]
  */
 
@@ -2136 +2139 @@
         PSZ p;
 
+        // WarpIN V1.0.18
+        xstrcpy(&ptxvd->xfd.strOrigText,
+                pcszText,
+                0);
+
         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
+                // WarpIN V1.0.18
                 if (p = strdup(pcszText))
                 {
-                    PSZ p2 = p;
-                    while (p2 = strchr(p2, '\xFF'))
-                        *p2 = ' ';
+                    PSZ p2;
+                    for (p2 = p; p2 = strchr(p2, TXVESC_CHAR); *p2 = ' ');
+                    txvStripLinefeeds(&p, 4);
+                    xstrset(pstr, p);
+                }
+            break;
+
+            case XS_HTML:               // 0x0200
+                // WarpIN V1.0.18
+                if (p = strdup(pcszText))
+                {
+                    PSZ p2;
+                    for (p2 = p; p2 = strchr(p2, TXVESC_CHAR); *p2 = ' ');
                     txvConvertFromHTML(&p, NULL, NULL, NULL);
                     xstrset(pstr, p);
@@ -2777 +2785 @@
  *@@added V1.0.0 (2002-08-12) [umoeller]
  *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: added correct ID for horiz. scroll @@fixes 1086
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: added Ctrl-Ins copy capability @@fixes 1116
  */
 
@@ -2874 +2883 @@
 
                     usCmd = SB_SLIDERPOSITION;
+                break;
+
+                // WarpIN V1.0.18
+                case VK_INSERT:
+                    if (usFlags & KC_CTRL)
+                    {
+                        ulMsg = TXM_COPY;
+                        usID = 0;
+                    }
                 break;
 
@@ -2971 +2989 @@
     {
         xstrClear(&ptxvd->xfd.strViewText);
+        xstrClear(&ptxvd->xfd.strOrigText);  // WarpIN V1.0.18
         lstClear(&ptxvd->xfd.llRectangles);
         lstClear(&ptxvd->xfd.llWords);
@@ -3036 +3055 @@
  *@@changed V0.9.20 (2002-08-10) [umoeller]: added support for formatting HTML and plain text automatically
  *@@changed V1.0.0 (2002-08-12) [umoeller]: optimized locality by moving big chunks into subfuncs
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: added Ctrl-Ins copy capability @@fixes 1116
+ *@@changed WarpIN V1.0.18 (2008-11-29) [pr]: added style set/query functions @@fixes 1116
  */
 
@@ -3446 +3467 @@
                        sizeof(SIZEL));
                 mrc = (MRESULT)TRUE;
+            }
+        break;
+
+        /*
+         *@@ TXM_QUERYSTYLE:
+         *      returns the current style flags.
+         *
+         *      This must be sent, not posted, to the control.
+         *
+         *      Parameters:
+         *
+         *      --  PULONG mp1: pointer to a ULONG buffer.
+         *
+         *      Returns TRUE on success.
+         *
+         *@@added WarpIN V1.0.18 (2008-11-29) [pr]
+         */
+
+        case TXM_QUERYSTYLE:
+            if (    (mp1)
+                 && (ptxvd = (PTEXTVIEWWINDATA)WinQueryWindowPtr(hwndTextView, QWL_PRIVATE))
+               )
+            {
+                *((ULONG *) mp1) = ptxvd->flStyle;
+                mrc = (MRESULT)TRUE;
+            }
+        break;
+
+        /*
+         *@@ TXM_SETSTYLE:
+         *      sets the current style flags.
+         *
+         *      This must be sent, not posted, to the control.
+         *
+         *      Parameters:
+         *
+         *      --  PULONG mp1: pointer to a ULONG buffer.
+         *
+         *      Returns TRUE on success.
+         *
+         *@@added WarpIN V1.0.18 (2008-11-29) [pr]
+         */
+
+        case TXM_SETSTYLE:
+            if (    (mp1)
+                 && (ptxvd = (PTEXTVIEWWINDATA)WinQueryWindowPtr(hwndTextView, QWL_PRIVATE))
+               )
+            {
+                ptxvd->flStyle = *((ULONG *) mp1);
+                mrc = (MRESULT)TRUE;
+            }
+        break;
+
+        /*
+         *@@ TXM_COPY:
+         *      copies the unprocessed window text to the clipboard.
+         *
+         *      Returns TRUE on success.
+         *
+         *@@added WarpIN V1.0.18 (2008-11-16) [pr]
+         */
+
+        case TXM_COPY:
+            if (ptxvd = (PTEXTVIEWWINDATA)WinQueryWindowPtr(hwndTextView, QWL_PRIVATE))
+            {
+                mrc = (MRESULT) winhSetClipboardText(ptxvd->hab,
+                                                     ptxvd->xfd.strOrigText.psz,
+                                                     strlen(ptxvd->xfd.strOrigText.psz));
             }
         break;