Ticket #6885: textview_paste_26102011.patch

src/kits/interface/TextView.cpp

@@ -1447 +1447 @@
                     B_MIME_TYPE, (const void **)&runArray, &runLen);
             }
 
+            _FilterDisallowedChars((char*)text, len, runArray);
+
+            if (len < 1) {
+                beep();
+                clipboard->Unlock();
+                return;
+            }
+
             if (fUndo) {
                 delete fUndo;
                 fUndo = new PasteUndoBuffer(this, text, len, runArray,
@@ -4805 +4813 @@
             inMessage->FindData("application/x-vnd.Be-text_run_array",
                 B_MIME_TYPE, (const void **)&runArray, &runLen);
 
+        _FilterDisallowedChars((char*)text, dataLen, runArray);
+
+        if (dataLen < 1) {
+            beep();
+            return true;
+        }
+
         if (fUndo) {
             delete fUndo;
             fUndo = new DropUndoBuffer(this, text, dataLen, runArray,
@@ -5574 +5589 @@
     int32 start;
     int32 finish;
     GetSelection(&start, &finish);
-    
+
     bool canEdit = IsEditable();
     int32 length = TextLength();
 
@@ -5602 +5617 @@
     menu->Go(where, true, true, true);
 }
 
+
+void
+BTextView::_FilterDisallowedChars(char* text, int32& len,
+    text_run_array* runArray)
+{
+    if (!fDisallowedChars)
+        return;
+
+    if (fDisallowedChars->IsEmpty() || !text)
+        return;
+
+    int32 s = 0;
+    if (runArray) {
+        int32 remNext = 0;
+
+        for (int i = 0; i < runArray->count; i++) {
+            runArray->runs[i].offset -= remNext;
+            while (s < runArray->runs[i].offset && s < len) {
+                if (fDisallowedChars->HasItem((void*)text[s])) {
+                    memmove(text + s, text + s + 1, len - s - 1);
+                    len--;
+                    runArray->runs[i].offset--;
+                    remNext++;
+                } else
+                    s++;
+            }
+        }
+    }
+
+    while (s < len) {
+        if (fDisallowedChars->HasItem((void*)text[s])) {
+            memmove(text + s, text + s + 1, len - s - 1);
+            len--;
+        } else
+            s++;
+    }
+}
+
 // #pragma mark - BTextView::TextTrackState
 
 

headers/os/interface/TextView.h

@@ -411 +411 @@
 
             void                _ShowContextMenu(BPoint where);
 
+            void                _FilterDisallowedChars(char* text, int32& len,
+                                    text_run_array* runArray);
+
 private:
             BPrivate::TextGapBuffer*    fText;
             LineBuffer*         fLines;