From 0562b13743f56e016319da9510c4a84809cb4c04 Mon Sep 17 00:00:00 2001
From: Koji Yokota <yokota@lyx.org>
Date: Tue, 20 Aug 2024 21:11:15 +0900
Subject: [PATCH] Fix wrong preedit cursor position in Qt5

---
 src/frontends/qt/GuiWorkArea.cpp | 50 +++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/frontends/qt/GuiWorkArea.cpp b/src/frontends/qt/GuiWorkArea.cpp
index 3f7c34dc4d..558ab2311c 100644
--- a/src/frontends/qt/GuiWorkArea.cpp
+++ b/src/frontends/qt/GuiWorkArea.cpp
@@ -1227,11 +1227,20 @@ void GuiWorkArea::Private::paintPreeditText(GuiPainter & pain)
 	// get attributes of input method cursor.
 	// cursor_pos : cursor position in preedit string.
 	size_t cursor_pos = 0;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	bool cursor_is_visible = false;
+#endif
+
 	for (auto const & attr : preedit_attr_) {
 		if (attr.type == QInputMethodEvent::Cursor) {
+			// in the completing mode, cursor_pos comes after the selected
+			// snippet in Qt 5
+			// in Qt 6, it comes at the head of the selected snippet
 			cursor_pos = size_t(attr.start);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 			cursor_is_visible = attr.length != 0;
+#endif
 			break;
 		}
 	}
@@ -1244,21 +1253,34 @@ void GuiWorkArea::Private::paintPreeditText(GuiPainter & pain)
 	size_t rStart = 0;
 	// rLength : selected string length in IM.
 	size_t rLength = 0;
-	if (cursor_pos < preedit_length) {
-		for (auto const & attr : preedit_attr_) {
-			if (attr.type == QInputMethodEvent::TextFormat) {
-				if (attr.start <= int(cursor_pos)
-					&& int(cursor_pos) < attr.start + attr.length) {
-						rStart = size_t(attr.start);
-						rLength = size_t(attr.length);
-						if (!cursor_is_visible)
-							cursor_pos += rLength;
-						break;
-				}
+
+	for (auto const & attr : preedit_attr_) {
+		if (attr.type == QInputMethodEvent::TextFormat) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+			if (attr.start <= int(cursor_pos)
+				&& int(cursor_pos) < attr.start + attr.length) {
+				// we are in the completing mode
+				// (selecting the right chars from candidates)
+				rStart = size_t(attr.start);
+				rLength = size_t(attr.length);
+				if (!cursor_is_visible)
+					cursor_pos += rLength;
+				break;
+			}
+#else
+			if (attr.start < int(cursor_pos)
+				&& int(cursor_pos) <= attr.start + attr.length) {
+				// we are in the completing mode
+				// (selecting the right chars from candidates)
+				rStart = size_t(attr.start);
+				rLength = size_t(attr.length);
+				break;
 			}
+#endif
 		}
 	}
-	else {
+	if (rStart == 0 && rLength == preedit_length) {
+		// we are in the composing mode (typing) as we didn't break above
 		rStart = cursor_pos;
 		rLength = 0;
 	}
@@ -1290,9 +1312,9 @@ void GuiWorkArea::Private::paintPreeditText(GuiPainter & pain)
 			ps = Painter::preedit_selecting;
 		}
 
-		if (pos == cursor_pos
-			&& (cursor_pos < rLength && rLength == preedit_length))
+		if (pos == cursor_pos && rLength == 0) {
 			ps = Painter::preedit_cursor;
+		}
 
 		// draw one character and update cur_x.
 		cur_x += pain.preeditText(cur_x, cur_y, typed_char, font, ps);
-- 
2.39.5