Merge pull request #1805 from contour-terminal/fix/minors

Addresses failed Precondition when rendering vertically overflowing glyphs

Author: christianparpart

.github/workflows/build.yml

@@ -122,10 +122,10 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 20
-        sudo apt-get install clang-format-20
+        sudo ./llvm.sh 21
+        sudo apt-get install clang-format-21
     - name: "Clang-format"
-      run: find ./src/ -name "*.cpp" -o -name "*.h" | xargs clang-format-20 --Werror --dry-run
+      run: find ./src/ -name "*.cpp" -o -name "*.h" | xargs clang-format-21 --Werror --dry-run
     - name: "Check includes"
       run: ./scripts/check-includes.sh
 

metainfo.xml

@@ -119,6 +119,7 @@
           <li>Fixes empty history jump (#1781)</li>
           <li>Fixes double line box drawing characters</li>
           <li>Fixes DECRQM (DEC Request Mode) response (#1797)</li>
+          <li>Fixes Precondition failure when rendering vertically overflowing glyphs (#1805)</li>
           <li>Enables customizing predefined color palette (#1763)</li>
           <li>Ensure inserting new tabs happens right next to the currently active tab (#1695)</li>
           <li>Allow glyphs to underflow if they are not bigger than the cell size (#1603)</li>

src/contour/Actions.h

@@ -288,8 +288,7 @@ namespace documentation
 #if defined(__clang__) && __clang_major__ >= 19
 constexpr
 #endif
-    inline auto
-    getDocumentation()
+    inline auto getDocumentation()
 {
     return std::array {
         std::tuple { Action { CancelSelection {} }, documentation::CancelSelection },

src/text_shaper/directwrite_locator.cpp

@@ -114,10 +114,7 @@ struct directwrite_locator::Private
     }
 };
 
-directwrite_locator::directwrite_locator():
-    _d { new Private(), [](Private* p) {
-            delete p;
-        } }
+directwrite_locator::directwrite_locator(): _d { new Private(), [](Private* p) { delete p; } }
 {
 }
 

src/text_shaper/fontconfig_locator.cpp

@@ -149,10 +149,7 @@ struct fontconfig_locator::private_tag
     }
 };
 
-fontconfig_locator::fontconfig_locator():
-    _d { new private_tag(), [](private_tag* p) {
-            delete p;
-        } }
+fontconfig_locator::fontconfig_locator(): _d { new private_tag(), [](private_tag* p) { delete p; } }
 {
 }
 

src/text_shaper/open_shaper.cpp

@@ -487,9 +487,7 @@ struct open_shaper::private_open_shaper // {{{
     }
 
     private_open_shaper(DPI dpi, font_locator& locator):
-        ftCleanup { [this]() {
-            FT_Done_FreeType(ft);
-        } },
+        ftCleanup { [this]() { FT_Done_FreeType(ft); } },
         locator { &locator },
         dpi { dpi },
         hbBuf(hb_buffer_create(), [](auto p) { hb_buffer_destroy(p); }),

src/vtbackend/ColorPalette.cpp

@@ -83,9 +83,7 @@ bool defaultColorPalettes(std::string const& colorPaletteName, ColorPalette& pal
 
     // TODO add dim colors, do we need to adapt them to each of color palettes?
     std::map<std::string, std::function<void()>> const definedColorPalettes = {
-        { "contour",
-          [&]() {
-          } },
+        { "contour", [&]() {} },
         { "monokai",
           [&]() {
               // Monokai dark colors

src/vtbackend/Screen.cpp

@@ -470,9 +470,7 @@ void Screen<Cell>::writeText(string_view text, size_t cellCount)
 
     // Do not log individual characters, as we already logged the whole string above
     _logCharTrace = false;
-    auto const _ = crispy::finally { [&]() {
-        _logCharTrace = true;
-    } };
+    auto const _ = crispy::finally { [&]() { _logCharTrace = true; } };
 #endif
 
     assert(cellCount <= static_cast<size_t>(pageSize().columns.value - _cursor.position.column.value));

src/vtbackend/Terminal.cpp

@@ -157,9 +157,7 @@ Terminal::Terminal(Events& eventListener,
     _effectiveImageCanvasSize { _settings.maxImageSize },
     _sixelColorPalette { std::make_shared<SixelColorPalette>(_maxSixelColorRegisters,
                                                              _maxSixelColorRegisters) },
-    _imagePool { [this](Image const* image) {
-        discardImage(*image);
-    } },
+    _imagePool { [this](Image const* image) { discardImage(*image); } },
     _hyperlinks { .cache = HyperlinkCache { 1024 } },
     _sequenceBuilder { ModeDependantSequenceHandler { *this }, TerminalInstructionCounter { *this } },
     _parser { std::ref(_sequenceBuilder) },

src/vtbackend/VTWriter.cpp

@@ -17,16 +17,12 @@ VTWriter::VTWriter(Writer writer): _writer { std::move(writer) }
 }
 
 VTWriter::VTWriter(std::ostream& output):
-    VTWriter { [&](char const* d, size_t n) {
-        output.write(d, static_cast<std::streamsize>(n));
-    } }
+    VTWriter { [&](char const* d, size_t n) { output.write(d, static_cast<std::streamsize>(n)); } }
 {
 }
 
 VTWriter::VTWriter(std::vector<char>& output):
-    VTWriter { [&](char const* d, size_t n) {
-        output.insert(output.end(), d, d + n);
-    } }
+    VTWriter { [&](char const* d, size_t n) { output.insert(output.end(), d, d + n); } }
 {
 }