Changeset 26003

Timestamp:

06/17/08 18:49:06 (5 months ago)

Author:

bonefish

Message:

* Some preparations for DEC private mode settings support.
* Implemented alternate screen buffer support. Not used by any program

yet, since we still use the beterm termcap entry.

Location:

haiku/trunk/src/apps/terminal

Files:

• BasicTerminalBuffer.cpp (modified) (6 diffs)
• BasicTerminalBuffer.h (modified) (5 diffs)
• TermParse.cpp (modified) (3 diffs)
• TermParse.h (modified) (1 diff)
• TermView.cpp (modified) (3 diffs)
• TerminalBuffer.cpp (modified) (5 diffs)
• TerminalBuffer.h (modified) (1 diff)

haiku/trunk/src/apps/terminal/BasicTerminalBuffer.cpp

@@ -121 +121 @@
 
         fOverwriteMode = true;
+        fAlternateScreenActive = false;
 
         fScreen = _AllocateLines(width, height);
@@ -163 +164 @@
                 return SetHistoryCapacity(historyCapacity);
 
-        // TODO: When alternate screen support is implemented, do that only when
-        // not using the alternate screen.
-        if (true)
-                return _ResizeRewrap(width, height, historyCapacity);
-
-        return _ResizeSimple(width, height, historyCapacity);
+        if (fAlternateScreenActive)
+                return _ResizeSimple(width, height, historyCapacity);
+
+        return _ResizeRewrap(width, height, historyCapacity);
 }
 
@@ -180 +179 @@
 
 void
-BasicTerminalBuffer::Clear()
+BasicTerminalBuffer::Clear(bool resetCursor)
 {
         fScreenOffset = 0;
         _ClearLines(0, fHeight - 1);
-        fCursor.SetTo(0, 0);
+
+        if (resetCursor)
+                fCursor.SetTo(0, 0);
 
         if (fHistory != NULL)
@@ -586 +587 @@
                 _Scroll(fScrollTop, fScrollBottom, 1);
         } else {
-                fCursor.y++;
+                if (fCursor.y < fHeight - 1)
+                        fCursor.y++;
                 _CursorChanged();
         }
@@ -732 +734 @@
 //debug_printf("BasicTerminalBuffer::SetCursor(%d, %d)\n", x, y);
         x = restrict_value(x, 0, fWidth - 1);
-        y = restrict_value(y, fScrollTop, fScrollBottom);
+        y = restrict_value(y, 0, fHeight - 1);
         if (x != fCursor.x || y != fCursor.y) {
                 fCursor.x = x;
@@ -774 +776 @@
 
 // #pragma mark - private methods
+
+
+void
+BasicTerminalBuffer::_InvalidateAll()
+{
+        fDirtyInfo.invalidateAll = true;
+
+        if (!fDirtyInfo.messageSent) {
+                NotifyListener();
+                fDirtyInfo.messageSent = true;
+        }
+}
 
 

haiku/trunk/src/apps/terminal/BasicTerminalBuffer.h

@@ -22 +22 @@
         int32   dirtyTop;                               // dirty line range
         int32   dirtyBottom;                    //
+        bool    invalidateAll;
         bool    messageSent;                    // listener has been notified
 
@@ -42 +43 @@
                 dirtyTop = INT_MAX;
                 dirtyBottom = INT_MIN;
+                invalidateAll = false;
                 messageSent = false;
         }
@@ -62 +64 @@
                         TerminalBufferDirtyInfo& DirtyInfo()    { return fDirtyInfo; }
 
-                        status_t                        ResizeTo(int32 width, int32 height);
-                        status_t                        ResizeTo(int32 width, int32 height,
+        virtual status_t                        ResizeTo(int32 width, int32 height);
+        virtual status_t                        ResizeTo(int32 width, int32 height,
                                                                         int32 historyCapacity);
                         status_t                        SetHistoryCapacity(int32 historyCapacity);
-                        void                            Clear();
+                        void                            Clear(bool resetCursor);
 
                         void                            SynchronizeWith(
@@ -140 +142 @@
         inline  void                            _Invalidate(int32 top, int32 bottom);
         inline  void                            _CursorChanged();
+                        void                            _InvalidateAll();
 
         static  TerminalLine**          _AllocateLines(int32 width, int32 count);
@@ -183 +186 @@
 
                         bool                            fOverwriteMode; // false for insert
+                        bool                            fAlternateScreenActive;
 
                         int                                     fEncoding;

haiku/trunk/src/apps/terminal/TermParse.cpp

@@ -791 +791 @@
                                 case CASE_DECSET:
                                         /* DECSET */
-                                        //      dpmodes(term, bitset);
+                                        for (int i = 0; i < nparam; i++)
+                                                _DecPrivateModeSet(param[i]);
                                         parsestate = groundtable;
                                         break;
@@ -797 +798 @@
                                 case CASE_DECRST:
                                         /* DECRST */
-                                        //      dpmodes(term, bitclr);
+                                        for (int i = 0; i < nparam; i++)
+                                                _DecPrivateModeReset(param[i]);
                                         parsestate = groundtable;
                                         break;
@@ -1071 +1073 @@
         }
 }
