platform: simplify class hierarchy of DisplayAdapter

magiblot · Nov 15, 2024 · b0df20d · b0df20d
1 parent 87c9eab
commit b0df20d
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 134 deletions.
diff --git a/include/tvision/internal/ansiwrit.h b/include/tvision/internal/ansiwrit.h
@@ -2,14 +2,17 @@
 #define TVISION_ANSIWRIT_H
 
 #define Uses_TScreenCell
+#define Uses_TPoint
 #include <tvision/tv.h>
 
-#include <internal/termdisp.h>
 #include <internal/endian.h>
 
 namespace tvision
 {
 
+class ConsoleCtl;
+class DisplayAdapter;
+
 // TermColor represents a color that is to be printed to screen
 // using certain ANSI escape sequences.
 
@@ -68,11 +71,36 @@ struct TermAttr
     TColorAttr::Style style;
 };
 
+// Terminal quirk flags.
+
+const ushort
+    qfBoldIsBright  = 0x0001,
+    qfBlinkIsBright = 0x0002,
+    qfNoItalic      = 0x0004,
+    qfNoUnderline   = 0x0008;
+
+enum TermCapColors : uint8_t
+{
+    NoColor,
+    Indexed8,
+    Indexed16,
+    Indexed256,
+    Direct,
+    TermCapColorCount,
+};
+
+struct TermCap
+{
+    TermCapColors colors;
+    ushort quirks;
+
+    static TermCap getDisplayCapabilities( ConsoleCtl &con,
+                                           DisplayAdapter &display ) noexcept;
+};
+
 // AnsiScreenWriter allows printing characters and color attributes directly
 // to screen using ANSI escape codes.
 
-class ConsoleCtl;
-
 class AnsiScreenWriter
 {
     class Buffer
@@ -92,7 +120,7 @@ class AnsiScreenWriter
     };
 
     ConsoleCtl &con;
-    const TermCap &termcap;
+    TermCap termcap;
     Buffer buf;
     TPoint caretPos {-1, -1};
     TermAttr lastAttr {};
@@ -102,7 +130,7 @@ class AnsiScreenWriter
 
 public:
 
