diff --git a/dub.json b/dub.json
index 3fe2229..2c325a7 100644
--- a/dub.json
+++ b/dub.json
@@ -12,7 +12,7 @@
"stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"],
"dependencies": {
- "dlangui": "==0.9.3",
+ "dlangui": "==0.9.4",
"dcd": "~>0.8.0"
},
diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d
index 02997d5..32a81ab 100644
--- a/src/dlangide/ui/dsourceedit.d
+++ b/src/dlangide/ui/dsourceedit.d
@@ -68,7 +68,10 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
static if (BACKEND_GUI) backgroundColor = style.customColor("edit_background");
setTokenHightlightColor(TokenCategory.Comment, style.customColor("syntax_highlight_comment")); // green
setTokenHightlightColor(TokenCategory.Keyword, style.customColor("syntax_highlight_keyword")); // blue
+ setTokenHightlightColor(TokenCategory.Integer, style.customColor("syntax_highlight_integer", 0x000000));
+ setTokenHightlightColor(TokenCategory.Float, style.customColor("syntax_highlight_float", 0x000000));
setTokenHightlightColor(TokenCategory.String, style.customColor("syntax_highlight_string")); // brown
+ setTokenHightlightColor(TokenCategory.Identifier, style.customColor("syntax_highlight_ident"));
setTokenHightlightColor(TokenCategory.Character, style.customColor("syntax_highlight_character")); // brown
setTokenHightlightColor(TokenCategory.Error, style.customColor("syntax_highlight_error")); // red
setTokenHightlightColor(TokenCategory.Comment_Documentation, style.customColor("syntax_highlight_comment_documentation"));
@@ -145,7 +148,7 @@ class DSourceEdit : SourceEdit, EditableContentMarksChangeListener {
return menu;
}
- uint _executionLineHighlightColor = 0x808080FF;
+ uint _executionLineHighlightColor = BACKEND_GUI ? 0x808080FF : 0x000080;
int _executionLine = -1;
@property int executionLine() { return _executionLine; }
@property void executionLine(int line) {
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index 381499d..1058598 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -266,7 +266,7 @@ class IDEFrame : AppFrame, ProgramExecutionStatusListener, BreakpointListChangeL
string tty = _logPanel.terminalDeviceName;
if (project.runInExternalConsole) {
version(Windows) {
- if (program.isMagoDebugger)
+ if (program.isMagoDebugger && BACKEND_GUI)
tty = "external-console";
} else {
externalConsoleExecutable = _settings.terminalExecutable;
diff --git a/src/dlangide/ui/outputpanel.d b/src/dlangide/ui/outputpanel.d
index 46dc31e..5d71aad 100644
--- a/src/dlangide/ui/outputpanel.d
+++ b/src/dlangide/ui/outputpanel.d
@@ -11,12 +11,16 @@ import std.regex;
import std.algorithm : startsWith;
import std.string;
-version (Windows) {
- enum ENABLE_INTERNAL_TERMINAL = false;
-} else {
+static if (BACKEND_CONSOLE) {
enum ENABLE_INTERNAL_TERMINAL = true;
+} else {
+ version (Windows) {
+ enum ENABLE_INTERNAL_TERMINAL = false;
+ } else {
+ enum ENABLE_INTERNAL_TERMINAL = true;
+ }
}
-
+enum ENABLE_INTERNAL_TERMINAL_TEST = false;
/// event listener to navigate by error/warning position
interface CompilerLogIssueClickHandler {
@@ -229,6 +233,9 @@ class OutputPanel : DockWindow {
_terminalWidget.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
_tabs.addTab(_terminalWidget, "Output"d);
_terminalWidget.write("Hello\nSecond line\nTest\n"d);
+ }
+ static if (ENABLE_INTERNAL_TERMINAL_TEST) {
+ _terminalWidget.write("Hello\nSecond line\nTest\n"d);
_terminalWidget.write("SomeString 123456789\rAwesomeString\n"d); // test \r
// testing tabs
_terminalWidget.write("id\tname\tdescription\n"d);
diff --git a/src/dlangide/ui/terminal.d b/src/dlangide/ui/terminal.d
index c72c283..9d6b99e 100644
--- a/src/dlangide/ui/terminal.d
+++ b/src/dlangide/ui/terminal.d
@@ -4,8 +4,8 @@ import dlangui.widgets.widget;
import dlangui.widgets.controls;
struct TerminalAttr {
- ubyte bgColor = 7;
- ubyte textColor = 0;
+ ubyte bgColor = 0;
+ ubyte textColor = 7;
ubyte flags = 0;
}
@@ -22,7 +22,7 @@ __gshared static uint[16] TERMINAL_PALETTE = [
0x0000FF,
0xFF00FF,
0x00FFFF,
- 0xFFFFFF, // white
+ 0xC0C0C0, // white
0x808080,
0x800000,
0x008000,
@@ -30,7 +30,7 @@ __gshared static uint[16] TERMINAL_PALETTE = [
0x000080,
0x800080,
0x008080,
- 0xC0C0C0,
+ 0xFFFFFF,
];
uint attrToColor(ubyte v) {
diff --git a/views/res/console_ide_theme_dark.xml b/views/res/console_ide_theme_dark.xml
index 6b2e0bc..7f2c264 100644
--- a/views/res/console_ide_theme_dark.xml
+++ b/views/res/console_ide_theme_dark.xml
@@ -1,20 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/views/res/console_ide_theme_default.xml b/views/res/console_ide_theme_default.xml
index 2ef65fa..f3c1184 100644
--- a/views/res/console_ide_theme_default.xml
+++ b/views/res/console_ide_theme_default.xml
@@ -6,11 +6,14 @@
-
-
+
+
+
+
+
diff --git a/views/res/ide_theme_dark.xml b/views/res/ide_theme_dark.xml
index 679b120..94753d7 100644
--- a/views/res/ide_theme_dark.xml
+++ b/views/res/ide_theme_dark.xml
@@ -12,6 +12,9 @@
+
+
+
diff --git a/views/res/ide_theme_default.xml b/views/res/ide_theme_default.xml
index b06fbaa..827a536 100644
--- a/views/res/ide_theme_default.xml
+++ b/views/res/ide_theme_default.xml
@@ -11,6 +11,9 @@
+
+
+