github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Refined Errors...

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7459 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-06-20 13:06:35 +00:00
parent b3cfaa1f45
commit 3dcecb2d72
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
uppsrc/ide/Console.cpp
View file

@ -56,16 +56,6 @@ void Console::Append(const String& s) {
SetEditable();
MoveTextEnd();
WString t = Filter(FromSystemCharset(s), sAppf).ToWString();
if(IsRunning())
for(const wchar *q = t; *q; q++) {
if(*q == '\n') {
WhenLine(line.ToString());
line.Clear();
}
else
if((byte)*q >= ' ')
line.Cat(*q);
}
int mg = sb.GetReducedViewSize().cx / GetFont().Info().GetAveWidth();
if(wrap_text && mg > 4) {
int x = GetColumnLine(GetCursor()).x;
@ -111,6 +101,20 @@ bool Console::Key(dword key, int count) {
return LineEdit::Key(key, count);
}
void Console::AppendOutput(const String& s)
{
Append(s);
for(const char *q = s; *q; q++) {
if(*q == '\n') {
WhenLine(line);
line.Clear();
}
else
if((byte)*q >= ' ')
line.Cat(*q);
}
}
int Console::Flush()
{
bool done_output = false;
@ -144,7 +148,7 @@ int Console::Flush()
if(!slot.quiet) {
if(console_lock < 0 || console_lock == i) {
console_lock = i;
Append(s);
AppendOutput(s);
}
else
slot.output.Cat(s);
@ -249,7 +253,7 @@ bool Console::Run(One<AProcess> pick_ process, const char *cmdline, Stream *out,
void Console::FlushConsole()
{
if(console_lock < 0) {
Append(spooled_output);
AppendOutput(spooled_output);
spooled_output = Null;
}
}
@ -363,7 +367,7 @@ void Console::CheckEndGroup()
msg << '\n';
spooled_output.Cat(msg);
if(console_lock < 0) {
Append(spooled_output);
AppendOutput(spooled_output);
spooled_output = Null;
}
}

3
uppsrc/ide/ide.h
View file

@ -85,7 +85,7 @@ protected:
int console_lock;
bool wrap_text;
FrameBottom<EditString> input;
WString line;
String line;
void CheckEndGroup();
void FlushConsole();
@ -108,6 +108,7 @@ public:
Console& operator<<(const String& s) { Append(s); return *this; }
void AppendOutput(const String& s);
bool IsRunning();
bool IsRunning(int slot);
int Flush();