WAGE: Remove leftover files

2 files changed, 0 insertions, 944 deletions

diff --git a/engines/wage/macmenu.cpp b/engines/wage/macmenu.cpp
deleted file mode 100644
index b776223295..0000000000
--- a/engines/wage/macmenu.cpp
+++ /dev/null
@@ -1,565 +0,0 @@
-/* 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.
- *
- * MIT License:
- *
- * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include "common/system.h"
-#include "common/keyboard.h"
-
-#include "graphics/primitives.h"
-#include "graphics/font.h"
-#include "graphics/macgui/macwindowmanager.h"
-#include "graphics/macgui/macwindow.h"
-
-#include "wage/macmenu.h"
-
-namespace Graphics {
-
-enum {
-	kMenuHeight = 20,
-	kMenuLeftMargin = 7,
-	kMenuSpacing = 13,
-	kMenuPadding = 16,
-	kMenuDropdownPadding = 14,
-	kMenuDropdownItemHeight = 16,
-	kMenuItemHeight = 20
-};
-
-struct MenuSubItem {
-	Common::String text;
-	int action;
-	int style;
-	char shortcut;
-	bool enabled;
-	Common::Rect bbox;
-
-	MenuSubItem(const char *t, int a, int s = 0, char sh = 0, bool e = true) : text(t), action(a), style(s), shortcut(sh), enabled(e) {}
-};
-
-typedef Common::Array<MenuSubItem *> SubItemArray;
-
-struct MenuItem {
-	Common::String name;
-	SubItemArray subitems;
-	Common::Rect bbox;
-	Common::Rect subbbox;
-
-	MenuItem(const char *n) : name(n) {}
-};
-
-Menu::Menu(int id, const Common::Rect &bounds, MacWindowManager *wm)
-		: BaseMacWindow(id, false, wm) {
-	_font = getMenuFont();
-
-	_screen.create(bounds.width(), bounds.height(), PixelFormat::createFormatCLUT8());
-
-	_bbox.left = 0;
-	_bbox.top = 0;
-	_bbox.right = _screen.w;
-	_bbox.bottom = kMenuHeight;
-
-	_menuActivated = false;
-	_activeItem = -1;
-	_activeSubItem = -1;
-
-	_ccallback = NULL;
-	_cdata = NULL;
-
-	_tempSurface.create(_screen.w, _font->getFontHeight(), PixelFormat::createFormatCLUT8());
-}
-
-Menu::~Menu() {
-	for (uint i = 0; i < _items.size(); i++) {
-		for (uint j = 0; j < _items[i]->subitems.size(); j++)
-			delete _items[i]->subitems[j];
-		delete _items[i];
-	}
-}
-
-void Menu::addStaticMenus(const MenuData *data) {
-	MenuItem *about = new MenuItem(_wm->hasBuiltInFonts() ? "\xa9" : "\xf0"); // (c) Symbol as the most resembling apple
-	_items.push_back(about);
-
-	for (int i = 0; data[i].menunum; i++) {
-		const MenuData *m = &data[i];
-
-		if (m->menunum == kMenuHighLevel) {
-			MenuItem *item = new MenuItem(m->title);
-			_items.push_back(item);
-
-			continue;
-		}
-
-		_items[m->menunum]->subitems.push_back(new MenuSubItem(m->title, m->action, 0, m->shortcut, m->enabled));
-	}
-}
-
-int Menu::addMenuItem(const char *name) {
-	MenuItem *i = new MenuItem(name);
-	_items.push_back(i);
-
-	return _items.size() - 1;
-}
-
-void Menu::addMenuSubItem(int id, const char *text, int action, int style, char shortcut, bool enabled) {
-	_items[id]->subitems.push_back(new MenuSubItem(text, action, style, shortcut, enabled));
-
-	calcMenuBounds(_items[id]);
-}
-
-void Menu::calcDimensions() {
-	// Calculate menu dimensions
-	int y = 1;
-	int x = 18;
-
-	for (uint i = 0; i < _items.size(); i++) {
-		int w = _font->getStringWidth(_items[i]->name);
-
-		if (_items[i]->bbox.bottom == 0) {
-			_items[i]->bbox.left = x - kMenuLeftMargin;
-			_items[i]->bbox.top = y;
-			_items[i]->bbox.right = x + w + kMenuSpacing - kMenuLeftMargin;
-			_items[i]->bbox.bottom = y + _font->getFontHeight() + (_wm->hasBuiltInFonts() ? 3 : 2);
-		}
-
-		calcMenuBounds(_items[i]);
-
-		x += w + kMenuSpacing;
-	}
-}
-
-void Menu::clearSubMenu(int id) {
-	MenuItem *menu = _items[id];
-
-	for (uint j = 0; j < menu->subitems.size(); j++)
-		delete menu->subitems[j];
-
-	menu->subitems.clear();
-}
-
-void Menu::createSubMenuFromString(int id, const char *str) {
-	clearSubMenu(id);
-
-	MenuItem *menu = _items[id];
-	Common::String string(str);
-
-	Common::String item;
-
-	for (uint i = 0; i < string.size(); i++) {
-		while(i < string.size() && string[i] != ';') // Read token
-			item += string[i++];
-
-		if (item == "(-") {
-			menu->subitems.push_back(new MenuSubItem(NULL, 0));
-		} else {
-			bool enabled = true;
-			int style = 0;
-			char shortcut = 0;
-			const char *shortPtr = strrchr(item.c_str(), '/');
-			if (shortPtr != NULL) {
-				if (strlen(shortPtr) >= 2) {
-					shortcut = shortPtr[1];
-					item.deleteChar(shortPtr - item.c_str());
-					item.deleteChar(shortPtr - item.c_str());
-				} else {
-					error("Unexpected shortcut: '%s', item '%s' in menu '%s'", shortPtr, item.c_str(), string.c_str());
-				}
-			}
-
-			while (item.size() >= 2 && item[item.size() - 2] == '<') {
-				char c = item.lastChar();
-				if (c == 'B') {
-					style |= kFontStyleBold;
-				} else if (c == 'I') {
-					style |= kFontStyleItalic;
-				} else if (c == 'U') {
-					style |= kFontStyleUnderline;
-				} else if (c == 'O') {
-					style |= kFontStyleOutline;
-				} else if (c == 'S') {
-					style |= kFontStyleShadow;
-				} else if (c == 'C') {
-					style |= kFontStyleCondensed;
-				} else if (c == 'E') {
-					style |= kFontStyleExtended;
-				}
-				item.deleteLastChar();
-				item.deleteLastChar();
-			}
-
-			Common::String tmpitem(item);
-			tmpitem.trim();
-			if (tmpitem[0] == '(') {
-				enabled = false;
-
-				for (uint j = 0; j < item.size(); j++)
-					if (item[j] == '(') {
-						item.deleteChar(j);
-						break;
-					}
-			}
-
-			menu->subitems.push_back(new MenuSubItem(item.c_str(), kMenuActionCommand, style, shortcut, enabled));
-		}
-
-		item.clear();
-	}
-
-	calcMenuBounds(menu);
-}
-
-const Font *Menu::getMenuFont() {
-	return _wm->getFont("Chicago-12", FontManager::kBigGUIFont);
-}
-
-const char *Menu::getAcceleratorString(MenuSubItem *item, const char *prefix) {
-	static char res[20];
-	*res = 0;
-
-	if (item->shortcut != 0)
-		sprintf(res, "%s%c%c", prefix, (_wm->hasBuiltInFonts() ? '^' : '\x11'), item->shortcut);
-
-	return res;
-}
-
-int Menu::calculateMenuWidth(MenuItem *menu) {
-	int maxWidth = 0;
-	for (uint i = 0; i < menu->subitems.size(); i++) {
-		MenuSubItem *item = menu->subitems[i];
-		if (!item->text.empty()) {
-			Common::String text(item->text);
-			Common::String acceleratorText(getAcceleratorString(item, "  "));
-			if (!acceleratorText.empty()) {
-				text += acceleratorText;
-			}
-
-			int width = _font->getStringWidth(text);
-			if (width > maxWidth) {
-				maxWidth = width;
-			}
-		}
-	}
-	return maxWidth;
-}
-
-void Menu::calcMenuBounds(MenuItem *menu) {
-	// TODO: cache maxWidth
-	int maxWidth = calculateMenuWidth(menu);
-	int x1 = menu->bbox.left - 1;
-	int y1 = menu->bbox.bottom + 1;
-	int x2 = x1 + maxWidth + kMenuDropdownPadding * 2 - 4;
-	int y2 = y1 + menu->subitems.size() * kMenuDropdownItemHeight + 2;
-
-	menu->subbbox.left = x1;
-	menu->subbbox.top = y1;
-	menu->subbbox.right = x2;
-	menu->subbbox.bottom = y2;
-}
-
-static void drawPixelPlain(int x, int y, int color, void *data) {
-	ManagedSurface *surface = (ManagedSurface *)data;
-
-	if (x >= 0 && x < surface->w && y >= 0 && y < surface->h)
-		*((byte *)surface->getBasePtr(x, y)) = (byte)color;
-}
-
-static void drawFilledRoundRect(ManagedSurface *surface, Common::Rect &rect, int arc, int color) {
-	drawRoundRect(rect, arc, color, true, drawPixelPlain, surface);
-}
-
-bool Menu::draw(ManagedSurface *g, bool forceRedraw) {
-	Common::Rect r(_bbox);
-
-	if (!_contentIsDirty && !forceRedraw)
-		return false;
-
-	_contentIsDirty = false;
-
-	_screen.clear(kColorGreen);
-
-	drawFilledRoundRect(&_screen, r, kDesktopArc, kColorWhite);
-	r.top = 7;
-	_screen.fillRect(r, kColorWhite);
-	r.top = kMenuHeight - 1;
-	r.bottom++;
-	_screen.fillRect(r, kColorGreen);
-	r.bottom--;
-	_screen.fillRect(r, kColorBlack);
-
-	for (uint i = 0; i < _items.size(); i++) {
-		int color = kColorBlack;
-		MenuItem *it = _items[i];
-
-		if ((uint)_activeItem == i) {
-			Common::Rect hbox = it->bbox;
-
-			hbox.left -= 1;
-			hbox.right += 3;
-			hbox.bottom += 1;
-
-			_screen.fillRect(hbox, kColorBlack);
-			color = kColorWhite;
-
-			if (!it->subitems.empty())
-				renderSubmenu(it);
-		}
-
-		_font->drawString(&_screen, it->name, it->bbox.left + kMenuLeftMargin, it->bbox.top + (_wm->hasBuiltInFonts() ? 2 : 1), it->bbox.width(), color);
-	}
-
-	g->transBlitFrom(_screen, kColorGreen);
-
-	g_system->copyRectToScreen(g->getPixels(), g->pitch, 0, 0, g->w, g->h);
-
-	return true;
-}
-
-void Menu::renderSubmenu(MenuItem *menu) {
-	Common::Rect *r = &menu->subbbox;
-
-	if (r->width() == 0 || r->height() == 0)
-		return;
-
-	_screen.fillRect(*r, kColorWhite);
-	_screen.frameRect(*r, kColorBlack);
-	_screen.vLine(r->right, r->top + 3, r->bottom + 1, kColorBlack);
-	_screen.vLine(r->right + 1, r->top + 3, r->bottom + 1, kColorBlack);
-	_screen.hLine(r->left + 3, r->bottom, r->right + 1, kColorBlack);
-	_screen.hLine(r->left + 3, r->bottom + 1, r->right + 1, kColorBlack);
-
-	int x = r->left + kMenuDropdownPadding;
-	int y = r->top + 1;
-	for (uint i = 0; i < menu->subitems.size(); i++) {
-		Common::String text(menu->subitems[i]->text);
-		Common::String acceleratorText(getAcceleratorString(menu->subitems[i], ""));
-		int accelX = r->right - 25;
-
-		int color = kColorBlack;
-		if (i == (uint)_activeSubItem && !text.empty() && menu->subitems[i]->enabled) {
-			color = kColorWhite;
-			Common::Rect trect(r->left, y - (_wm->hasBuiltInFonts() ? 1 : 0), r->right, y + _font->getFontHeight());
-
-			_screen.fillRect(trect, kColorBlack);
-		}
-
-		if (!text.empty()) {
-			ManagedSurface *s = &_screen;
-			int tx = x, ty = y;
-
-			if (!menu->subitems[i]->enabled) {
-				s = &_tempSurface;
-				tx = 0;
-				ty = 0;
-				accelX -= x;
-
-				_tempSurface.clear(kColorGreen);
-			}
-
-			_font->drawString(s, text, tx, ty, r->width(), color);
-
-			if (!acceleratorText.empty())
-				_font->drawString(s, acceleratorText, accelX, ty, r->width(), color);
-
-			if (!menu->subitems[i]->enabled) {
-				// I am lazy to extend drawString() with plotProc as a parameter, so
-				// fake it here
-				for (int ii = 0; ii < _tempSurface.h; ii++) {
-					const byte *src = (const byte *)_tempSurface.getBasePtr(0, ii);
-					byte *dst = (byte *)_screen.getBasePtr(x, y+ii);
-					byte pat = _wm->getPatterns()[kPatternCheckers2 - 1][ii % 8];
-					for (int j = 0; j < r->width(); j++) {
-						if (*src != kColorGreen && (pat & (1 << (7 - (x + j) % 8))))
-							*dst = *src;
-						src++;
-						dst++;
-					}
-				}
-			}
-		} else { // Delimiter
-			bool flip = r->left & 2;
-			byte *ptr = (byte *)_screen.getBasePtr(r->left + 1, y + kMenuDropdownItemHeight / 2);
-			for (int xx = r->left + 1; xx <= r->right - 1; xx++, ptr++) {
-				*ptr = flip ? kColorBlack : kColorWhite;
-				flip = !flip;
-			}
-		}
-
-		y += kMenuDropdownItemHeight;
-	}
-
-	_contentIsDirty = true;
-	//g_system->copyRectToScreen(_screen.getBasePtr(r->left, r->top), _screen.pitch, r->left, r->top, r->width() + 2, r->height() + 2);
-}
-
-bool Menu::processEvent(Common::Event &event) {
-	switch (event.type) {
-	case Common::EVENT_KEYDOWN:
-		return keyEvent(event);
-	case Common::EVENT_LBUTTONDOWN:
-		return mouseClick(event.mouse.x, event.mouse.y);
-	case Common::EVENT_LBUTTONUP:
-		return mouseRelease(event.mouse.x, event.mouse.y);
-	case Common::EVENT_MOUSEMOVE:
-		return mouseMove(event.mouse.x, event.mouse.y);
-	default:
-		return false;
-	}
-}
-
-bool Menu::keyEvent(Common::Event &event) {
-	if (event.type != Common::EVENT_KEYDOWN)
-		return false;
-
-	if (event.kbd.flags & (Common::KBD_ALT | Common::KBD_CTRL | Common::KBD_META)) {
-		if (event.kbd.ascii >= 0x20 && event.kbd.ascii <= 0x7f) {
-			return processMenuShortCut(event.kbd.flags, event.kbd.ascii);
-		}
-	}
-
-	return false;
-}
-
-bool Menu::mouseClick(int x, int y) {
-	if (_bbox.contains(x, y)) {
-		for (uint i = 0; i < _items.size(); i++)
-			if (_items[i]->bbox.contains(x, y)) {
-			  if ((uint)_activeItem == i)
-					return false;
-
-				if (_activeItem != -1) { // Restore background
-					Common::Rect r(_items[_activeItem]->subbbox);
-					r.right += 3;
-					r.bottom += 3;
-
-					_wm->setFullRefresh(true);
-				}
-
-				_activeItem = i;
-				_activeSubItem = -1;
-				_menuActivated = true;
-
-				_contentIsDirty = true;
-
-				return true;
-			}
-	} else if (_menuActivated && _items[_activeItem]->subbbox.contains(x, y)) {
-		MenuItem *it = _items[_activeItem];
-		int numSubItem = (y - it->subbbox.top) / kMenuDropdownItemHeight;
-
-		if (numSubItem != _activeSubItem) {
-			_activeSubItem = numSubItem;
-
-			renderSubmenu(_items[_activeItem]);
-			_contentIsDirty = true;
-		}
-	} else if (_menuActivated && _activeItem != -1) {
-		_activeSubItem = -1;
-
-		renderSubmenu(_items[_activeItem]);
-		_contentIsDirty = true;
-	}
-
-	return false;
-}
-
-bool Menu::mouseMove(int x, int y) {
-	if (_menuActivated)
-		if (mouseClick(x, y))
-			return true;
-
-	return false;
-}
-
-bool Menu::mouseRelease(int x, int y) {
-	if (_menuActivated) {
-		_menuActivated = false;
-
-		if (_activeItem != -1 && _activeSubItem != -1 && _items[_activeItem]->subitems[_activeSubItem]->enabled)
-			(*_ccallback)(_items[_activeItem]->subitems[_activeSubItem]->action,
-					_items[_activeItem]->subitems[_activeSubItem]->text, _cdata);
-
-		_activeItem = -1;
-		_activeSubItem = -1;
-
-		_wm->setFullRefresh(true);
-
-		return true;
-	}
-
-	return false;
-}
-
-bool Menu::processMenuShortCut(byte flags, uint16 ascii) {
-	ascii = tolower(ascii);
-
-	if (flags & (Common::KBD_CTRL | Common::KBD_META)) {
-		for (uint i = 0; i < _items.size(); i++)
-			for (uint j = 0; j < _items[i]->subitems.size(); j++)
-				if (_items[i]->subitems[j]->enabled && tolower(_items[i]->subitems[j]->shortcut) == ascii) {
-					(*_ccallback)(_items[i]->subitems[j]->action, _items[i]->subitems[j]->text, _cdata);
-					return true;
-				}
-	}
-
-	return false;
-}
-
-void Menu::enableCommand(int menunum, int action, bool state) {
-	for (uint i = 0; i < _items[menunum]->subitems.size(); i++)
-		if (_items[menunum]->subitems[i]->action == action)
-			_items[menunum]->subitems[i]->enabled = state;
-
-	_contentIsDirty = true;
-}
-
-void Menu::disableAllMenus() {
-	for (uint i = 1; i < _items.size(); i++) // Leave About menu on
-		for (uint j = 0; j < _items[i]->subitems.size(); j++)
-			_items[i]->subitems[j]->enabled = false;
-
-	_contentIsDirty = true;
-}
-
-} // End of namespace Wage
diff --git a/engines/wage/macwindowmanager.cpp b/engines/wage/macwindowmanager.cpp
deleted file mode 100644
index 6ca2efd7c9..0000000000
--- a/engines/wage/macwindowmanager.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/* 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.
- *
- * MIT License:
- *
- * Copyright (c) 2009 Alexei Svitkine, Eugene Sandulenko
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include "common/array.h"
-#include "common/events.h"
-#include "common/list.h"
-#include "common/unzip.h"
-#include "common/system.h"
-#include "common/stream.h"
-
-#include "graphics/cursorman.h"
-#include "graphics/fonts/bdf.h"
-#include "graphics/managed_surface.h"
-#include "graphics/palette.h"
-#include "graphics/primitives.h"
-
-#include "wage/macwindowmanager.h"
-#include "wage/macwindow.h"
-#include "wage/macmenu.h"
-
-namespace Wage {
-
-static const byte palette[] = {
-	0, 0, 0,           // Black
-	0x80, 0x80, 0x80,  // Gray
-	0xff, 0xff, 0xff,  // White
-	0x00, 0xff, 0x00,  // Green
-	0x00, 0xcf, 0x00   // Green2
-};
-
-static byte fillPatterns[][8] = { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, // kPatternSolid
-								  { 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 }, // kPatternStripes
-								  { 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55 }, // kPatternCheckers
-								  { 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa }  // kPatternCheckers2
-};
-
-static const byte macCursorArrow[] = {
-	2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-	2, 0, 2, 3, 3, 3, 3, 3, 3, 3, 3,
-	2, 0, 0, 2, 3, 3, 3, 3, 3, 3, 3,
-	2, 0, 0, 0, 2, 3, 3, 3, 3, 3, 3,
-	2, 0, 0, 0, 0, 2, 3, 3, 3, 3, 3,
-	2, 0, 0, 0, 0, 0, 2, 3, 3, 3, 3,
-	2, 0, 0, 0, 0, 0, 0, 2, 3, 3, 3,
-	2, 0, 0, 0, 0, 0, 0, 0, 2, 3, 3,
-	2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3,
-	2, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2,
-	2, 0, 0, 2, 0, 0, 2, 3, 3, 3, 3,
-	2, 0, 2, 3, 2, 0, 0, 2, 3, 3, 3,
-	2, 2, 3, 3, 2, 0, 0, 2, 3, 3, 3,
-	2, 3, 3, 3, 3, 2, 0, 0, 2, 3, 3,
-	3, 3, 3, 3, 3, 2, 0, 0, 2, 3, 3,
-	3, 3, 3, 3, 3, 3, 2, 2, 2, 3, 3
-};
-
-static const byte macCursorBeam[] = {
-	0, 0, 3, 3, 3, 0, 0, 3, 3, 3, 3,
-	3, 3, 0, 3, 0, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 0, 3, 0, 3, 3, 3, 3, 3, 3,
-	0, 0, 3, 3, 3, 0, 0, 3, 3, 3, 3,
-};
-
-MacWindowManager::MacWindowManager() {
-	_screen = 0;
-	_lastId = 0;
-	_activeWindow = -1;
-
-	_menu = 0;
-
-	_fullRefresh = true;
-
-	_builtInFonts = true;
-
-	for (int i = 0; i < ARRAYSIZE(fillPatterns); i++)
-		_patterns.push_back(fillPatterns[i]);
-
-	loadFonts();
-
-	g_system->getPaletteManager()->setPalette(palette, 0, ARRAYSIZE(palette) / 3);
-
-	CursorMan.replaceCursorPalette(palette, 0, ARRAYSIZE(palette) / 3);
-	CursorMan.replaceCursor(macCursorArrow, 11, 16, 1, 1, 3);
-	_cursorIsArrow = true;
-	CursorMan.showMouse(true);
-}
-
-MacWindowManager::~MacWindowManager() {
-	for (int i = 0; i < _lastId; i++)
-		delete _windows[i];
-}
-
-MacWindow *MacWindowManager::addWindow(bool scrollable, bool resizable, bool editable) {
-	MacWindow *w = new MacWindow(_lastId, scrollable, resizable, editable, this);
-
-	_windows.push_back(w);
-	_windowStack.push_back(w);
-
-	setActive(_lastId);
-
-	_lastId++;
-
-	return w;
-}
-
-Menu *MacWindowManager::addMenu() {
-	_menu = new Menu(_lastId, _screen->getBounds(), this);
-
-	_windows.push_back(_menu);
-
-	_lastId++;
-
-	return _menu;
-}
-
-void MacWindowManager::setActive(int id) {
-	if (_activeWindow == id)
-		return;
-
-	if (_activeWindow != -1)
-		_windows[_activeWindow]->setActive(false);
-
-	_activeWindow = id;
-
-	_windows[id]->setActive(true);
-
-	_windowStack.remove(_windows[id]);
-	_windowStack.push_back(_windows[id]);
-
-	_fullRefresh = true;
-}
-
-struct PlotData {
-	Graphics::ManagedSurface *surface;
-	Patterns *patterns;
-	uint fillType;
-	int thickness;
-
-	PlotData(Graphics::ManagedSurface *s, Patterns *p, int f, int t) :
-		surface(s), patterns(p), fillType(f), thickness(t) {}
-};
-
-static void drawPixel(int x, int y, int color, void *data) {
-	PlotData *p = (PlotData *)data;
-
-	if (p->fillType > p->patterns->size())
-		return;
-
-	byte *pat = p->patterns->operator[](p->fillType - 1);
-
-	if (p->thickness == 1) {
-		if (x >= 0 && x < p->surface->w && y >= 0 && y < p->surface->h) {
-			uint xu = (uint)x; // for letting compiler optimize it
-			uint yu = (uint)y;
-
-			*((byte *)p->surface->getBasePtr(xu, yu)) =
-				(pat[yu % 8] & (1 << (7 - xu % 8))) ?
-					color : kColorWhite;
-		}
-	} else {
-		int x1 = x;
-		int x2 = x1 + p->thickness;
-		int y1 = y;
-		int y2 = y1 + p->thickness;
-
-		for (y = y1; y < y2; y++)
-			for (x = x1; x < x2; x++)
-				if (x >= 0 && x < p->surface->w && y >= 0 && y < p->surface->h) {
-					uint xu = (uint)x; // for letting compiler optimize it
-					uint yu = (uint)y;
-					*((byte *)p->surface->getBasePtr(xu, yu)) =
-						(pat[yu % 8] & (1 << (7 - xu % 8))) ?
-							color : kColorWhite;
-				}
-	}
-}
-
-void MacWindowManager::drawDesktop() {
-	Common::Rect r(_screen->getBounds());
-
-	PlotData pd(_screen, &_patterns, kPatternCheckers, 1);
-
-	Graphics::drawRoundRect(r, kDesktopArc, kColorBlack, true, drawPixel, &pd);
-
-	g_system->copyRectToScreen(_screen->getPixels(), _screen->pitch, 0, 0, _screen->w, _screen->h);
-}
-
-void MacWindowManager::draw() {
-	assert(_screen);
-
-	if (_fullRefresh)
-		drawDesktop();
-
-	for (Common::List<BaseMacWindow *>::const_iterator it = _windowStack.begin(); it != _windowStack.end(); it++) {
-		BaseMacWindow *w = *it;
-		if (w->draw(_screen, _fullRefresh)) {
-			w->setDirty(false);
-
-			Common::Rect clip(w->getDimensions().left - 2, w->getDimensions().top - 2, w->getDimensions().right - 2, w->getDimensions().bottom - 2);
-			clip.clip(_screen->getBounds());
-
-			g_system->copyRectToScreen(_screen->getBasePtr(clip.left, clip.top), _screen->pitch, clip.left, clip.top, clip.width(), clip.height());
-		}
-	}
-
-	// Menu is drawn on top of everything and always
-	if (_menu)
-		_menu->draw(_screen, _fullRefresh);
-
-	_fullRefresh = false;
-}
-
-bool MacWindowManager::processEvent(Common::Event &event) {
-	// Menu gets events first fir shortcuts and menu bar
-	if (_menu && _menu->processEvent(event))
-		return true;
-
-	if (event.type != Common::EVENT_MOUSEMOVE && event.type != Common::EVENT_LBUTTONDOWN &&
-			event.type != Common::EVENT_LBUTTONUP)
-		return false;
-
-	if (_windows[_activeWindow]->isEditable() && _windows[_activeWindow]->getType() == kWindowWindow &&
-			((MacWindow *)_windows[_activeWindow])->getInnerDimensions().contains(event.mouse.x, event.mouse.y)) {
-		if (_cursorIsArrow) {
-			CursorMan.replaceCursor(macCursorBeam, 11, 16, 3, 8, 3);
-			_cursorIsArrow = false;
-		}
-	} else {
-		if (_cursorIsArrow == false) {
-			CursorMan.replaceCursor(macCursorArrow, 11, 16, 1, 1, 3);
-			_cursorIsArrow = true;
-		}
-	}
-
-	for (Common::List<BaseMacWindow *>::const_iterator it = _windowStack.end(); it != _windowStack.begin();) {
-		it--;
-		BaseMacWindow *w = *it;
-
-		if (w->hasAllFocus() || w->getDimensions().contains(event.mouse.x, event.mouse.y)) {
-			if (event.type == Common::EVENT_LBUTTONDOWN || event.type == Common::EVENT_LBUTTONUP)
-				setActive(w->getId());
-
-			return w->processEvent(event);
-		}
-	}
-
-	return false;
-}
-
-//////////////////////
-// Font stuff
-//////////////////////
-void MacWindowManager::loadFonts() {
-	Common::Archive *dat;
-
-	dat = Common::makeZipArchive("classicmacfonts.dat");
-
-	if (!dat) {
-		warning("Could not find classicmacfonts.dat. Falling back to built-in fonts");
-		_builtInFonts = true;
-
-		return;
-	}
-
-	Common::ArchiveMemberList list;
-	dat->listMembers(list);
-
-	for (Common::ArchiveMemberList::iterator it = list.begin(); it != list.end(); ++it) {
-		Common::SeekableReadStream *stream = dat->createReadStreamForMember((*it)->getName());
-
-		Graphics::BdfFont *font = Graphics::BdfFont::loadFont(*stream);
-
-		delete stream;
-
-		Common::String fontName = (*it)->getName();
-
-		// Trim the .bdf extension
-		for (int i = fontName.size() - 1; i >= 0; --i) {
-			if (fontName[i] == '.') {
-				while ((uint)i < fontName.size()) {
-					fontName.deleteLastChar();
-				}
-				break;
-			}
-		}
-
-		FontMan.assignFontToName(fontName, font);
-
-		debug(2, " %s", fontName.c_str());
-	}
-
-	_builtInFonts = false;
-
-	delete dat;
-}
-
-const Graphics::Font *MacWindowManager::getFont(const char *name, Graphics::FontManager::FontUsage fallback) {
-	const Graphics::Font *font = 0;
-
-	if (!_builtInFonts) {
-		font = FontMan.getFontByName(name);
-
-		if (!font)
-			warning("Cannot load font %s", name);
-	}
-
-	if (_builtInFonts || !font)
-		font = FontMan.getFontByUsage(fallback);
-
-	return font;
-}
-
-/////////////////
-// Cursor stuff
-/////////////////
-void MacWindowManager::pushArrowCursor() {
-	CursorMan.pushCursor(macCursorArrow, 11, 16, 1, 1, 3);
-}
-
-void MacWindowManager::popCursor() {
-	CursorMan.popCursor();
-}
-
-} // End of namespace Wage