1 files changed, 75 insertions, 13 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 5db1a54..50f2f26 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -6,17 +6,20 @@
 
 #pragma once
 
+#include <vector>
+#include <string>
+
 #include <boost/optional.hpp>
-#include <Swiften/Base/boost_bsignals.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <vector>
 
-#include <string>
+#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/SecurityLabelsCatalog.h>
 #include <Swiften/Elements/ChatState.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/MUCOccupant.h>
+#include <Swift/Controllers/HighlightManager.h>
 
 
 namespace Swift {
@@ -29,31 +32,85 @@ namespace Swift {
 	class FileTransferController;
 	class InviteToChatWindow;
 
+
 	class ChatWindow {
 		public:
+			class ChatMessagePart {
+				public:
+					virtual ~ChatMessagePart() {}
+			};
+
+			class ChatMessage {
+				public:
+					ChatMessage() {}
+					ChatMessage(const std::string& text) {
+						append(boost::make_shared<ChatTextMessagePart>(text));
+					}
+					void append(const boost::shared_ptr<ChatMessagePart>& part) {
+						parts_.push_back(part);
+					}
+
+					const std::vector<boost::shared_ptr<ChatMessagePart> >& getParts() const {
+						return parts_;
+					}
+				private:
+					std::vector<boost::shared_ptr<ChatMessagePart> > parts_;
+			};
+
+			class ChatTextMessagePart : public ChatMessagePart {
+				public:
+					ChatTextMessagePart(const std::string& text) : text(text) {}
+					std::string text;
+			};
+
+			class ChatURIMessagePart : public ChatMessagePart {
+				public:
+					ChatURIMessagePart(const std::string& target) : target(target) {}
+					std::string target;
+			};
+
+			class ChatEmoticonMessagePart : public ChatMessagePart {
+				public:
+					std::string imagePath;
+					std::string alternativeText;
+			};
+
+			class ChatHighlightingMessagePart : public ChatMessagePart {
+				public:
+					std::string foregroundColor;
+					std::string backgroundColor;
+					std::string text;
+			};
+
+
 			enum AckState {Pending, Received, Failed};
 			enum ReceiptState {ReceiptRequested, ReceiptReceived};
 			enum Tristate {Yes, No, Maybe};
-			enum OccupantAction {Kick, Ban, MakeModerator, MakeParticipant, MakeVisitor, AddContact};
+			enum OccupantAction {Kick, Ban, MakeModerator, MakeParticipant, MakeVisitor, AddContact, ShowProfile};
 			enum RoomAction {ChangeSubject, Configure, Affiliations, Destroy, Invite};
 			enum FileTransferState {WaitingForAccept, Negotiating, Transferring, Canceled, Finished, FTFailed};
 			enum WhiteboardSessionState {WhiteboardAccepted, WhiteboardTerminated, WhiteboardRejected};
+			enum BlockingState {BlockingUnsupported, IsBlocked, IsUnblocked};
+			enum Direction { UnknownDirection, DefaultDirection };
+
 			ChatWindow() {}
-			virtual ~ChatWindow() {};
+			virtual ~ChatWindow() {}
 
 			/** Add message to window.
 			 * @return id of added message (for acks).
 			 */
-			virtual std::string addMessage(const std::string& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0;
+			virtual std::string addMessage(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time, const HighlightAction& highlight) = 0;
 			/** Adds action to window.
 			 * @return id of added message (for acks);
 			 */
-			virtual std::string addAction(const std::string& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0;
-			virtual void addSystemMessage(const std::string& message) = 0;
-			virtual void addPresenceMessage(const std::string& message) = 0;
-			virtual void addErrorMessage(const std::string& message) = 0;
-			virtual void replaceMessage(const std::string& message, const std::string& id, const boost::posix_time::ptime& time) = 0;
-			virtual void replaceWithAction(const std::string& message, const std::string& id, const boost::posix_time::ptime& time) = 0;
+			virtual std::string addAction(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time, const HighlightAction& highlight) = 0;
+
+			virtual void addSystemMessage(const ChatMessage& message, Direction direction) = 0;
+			virtual void addPresenceMessage(const ChatMessage& message, Direction direction) = 0;
+
+			virtual void addErrorMessage(const ChatMessage& message) = 0;
+			virtual void replaceMessage(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time, const HighlightAction& highlight) = 0;
+			virtual void replaceWithAction(const ChatMessage& message, const std::string& id, const boost::posix_time::ptime& time, const HighlightAction& highlight) = 0;
 			
 			// File transfer related stuff
 			virtual std::string addFileTransfer(const std::string& senderName, bool senderIsSelf, const std::string& filename, const boost::uintmax_t sizeInBytes) = 0;
@@ -82,12 +139,13 @@ namespace Swift {
 			virtual void setInputEnabled(bool enabled) = 0;
 			virtual void setRosterModel(Roster* model) = 0;
 			virtual void setTabComplete(TabComplete* completer) = 0;
-			virtual void replaceLastMessage(const std::string& message) = 0;
+			virtual void replaceLastMessage(const ChatMessage& message) = 0;
 			virtual void setAckState(const std::string& id, AckState state) = 0;
 			virtual void flash() = 0;
 			virtual void setSubject(const std::string& subject) = 0;
 			virtual void setAffiliations(MUCOccupant::Affiliation, const std::vector<JID>&) = 0;
 			virtual void setAvailableRoomActions(const std::vector<RoomAction> &actions) = 0;
+			virtual void setBlockingState(BlockingState state) = 0;
 			/**
 			 * Set an alert on the window.
 			 * @param alertText Description of alert (required).
@@ -141,6 +199,10 @@ namespace Swift {
 			boost::signal<void ()> onWhiteboardSessionAccept;
 			boost::signal<void ()> onWhiteboardSessionCancel;
 			boost::signal<void ()> onWhiteboardWindowShow;
+
+			// Blocking Command related
+			boost::signal<void ()> onBlockUserRequest;
+			boost::signal<void ()> onUnblockUserRequest;
 	};
 }