Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 969 vs 977 for /trunk/Source Code/GUI/Headers/GUIConsole.h

Diff revisions: vs.
  @@ -39,6 +39,7 @@
39 39 #endif
40 40 #include <CEGUI/CEGUI.h>
41 41
42 + #include "Core/Headers/Console.h"
42 43 #include "Platform/Headers/PlatformDefines.h"
43 44 #include "Core/Headers/PlatformContextComponent.h"
44 45
  @@ -66,7 +67,7 @@
66 67 void update(const U64 deltaTimeUS);
67 68
68 69 /// Add text to the console Window. Uses a text buffer if the console isn't ready for display yet
69 - void printText(const char* output, bool error);
70 + void printText(const Console::OutputEntry& entry);
70 71
71 72 protected:
72 73 void RegisterHandlers(); //< Register our handler functions
  @@ -81,13 +82,13 @@
81 82 void CreateCEGUIWindow(); //< The function which will load in the CEGUI
82 83 //Window and register event handlers
83 84 // Post the message to the ChatHistory listbox with a white colour default
84 - void OutputText(const char* inMsg, const bool error = false);
85 + void OutputText(const Console::OutputEntry& text);
85 86
86 87 protected:
87 88 /// used to check if the console is ready
88 89 bool _init;
89 90 bool _closing;
90 - bool _lastMsgError;
91 + Console::EntryType _lastMsgType;
91 92 CEGUI::String _lastMsg;
92 93 /// pointer to the editBox to reduce typing and casting
93 94 CEGUI::Editbox* _editBox;
  @@ -107,7 +108,9 @@
107 108 I16 _inputHistoryIndex;
108 109
109 110 SharedLock _outputLock;
110 - boost::circular_buffer<std::pair<stringImpl, bool>> _outputBuffer;
111 + boost::circular_buffer<Console::OutputEntry> _outputBuffer;
112 +
113 + size_t _consoleCallbackIndex;
111 114 };
112 115
113 116 }; // namespace Divide