Changeset 22129

Timestamp:

08/31/07 03:39:18 (15 months ago)

Author:

jackburton

Message:

If typing is hidden, don't reply to B_COPY or B_CUT messages, but beep()
in this case. Note that the public methods still let you copy and cut
the real text. Also prevented stealing passwords via scripting (not
tested, though). Fixes bug #1354
Got rid of the _BTextGapBuffer_::[] operator since using it creates less readable code.
Also Implemented _BTextGapBuffer_::RealText() and used it instead of Text() inside BTextView. Will make sense later.

Location:

haiku/trunk/src/kits/interface

Files:

• TextView.cpp (modified) (13 diffs)
• textview_support/TextGapBuffer.cpp (modified) (8 diffs)
• textview_support/TextGapBuffer.h (modified) (2 diffs)

haiku/trunk/src/kits/interface/TextView.cpp

@@ -774 +774 @@
         switch (message->what) {
                 case B_CUT:
-                        Cut(be_clipboard);
+                        if (!IsTypingHidden())
+                                Cut(be_clipboard);
+                        else
+                                beep();
                         break;
                         
                 case B_COPY:
-                        Copy(be_clipboard);
+                        if (!IsTypingHidden())
+                                Copy(be_clipboard);
+                        else
+                                beep();
                         break;
                         
@@ -846 +852 @@
                                 break;
                         }
-
+                        
+                        BMessage reply;
+                        bool handled = false;
                         switch(message->what) {         
                                 case B_GET_PROPERTY:
-                                {
-                                        BMessage reply;
-                                        GetProperty(&specifier, specifier.what, property, &reply);
-                                        message->SendReply(&reply);
+                                        handled = GetProperty(&specifier, specifier.what, property, &reply);
                                         break;
-                                }
                                 
                                 case B_SET_PROPERTY:
-                                {
-                                        BMessage reply;
-                                        SetProperty(&specifier, specifier.what, property, &reply);
-                                        message->SendReply(&reply);
+                                        handled = SetProperty(&specifier, specifier.what, property, &reply);
                                         break;
-                                }
                                 
                                 case B_COUNT_PROPERTIES:
-                                {
-                                        BMessage reply;
-                                        CountProperties(&specifier, specifier.what, property, &reply);  
-                                        message->SendReply(&reply);
+                                        handled = CountProperties(&specifier, specifier.what, property, &reply);        
                                         break;
-                                }
                                 
                                 default:
                                         break;
                         }
-
+                        if (handled)
+                                message->SendReply(&reply);
+                        else
+                                BView::MessageReceived(message);
                         break;
                 }
@@ -1133 +1132 @@
 BTextView::Text() const
 {
-        return fText->Text();
+        return fText->RealText();
 }
 
@@ -1165 +1164 @@
                 return '\0';
                 
-        return (*fText)[offset];
+        return fText->RealCharAt(offset);
 }
 
@@ -1636 +1635 @@
         
                 // special case: go down one line if inOffset is a newline
