[Scummvm-cvs-logs] scummvm master -> 25c380f92e6585a05dc1038b5809f55daeb88314
sev-
sev at scummvm.org
Wed Apr 13 11:23:45 CEST 2016
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d42a8d0f2d WAGE: Stub for MacWindow class
daa62019fa WAGE: More auxiliary methods to MacWindow class
25c380f92e WAGE: Added stub of MacWindowManager class
Commit: d42a8d0f2dbd98a466c4a1ca0f64ca18561211f9
https://github.com/scummvm/scummvm/commit/d42a8d0f2dbd98a466c4a1ca0f64ca18561211f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-13T11:23:39+02:00
Commit Message:
WAGE: Stub for MacWindow class
Changed paths:
A engines/wage/macwindow.cpp
A engines/wage/macwindow.h
engines/wage/gui.h
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
index 48ec41c..fac41ce 100644
--- a/engines/wage/gui.h
+++ b/engines/wage/gui.h
@@ -54,15 +54,12 @@
#include "graphics/surface.h"
#include "common/rect.h"
+#include "wage/macwindow.h"
+
namespace Wage {
class Menu;
-enum WindowType {
- kWindowScene,
- kWindowConsole
-};
-
enum {
kMenuHeight = 20,
kMenuLeftMargin = 7,
diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp
new file mode 100644
index 0000000..a9be445
--- /dev/null
+++ b/engines/wage/macwindow.cpp
@@ -0,0 +1,68 @@
+/* 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 "wage/macwindow.h"
+
+namespace Wage {
+
+MacWindow::MacWindow(WindowType type) : _type(type) {
+}
+
+MacWindow::~MacWindow() {
+}
+
+void MacWindow::resize(int w, int h) {
+ _surface.free();
+
+ _surface.create(w, h, Graphics::PixelFormat::createFormatCLUT8());
+}
+
+void MacWindow::draw(Graphics::Surface *g, int x, int y) {
+
+}
+
+} // End of namespace Wage
diff --git a/engines/wage/macwindow.h b/engines/wage/macwindow.h
new file mode 100644
index 0000000..370468e
--- /dev/null
+++ b/engines/wage/macwindow.h
@@ -0,0 +1,73 @@
+/* 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.
+ *
+ */
+
+#ifndef WAGE_MACWINDOW_H
+#define WAGE_MACWINDOW_H
+
+#include "graphics/managed_surface.h"
+
+namespace Wage {
+
+enum WindowType {
+ kWindowScene,
+ kWindowConsole
+};
+
+class MacWindow {
+ MacWindow(WindowType type);
+ ~MacWindow();
+ void resize(int w, int h);
+ void draw(Graphics::Surface *g, int x, int y);
+
+private:
+ Graphics::ManagedSurface _surface;
+ WindowType _type;
+};
+
+} // End of namespace Wage
+
+#endif
Commit: daa62019fa64789b9fe7df8d72b1752350cb58b3
https://github.com/scummvm/scummvm/commit/daa62019fa64789b9fe7df8d72b1752350cb58b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-13T11:23:39+02:00
Commit Message:
WAGE: More auxiliary methods to MacWindow class
Changed paths:
engines/wage/macwindow.cpp
engines/wage/macwindow.h
diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp
index a9be445..002422e4 100644
--- a/engines/wage/macwindow.cpp
+++ b/engines/wage/macwindow.cpp
@@ -50,11 +50,21 @@
namespace Wage {
MacWindow::MacWindow(WindowType type) : _type(type) {
+ _active = false;
+ _bordersDirty = true;
}
MacWindow::~MacWindow() {
}
+void MacWindow::setActive(bool active) {
+ if (active == _active)
+ return;
+
+ _active = active;
+ _bordersDirty = true;
+}
+
void MacWindow::resize(int w, int h) {
_surface.free();
@@ -62,7 +72,12 @@ void MacWindow::resize(int w, int h) {
}
void MacWindow::draw(Graphics::Surface *g, int x, int y) {
+ if (_bordersDirty)
+ drawBorder();
+}
+void MacWindow::drawBorder() {
+ _bordersDirty = false;
}
} // End of namespace Wage
diff --git a/engines/wage/macwindow.h b/engines/wage/macwindow.h
index 370468e..4efdbd0 100644
--- a/engines/wage/macwindow.h
+++ b/engines/wage/macwindow.h
@@ -62,10 +62,18 @@ class MacWindow {
~MacWindow();
void resize(int w, int h);
void draw(Graphics::Surface *g, int x, int y);
+ void setActive(bool active);
+ Graphics::ManagedSurface *getSurface() { return &_surface; }
+
+private:
+ void drawBorder();
private:
Graphics::ManagedSurface _surface;
+ Graphics::ManagedSurface _borderSurface;
WindowType _type;
+ bool _active;
+ bool _borderIsDirty;
};
} // End of namespace Wage
Commit: 25c380f92e6585a05dc1038b5809f55daeb88314
https://github.com/scummvm/scummvm/commit/25c380f92e6585a05dc1038b5809f55daeb88314
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-13T11:23:39+02:00
Commit Message:
WAGE: Added stub of MacWindowManager class
Changed paths:
A engines/wage/macwindowmanager.cpp
A engines/wage/macwindowmanager.h
engines/wage/macwindow.cpp
engines/wage/module.mk
diff --git a/engines/wage/macwindow.cpp b/engines/wage/macwindow.cpp
index 002422e4..a745755 100644
--- a/engines/wage/macwindow.cpp
+++ b/engines/wage/macwindow.cpp
@@ -51,7 +51,7 @@ namespace Wage {
MacWindow::MacWindow(WindowType type) : _type(type) {
_active = false;
- _bordersDirty = true;
+ _borderIsDirty = true;
}
MacWindow::~MacWindow() {
@@ -62,7 +62,7 @@ void MacWindow::setActive(bool active) {
return;
_active = active;
- _bordersDirty = true;
+ _borderIsDirty = true;
}
void MacWindow::resize(int w, int h) {
@@ -72,12 +72,12 @@ void MacWindow::resize(int w, int h) {
}
void MacWindow::draw(Graphics::Surface *g, int x, int y) {
- if (_bordersDirty)
+ if (_borderIsDirty)
drawBorder();
}
void MacWindow::drawBorder() {
- _bordersDirty = false;
+ _borderIsDirty = false;
}
} // End of namespace Wage
diff --git a/engines/wage/macwindowmanager.cpp b/engines/wage/macwindowmanager.cpp
new file mode 100644
index 0000000..02e47a1
--- /dev/null
+++ b/engines/wage/macwindowmanager.cpp
@@ -0,0 +1,58 @@
+/* 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 "wage/macwindowmanager.h"
+
+namespace Wage {
+
+MacWindowManager::MacWindowManager() {
+}
+
+MacWindowManager::~MacWindowManager() {
+}
+
+} // End of namespace Wage
diff --git a/engines/wage/macwindowmanager.h b/engines/wage/macwindowmanager.h
new file mode 100644
index 0000000..eaec462
--- /dev/null
+++ b/engines/wage/macwindowmanager.h
@@ -0,0 +1,60 @@
+/* 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.
+ *
+ */
+
+#ifndef WAGE_MACWINDOWMANAGER_H
+#define WAGE_MACWINDOWMANAGER_H
+
+namespace Wage {
+
+class MacWindowManager {
+ MacWindowManager();
+ ~MacWindowManager();
+};
+
+} // End of namespace Wage
+
+#endif
diff --git a/engines/wage/module.mk b/engines/wage/module.mk
index 21316bb..d65934f 100644
--- a/engines/wage/module.mk
+++ b/engines/wage/module.mk
@@ -9,6 +9,8 @@ MODULE_OBJS := \
entities.o \
gui.o \
gui-console.o \
+ macwindow.o \
+ macwindowmanager.o \
menu.o \
randomhat.o \
script.o \
More information about the Scummvm-git-logs
mailing list