Rename <terminal> library to <vtbackend>.

contour-terminal · Dec 10, 2022 · ad60fa3 · ad60fa3
1 parent 7ab18fa
commit ad60fa3
Show file tree

Hide file tree

Showing 125 changed files with 296 additions and 292 deletions.
diff --git a/.clang-format b/.clang-format
@@ -69,7 +69,7 @@ UseTab: Never
 IncludeCategories:
   - Regex:     '^<(contour)/'
     Priority:  0
-  - Regex:     '^<(terminal)/'
+  - Regex:     '^<(vtbackend)/'
     Priority:  1
   - Regex:     '^<(vtparser)/'
     Priority:  2

diff --git a/.codecov.yml b/.codecov.yml
@@ -13,7 +13,7 @@ coverage:
     changes: no
 
   ignore:
-    - src/terminal/*_test.cpp
+    - src/vtbackend/*_test.cpp
     - 3rdparty/*
 
 parsers:

diff --git a/.github/fedora/contour.spec b/.github/fedora/contour.spec
@@ -70,7 +70,7 @@ cd build
 
 %check
 ./build/src/crispy/crispy_test
-./build/src/terminal/terminal_test
+./build/src/vtbackend/terminal_test
 
 
 %files

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -7,9 +7,13 @@ OpenGL:
     - src/contour/opengl/*.cpp
     - src/contour/opengl/*.h
 "VT: backend":
-    - src/terminal/*.cpp
-    - src/terminal/*.h
-"VT: renderer":
+    - src/vtbackend/*.cpp
+    - src/vtbackend/*.h
+    - src/vtpty/*.cpp
+    - src/vtpty/*.h
+    - src/vtparser/*.cpp
+    - src/vtparser/*.h
+"VT: rasterizer":
     - src/vtrasterizer/*.cpp
     - src/vtrasterizer/*.h
 documentation:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -204,7 +204,7 @@ jobs:
             cmake --build build/ -j2
             ./build/src/crispy/crispy_test
             ./build/src/vtparser/vtparser_test
-            ./build/src/terminal/terminal_test
+            ./build/src/vtbackend/terminal_test
             rm -rf _deps build
 
   osx_qt5:
@@ -243,7 +243,7 @@ jobs:
       - name: "test: vtparser"
         run: ./build/src/vtparser/vtparser_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
       - name: "Create Package(s)"
         run: |
           set -ex
@@ -297,7 +297,7 @@ jobs:
       - name: "test: vtparser"
         run: ./build/src/vtparser/vtparser_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
 
   windows:
     name: "Windows"
@@ -341,7 +341,7 @@ jobs:
       - name: "test: vtparser"
         run: .\build\src\vtparser\Release\vtparser_test.exe
       - name: "test: libterminal"
-        run: .\build\src\terminal\Release\terminal_test.exe
+        run: .\build\src\vtbackend\Release\terminal_test.exe
       - name: "Create Package(s)"
         shell: powershell
         run: |
@@ -449,7 +449,7 @@ jobs:
       - name: "test: vtparser"
         run: ./build/src/vtparser/vtparser_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
       - name: "Upload unit tests"
         if: ${{ matrix.compiler == 'GCC 10' && matrix.cxx == '20' }}
         uses: actions/upload-artifact@v3
@@ -458,8 +458,8 @@ jobs:
           path: |
             build/src/crispy/crispy_test
             build/src/vtparser/vtparser_test
-            build/src/terminal/terminal_test
-            build/src/terminal/bench-headless
+            build/src/vtbackend/terminal_test
+            build/src/vtbackend/bench-headless
             test/images
           retention-days: 1
 
@@ -521,7 +521,7 @@ jobs:
       - name: "test: vtparser"
         run: ./build/src/vtparser/vtparser_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
       - name: "linuxdeploy: Creating AppImage"
         run: |
           set -ex
@@ -608,7 +608,7 @@ jobs:
       - name: "test: vtparser"
         run: ./build/src/vtparser/vtparser_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
       - name: "CPack: Creating DEB package"
         run: |
           set -ex
@@ -672,7 +672,7 @@ jobs:
       - name: "test: vtparser (via valgrind)"
         run: valgrind --error-exitcode=64 ./build/src/vtparser/vtparser_test
       - name: "test: libterminal (via valgrind)"
-        run: valgrind --error-exitcode=64 ./build/src/terminal/terminal_test
+        run: valgrind --error-exitcode=64 ./build/src/vtbackend/terminal_test
       - name: "Delete artifact: contour-ubuntu2204-tests"
         uses: geekyeggo/delete-artifact@v2
         with:
@@ -714,7 +714,7 @@ jobs:
                           ncurses-bin \
                           valgrind
       - name: "bench-headless: ${{ matrix.test_case }}"
-        run: valgrind --error-exitcode=64 ./build/src/terminal/bench-headless ${{ matrix.test_case }} size 1
+        run: valgrind --error-exitcode=64 ./build/src/vtbackend/bench-headless ${{ matrix.test_case }} size 1
       - name: "Delete artifact: contour-ubuntu2204-tests"
         uses: geekyeggo/delete-artifact@v2
         with:

diff --git a/.github/workflows/codeql-analysis.yml.disabled b/.github/workflows/codeql-analysis.yml.disabled
@@ -51,7 +51,7 @@ jobs:
       - name: "test: libcrispy"
         run: ./build/src/crispy/crispy_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v1

diff --git a/.github/workflows/external_tests.yml b/.github/workflows/external_tests.yml
@@ -109,7 +109,7 @@ jobs:
     - name: "test: crispy"
       run: ./build/src/crispy/crispy_test
     - name: "test: libterminal"
-      run: ./build/src/terminal/terminal_test
+      run: ./build/src/vtbackend/terminal_test
     - name: "CPack: Creating DEB package"
       run: |
         set -ex

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -129,7 +129,7 @@ jobs:
       - name: "test: libcrispy"
         run: ./build/src/crispy/crispy_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
       - name: inspect
         run: |
           find build/ -print
@@ -353,7 +353,7 @@ jobs:
       - name: "test: crispy"
         run: ./build/src/crispy/crispy_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
       - name: "linuxdeploy: Creating AppImage"
         run: |
           set -ex
@@ -427,7 +427,7 @@ jobs:
       - name: "test: crispy"
         run: ./build/src/crispy/crispy_test
       - name: "test: libterminal"
-        run: ./build/src/terminal/terminal_test
+        run: ./build/src/vtbackend/terminal_test
       - name: "CPack: Creating DEB package"
         run: |
           set -ex

diff --git a/debian/rules b/debian/rules
@@ -26,7 +26,7 @@ build-stamp: configure-stamp
 	dh_testdir
 	$(MAKE) -C ${BUILDDIR} -j3
 	${BUILDDIR}/src/crispy/crispy_test
-	${BUILDDIR}/src/terminal/terminal_test
+	${BUILDDIR}/src/vtbackend/terminal_test
 	touch $@
 
 install: install-stamp

diff --git a/examples/watch-mouse-events.cpp b/examples/watch-mouse-events.cpp
@@ -11,9 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <terminal/InputGenerator.h>
-#include <terminal/Sequence.h>
-#include <terminal/primitives.h>
+#include <vtbackend/InputGenerator.h>
+#include <vtbackend/Sequence.h>
+#include <vtbackend/primitives.h>
 
 #include <vtparser/Parser.h>
 #include <vtparser/ParserEvents.h>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ add_subdirectory(crispy)
 add_subdirectory(text_shaper)
 add_subdirectory(vtpty)
 add_subdirectory(vtparser)
-add_subdirectory(terminal)
+add_subdirectory(vtbackend)
 add_subdirectory(vtrasterizer)
 
 if(CONTOUR_FRONTEND_GUI)

diff --git a/src/contour/CaptureScreen.cpp b/src/contour/CaptureScreen.cpp
@@ -13,7 +13,7 @@
  */
 #include <contour/CaptureScreen.h>
 
-#include <terminal/Functions.h>
+#include <vtbackend/Functions.h>
 
 #include <vtparser/Parser.h>
 #include <vtparser/ParserEvents.h>

diff --git a/src/contour/CaptureScreen.h b/src/contour/CaptureScreen.h
@@ -13,7 +13,7 @@
  */
 #pragma once
 
-#include <terminal/primitives.h>
+#include <vtbackend/primitives.h>
 
 #include <string>
 

diff --git a/src/contour/Config.cpp b/src/contour/Config.cpp
@@ -13,8 +13,8 @@
  */
 #include "Config.h"
 
-#include <terminal/ControlCode.h>
-#include <terminal/InputGenerator.h>
+#include <vtbackend/ControlCode.h>
+#include <vtbackend/InputGenerator.h>
 
 #include <vtpty/Process.h>
 

diff --git a/src/contour/Config.h b/src/contour/Config.h
@@ -16,10 +16,10 @@
 #include <contour/Actions.h>
 #include <contour/display/ShaderConfig.h>
 
-#include <terminal/Color.h>
-#include <terminal/ColorPalette.h>
-#include <terminal/InputBinding.h>
-#include <terminal/Sequencer.h> // CursorDisplay
+#include <vtbackend/Color.h>
+#include <vtbackend/ColorPalette.h>
+#include <vtbackend/InputBinding.h>
+#include <vtbackend/Sequencer.h> // CursorDisplay
 
 #include <vtpty/Process.h>
 

diff --git a/src/contour/ContourApp.cpp b/src/contour/ContourApp.cpp
@@ -15,8 +15,8 @@
 #include <contour/Config.h>
 #include <contour/ContourApp.h>
 
-#include <terminal/Capabilities.h>
-#include <terminal/Functions.h>
+#include <vtbackend/Capabilities.h>
+#include <vtbackend/Functions.h>
 
 #include <vtparser/Parser.h>
 

diff --git a/src/contour/ScrollableDisplay.cpp b/src/contour/ScrollableDisplay.cpp
@@ -16,8 +16,8 @@
 #include <contour/TerminalSession.h>
 #include <contour/helper.h>
 
