Improve some internal variable/method names in TEditor

Author: magiblot

include/tvision/editors.h

@@ -251,7 +251,7 @@ class TEditor : public TView
     void unlock();
     void update( uchar );
     void checkScrollBar( const TEvent&, TScrollBar *, int& );
-    void detectEOL();
+    void detectEol();
 
     TScrollBar *hScrollBar;
     TScrollBar *vScrollBar;
@@ -277,13 +277,13 @@ class TEditor : public TView
     Boolean overwrite;
     Boolean autoIndent;
 
-    enum EOLTypes { eolCRLF, eolLF, eolCR } eolType;
+    enum EolType { eolCrLf, eolLf, eolCr } eolType;
+    enum Encoding { encDefault, encSingleByte } encoding;
 
-    Boolean encSingleByte;
     void nextChar( TStringView, uint &P, uint &width );
     Boolean formatCell( TSpan<TScreenCell>, uint&, TStringView, uint& , TColorAttr );
     TStringView bufChars( uint );
-    TStringView bufPrevChars( uint );
+    TStringView prevBufChars( uint );
 
     static TEditorDialog _NEAR editorDialog;
     static ushort _NEAR editorFlags;

source/tvision/edits.cpp

@@ -55,15 +55,20 @@ void TEditor::formatLine( TScreenCell *DrawBuf,
             char Char = chars[0];
             if (Char == '\r' || Char == '\n')
                 goto fill;
-            if (Char == '\t') {
-                if (X < Width) {
-                    do {
+            if (Char == '\t')
+            {
+                if (X < Width)
+                {
+                    do
+                    {
                         ::setCell(Cells[X++], ' ', Color);
                     } while (X%8 != 0 && X < Width);
                     ++P;
-                } else
+                }
+                else
                     break;
-            } else
+            }
+            else
                 if (!formatCell(Cells, (uint&) X, chars, P, Color))
                     break;
         }
@@ -109,7 +114,7 @@ uint TEditor::nextChar( uint P )
     {
         if (bufChar(P) == '\r' && bufChar(P + 1) == '\n')
             return P + 2;
-        if (encSingleByte)
+        if (encoding == encSingleByte)
             return P + 1;
         else
             return P + TText::next(bufChars(P));
@@ -123,11 +128,11 @@ uint TEditor::prevChar( uint P )
     {
         if (bufChar(P - 2) == '\r' && bufChar(P - 1) == '\n')
             return P - 2;
-        if (encSingleByte)
+        if (encoding == encSingleByte)
             return P - 1;
         else
         {
-            TStringView t = bufPrevChars(P);
+            TStringView t = prevBufChars(P);
             return P - TText::prev(t, t.size());
         }
     }

source/tvision/teditor1.cpp

@@ -192,7 +192,7 @@ TEditor::TEditor( const TRect& bounds,
     selecting( False ),
     overwrite( False ),
     autoIndent( True ) ,
-    encSingleByte( False ),
+    encoding( encDefault ),
     lockCount( 0 ),
     updateFlags( 0 ),
     keyState( 0 )
@@ -233,41 +233,41 @@ void TEditor::changeBounds( const TRect& bounds )
 
 TStringView TEditor::bufChars( uint P )
 {
-    static thread_local char buf[4];
-    if (!encSingleByte)
+    static thread_local char buf[maxCharLength];
+    if (encoding == encSingleByte)
+        {
+        buf[0] = bufChar(P);
+        return TStringView(buf, 1);
+        }
+    else
         {
         int len = min(max(max(curPtr, bufLen) - P, 1), sizeof(buf));
         for (int i = 0; i < len; ++i)
             buf[i] = bufChar(P + i);
         return TStringView(buf, len);
         }
-    else
-        {
-        buf[0] = bufChar(P);
-        return TStringView(buf, 1);
-        }
 }
 
-TStringView TEditor::bufPrevChars( uint P )
+TStringView TEditor::prevBufChars( uint P )
 {
-    static thread_local char buf[4];
-    if (!encSingleByte)
+    static thread_local char buf[maxCharLength];
+    if (encoding == encSingleByte)
+        {
+        buf[0] = bufChar(P - 1);
+        return TStringView(buf, 1);
+        }
+    else
         {
         int len = min(max(P, 1), sizeof(buf));
         for (int i = 0; i < len; ++i)
             buf[i] = bufChar(P - len + i);
         return TStringView(buf, len);
         }
-    else
-        {
-        buf[0] = bufChar(P - 1);
-        return TStringView(buf, 1);
-        }
 }
 
 void TEditor::nextChar( TStringView s, uint &p, uint &width )
 {
-    if (encSingleByte || !s.size())
+    if (encoding == encSingleByte || s.size() == 0)
         {
         ++p;
         ++width;
@@ -618,7 +618,7 @@ void TEditor::handleEvent( TEvent& event )
             break;
 
         case evKeyDown:
-            if( ( !encSingleByte && event.keyDown.textLength > 0 ) ||
+            if( ( encoding != encSingleByte && event.keyDown.textLength > 0 ) ||
                 event.keyDown.charScan.charCode == 9 ||
                 ( event.keyDown.charScan.charCode >= 32 && event.keyDown.charScan.charCode < 255 )
               )
@@ -637,7 +637,7 @@ void TEditor::handleEvent( TEvent& event )
                         if( curPtr != lineEnd(curPtr) )
                             selEnd = nextChar(curPtr);
 
-                    if( !encSingleByte && event.keyDown.textLength > 0 )
+                    if( encoding != encSingleByte && event.keyDown.textLength > 0 )
                         insertText( event.keyDown.text, event.keyDown.textLength, False );
                     else
                         insertText( &event.keyDown.charScan.charCode, 1, False );

source/tvision/teditor2.cpp

@@ -68,24 +68,24 @@ static inline int isWordChar( int ch )
 
 #pragma warn .asc
 
-void TEditor::detectEOL()
+void TEditor::detectEol()
 {
     for (uint p = 0; p < bufLen; ++p)
         if (bufChar(p) == '\r')
         {
             if (p+1 < bufLen && bufChar(p+1) == '\n')
-                eolType = eolCRLF;
+                eolType = eolCrLf;
             else
-                eolType = eolCR;
+                eolType = eolCr;
             return;
         }
         else if (bufChar(p) == '\n')
         {
-            eolType = eolLF;
+            eolType = eolLf;
             return;
         }
-    // Default to CRLF
-    eolType = eolCRLF;
+    // Default to CRLF.
+    eolType = eolCrLf;
 }
 
 Boolean TEditor::hasSelection()
@@ -425,7 +425,7 @@ void TEditor::setBufLen( uint length )
     delCount = 0;
     insCount = 0;
     modified = False;
-    detectEOL();
+    detectEol();
     update(ufView);
 }
 
@@ -555,7 +555,10 @@ void TEditor::startSelect()
 
 void TEditor::toggleEncoding()
 {
-    encSingleByte = Boolean( !encSingleByte );
+    if( encoding == encDefault )
+        encoding = encSingleByte;
+    else
+        encoding = encDefault;
     updateFlags |= ufView;
     setSelect(selStart, selEnd, Boolean( curPtr < selEnd ));
 }
@@ -633,7 +636,7 @@ void TEditor::write( opstream& os )
     TView::write( os );
     os << hScrollBar << vScrollBar << indicator
        << bufSize << (uchar)canUndo << (uchar)eolType
-       << (uchar)encSingleByte;
+       << (uchar)encoding;
 }
 
 void *TEditor::read( ipstream& is )
@@ -643,8 +646,8 @@ void *TEditor::read( ipstream& is )
        >> bufSize;
     uchar temp;
     is >> temp; canUndo = Boolean(temp);
-    is >> temp; eolType = EOLTypes(temp);
-    is >> temp; encSingleByte = Boolean(temp);
+    is >> temp; eolType = EolType(temp);
+    is >> temp; encoding = Encoding(temp);
     selecting = False;
     overwrite = False;
     autoIndent = True;