Removes images.sixel_cursor_conformance config option.

contour-terminal · Sep 20, 2022 · 753566d · 753566d
1 parent aef7a5c
commit 753566d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/metainfo.xml b/metainfo.xml
@@ -104,6 +104,7 @@
         <ul>
           <li>Fixes a problem with oversized glyphs being wrongly cut off (#821).</li>
           <li>Fixes vertical cursor movement for sixel graphics with only newlines (#822)</li>
+					<li>Removes `images.sixel_cursor_conformance` config option</li>
         </ul>
       </description>
     </release>

diff --git a/src/contour/Config.cpp b/src/contour/Config.cpp
@@ -1705,7 +1705,6 @@ void loadConfigFromFile(Config& _config, FileSystem::path const& _fileName)
     }
 
     tryLoadValue(usedKeys, doc, "images.sixel_scrolling", _config.sixelScrolling);
-    tryLoadValue(usedKeys, doc, "images.sixel_cursor_conformance", _config.sixelCursorConformance);
     tryLoadValue(usedKeys, doc, "images.sixel_register_count", _config.maxImageColorRegisters);
     tryLoadValue(usedKeys, doc, "images.max_width", _config.maxImageSize.width);
     tryLoadValue(usedKeys, doc, "images.max_height", _config.maxImageSize.height);

diff --git a/src/contour/Config.h b/src/contour/Config.h
@@ -283,7 +283,6 @@ struct Config
     std::shared_ptr<logstore::Sink> loggingSink;
 
     bool sixelScrolling = true;
-    bool sixelCursorConformance = true;
     terminal::ImageSize maxImageSize = {}; // default to runtime system screen size.
     unsigned maxImageColorRegisters = 4096;
 

diff --git a/src/contour/TerminalSession.cpp b/src/contour/TerminalSession.cpp
@@ -110,7 +110,7 @@ TerminalSession::TerminalSession(unique_ptr<Pty> _pty, ContourGuiApp& _app):
                 config_.bypassMouseProtocolModifier, // TODO: you too
                 config_.maxImageSize,
                 config_.maxImageColorRegisters,
-                config_.sixelCursorConformance,
+                true,
                 profile_.colors,
                 50.0,
                 config_.reflowOnResize,
@@ -1088,7 +1088,7 @@ void TerminalSession::configureTerminal()
 
     SessionLog()("Setting terminal ID to {}.", profile_.terminalId);
     terminal_.setTerminalId(profile_.terminalId);
-    terminal_.setSixelCursorConformance(config_.sixelCursorConformance);
+    terminal_.setSixelCursorConformance(true);
     terminal_.setMaxImageColorRegisters(config_.maxImageColorRegisters);
     terminal_.setMaxImageSize(config_.maxImageSize);
     terminal_.setMode(terminal::DECMode::NoSixelScrolling, !config_.sixelScrolling);

diff --git a/src/contour/contour.yml b/src/contour/contour.yml
@@ -125,9 +125,6 @@ images:
     sixel_scrolling: true
     # Configures the maximum number of color registers available when rendering Sixel graphics.
     sixel_register_count: 4096
-    # If enabled, the ANSI text cursor is placed at the position of the sixel graphics cursor after
-    # image rendering, otherwise (if disabled) the cursor is placed underneath the image.
-    sixel_cursor_conformance: true
     # maximum width in pixels of an image to be accepted (0 defaults to system screen pixel width)
     max_width: 0
     # maximum height in pixels of an image to be accepted (0 defaults to system screen pixel height)