forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

terminal colors

This commit is contained in:
Vadim Lopatin 2016-05-30 16:36:03 +03:00
parent 7055f48cc5
commit 97cb667dc9
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dlangide/ui/outputpanel.d
View File

@ -178,6 +178,8 @@ class OutputPanel : DockWindow {
//_terminalWidget.write("\x1b[1Kerased bol"d); //_terminalWidget.write("\x1b[1Kerased bol"d);
//_terminalWidget.write("\x1b[2Kerased line"d); //_terminalWidget.write("\x1b[2Kerased line"d);
//_terminalWidget.write("Юникод Unicode"d); //_terminalWidget.write("Юникод Unicode"d);
_terminalWidget.write("\x1b[34;45m blue on magenta "d);
_terminalWidget.write("\x1b[31;46m red on cyan "d);
return _tabs; return _tabs;
} }

42
src/dlangide/ui/terminal.d
View File

@ -6,6 +6,7 @@ import dlangui.widgets.controls;
struct TerminalAttr { struct TerminalAttr {
ubyte bgColor = 7; ubyte bgColor = 7;
ubyte textColor = 0; ubyte textColor = 0;
ubyte flags = 0;
} }
struct TerminalChar { struct TerminalChar {
@ -69,6 +70,7 @@ struct TerminalContent {
Rect rc; Rect rc;
FontRef font; FontRef font;
TerminalAttr currentAttr; TerminalAttr currentAttr;
TerminalAttr defAttr;
int maxBufferLines = 3000; int maxBufferLines = 3000;
int topLine; int topLine;
int width; // width in chars int width; // width in chars
@ -133,6 +135,32 @@ struct TerminalContent {
cursory = screenTop + height - 1; cursory = screenTop + height - 1;
} }
} }
void setAttributes(int[] attrs) {
foreach (attr; attrs) {
if (attr < 0)
continue;
if (attr >= 30 && attr <= 37) {
currentAttr.textColor = cast(ubyte)(attr - 30);
} else if (attr >= 40 && attr <= 47) {
currentAttr.bgColor = cast(ubyte)(attr - 40);
} else if (attr >= 0 && attr <= 10) {
switch(attr) {
case 0:
currentAttr = defAttr;
break;
case 1:
case 2:
case 4:
case 5:
case 7:
case 8:
default:
break;
}
}
}
}
void moveCursorTo(int x, int y) { void moveCursorTo(int x, int y) {
int screenTop = screenTopLine; int screenTop = screenTopLine;
if (x < 0 || y < 0) { if (x < 0 || y < 0) {
@ -499,6 +527,7 @@ class TerminalWidget : WidgetGroup, OnScrollHandler {
break; // unfinished break; // unfinished
int param1 = -1; int param1 = -1;
int param2 = -1; int param2 = -1;
int[] extraParams;
int index = i + 2; int index = i + 2;
bool questionMark = false; bool questionMark = false;
if (index < outputChars.length && outputChars[index] == '?') { if (index < outputChars.length && outputChars[index] == '?') {
@ -510,11 +539,24 @@ class TerminalWidget : WidgetGroup, OnScrollHandler {
index++; index++;
parseParam(outputChars, index, param2); parseParam(outputChars, index, param2);
} }
while (index < outputChars.length && outputChars[index] == ';') {
index++;
int n = -1;
parseParam(outputChars, index, n);
if (n >= 0)
extraParams ~= n;
}
if (index >= outputChars.length) if (index >= outputChars.length)
break; // unfinished sequence: not enough chars break; // unfinished sequence: not enough chars
int param1def1 = param1 >= 1 ? param1 : 1; int param1def1 = param1 >= 1 ? param1 : 1;
ch3 = outputChars[index]; ch3 = outputChars[index];
i = index; i = index;
if (ch3 == 'm') {
// set attributes
_content.setAttributes([param1, param2]);
if (extraParams.length)
_content.setAttributes(extraParams);
}
// command is parsed completely, ch3 == command type char // command is parsed completely, ch3 == command type char
// ESC[7h and ESC[7l -- enable/disable line wrap // ESC[7h and ESC[7l -- enable/disable line wrap