+
+
+void
+TermParse::_DecPrivateModeSet(int value)
+{
+        switch (value) {
+                case 1:
+                        // Application Cursor Keys (whatever that means).
+                        // Not supported yet.
+                        break;
+                case 5:
+                        // Reverse Video (inverses colors for the complete screen
+                        // -- when followed by normal video, that's shortly flashes the
+                        // screen).
+                        // Not supported yet.
+                        break;
+                case 12:
+                        // Start Blinking Cursor.
+                        // Not supported yet.
+                        break;
+                case 25:
+                        // Show Cursor
+                        // Not supported yet.
+                        break;
+                case 1034:
+                        // Interpret "meta" key, sets eighth bit.
+                        // Not supported yet.
+                        break;
+                case 1049:
+                        // Save cursor as in DECSC and use Alternate Screen Buffer, clearing
+                        // it first.
+                        fBuffer->SaveCursor();
+                        fBuffer->UseAlternateScreenBuffer();
+                        break;
+        }
+}
+
+
+void
+TermParse::_DecPrivateModeReset(int value)
+{
+        switch (value) {
+                case 1:
+                        // Normal Cursor Keys (whatever that means).
+                        // Not supported yet.
+                        break;
+                case 3:
+                        // 80 Column Mode.
+                        // Not supported yet.
+                        break;
+                case 4:
+                        // Jump (Fast) Scroll.
+                        // Not supported yet.
+                        break;
+                case 5:
+                        // Normal Video (Leaves Reverse Video, cf. there).
+                        // Not supported yet.
+                        break;
+                case 12:
+                        // Stop Blinking Cursor.
+                        // Not supported yet.
+                        break;
+                case 25:
+                        // Hide Cursor
+                        // Not supported yet.
+                        break;
+                case 1034:
+                        // Don’t interpret "meta" key.
+                        // Not supported yet.
+                        break;
+                case 1049:
+                        // Use Normal Screen Buffer and restore cursor as in DECRC.
+                        fBuffer->RestoreCursor();
+                        fBuffer->UseNormalScreenBuffer();
+                        break;
+        }
+}

haiku/trunk/src/apps/terminal/TermParse.h

@@ -77 +77 @@
 
         void _DeviceStatusReport(int n);
+        void _DecPrivateModeSet(int value);
+        void _DecPrivateModeReset(int value);
 
         int fFd;

haiku/trunk/src/apps/terminal/TermView.cpp

@@ -711 +711 @@
         {
                 BAutolock _(fTextBuffer);
-                fTextBuffer->Clear();
-        }
-        fVisibleTextBuffer->Clear();
+                fTextBuffer->Clear(true);
+        }
+        fVisibleTextBuffer->Clear(true);
 
 //debug_printf("Invalidate()\n");
@@ -1564 +1564 @@
         TerminalBufferDirtyInfo& info = fTextBuffer->DirtyInfo();
         int32 linesScrolled = info.linesScrolled;
-        BRect bounds = Bounds();
-        int32 firstVisible = _LineAt(0);
-        int32 lastVisible = _LineAt(bounds.bottom);
-        int32 historySize = fTextBuffer->HistorySize();
 
 //debug_printf("TermView::_SynchronizeWithTextBuffer(): dirty: %ld - %ld, "
@@ -1630 +1626 @@
                 fScrolledSinceLastSync = 0;
         }
+
+        // Simple case first -- complete invalidation.
+        if (info.invalidateAll) {
+                Invalidate();
+                _UpdateScrollBarRange();
+                int32 offset = _LineAt(0);
+                fVisibleTextBuffer->SynchronizeWith(fTextBuffer, offset, offset,
+                        offset + fTextBuffer->Height() + 2);
+                info.Reset();
+                return;
+        }
+
+        BRect bounds = Bounds();
+        int32 firstVisible = _LineAt(0);
+        int32 lastVisible = _LineAt(bounds.bottom);
+        int32 historySize = fTextBuffer->HistorySize();
 
         bool doScroll = false;

haiku/trunk/src/apps/terminal/TerminalBuffer.cpp

