EVENTS: Handle the notifications bundled in the main thread

xoreos · Mar 20, 2014 · 833af86 · 833af86
1 parent cd33eee
commit 833af86
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 60 deletions.
diff --git a/src/engines/nwn/area.h b/src/engines/nwn/area.h
@@ -102,11 +102,6 @@ class Area : public Aurora::NWScript::Object {
 	static Common::UString getName(const Common::UString &resRef);
 
 
-protected:
-	/** Notify the area that the camera has been moved. */
-	void notifyCameraMoved();
-
-
 private:
 	/** Tile orientation. */
 	enum Orientation {

diff --git a/src/engines/nwn/gui/ingame/compass.cpp b/src/engines/nwn/gui/ingame/compass.cpp
@@ -87,7 +87,7 @@ Compass::Compass(float position) {
 	addWidget(_compass);
 
 
-	notifyResized(0, 0, GfxMan.getScreenWidth(), GfxMan.getScreenHeight());
+	notify(Events::kNotificationResized);
 }
 
 Compass::~Compass() {
@@ -96,16 +96,23 @@ Compass::~Compass() {
 void Compass::callbackActive(Widget &widget) {
 }
 
-void Compass::notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight) {
-	setPosition(newWidth / 2.0, - (newHeight / 2.0), -400.0);
-}
+void Compass::notify(Events::Notification notification) {
+	if (notification == Events::kNotificationResized) {
+		const float width  = GfxMan.getScreenWidth();
+		const float height = GfxMan.getScreenHeight();
+
+		setPosition(width / 2.0, -(height / 2.0), -400.0);
+		return;
+	}
 
-void Compass::notifyCameraMoved() {
-	float roll, pitch, yaw, x, y, z;
-	CameraMan.getOrientation(roll, pitch, yaw);
-	CameraMan.getDirection(x, y, z);
+	if (notification == Events::kNotificationCameraMoved) {
+		float roll, pitch, yaw, x, y, z;
+		CameraMan.getOrientation(roll, pitch, yaw);
+		CameraMan.getDirection(x, y, z);
 
-	_compass->setRotation(x, y, yaw);
+		_compass->setRotation(x, y, yaw);
+		return;
+	}
 }
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/ingame/compass.h b/src/engines/nwn/gui/ingame/compass.h
@@ -61,8 +61,7 @@ class Compass : public GUI, public Events::Notifyable {
 private:
 	CompassWidget *_compass;
 
-	void notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight);
-	void notifyCameraMoved();
+	void notify(Events::Notification notification);
 };
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/ingame/dialog.cpp b/src/engines/nwn/gui/ingame/dialog.cpp
@@ -564,7 +564,7 @@ Dialog::Dialog(const Common::UString &conv, Creature &pc, Object &obj,
 	playSound(playHello);
 	playAnimation();
 
-	notifyResized(0, 0, GfxMan.getScreenWidth(), GfxMan.getScreenHeight());
+	notify(Events::kNotificationResized);
 }
 
 Dialog::~Dialog() {
@@ -687,9 +687,15 @@ void Dialog::checkPicked() {
 	mouseMove();
 }
 
-void Dialog::notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight) {
-	const float x = -(newWidth  / 2.0)                        + 10.0;
-	const float y =  (newHeight / 2.0) - _dlgBox->getHeight() - 20.0;
+void Dialog::notify(Events::Notification notification) {
+	if (notification != Events::kNotificationResized)
+		return;
+
+	const float width  = GfxMan.getScreenWidth();
+	const float height = GfxMan.getScreenHeight();
+
+	const float x = -(width  / 2.0)                        + 10.0;
+	const float y =  (height / 2.0) - _dlgBox->getHeight() - 20.0;
 
 	_dlgBox->setPosition(x, y, 0.0);
 }

diff --git a/src/engines/nwn/gui/ingame/dialog.h b/src/engines/nwn/gui/ingame/dialog.h
@@ -206,7 +206,7 @@ class Dialog : public Events::Notifyable {
 	int processEventQueue();
 
 protected:
-	void notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight);
+	void notify(Events::Notification notification);
 
 private:
 	Common::UString _conv; ///< The conversation file.

diff --git a/src/engines/nwn/gui/ingame/partyleader.cpp b/src/engines/nwn/gui/ingame/partyleader.cpp
@@ -117,7 +117,7 @@ PartyLeader::PartyLeader(Module &module) : _module(&module),
 
 
 	updatePortraitTooltip();
-	notifyResized(0, 0, GfxMan.getScreenWidth(), GfxMan.getScreenHeight());
+	notify(Events::kNotificationResized);
 }
 
 PartyLeader::~PartyLeader() {
@@ -183,8 +183,14 @@ void PartyLeader::updatePortraitTooltip() {
 	*/
 }
 
-void PartyLeader::notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight) {
-	setPosition(newWidth / 2.0, newHeight / 2.0, -400.0);
+void PartyLeader::notify(Events::Notification notification) {
+	if (notification != Events::kNotificationResized)
+		return;
+
+	const float width  = GfxMan.getScreenWidth();
+	const float height = GfxMan.getScreenHeight();
+
+	setPosition(width / 2.0, height / 2.0, -400.0);
 }
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/ingame/partyleader.h b/src/engines/nwn/gui/ingame/partyleader.h
@@ -82,7 +82,7 @@ class PartyLeader : public CharacterInfo, public Events::Notifyable {
 
 	void updatePortraitTooltip();
 
-	void notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight);
+	void notify(Events::Notification notification);
 };
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/ingame/quickbar.cpp b/src/engines/nwn/gui/ingame/quickbar.cpp
@@ -131,7 +131,7 @@ Quickbar::Quickbar() {
 	topEdge->setPosition(0.0, _slotHeight, 0.0);
 	addWidget(topEdge);
 
-	notifyResized(0, 0, GfxMan.getScreenWidth(), GfxMan.getScreenHeight());
+	notify(Events::kNotificationResized);
 }
 
 Quickbar::~Quickbar() {
@@ -160,8 +160,14 @@ void Quickbar::getSlotSize() {
 	delete model;
 }
 
-void Quickbar::notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight) {
-	setPosition(- ((12 * _slotWidth) / 2.0), -(newHeight / 2.0), -400.0);
+void Quickbar::notify(Events::Notification notification) {
+	if (notification != Events::kNotificationResized)
+		return;
+
+	const float width  = GfxMan.getScreenWidth();
+	const float height = GfxMan.getScreenHeight();
+
+	setPosition(- ((12 * _slotWidth) / 2.0), -(height / 2.0), -400.0);
 }
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/ingame/quickbar.h b/src/engines/nwn/gui/ingame/quickbar.h
@@ -94,7 +94,7 @@ class Quickbar : public GUI, public Events::Notifyable {
 
 	void getSlotSize();
 
-	void notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight);
+	void notify(Events::Notification notification);
 };
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/ingame/quickchat.cpp b/src/engines/nwn/gui/ingame/quickchat.cpp
@@ -109,7 +109,7 @@ Quickchat::Quickchat(float position) {
 	addWidget(modeButton);
 
 
-	notifyResized(0, 0, GfxMan.getScreenWidth(), GfxMan.getScreenHeight());
+	notify(Events::kNotificationResized);
 }
 
 Quickchat::~Quickchat() {
@@ -126,8 +126,14 @@ float Quickchat::getHeight() const {
 void Quickchat::callbackActive(Widget &widget) {
 }
 
-void Quickchat::notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight) {
-	setPosition(- (newWidth / 2.0), -(newHeight / 2.0), -400.0);
+void Quickchat::notify(Events::Notification notification) {
+	if (notification != Events::kNotificationResized)
+		return;
+
+	const float width  = GfxMan.getScreenWidth();
+	const float height = GfxMan.getScreenHeight();
+
+	setPosition(- (width / 2.0), -(height / 2.0), -400.0);
 }
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/ingame/quickchat.h b/src/engines/nwn/gui/ingame/quickchat.h
@@ -86,7 +86,7 @@ class Quickchat : public GUI, public Events::Notifyable {
 private:
 	WidgetPanel *_prompt;
 
-	void notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight);
+	void notify(Events::Notification notification);
 };
 
 } // End of namespace NWN

diff --git a/src/engines/nwn/gui/widgets/tooltip.cpp b/src/engines/nwn/gui/widgets/tooltip.cpp
@@ -154,7 +154,10 @@ void Tooltip::setAlign(float align) {
 	redoLayout();
 }
 
-void Tooltip::notifyCameraMoved() {
+void Tooltip::notify(Events::Notification notification) {
+	if (notification != Events::kNotificationCameraMoved)
+		return;
+
 	updatePosition();
 }
 

diff --git a/src/engines/nwn/gui/widgets/tooltip.h b/src/engines/nwn/gui/widgets/tooltip.h
@@ -75,7 +75,7 @@ class Tooltip : public Events::Notifyable {
 
 
 protected:
-	void notifyCameraMoved();
+	void notify(Events::Notification notification);
 
 
 private:

diff --git a/src/events/events.cpp b/src/events/events.cpp
@@ -288,6 +288,9 @@ void EventsManager::runMainLoop() {
 
 		_queueProcessed.signal();
 
+		// Handle the notifications
+		NotificationMan.handle();
+
 		if (!_quitRequested)
 			// Render a frame
 			GfxMan.renderScene();

diff --git a/src/events/notifications.cpp b/src/events/notifications.cpp
@@ -41,6 +41,8 @@ NotificationManager::~NotificationManager() {
 }
 
 void NotificationManager::init() {
+	for (int i = 0; i < kNotificationMAX; i++)
+		_notifications[i].store(false);
 }
 
 std::list<Notifyable *>::iterator NotificationManager::registerNotifyable(Notifyable &notifyable) {
@@ -57,18 +59,19 @@ void NotificationManager::unregisterNotifyable(const std::list<Notifyable *>::it
 	_notifyables.erase(it);
 }
 
-void NotificationManager::resized(int oldWidth, int oldHeight, int newWidth, int newHeight) {
-	Common::StackLock lock(_mutex);
+void NotificationManager::notify(Notification notification) {
+	assert((notification >= 0) && (notification < kNotificationMAX));
 
-	for (std::list<Notifyable *>::iterator it = _notifyables.begin(); it != _notifyables.end(); ++it)
-		(*it)->notifyResized(oldWidth, oldHeight, newWidth, newHeight);
+	_notifications[notification].store(true);
 }
 
-void NotificationManager::cameraMoved() {
+void NotificationManager::handle() {
 	Common::StackLock lock(_mutex);
 
-	for (std::list<Notifyable *>::iterator it = _notifyables.begin(); it != _notifyables.end(); ++it)
-		(*it)->notifyCameraMoved();
+	for (int i = 0; i < kNotificationMAX; i++)
+		if (_notifications[i].exchange(false))
+			for (std::list<Notifyable *>::iterator it = _notifyables.begin(); it != _notifyables.end(); ++it)
+				(*it)->notify((Notification) i);
 }
 
 } // End of namespace Events
diff --git a/src/events/notifications.h b/src/events/notifications.h
@@ -32,6 +32,8 @@
 
 #include <list>
 
+#include <boost/atomic.hpp>
+
 #include "common/types.h"
 #include "common/singleton.h"
 #include "common/mutex.h"
@@ -42,6 +44,13 @@ namespace Events {
 
 class Notifyable;
 
+/** Types of notifications that can be sent. */
+enum Notification {
+	kNotificationResized     = 0, ///< The main window was resized.
+	kNotificationCameraMoved    , ///< The camera was moved.
+	kNotificationMAX              ///< For range checks.
+};
+
 /** The notification manager, handling all notifications.
  *
  *  Notifications are handed out to all classes of the Notifyable type for
@@ -58,20 +67,23 @@ class NotificationManager : public Common::Singleton<NotificationManager> {
 
 	void init();
 
-	/** Notify all Notifyables that the screen size changed. */
-	void resized(int oldWidth, int oldHeight, int newWidth, int newHeight);
-	/** Notify all Notifyables that the camera moved. */
-	void cameraMoved();
+	/** Notify all Notifyables of a Notification. */
+	void notify(Notification notification);
 
 private:
 	Common::Mutex _mutex;
 
+	boost::atomic<bool> _notifications[kNotificationMAX];
+
 	std::list<Notifyable *> _notifyables;
 
 	std::list<Notifyable *>::iterator registerNotifyable(Notifyable &notifyable);
 	void unregisterNotifyable(const std::list<Notifyable *>::iterator &it);
 
 	friend class Notifyable;
+
+public:
+	void handle(); ///< Called by the main thread.
 };
 
 } // End of namespace Events

diff --git a/src/events/notifyable.h b/src/events/notifyable.h
@@ -50,9 +50,7 @@ class Notifyable {
 	}
 
 private:
-	virtual void notifyResized(int oldWidth, int oldHeight, int newWidth, int newHeight) {
-	}
-	virtual void notifyCameraMoved() {
+	virtual void notify(Notification notification) {
 	}
 
 	friend class NotificationManager;