[Scummvm-cvs-logs] SF.net SVN: scummvm:[44799] scummvm/trunk/engines/sci/gui

[m_kiewitz at users.sourceforge.net]

Revision: 44799
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44799&view=rev
Author:   m_kiewitz
Date:     2009-10-08 20:51:49 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
SCI/newgui: more cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui_gfx.cpp
    scummvm/trunk/engines/sci/gui/gui_helpers.h
    scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
    scummvm/trunk/engines/sci/gui/gui_windowmgr.h

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-08 20:37:10 UTC (rev 44798)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-08 20:51:49 UTC (rev 44799)
@@ -46,7 +46,7 @@
 	: _s(state), _screen(screen), _palette(palette), _cursor(cursor) {
 
 	_gfx = new SciGuiGfx(_s, _screen, _palette);
-	_windowMgr = new SciGuiWindowMgr(_s, _gfx);
+	_windowMgr = new SciGuiWindowMgr(_s, _screen, _gfx);
 }
 
 SciGui::SciGui() {

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-08 20:37:10 UTC (rev 44798)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-08 20:51:49 UTC (rev 44799)
@@ -1356,7 +1356,7 @@
 
 			// arr1[inx] = 1;
 			if (signal & SCI_ANIMATE_SIGNAL_REMOVEVIEW) {
-				signal &= 0xFFFF ^ GFX_REMOVEVIEW;
+				signal &= 0xFFFF ^ SCI_ANIMATE_SIGNAL_REMOVEVIEW;
 				PUT_SEL32V(curObject, signal, signal);
 			}
 			

Modified: scummvm/trunk/engines/sci/gui/gui_helpers.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-08 20:37:10 UTC (rev 44798)
+++ scummvm/trunk/engines/sci/gui/gui_helpers.h	2009-10-08 20:51:49 UTC (rev 44799)
@@ -103,17 +103,6 @@
 	uint32 schedule;
 };
 
-enum {
-	GFX_STOPUPDATE = 0x01,
-	GFX_VIEWUPDATED = 0x02,
-	GFX_NOUPDATE = 0x04,
-	GFX_HIDDEN = 0x08,
-	GFX_FIXEDPRIO=0x10,
-	GFX_ALWAYSUPDATE = 0x20,
-	GFX_FORCEUPDATE = 0x40,
-	GFX_REMOVEVIEW = 0x80
-};
-
 } // End of namespace Sci
 
 #endif

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-08 20:37:10 UTC (rev 44798)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.cpp	2009-10-08 20:51:49 UTC (rev 44799)
@@ -28,6 +28,7 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/tools.h"
+#include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_gfx.h"
 #include "sci/gui/gui_windowmgr.h"
 
@@ -42,8 +43,8 @@
 	kUser        = (1 << 7)
 };
 
-SciGuiWindowMgr::SciGuiWindowMgr(EngineState *state, SciGuiGfx *gfx)
-	: _s(state), _gfx(gfx) {
+SciGuiWindowMgr::SciGuiWindowMgr(EngineState *state, SciGuiScreen *screen, SciGuiGfx *gfx)
+	: _s(state), _screen(screen), _gfx(gfx) {
 
 	_wmgrPort = new GuiPort(1);
 	_windowsById.resize(2);
@@ -60,10 +61,9 @@
 	_wmgrPort->rect.moveTo(0, 0);
 	_wmgrPort->curTop = 0;
 	_wmgrPort->curLeft = 0;
-
 	_windowList.push_front(_wmgrPort);
 
-	_picWind = NewWindow(Common::Rect(0, 10, 320, 200), 0, 0, kTransparent | kNoFrame, 0, true);
+	_picWind = NewWindow(Common::Rect(0, 10, _screen->_width, _screen->_height), 0, 0, kTransparent | kNoFrame, 0, true);
 }
 
 SciGuiWindowMgr::~SciGuiWindowMgr() {
@@ -111,7 +111,6 @@
 		_windowsById.push_back(0);
 	assert(0 < id && id < 0xFFFF);
 
-
 	GuiWindow *pwnd = new GuiWindow(id);
 	Common::Rect r;
 

Modified: scummvm/trunk/engines/sci/gui/gui_windowmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-08 20:37:10 UTC (rev 44798)
+++ scummvm/trunk/engines/sci/gui/gui_windowmgr.h	2009-10-08 20:51:49 UTC (rev 44799)
@@ -33,7 +33,7 @@
 
 class SciGuiWindowMgr {
 public:
-	SciGuiWindowMgr(EngineState *state, SciGuiGfx *gfx);
+	SciGuiWindowMgr(EngineState *state, SciGuiScreen *screen, SciGuiGfx *gfx);
 	~SciGuiWindowMgr();
 
 	int16 isFrontWindow(GuiWindow *wnd);
@@ -53,6 +53,7 @@
 	typedef Common::List<GuiPort *> PortList;
 
 	EngineState *_s;
+	SciGuiScreen *_screen;
 	SciGuiGfx *_gfx;
 
 	/** The list of open 'windows' (and ports), in visual order. */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.