@@ -6 +6 @@
 #include "TerminalBuffer.h"
 
+#include <algorithm>
+
 #include <Message.h>
 
@@ -19 +21 @@
         BLocker("terminal buffer"),
         fEncoding(M_UTF8),
+        fAlternateScreen(NULL),
+        fAlternateHistory(NULL),
+        fAlternateScreenOffset(0),
         fListenerValid(false)
 {
@@ -26 +31 @@
 TerminalBuffer::~TerminalBuffer()
 {
+        delete fAlternateScreen;
+        delete fAlternateHistory;
 }
 
@@ -34 +41 @@
         if (Sem() < 0)
                 return Sem();
+
+        fAlternateScreen = _AllocateLines(width, height);
+        if (fAlternateScreen == NULL)
+                return B_NO_MEMORY;
 
         return BasicTerminalBuffer::Init(width, height, historySize);
@@ -96 +107 @@
                 fListener.SendMessage(MSG_TERMINAL_BUFFER_CHANGED);
 }
+
+
+status_t
+TerminalBuffer::ResizeTo(int32 width, int32 height)
+{
+        int32 historyCapacity = 0;
+        if (!fAlternateScreenActive)
+                historyCapacity = HistoryCapacity();
+        else if (fAlternateHistory != NULL)
+                historyCapacity = fAlternateHistory->Capacity();
+
+        return ResizeTo(width, height, historyCapacity);
+}
+
+
+status_t
+TerminalBuffer::ResizeTo(int32 width, int32 height, int32 historyCapacity)
+{
+        // switch to the normal screen buffer first
+        bool alternateScreenActive = fAlternateScreenActive;
+        if (alternateScreenActive)
+                _SwitchScreenBuffer();
+
+        int32 oldWidth = fWidth;
+        int32 oldHeight = fHeight;
+
+        // Resize the normal screen buffer/history.
+        status_t error = BasicTerminalBuffer::ResizeTo(width, height,
+                historyCapacity);
+        if (error != B_OK) {
+                if (alternateScreenActive)
+                        _SwitchScreenBuffer();
+                return error;
+        }
+
+        TermPos cursor = fCursor;
+
+        // Switch to the alternate screen buffer and resize it.
+        if (fAlternateScreen != NULL) {
+                _SwitchScreenBuffer();
+
+                fWidth = oldWidth;
+                fHeight = oldHeight;
+                fCursor.SetTo(0, 0);
+
+                error = BasicTerminalBuffer::ResizeTo(width, height, 0);
+                if (error != B_OK) {
+                        // This sucks -- we can't do anything about it. Delete the
+                        // alternate screen buffer.
+                        _FreeLines(fAlternateScreen, oldHeight);
+                        fAlternateScreen = NULL;
+                }
+
+                // Switch back.
+                if (!alternateScreenActive)
+                        _SwitchScreenBuffer();
+
+                fWidth = width;
+                fHeight = height;
+                fCursor = cursor;
+        }
+
+        return error;
+}
+
+
+void
+TerminalBuffer::UseAlternateScreenBuffer()
+{
+        if (fAlternateScreenActive || fAlternateScreen == NULL)
+                return;
+
+        _SwitchScreenBuffer();
+        Clear(false);
+        _InvalidateAll();
+}
+
+
+void
+TerminalBuffer::UseNormalScreenBuffer()
+{
+        if (!fAlternateScreenActive)
+                return;
+
+        _SwitchScreenBuffer();
+        _InvalidateAll();
+}
+
+
+void
+TerminalBuffer::_SwitchScreenBuffer()
+{
+        std::swap(fScreen, fAlternateScreen);
+        std::swap(fHistory, fAlternateHistory);
+        std::swap(fScreenOffset, fAlternateScreenOffset);
+        fAlternateScreenActive = !fAlternateScreenActive;
+}

haiku/trunk/src/apps/terminal/TerminalBuffer.h

@@ -29 +29 @@
                         void                            NotifyQuit(int32 reason);
 
+        virtual status_t                        ResizeTo(int32 width, int32 height);
+        virtual status_t                        ResizeTo(int32 width, int32 height,
+                                                                        int32 historyCapacity);
+
+                        void                            UseAlternateScreenBuffer();
+                        void                            UseNormalScreenBuffer();
+
 protected:
         virtual void                            NotifyListener();
 
 private:
+                        void                            _SwitchScreenBuffer();
+
+private:
                         int                                     fEncoding;
+
+                        TerminalLine**          fAlternateScreen;
+                        HistoryBuffer*          fAlternateHistory;
+                        int32                           fAlternateScreenOffset;
 
                         // listener/dirty region management