From 8fcc919b565bb944a3ff87540715fefc8761cf89 Mon Sep 17 00:00:00 2001
From: Alexander Tkachev
Date: Fri, 5 Aug 2016 14:40:53 +0600
Subject: WAGE: Fix cursor

It's now being clipped within window borders.
---
 engines/wage/gui.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'engines/wage/gui.cpp')

diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 86c2a9bfad..212e75be48 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -96,16 +96,22 @@ static void cursorTimerHandler(void *refCon) {
 
 	x += gui->_consoleWindow->getInnerDimensions().left;
 	y += gui->_consoleWindow->getInnerDimensions().top;
+	int h = kCursorHeight;
 
-	gui->_screen.vLine(x, y, y + kCursorHeight, gui->_cursorState ? kColorBlack : kColorWhite);
+	if (y + h > gui->_consoleWindow->getInnerDimensions().bottom) {
+		h = gui->_consoleWindow->getInnerDimensions().bottom - y;
+	}
+
+	if (h > 0)
+		gui->_screen.vLine(x, y, y + h, gui->_cursorState ? kColorBlack : kColorWhite);
 
 	if (!gui->_cursorOff)
 		gui->_cursorState = !gui->_cursorState;
 
 	gui->_cursorRect.left = x;
 	gui->_cursorRect.right = MIN<uint16>(x + 1, gui->_screen.w);
-	gui->_cursorRect.top = y;
-	gui->_cursorRect.bottom = MIN<uint16>(y + kCursorHeight, gui->_screen.h);
+	gui->_cursorRect.top = MIN<uint16>(y - 1, gui->_consoleWindow->getInnerDimensions().top);
+	gui->_cursorRect.bottom = MIN<uint16>(MIN<uint16>(y + h, gui->_screen.h), gui->_consoleWindow->getInnerDimensions().bottom);
 
 	gui->_cursorDirty = true;
 }
-- 
cgit v1.2.3