-    AnsiScreenWriter(ConsoleCtl &aCon, const TermCap &aTermcap) noexcept :
+    AnsiScreenWriter(ConsoleCtl &aCon, TermCap aTermcap) noexcept :
         con(aCon),
         termcap(aTermcap)
     {

diff --git a/include/tvision/internal/ncurdisp.h b/include/tvision/internal/ncurdisp.h
@@ -1,7 +1,7 @@
 #ifndef TVISION_NCURDISP_H
 #define TVISION_NCURDISP_H
 
-#include <internal/termdisp.h>
+#include <internal/platform.h>
 
 #ifdef HAVE_NCURSES
 
@@ -11,20 +11,21 @@
 namespace tvision
 {
 
-class NcursesDisplay final : public TerminalDisplay
+class NcursesDisplay final : public DisplayAdapter
 {
 public:
 
-    // The lifetime of 'con' exceeds that of 'this'.
-    NcursesDisplay(ConsoleCtl &con) noexcept;
+    // The lifetime of 'con' exceeds that of the returned object.
+    static NcursesDisplay &create(ConsoleCtl &con) noexcept;
     ~NcursesDisplay();
 
 private:
 
-    AnsiScreenWriter ansiScreenWriter;
+    ConsoleCtl &con;
     SCREEN *term;
+    AnsiScreenWriter ansiScreenWriter;
 
-protected:
+    NcursesDisplay(ConsoleCtl &, SCREEN *) noexcept;
 
     TPoint reloadScreenInfo() noexcept override;
 

diff --git a/include/tvision/internal/termdisp.h b/include/tvision/internal/termdisp.h
diff --git a/include/tvision/internal/win32con.h b/include/tvision/internal/win32con.h
@@ -3,7 +3,7 @@
 
 #include <tvision/tv.h>
 #include <compat/windows/windows.h>
-#include <internal/termdisp.h>
+#include <internal/platform.h>
 #include <internal/termio.h>
 #include <internal/ansiwrit.h>
 
@@ -65,7 +65,7 @@ class Win32Input final : public InputAdapter
     bool getEvent(TEvent &ev) noexcept override;
 };
 
-class Win32Display final : public TerminalDisplay
+class Win32Display final : public DisplayAdapter
 {
 public:
 
@@ -75,17 +75,17 @@ class Win32Display final : public TerminalDisplay
 
 private:
 
+    ConsoleCtl &con;
+
     TPoint size {};
     CONSOLE_FONT_INFO lastFontInfo {};
 
-    AnsiScreenWriter *ansiScreenWriter;
+    AnsiScreenWriter *ansiScreenWriter {nullptr};
 
     TPoint caretPos {-1, -1};
     uchar lastAttr {'\x00'};
     std::vector<char> buf;
 
-protected:
-
     TPoint reloadScreenInfo() noexcept override;
 
     int getColorCount() noexcept override;

diff --git a/source/platform/ansiwrit.cpp b/source/platform/ansiwrit.cpp
@@ -1,14 +1,49 @@
 #include <internal/ansiwrit.h>
-#include <internal/termdisp.h>
+#include <internal/platform.h>
 #include <internal/strings.h>
 #include <internal/conctl.h>
+#include <internal/getenv.h>
 #include <stdlib.h>
 
 #define CSI "\x1B["
 
 namespace tvision
 {
 
+TermCap TermCap::getDisplayCapabilities( ConsoleCtl &con,
+                                         DisplayAdapter &display ) noexcept
+{
+    TermCap termcap {};
+    auto colorterm = getEnv<TStringView>("COLORTERM");
+    if (colorterm == "truecolor" || colorterm == "24bit")
+        termcap.colors = Direct;
+    else
+    {
+        int colors = display.getColorCount();
+        if (colors >= 256*256*256)
+            termcap.colors = Direct;
+        else if (colors >= 256)
+            termcap.colors = Indexed256;
+        else if (colors >= 16)
+            termcap.colors = Indexed16;
+        else if (colors >= 8)
+        {
+            termcap.colors = Indexed8;
+            termcap.quirks |= qfBoldIsBright;
+#ifdef __linux__
+            if (con.isLinuxConsole())
+                termcap.quirks |= qfBlinkIsBright | qfNoItalic | qfNoUnderline;
+            else
+#endif // __linux__
+            if (getEnv<TStringView>("TERM") == "xterm")
+                // Let's assume all terminals disguising themselves as 'xterm'
+                // support at least 16 colors.
+                termcap.colors = Indexed16;
+        }
+    }
+    return termcap;
+}
+
 inline AnsiScreenWriter::Buffer::~Buffer()
 {
     free(head);

diff --git a/source/platform/ncurdisp.cpp b/source/platform/ncurdisp.cpp
@@ -4,20 +4,27 @@
 #include <internal/conctl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ncurses.h>
 
 namespace tvision
 {
 
-NcursesDisplay::NcursesDisplay(ConsoleCtl &aCon) noexcept :
-    TerminalDisplay(aCon),
-    ansiScreenWriter(aCon, TerminalDisplay::termcap)
+inline NcursesDisplay::NcursesDisplay(ConsoleCtl &aCon, SCREEN *aTerm) noexcept :
+    con(aCon),
+    term(aTerm),
+    ansiScreenWriter(aCon, TermCap::getDisplayCapabilities(con, *this))
+{
+}
+
+NcursesDisplay &NcursesDisplay::create(ConsoleCtl &con) noexcept
 {
     // Start curses mode.
-    term = newterm(nullptr, con.fout(), con.fin());
+    SCREEN *term = newterm(nullptr, con.fout(), con.fin());
     if (!term)
     {
-        fputs("Cannot initialize Ncurses: 'newterm' failed.\n", stderr);
+        const char *termEnv = getenv("TERM");
+        if (!termEnv)
+            termEnv = "";
+        fprintf(stderr, "Cannot initialize Ncurses: 'newterm' failed (TERM is '%s').\n", termEnv);
         exit(1);
     }
     // Enable colors if the terminal supports it.
@@ -27,10 +34,11 @@ NcursesDisplay::NcursesDisplay(ConsoleCtl &aCon) noexcept :
         // Use default colors when clearing the screen.
         use_default_colors();
     }
-    TerminalDisplay::initCapabilities();
     /* Refresh now so that a possible first getch() doesn't make any relevant
      * changes to the screen due to its implicit refresh(). */
     wrefresh(stdscr);
+
+    return *new NcursesDisplay(con, term);
 }
 
 NcursesDisplay::~NcursesDisplay()

diff --git a/source/platform/platfcon.cpp b/source/platform/platfcon.cpp
@@ -11,7 +11,6 @@
 #include <internal/sighandl.h>
 #include <internal/conctl.h>
 #include <internal/termio.h>
-#include <internal/getenv.h>
 
 namespace tvision
 {
@@ -27,7 +26,7 @@ ConsoleAdapter &Platform::createConsole() noexcept
 #else
     auto &con = ConsoleCtl::getInstance();
     InputState &inputState = *new InputState;
-    NcursesDisplay &display = *new NcursesDisplay(con);
+    NcursesDisplay &display = NcursesDisplay::create(con);
 #ifdef __linux__
     if (con.isLinuxConsole())
         return LinuxConsoleAdapter::create(con, displayBuf, inputState, display, *new NcursesInput(con, display, inputState, false));

diff --git a/source/platform/termdisp.cpp b/source/platform/termdisp.cpp
diff --git a/source/platform/win32con.cpp b/source/platform/win32con.cpp
@@ -241,11 +241,10 @@ bool Win32Input::getEvent(const INPUT_RECORD &ir, TEvent &ev) noexcept
 // Win32Display
 
 Win32Display::Win32Display(ConsoleCtl &aCon, bool useAnsi) noexcept :
-    TerminalDisplay(aCon),
-    ansiScreenWriter( useAnsi ? new AnsiScreenWriter(aCon, TerminalDisplay::termcap)
-                              : nullptr )
+    con(aCon)
 {
-    TerminalDisplay::initCapabilities();
+    if (useAnsi)
+        ansiScreenWriter = new AnsiScreenWriter(con, TermCap::getDisplayCapabilities(con, *this));
 }
 
 Win32Display::~Win32Display()