-#include <terminal/Terminal.h>
-#include <terminal/Viewport.h>
+#include <vtbackend/Terminal.h>
+#include <vtbackend/Viewport.h>
 
 namespace contour
 {

diff --git a/src/contour/TerminalSession.cpp b/src/contour/TerminalSession.cpp
@@ -16,9 +16,9 @@
 #include <contour/display/TerminalWidget.h>
 #include <contour/helper.h>
 
-#include <terminal/MatchModes.h>
-#include <terminal/Terminal.h>
-#include <terminal/ViCommands.h>
+#include <vtbackend/MatchModes.h>
+#include <vtbackend/Terminal.h>
+#include <vtbackend/ViCommands.h>
 
 #include <vtpty/Process.h>
 #include <vtpty/Pty.h>

diff --git a/src/contour/TerminalSession.h b/src/contour/TerminalSession.h
@@ -16,7 +16,7 @@
 #include <contour/Audio.h>
 #include <contour/Config.h>
 
-#include <terminal/Terminal.h>
+#include <vtbackend/Terminal.h>
 
 #include <vtrasterizer/Renderer.h>
 

diff --git a/src/contour/TerminalWindow.cpp b/src/contour/TerminalWindow.cpp
@@ -23,7 +23,7 @@
 
 #include <contour/display/TerminalWidget.h>
 
-#include <terminal/Metrics.h>
+#include <vtbackend/Metrics.h>
 
 #include <vtpty/Pty.h>
 

diff --git a/src/contour/TerminalWindow.h b/src/contour/TerminalWindow.h
@@ -19,7 +19,7 @@
 #include <contour/TerminalSession.h>
 #include <contour/display/TerminalWidget.h>
 
-#include <terminal/Metrics.h>
+#include <vtbackend/Metrics.h>
 
 #include <crispy/assert.h>
 

diff --git a/src/contour/display/OpenGLRenderer.h b/src/contour/display/OpenGLRenderer.h
@@ -15,7 +15,7 @@
 
 #include <contour/display/Blur.h>
 
-#include <terminal/Image.h>
+#include <vtbackend/Image.h>
 
 #include <vtrasterizer/RenderTarget.h>
 #include <vtrasterizer/TextureAtlas.h>

diff --git a/src/contour/display/TerminalWidget.cpp b/src/contour/display/TerminalWidget.cpp
@@ -18,8 +18,8 @@
 #include <contour/display/TerminalWidget.h>
 #include <contour/helper.h>
 
-#include <terminal/Color.h>
-#include <terminal/Metrics.h>
+#include <vtbackend/Color.h>
+#include <vtbackend/Metrics.h>
 
 #include <vtpty/Pty.h>
 

diff --git a/src/contour/display/TerminalWidget.h b/src/contour/display/TerminalWidget.h
@@ -18,9 +18,9 @@
 #include <contour/TerminalSession.h>
 #include <contour/helper.h>
 
-#include <terminal/Color.h>
-#include <terminal/Metrics.h>
-#include <terminal/primitives.h>
+#include <vtbackend/Color.h>
+#include <vtbackend/Metrics.h>
+#include <vtbackend/primitives.h>
 
 #include <vtrasterizer/Renderer.h>
 

diff --git a/src/contour/helper.cpp b/src/contour/helper.cpp
@@ -15,7 +15,7 @@
 #include <contour/display/TerminalWidget.h>
 #include <contour/helper.h>
 
-#include <terminal/Terminal.h>
+#include <vtbackend/Terminal.h>
 
 #include <vtrasterizer/Renderer.h>
 

diff --git a/src/contour/helper.h b/src/contour/helper.h
@@ -15,8 +15,8 @@
 
 #include <contour/Config.h>
 
-#include <terminal/InputGenerator.h>
-#include <terminal/ScreenEvents.h>
+#include <vtbackend/InputGenerator.h>
+#include <vtbackend/ScreenEvents.h>
 
 #include <vtrasterizer/GridMetrics.h>
 

diff --git a/src/crispy/Size_test.cpp b/src/crispy/Size_test.cpp
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <terminal/Size.h>
+#include <vtbackend/Size.h>
 
 #include <catch2/catch.hpp>
 

diff --git a/src/terminal/MatchModes.cpp b/src/terminal/MatchModes.cpp
diff --git a/src/terminal/CMakeLists.txt → src/vtbackend/CMakeLists.txt b/src/terminal/CMakeLists.txt → src/vtbackend/CMakeLists.txt
diff --git a/src/terminal/Capabilities.cpp → src/vtbackend/Capabilities.cpp b/src/terminal/Capabilities.cpp → src/vtbackend/Capabilities.cpp
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <terminal/Capabilities.h>
+#include <vtbackend/Capabilities.h>
 
 #include <crispy/escape.h>
 

diff --git a/src/terminal/Capabilities.h → src/vtbackend/Capabilities.h b/src/terminal/Capabilities.h → src/vtbackend/Capabilities.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,7 @@ cd build @@
     %check
     ./build/src/crispy/crispy_test
-    ./build/src/terminal/terminal_test
+    ./build/src/vtbackend/terminal_test
     %files
@@ Expand Down @@