dub-mirrors/d-colorize
1
0
Fork 0
mirror of https://github.com/yamadapc/d-colorize synced 2024-11-14 21:14:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fg and bg colours working. There was a problem with changing colors before stdout was ever flushed.

Browse source
This commit is contained in:
ponce 2014-07-29 23:36:46 +02:00
parent 30f4576db5
commit 8ff025230e
2 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/colorize/cwrite.d
View file

@ -53,11 +53,24 @@ void cwrite(S...)(File f, S args)
version(Windows)
{
auto winterm = WinTermEmulation();
foreach(c ; s)
WinTermEmulation winterm;
winterm.initialize();
foreach(dchar c ; s)
{
if (winterm.feed(c))
f.write(c);
auto charAction = winterm.feed(c);
final switch(charAction) with (WinTermEmulation.CharAction)
{
case drop:
break;
case write:
f.write(c);
break;
case flush:
f.flush();
break;
}
}
}
else

26
source/colorize/winterm.d
View file

@ -17,7 +17,7 @@ version(Windows)
struct WinTermEmulation
{
public:
this(bool workardound = true) nothrow @nogc
void initialize() nothrow @nogc
{
// saves console attributes
_console = GetStdHandle(STD_OUTPUT_HANDLE);
@ -36,8 +36,16 @@ version(Windows)
}
}
// Eat one character and update color state accordingly. Return true if this character should be displayed.
bool feed(dchar d) nothrow @nogc
enum CharAction
{
write,
drop,
flush
}
// Eat one character and update color state accordingly.
// What to do with the fed character.
CharAction feed(dchar d) nothrow @nogc
{
final switch(_state) with (State)
{
@ -45,7 +53,7 @@ version(Windows)
if (d == '\x1B')
{
_state = escaped;
return false;
return CharAction.flush;
}
break;
@ -54,7 +62,7 @@ version(Windows)
{
_state = readingAttribute;
_parsedAttr = 0;
return false;
return CharAction.drop;
}
break;
@ -63,23 +71,23 @@ version(Windows)
if (d >= '0' && d <= '9')
{
_parsedAttr = _parsedAttr * 10 + (d - '0');
return false;
return CharAction.drop;
}
else if (d == ';')
{
executeAttribute(_parsedAttr);
_parsedAttr = 0;
return false;
return CharAction.drop;
}
else if (d == 'm')
{
executeAttribute(_parsedAttr);
_state = State.initial;
return false;
return CharAction.drop;
}
break;
}
return true;
return CharAction.write;
}
private: