From 184a448bb6f801223b2325205227063a7d754810 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Wed, 23 Mar 2016 23:49:01 +0100
Subject: AGI: Fix inaccurate predictive dialog trigger rect

Trigger rect is the rect, that the user needs to click to
trigger the predictive dialog.

Previously cursor char got drawn, rect started right afterwards
In case cursor char is enabled, the rect will get adjusted
accordingly now.
---
 engines/agi/text.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'engines/agi')

diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index 0cacce2421..110ba10632 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -885,6 +885,12 @@ void TextMgr::stringEdit(int16 stringMaxLen) {
 	_inputStringRow = _textPos.row;
 	_inputStringColumn = _textPos.column;
 
+	if (_inputCursorChar) {
+		// Cursor character is shown, which means we are one beyond the start of the input
+		// Adjust the column for predictive input dialog
+		_inputStringColumn--;
+	}
+
 	// Caller can set the input string
 	_inputStringCursorPos = 0;
 	while (_inputStringCursorPos < inputStringLen) {
-- 
cgit v1.2.3


From 31130f08dc29c472874ca6796a09542d8db08794 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Wed, 13 Apr 2016 14:27:21 +0300
Subject: AGI: Move predictivedialog.h out of agi.h

---
 engines/agi/agi.h        | 2 --
 engines/agi/keyboard.cpp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines/agi')

diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index b288557f57..1baf0d912f 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -43,8 +43,6 @@
 #include "agi/logic.h"
 #include "agi/sound.h"
 
-#include "gui/predictivedialog.h"
-
 namespace Common {
 class RandomSource;
 }
diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index 3bc45af5d4..7ed67949b5 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/events.h"
+#include "gui/predictivedialog.h"
 
 #include "agi/agi.h"
 #include "agi/graphics.h"
-- 
cgit v1.2.3


From 356403233047e260e34887ba0144892be322f472 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 14 Apr 2016 16:10:21 +0300
Subject: JANITORIAL: Reduce audio header dependencies

---
 engines/agi/agi.cpp          | 1 -
 engines/agi/preagi.cpp       | 6 ++----
 engines/agi/preagi.h         | 4 +++-
 engines/agi/sound_midi.cpp   | 1 -
 engines/agi/sound_sarien.cpp | 2 --
 5 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'engines/agi')

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 6e63cd3e71..e566ad12f6 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -37,7 +37,6 @@
 #include "graphics/cursorman.h"
 
 #include "audio/mididrv.h"
-#include "audio/mixer.h"
 
 #include "agi/agi.h"
 #include "agi/font.h"
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index bb5d3b8896..7e2e65a3eb 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -20,16 +20,14 @@
  *
  */
 
-#include "common/config-manager.h"
+#include "audio/softsynth/pcspk.h"
+
 #include "common/debug-channels.h"
 #include "common/events.h"
 #include "common/random.h"
-#include "common/textconsole.h"
 
 #include "agi/preagi.h"
 #include "agi/graphics.h"
-#include "agi/keyboard.h"
-#include "agi/text.h"
 
 namespace Agi {
 
diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h
index 289b5ecdb9..d6026a5d4d 100644
--- a/engines/agi/preagi.h
+++ b/engines/agi/preagi.h
@@ -25,7 +25,9 @@
 
 #include "agi/agi.h"
 
-#include "audio/softsynth/pcspk.h"
+namespace Audio {
+class PCSpeaker;
+}
 
 namespace Agi {
 
diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp
index f5c48b3b21..6998df6862 100644
--- a/engines/agi/sound_midi.cpp
+++ b/engines/agi/sound_midi.cpp
@@ -46,7 +46,6 @@
 #include "common/file.h"
 #include "common/memstream.h"
 #include "common/stream.h"
-#include "common/textconsole.h"
 
 #include "agi/agi.h"
 
diff --git a/engines/agi/sound_sarien.cpp b/engines/agi/sound_sarien.cpp
index c8a7042ea3..939c3d2c77 100644
--- a/engines/agi/sound_sarien.cpp
+++ b/engines/agi/sound_sarien.cpp
@@ -22,8 +22,6 @@
 
 #include "common/random.h"
 
-#include "audio/mididrv.h"
-
 #include "agi/agi.h"
 
 #include "agi/sound_sarien.h"
-- 
cgit v1.2.3