-                if (inOffset == textLength && (*fText)[inOffset - 1] == B_ENTER) {
+                if (inOffset == textLength && fText->RealCharAt(inOffset - 1) == B_ENTER) {
                         result.y += height;
                         height = LineHeight(CountLines() - 1);
@@ -1863 +1862 @@
         float height = (*fLines)[endLine + 1]->origin - (*fLines)[startLine]->origin;
                                 
-        if (startLine != endLine && endLine == numLines - 1 && (*fText)[fText->Length() - 1] == B_ENTER)
+        if (startLine != endLine && endLine == numLines - 1 && fText->RealCharAt(fText->Length() - 1) == B_ENTER)
                 height += (*fLines)[endLine + 1]->origin - (*fLines)[endLine]->origin;
         
@@ -2653 +2652 @@
         
         // add the text
-        drag->AddData("text/plain", B_MIME_TYPE, fText->Text() + fSelStart, 
+        drag->AddData("text/plain", B_MIME_TYPE, fText->RealText() + fSelStart, 
                                   fSelEnd - fSelStart);
         
@@ -3288 +3287 @@
                 }
                 for ( ; (offset + delta) < limit; delta++) {
-                        uchar theChar = (*fText)[offset + delta];
+                        uchar theChar = fText->RealCharAt(offset + delta);
                         if (!CanEndLine(offset + delta))
                                 break;
@@ -3321 +3320 @@
                 else {
                         int32 tabCount = 0;
-                        for (int32 i = delta - 1; (*fText)[offset + i] == B_TAB; i--)
+                        for (int32 i = delta - 1; fText->RealCharAt(offset + i) == B_TAB; i--)
                                 tabCount++;
                                 
@@ -3351 +3350 @@
                         if (!foundNewline) {
                                 for ( ; (offset + delta) < limit; delta++) {
-                                        if ((*fText)[offset + delta] != B_SPACE &&
-                                                (*fText)[offset + delta] != B_TAB)
+                                        const char realChar = fText->RealCharAt(offset + delta);
+                                        if (realChar != B_SPACE
+                                                && realChar != B_TAB)
                                                 break;
                                 }
-                                if ( (offset + delta) < limit && 
-                                         (*fText)[offset + delta] == B_ENTER )
+                                if ((offset + delta) < limit
+                                        && fText->RealCharAt(offset + delta) == B_ENTER )
                                         delta++;
                         }
@@ -3427 +3427 @@
                 } else
 #endif
-                        result += font->StringWidth(fText->Text() + fromOffset, numChars);
+                        result += font->StringWidth(fText->RealText() + fromOffset, numChars);
                 
                 fromOffset += numChars;
@@ -3594 +3594 @@
                                 
                                 int32 returnedBytes = tabChars;
-                                view->DrawString(fText->GetString(offset, &returnedBytes), returnedBytes);
-                                
+                                const char *stringToDraw = fText->GetString(offset, &returnedBytes);
+                                        
+                                view->DrawString(stringToDraw, returnedBytes);
                                 if (foundTab) {
                                         float penPos = PenLocation().x - fTextRect.left;
@@ -4309 +4310 @@
 
         } else if (strcmp(property, "Text") == 0) {
+                
+                if (IsTypingHidden()) {
+                        // Do not allow stealing passwords via scripting                        
+                        beep();
+                        return false;           
+                }               
+
                 int32 index, range;
                 

haiku/trunk/src/kits/interface/textview_support/TextGapBuffer.cpp

@@ -8 +8 @@
  */
 
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -194 +195 @@
                 
                 for (long i = 0; i < numBytes; i++)
-                        fScratchBuffer[i] = (*this)[fromOffset + i];
+                        fScratchBuffer[i] = RealCharAt(fromOffset + i);
 
                 result = fScratchBuffer;
@@ -204 +205 @@
                 uint32 numChars = UTF8CountChars(result, numBytes);
                 uint32 charLen = UTF8CountBytes(B_UTF8_BULLET, 1);
-                uint32 newSize = numChars * charLen + 1;
+                uint32 newSize = numChars * charLen;
+                
                 if ((uint32)fScratchSize < newSize) {
                         fScratchBuffer = (char *)realloc(fScratchBuffer, newSize);
@@ -216 +218 @@
                         scratchPtr += charLen;
                 }
-                scratchPtr = '\0';      
                 *_numBytes = newSize - 1;       
         }
@@ -229 +230 @@
         long numChars = *ioDelta;
         for (long i = 0; i < numChars; i++) {
-                if (((*this)[fromIndex + i] & 0xc0) == 0x80)
+                if ((RealCharAt(fromIndex + i) & 0xc0) == 0x80)
                         continue;
-                if ((*this)[fromIndex + i] == inChar) {
+                if (RealCharAt(fromIndex + i) == inChar) {
                         *ioDelta = i;
                         return true;
@@ -244 +245 @@
 _BTextGapBuffer_::Text()
 {
+        const char *realText = RealText();
+        
+        if (fPasswordMode) {
+                const uint32 numChars = UTF8CountChars(realText, Length());
+                const uint32 bulletCharLen = UTF8CountBytes(B_UTF8_BULLET, 1);
+                uint32 newSize = numChars * bulletCharLen + 1;
+                
+                if ((uint32)fScratchSize < newSize) {
+                        fScratchBuffer = (char *)realloc(fScratchBuffer, newSize);
+                        fScratchSize = newSize;
+                }
+                
+                char *scratchPtr = fScratchBuffer;
+                for (uint32 i = 0; i < numChars; i++) {
+                        memcpy(scratchPtr, B_UTF8_BULLET, bulletCharLen);
+                        scratchPtr += bulletCharLen;
+                }
+                scratchPtr = '\0';
+
+                return fScratchBuffer;
+        }
+        
+        return realText;
+}
+
+
+const char *
+_BTextGapBuffer_::RealText()
+{
         MoveGapTo(fItemCount);
         fBuffer[fItemCount] = '\0';
@@ -249 +279 @@
         return fBuffer;
 }
-
-
-/*char *
-_BTextGapBuffer_::RealText()
-{
-        return fText;
-}*/
 
 
@@ -299 +322 @@
 
 
-char 
-_BTextGapBuffer_::RealCharAt(int32 offset) const
-{
-        return (offset < fGapIndex) ? fBuffer[offset] : fBuffer[offset + fGapCount];
-}
-
-
 bool
 _BTextGapBuffer_::PasswordMode() const

haiku/trunk/src/kits/interface/textview_support/TextGapBuffer.h

@@ -30 +30 @@
 
                 const char      *Text();
+                const char      *RealText();
                 int32           Length() const;
-                char            operator[](int32 index) const;
-
                 
-//              char            *RealText();
                 const char      *GetString(int32 fromOffset, int32 *numBytes);
                 void            GetString(int32 offset, int32 length, char *buffer);
@@ -66 +64 @@
 
 inline char 
-_BTextGapBuffer_::operator[](long index) const
+_BTextGapBuffer_::RealCharAt(long index) const
 {
         return (index < fGapIndex) ? fBuffer[index] : fBuffer[index + fGapCount];