Fullwidth-aware VMenu rendering and other improvements.

Author: MKadaner

far/changelog

@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+MZK 2026-01-04 17:57:18-05:00 - build 6626
+
+1. Fullwidth-aware VMenu rendering and other improvements.
+
 --------------------------------------------------------------------------------
 w17 2026-01-04 21:12:17+03:00 - build 6625
 

far/common.tests.cpp

@@ -44,6 +44,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Platform:
 
 // Common:
+#include "common/segment.hpp"
 
 // External:
 

far/common/algorithm.hpp

@@ -34,7 +34,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "exception.hpp"
 #include "preprocessor.hpp"
-#include "segment.hpp"
 #include "type_traits.hpp"
 
 #include <algorithm>
@@ -127,19 +126,4 @@ constexpr bool none_of(auto const&... Args)
 	return !any_of(Args...);
 }
 
-template<typename TA, typename TB, typename TC = std::common_type_t<TA, TB>>
-segment_t<TC> intersect(segment_t<TA> const A, segment_t<TB> const B)
-{
-	if (A.empty() || B.empty())
-		return {};
-
-	if (B.start() < A.start())
-		return intersect(B, A);
-
-	if (A.end() <= B.start())
-		return {};
-
-	return { static_cast<TC>(B.start()), typename segment_t<TC>::sentinel_tag{ std::min(static_cast<TC>(A.end()), static_cast<TC>(B.end())) } };
-}
-
 #endif // ALGORITHM_HPP_BBD588C0_4752_46B2_AAB9_65450622FFF0

far/common/segment.hpp

@@ -36,6 +36,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <limits>
 #include <ranges>
 
+#include "2d/rectangle.hpp"
+
 //----------------------------------------------------------------------------
 
 template<typename T>
@@ -92,6 +94,20 @@ class segment_t
 			: segment_t{ InitialPoint, length_tag{ domain_max() } };
 	}
 
+	template<typename U>
+	[[nodiscard]]
+	static constexpr segment_t horizontal_extent(const rectangle_t<U>& rect) noexcept
+	{
+		return { rect.left, length_tag{ rect.width() } };
+	}
+
+	template<typename U>
+	[[nodiscard]]
+	static constexpr segment_t vertical_extent(const rectangle_t<U>& rect) noexcept
+	{
+		return { rect.top, length_tag{ rect.height() } };
+	}
+
 private:
 	constexpr segment_t(T const Start, T const End) noexcept
 		: m_Start{ Start }
@@ -105,6 +121,21 @@ class segment_t
 	T m_End{}; // One past last
 };
 
+template<typename TA, typename TB, typename TC = std::common_type_t<TA, TB>>
+segment_t<TC> intersect(segment_t<TA> const A, segment_t<TB> const B)
+{
+	if (A.empty() || B.empty())
+		return {};
+
+	if (B.start() < A.start())
+		return intersect(B, A);
+
+	if (A.end() <= B.start())
+		return {};
+
+	return { static_cast<TC>(B.start()), typename segment_t<TC>::sentinel_tag{ std::min(static_cast<TC>(A.end()), static_cast<TC>(B.end())) } };
+}
+
 using small_segment = segment_t<short>;
 using segment = segment_t<int>;
 

far/interf.cpp

@@ -914,32 +914,71 @@ static void string_to_cells(string_view Str, size_t& CharsConsumed, cells& Cells
 void chars_to_cells(string_view Str, size_t& CharsConsumed, size_t const CellsAvailable, size_t& CellsConsumed)
 {
 	cells Cells;
-	const auto& CellsToBeConsumed = Cells.emplace<0>();
+	const auto& CellsToBeConsumed = Cells.emplace<size_t>();
 	string_to_cells(Str, CharsConsumed, Cells, CellsAvailable);
 	CellsConsumed = CellsToBeConsumed;
 
-#ifdef _DEBUG
-	if (CharsConsumed == Str.size())
-		assert(CellsConsumed == visual_string_length(Str));
-#endif
+	assert(CharsConsumed < Str.size() || CellsConsumed == visual_string_length(Str));
 }
 
-size_t Text(string_view Str, size_t const CellsAvailable)
+// Does not advance CurX
+static void write_text(string_view Str, size_t& CharsConsumed, size_t const CellsAvailable, size_t& CellsConsumed)
 {
-	if (Str.empty())
-		return 0;
+	CharsConsumed = 0;
+	CellsConsumed = 0;
 
-	cells Cells;
-	const auto& Buffer = Cells.emplace<1>();
+	if (Str.empty()) return;
 
-	size_t CharsConsumed = 0;
+	cells Cells;
+	const auto& Buffer = Cells.emplace<real_cells>();
 
 	string_to_cells(Str, CharsConsumed, Cells, CellsAvailable);
 
 	Global->ScrBuf->Write(CurX, CurY, Buffer);
-	CurX += static_cast<int>(Buffer.size());
 
-	return Buffer.size();
+	CellsConsumed = Buffer.size();
+}
+
+// Returns true if all cells were consumed
+bool ClippedText(string_view Str, const segment Bounds, bool& AllCharsConsumed)
+{
+	const auto WriteOrSkip{ [&Str](const auto RightBoundary, const auto Operation)
+	{
+		if (Str.empty() || CurX >= RightBoundary) return;
+
+		size_t CharsConsumed{};
+		size_t CellsConsumed{};
+		Operation(Str, CharsConsumed, RightBoundary - CurX, CellsConsumed);
+		Str = Str.substr(CharsConsumed);
+		CurX += static_cast<int>(CellsConsumed);
+	} };
+
+	WriteOrSkip(Bounds.start(), chars_to_cells);
+	WriteOrSkip(Bounds.end(), write_text);
+
+	AllCharsConsumed = Str.empty();
+	if (AllCharsConsumed || CurX >= Bounds.end())
+		return CurX >= Bounds.end();
+
+	assert(char_width::is_wide(encoding::utf16::extract_codepoint(Str)));
+	assert(CurX == Bounds.end() - 1);
+	return true;
+}
+
+// Returns true if all cells were consumed
+bool ClippedText(string_view Str, const segment Bounds)
+{
+	bool AllCharsConsumed{};
+	return ClippedText(Str, Bounds, AllCharsConsumed);
+}
+
+size_t Text(string_view Str, size_t const CellsAvailable)
+{
+	size_t CharsConsumed{};
+	size_t CellsConsumed{};
+	write_text(Str, CharsConsumed, CellsAvailable, CellsConsumed);
+	CurX += static_cast<int>(CellsConsumed);
+	return CellsConsumed;
 }
 
 size_t Text(string_view Str)

far/interf.hpp

@@ -44,6 +44,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "common/2d/matrix.hpp"
 #include "common/2d/rectangle.hpp"
 #include "common/function_ref.hpp"
+#include "common/segment.hpp"
 #include "common/singleton.hpp"
 
 // External:
@@ -177,6 +178,10 @@ bool is_valid_surrogate_pair(wchar_t First, wchar_t Second);
 
 void Text(point Where, const FarColor& Color, string_view Str);
 
+// Returns true if all cells were consumed
+bool ClippedText(string_view Str, const segment Bounds, bool& AllCharsConsumed);
+bool ClippedText(string_view Str, const segment Bounds);
+
 size_t Text(string_view Str, size_t CellsAvailable);
 size_t Text(string_view Str);
 

far/vbuild.m4

@@ -1 +1 @@
-6625
+6626