From d69645413f35ba6ebff9359a89bd121733a2e475 Mon Sep 17 00:00:00 2001
From: Egmont Koblinger <egmont@gmail.com>
Date: Fri, 2 Oct 2015 19:38:38 +0200
Subject: widget: Fix painting the preedit text near the right margin

https://bugzilla.gnome.org/show_bug.cgi?id=755668
---
 src/vte.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vte.cc b/src/vte.cc
index 2643d1e8..40a19360 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -776,9 +776,9 @@ _vte_invalidate_cursor_once(VteTerminal *terminal, gboolean periodic)
 				columns++;
 			}
 		}
-		if (preedit_width > 0) {
-			columns += preedit_width;
-			columns++; /* one more for the preedit cursor */
+		columns = MAX(columns, preedit_width);
+		if (column + columns > terminal->pvt->column_count) {
+			column = MAX(0, terminal->pvt->column_count - columns);
 		}
 
 		_vte_debug_print(VTE_DEBUG_UPDATES,
-- 
cgit v1.2.1