Ticket #4657: term-tab-stops.patch

src/apps/terminal/BasicTerminalBuffer.cpp

@@ -93 +93 @@
 BasicTerminalBuffer::BasicTerminalBuffer()
     :
     fScreen(NULL),
-    fHistory(NULL)
+    fHistory(NULL),
+    fTabStops(NULL)
 {
 }
 
@@ -102 +103 @@
 {
     delete fHistory;
     _FreeLines(fScreen, fHeight);
+    delete[] fTabStops;
 }
 
 
 status_t
 BasicTerminalBuffer::Init(int32 width, int32 height, int32 historySize)
 {
+    status_t error;
+
     fWidth = width;
     fHeight = height;
 
@@ -133 +137 @@
         if (fHistory == NULL)
             return B_NO_MEMORY;
 
-        status_t error = fHistory->Init(width, historySize);
+        error = fHistory->Init(width, historySize);
         if (error != B_OK)
             return error;
     }
 
+    error = _ResetTabStops(fWidth);
+    if (error != B_OK)
+        return error;
+
     for (int32 i = 0; i < fHeight; i++)
         fScreen[i]->Clear();
 
@@ -622 +630 @@
 }
 
 void
+BasicTerminalBuffer::InsertTab()
+{
+    int32 x;
+
+    fSoftWrappedCursor = false;
+
+    for (x = fCursor.x + 1; x < fWidth && !fTabStops[x]; x++)
+        ; // no body
+    x = restrict_value(x, 0, fWidth - 1);
+
+    if (x != fCursor.x) {
+        fCursor.x = x;
+        _CursorChanged();
+    }
+}
+
+void
 BasicTerminalBuffer::InsertLines(int32 numLines)
 {
     if (fCursor.y >= fScrollTop && fCursor.y < fScrollBottom) {
@@ -824 +849 @@
     fOriginMode = fSavedOriginMode;
 }
 
+void
+BasicTerminalBuffer::SetTabStop(int32 x)
+{
+    x = restrict_value(x, 0, fWidth - 1);
+    fTabStops[x] = true;
+}
+
+
+void
+BasicTerminalBuffer::ClearTabStop(int32 x)
+{
+    x = restrict_value(x, 0, fWidth - 1);
+    fTabStops[x] = false;
+}
+
+
+void
+BasicTerminalBuffer::ClearAllTabStops()
+{
+    for (int32 i = 0; i < fWidth; i++)
+        fTabStops[i] = false;
+}
+
 
 void
 BasicTerminalBuffer::NotifyListener()
@@ -1024 +1072 @@
     _FreeLines(fScreen, fHeight);
     fScreen = lines;
 
+    if (fWidth != width) {
+        status_t error = _ResetTabStops(width);
+        if (error != B_OK)
+            return error;
+    }
+
     fWidth = width;
     fHeight = height;
 
@@ -1209 +1263 @@
     fScreen = screen;
     fHistory = history;
 
+    if (fWidth != width) {
+        status_t error = _ResetTabStops(width);
+        if (error != B_OK)
+            return error;
+    }
+
 //debug_printf("  cursor: (%ld, %ld) -> (%ld, %ld)\n", fCursor.x, fCursor.y,
 //cursor.x, cursor.y);
     fCursor.x = cursor.x;
@@ -1229 +1289 @@
 }
 
 
+status_t
+BasicTerminalBuffer::_ResetTabStops(int32 width)
+{
+    if (fTabStops != NULL)
+        delete[] fTabStops;
+
+    fTabStops = new(std::nothrow) bool[width];
+    if (fTabStops == NULL)
+        return B_NO_MEMORY;
+
+    for (int32 i = 0; i < width; i++)
+        fTabStops[i] = (i % TAB_WIDTH) == 0;
+    return B_OK;
+}
+
 void
 BasicTerminalBuffer::_Scroll(int32 top, int32 bottom, int32 numLines)
 {

src/apps/terminal/BasicTerminalBuffer.h

@@ -107 +107 @@
             void                InsertCR();
             void                InsertLF();
             void                InsertRI();
+            void                InsertTab();
             void                SetInsertMode(int flag);
             void                InsertSpace(int32 num);
             void                InsertLines(int32 numLines);
@@ -142 +143 @@
             void                SetOriginMode(bool enabled);
             void                SaveOriginMode();
             void                RestoreOriginMode();
+            void                SetTabStop(int32 x);
+            void                ClearTabStop(int32 x);
+            void                ClearAllTabStops();
 
 protected:
     virtual void                NotifyListener();
@@ -166 +170 @@
                                     int32 historyCapacity);
             status_t            _ResizeRewrap(int32 width, int32 height,
                                     int32 historyCapacity);
+            status_t            _ResetTabStops(int32 width);
 
             void                _Scroll(int32 top, int32 bottom,
                                     int32 numLines);
@@ -202 +207 @@
             bool                fAlternateScreenActive;
             bool                fOriginMode;
             bool                fSavedOriginMode;
+            bool*               fTabStops;
 
             int                 fEncoding;
 

src/apps/terminal/TermConst.h

@@ -152 +152 @@
   SCRDOWN
 };
 
+#define TAB_WIDTH 8
+
 #define MIN_COLS 10
 #define MAX_COLS 256
 #define MIN_ROWS 10

src/apps/terminal/TermParse.cpp

@@ -301 +301 @@
 int32
 TermParse::EscParse()
 {
-    int tmp;
     int top, bot;
     int cs96 = 0;
     uchar curess = 0;
@@ -517 +516 @@
                 break;
 
             case CASE_TAB:
-                tmp = fBuffer->Cursor().x;
-                tmp %= 8;
-                fBuffer->MoveCursorRight(8 - tmp);
+                fBuffer->InsertTab();
                 break;
 
             case CASE_ESC:
@@ -847 +844 @@
 
                 case CASE_HTS:
                     /* HTS */
-                    //      TabSet(term->tabs, screen->cur_col);
+                    fBuffer->SetTabStop(fBuffer->Cursor().x);
+                    parsestate = groundtable;
+                    break;
+
+                case CASE_TBC:
+                    /* TBC */
+                    if (param[0] < 1)
+                        fBuffer->ClearTabStop(fBuffer->Cursor().x);
+                    else if (param[0] == 3)
+                        fBuffer->ClearAllTabStops();
                     parsestate = groundtable;
                     break;
 

src/apps/terminal/VTPrsTbl.c

@@ -1140 +1140 @@
 CASE_VPA,
 CASE_GROUND_STATE,
 CASE_CUP,
-CASE_GROUND_STATE,
+CASE_TBC,
 /*  h       i       j       k   */
 CASE_SET,
 CASE_GROUND_STATE,