[Scummvm-git-logs] scummvm master -> 8458630e50d428ce6154aa303c24367abb34c9e9

[sev-]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e13d567eb9 GRAPHICS: MACGUI: Improved debug output in MacFontManager
5e9b72fbd9 WAGE: Do not dump the interpreter code
a7dbacb5c3 GRAPHICS: MACGUI: Ignore keys with modifiers in MacTextWindow
8458630e50 GRAPHICS: MACGUI: Added support for scrolling with mouse wheel


Commit: e13d567eb9021509ee4d7e9783c43f8bab8ee9ca
    https://github.com/scummvm/scummvm/commit/e13d567eb9021509ee4d7e9783c43f8bab8ee9ca
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-22T10:25:00+02:00

Commit Message:
GRAPHICS: MACGUI: Improved debug output in MacFontManager

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 8134955..c3a96dc 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -209,7 +209,7 @@ void MacFontManager::loadFonts(Common::MacResManager *fontFile) {
 			Common::Array<Graphics::MacFontFamily::AsscEntry> *assoc = fontFamily->getAssocTable();
 
 			for (uint i = 0; i < assoc->size(); i++) {
-				debug("size: %d style: %d id: %d", (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle,
+				debug(8, "size: %d style: %d id: %d", (*assoc)[i]._fontSize, (*assoc)[i]._fontStyle,
 										(*assoc)[i]._fontID);
 
 				Common::SeekableReadStream *fontstream;
@@ -222,7 +222,7 @@ void MacFontManager::loadFonts(Common::MacResManager *fontFile) {
 					fontstream = fontFile->getResource(MKTAG('F', 'O', 'N', 'T'), (*assoc)[i]._fontID);
 
 				if (!fontstream) {
-					warning("Unknown FontId: %d", (*assoc)[i]._fontID);
+					warning("MacFontManager: Unknown FontId: %d", (*assoc)[i]._fontID);
 
 					continue;
 				}


Commit: 5e9b72fbd918c3a8e977ed4c8d51d5b060cdc4c7
    https://github.com/scummvm/scummvm/commit/5e9b72fbd918c3a8e977ed4c8d51d5b060cdc4c7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-22T10:25:00+02:00

Commit Message:
WAGE: Do not dump the interpreter code

Changed paths:
    engines/wage/world.cpp


diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 4e92af2..df9fcaf 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -114,9 +114,9 @@ bool World::loadWorld(Common::MacResManager *resMan) {
 	Common::MacResIDArray::const_iterator iter;
 
 	// Dumping interpreter code
-#if 1
+#if 0
 	res = resMan->getResource(MKTAG('C','O','D','E'), 1);
-	warning("code size: %d", res->size());
+	warning("Dumping interpreter code size: %d", res->size());
 	byte *buf = (byte *)malloc(res->size());
 	res->read(buf, res->size());
 	Common::DumpFile out;


Commit: a7dbacb5c32b04ca5ffe59667ba12e5f76a5ec59
    https://github.com/scummvm/scummvm/commit/a7dbacb5c32b04ca5ffe59667ba12e5f76a5ec59
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-22T10:25:00+02:00

Commit Message:
GRAPHICS: MACGUI: Ignore keys with modifiers in MacTextWindow

Changed paths:
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 85a07b9..4818b5b 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -279,6 +279,10 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 	if (event.type == Common::EVENT_KEYDOWN) {
 		_wm->setActive(getId());
 
+		if (event.kbd.flags & (Common::KBD_ALT | Common::KBD_CTRL | Common::KBD_META)) {
+			return false;
+		}
+
 		switch (event.kbd.keycode) {
 		case Common::KEYCODE_BACKSPACE:
 			if (!_inputText.empty()) {


Commit: 8458630e50d428ce6154aa303c24367abb34c9e9
    https://github.com/scummvm/scummvm/commit/8458630e50d428ce6154aa303c24367abb34c9e9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-22T10:25:00+02:00

Commit Message:
GRAPHICS: MACGUI: Added support for scrolling with mouse wheel

Changed paths:
    graphics/macgui/mactextwindow.cpp
    graphics/macgui/mactextwindow.h


diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 4818b5b..c05468c 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -313,6 +313,16 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 	if (hasAllFocus())
 		return MacWindow::processEvent(event);	// Pass it to upstream
 
+	if (event.type == Common::EVENT_WHEELUP) {
+		scroll(-2);
+		return true;
+	}
+
+	if (event.type == Common::EVENT_WHEELDOWN) {
+		scroll(2);
+		return true;
+	}
+
 	if (click == kBorderScrollUp || click == kBorderScrollDown) {
 		if (event.type == Common::EVENT_LBUTTONDOWN) {
 			int consoleHeight = getInnerDimensions().height();
@@ -324,22 +334,12 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 
 			return true;
 		} else if (event.type == Common::EVENT_LBUTTONUP) {
-			int oldScrollPos = _scrollPos;
-
 			switch (click) {
 			case kBorderScrollUp:
-				_scrollPos = MAX<int>(0, _scrollPos - kConScrollStep);
-				undrawCursor();
-				_cursorY -= (_scrollPos - oldScrollPos);
-				_contentIsDirty = true;
-				_borderIsDirty = true;
+				scroll(-1);
 				break;
 			case kBorderScrollDown:
-				_scrollPos = MIN<int>(_mactext->getTextHeight() - kConScrollStep, _scrollPos + kConScrollStep);
-				undrawCursor();
-				_cursorY -= (_scrollPos - oldScrollPos);
-				_contentIsDirty = true;
-				_borderIsDirty = true;
+				scroll(1);
 				break;
 			default:
 				return false;
@@ -389,6 +389,17 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 	return MacWindow::processEvent(event);
 }
 
+void MacTextWindow::scroll(int delta) {
+	int oldScrollPos = _scrollPos;
+
+	_scrollPos += delta * kConScrollStep;
+	_scrollPos = CLIP<int>(_scrollPos, 0, _mactext->getTextHeight() - kConScrollStep);
+	undrawCursor();
+	_cursorY -= (_scrollPos - oldScrollPos);
+	_contentIsDirty = true;
+	_borderIsDirty = true;
+}
+
 void MacTextWindow::startMarking(int x, int y) {
 	x -= getInnerDimensions().left - 2;
 	y -= getInnerDimensions().top;
diff --git a/graphics/macgui/mactextwindow.h b/graphics/macgui/mactextwindow.h
index 6dd464e..5791da3 100644
--- a/graphics/macgui/mactextwindow.h
+++ b/graphics/macgui/mactextwindow.h
@@ -77,6 +77,8 @@ public:
 private:
 	bool isCutAllowed();
 
+	void scroll(int delta);
+
 	void undrawInput();
 	void drawInput();
 	void drawSelection();