SCI: Added two files missing in commit 4ac2940

2 files changed, 220 insertions, 0 deletions

diff --git a/engines/sci/graphics/controls32.cpp b/engines/sci/graphics/controls32.cpp
new file mode 100644
index 0000000000..a46b51a0a3
--- /dev/null
+++ b/engines/sci/graphics/controls32.cpp
@@ -0,0 +1,172 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "sci/sci.h"
+#include "sci/event.h"
+#include "sci/engine/kernel.h"
+#include "sci/engine/seg_manager.h"
+#include "sci/graphics/cache.h"
+#include "sci/graphics/compare.h"
+#include "sci/graphics/controls32.h"
+#include "sci/graphics/font.h"
+#include "sci/graphics/screen.h"
+#include "sci/graphics/text32.h"
+
+namespace Sci {
+
+GfxControls32::GfxControls32(SegManager *segMan, GfxCache *cache, GfxScreen *screen)
+	: _segMan(segMan), _cache(cache), _screen(screen) {
+}
+
+GfxControls32::~GfxControls32() {
+}
+
+void GfxControls32::kernelTexteditChange(reg_t controlObject) {
+	SciEvent curEvent;
+	uint16 maxChars = readSelectorValue(_segMan, controlObject, SELECTOR(max));
+	reg_t textReference = readSelector(_segMan, controlObject, SELECTOR(text));
+	GfxFont *font = _cache->getFont(readSelectorValue(_segMan, controlObject, SELECTOR(font)));
+	Common::String text;
+	uint16 textSize;
+	bool textChanged = false;
+	bool textAddChar = false;
+	Common::Rect rect;
+
+	if (textReference.isNull())
+		error("kEditControl called on object that doesnt have a text reference");
+	text = _segMan->getString(textReference);
+
+	// TODO: Finish this, add a loop etc
+	warning("kEditText ('%s')", text.c_str());
+	return;
+
+	uint16 cursorPos = 0;
+	//uint16 oldCursorPos = cursorPos;
+
+	curEvent = g_sci->getEventManager()->getSciEvent(SCI_EVENT_KEYBOARD);
+	if (curEvent.type != SCI_EVENT_NONE) {
+		textSize = text.size();
+
+		switch (curEvent.type) {
+		case SCI_EVENT_MOUSE_PRESS:
+			// TODO: Implement mouse support for cursor change
+			break;
+		case SCI_EVENT_KEYBOARD:
+			switch (curEvent.data) {
+			case SCI_KEY_BACKSPACE:
+				if (cursorPos > 0) {
+					cursorPos--; text.deleteChar(cursorPos);
+					textChanged = true;
+				}
+				break;
+			case SCI_KEY_DELETE:
+				if (cursorPos < textSize) {
+					text.deleteChar(cursorPos);
+					textChanged = true;
+				}
+				break;
+			case SCI_KEY_HOME: // HOME
+				cursorPos = 0; textChanged = true;
+				break;
+			case SCI_KEY_END: // END
+				cursorPos = textSize; textChanged = true;
+				break;
+			case SCI_KEY_LEFT: // LEFT
+				if (cursorPos > 0) {
+					cursorPos--; textChanged = true;
+				}
+				break;
+			case SCI_KEY_RIGHT: // RIGHT
+				if (cursorPos + 1 <= textSize) {
+					cursorPos++; textChanged = true;
+				}
+				break;
+			case 3:	// returned in SCI1 late and newer when Control - C is pressed
+				if (curEvent.modifiers & SCI_KEYMOD_CTRL) {
+					// Control-C erases the whole line
+					cursorPos = 0; text.clear();
+					textChanged = true;
+				}
+				break;
+			default:
+				if ((curEvent.modifiers & SCI_KEYMOD_CTRL) && curEvent.data == 99) {
+					// Control-C in earlier SCI games (SCI0 - SCI1 middle)
+					// Control-C erases the whole line
+					cursorPos = 0; text.clear();
+					textChanged = true;
+				} else if (curEvent.data > 31 && curEvent.data < 256 && textSize < maxChars) {
+					// insert pressed character
+					textAddChar = true;
+					textChanged = true;
+				}
+				break;
+			}
+			break;
+		}
+	}
+
+	if (textChanged) {
+		rect = g_sci->_gfxCompare->getNSRect(controlObject);
+
+		if (textAddChar) {
+			const char *textPtr = text.c_str();
+
+			// We check if we are really able to add the new char
+			uint16 textWidth = 0;
+			while (*textPtr)
+				textWidth += font->getCharWidth((byte)*textPtr++);
+			textWidth += font->getCharWidth(curEvent.data);
+
+			// Does it fit?
+			if (textWidth >= rect.width()) {
+				return;
+			}
+
+			text.insertChar(curEvent.data, cursorPos++);
+
+			// Note: the following checkAltInput call might make the text
+			// too wide to fit, but SSCI fails to check that too.
+		}
+		// TODO: Cursor
+		/*
+		texteditCursorErase();
+		_paint16->eraseRect(rect);
+		_text16->Box(text.c_str(), false, rect, SCI_TEXT16_ALIGNMENT_LEFT, -1);
+		_paint16->bitsShow(rect);
+		texteditCursorDraw(rect, text.c_str(), cursorPos);
+		*/
+		// Write back string
+		_segMan->strcpy(textReference, text.c_str());
+	} else {
+		// TODO: Cursor
+		/*
+		if (g_system->getMillis() >= _texteditBlinkTime) {
+			_paint16->invertRect(_texteditCursorRect);
+			_paint16->bitsShow(_texteditCursorRect);
+			_texteditCursorVisible = !_texteditCursorVisible;
+			texteditSetBlinkTime();
+		}
+		*/
+	}
+}
+
+} // End of namespace Sci
diff --git a/engines/sci/graphics/controls32.h b/engines/sci/graphics/controls32.h
new file mode 100644
index 0000000000..9a153e7ad5
--- /dev/null
+++ b/engines/sci/graphics/controls32.h
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef SCI_GRAPHICS_CONTROLS32_H
+#define SCI_GRAPHICS_CONTROLS32_H
+
+namespace Sci {
+
+class GfxCache;
+class GfxScreen;
+/**
+ * Controls class, handles drawing of controls in SCI32 (SCI2, SCI2.1, SCI3) games
+ */
+class GfxControls32 {
+public:
+	GfxControls32(SegManager *segMan, GfxCache *cache, GfxScreen *screen);
+	~GfxControls32();
+
+	void kernelTexteditChange(reg_t controlObject);
+
+private:
+	SegManager *_segMan;
+	GfxCache *_cache;
+	GfxScreen *_screen;
+};
+
+} // End of namespace Sci
+
+#endif