From aad8e39daeb6b214102adb357666e89b2798a212 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sun, 8 Jan 2023 21:35:18 +1300 Subject: [PATCH] Update themes --- addons/godot_xterm/themes/default.tres | 51 +++++++------- addons/godot_xterm/themes/default_light.tres | 51 +++++++------- addons/godot_xterm/themes/font_only.tres | 24 ++++--- .../themes/theme_substitutions.txt | 25 +++++++ .../godot_xterm/util/theme_substitutions.txt | 25 +++++++ themes/default.tres | 55 ++++++++------- themes/retro_green.tres | 70 +++++++++++-------- 7 files changed, 185 insertions(+), 116 deletions(-) create mode 100644 addons/godot_xterm/themes/theme_substitutions.txt create mode 100644 addons/godot_xterm/util/theme_substitutions.txt diff --git a/addons/godot_xterm/themes/default.tres b/addons/godot_xterm/themes/default.tres index 16efbb5..0a3225a 100644 --- a/addons/godot_xterm/themes/default.tres +++ b/addons/godot_xterm/themes/default.tres @@ -1,28 +1,29 @@ -[gd_resource type="Theme" load_steps=2 format=2] +[gd_resource type="Theme" load_steps=2 format=3 uid="uid://0gk8swmcldbg"] -[ext_resource path="res://addons/godot_xterm/themes/fonts/regular.tres" type="FontFile" id=1] +[ext_resource type="FontFile" uid="uid://dhmyegcx24dpo" path="res://addons/godot_xterm/themes/fonts/regular.tres" id="1"] [resource] -default_font = ExtResource( 1 ) -Terminal/colors/background = Color( 0.12549, 0.145098, 0.192157, 1 ) -Terminal/colors/black = Color( 0, 0, 0, 1 ) -Terminal/colors/blue = Color( 0.341176, 0.698039, 1, 1 ) -Terminal/colors/bright_black = Color( 0.462745, 0.47451, 0.509804, 1 ) -Terminal/colors/bright_blue = Color( 0.737255, 0.878431, 1, 1 ) -Terminal/colors/bright_cyan = Color( 0.776471, 1, 0.929412, 1 ) -Terminal/colors/bright_green = Color( 0.258824, 1, 0.760784, 1 ) -Terminal/colors/bright_magenta = Color( 0.807843, 0.643137, 0.945098, 1 ) -Terminal/colors/bright_red = Color( 1, 0.439216, 0.521569, 1 ) -Terminal/colors/bright_white = Color( 1, 1, 1, 1 ) -Terminal/colors/bright_yellow = Color( 1, 0.92549, 0.627451, 1 ) -Terminal/colors/cyan = Color( 0.4, 0.901961, 1, 1 ) -Terminal/colors/foreground = Color( 0.8, 0.807843, 0.827451, 1 ) -Terminal/colors/green = Color( 0.388235, 0.760784, 0.34902, 1 ) -Terminal/colors/magenta = Color( 0.623529, 0.439216, 1, 1 ) -Terminal/colors/red = Color( 1, 0.47, 0.42, 1 ) -Terminal/colors/white = Color( 0.8, 0.807843, 0.827451, 1 ) -Terminal/colors/yellow = Color( 1, 0.866667, 0.396078, 1 ) -Terminal/fonts/bold = ExtResource( 1 ) -Terminal/fonts/bold_italic = ExtResource( 1 ) -Terminal/fonts/italic = ExtResource( 1 ) -Terminal/fonts/regular = ExtResource( 1 ) +default_font = ExtResource("1") +Terminal/colors/ansi_0_color = Color(0, 0, 0, 1) +Terminal/colors/ansi_10_color = Color(0.258824, 1, 0.760784, 1) +Terminal/colors/ansi_11_color = Color(1, 0.92549, 0.627451, 1) +Terminal/colors/ansi_12_color = Color(0.737255, 0.878431, 1, 1) +Terminal/colors/ansi_13_color = Color(0.807843, 0.643137, 0.945098, 1) +Terminal/colors/ansi_14_color = Color(0.776471, 1, 0.929412, 1) +Terminal/colors/ansi_15_color = Color(1, 1, 1, 1) +Terminal/colors/ansi_1_color = Color(1, 0.47, 0.42, 1) +Terminal/colors/ansi_2_color = Color(0.388235, 0.760784, 0.34902, 1) +Terminal/colors/ansi_3_color = Color(1, 0.866667, 0.396078, 1) +Terminal/colors/ansi_4_color = Color(0.341176, 0.698039, 1, 1) +Terminal/colors/ansi_5_color = Color(0.623529, 0.439216, 1, 1) +Terminal/colors/ansi_6_color = Color(0.4, 0.901961, 1, 1) +Terminal/colors/ansi_7_color = Color(0.8, 0.807843, 0.827451, 1) +Terminal/colors/ansi_8_color = Color(0.462745, 0.47451, 0.509804, 1) +Terminal/colors/ansi_9_color = Color(1, 0.439216, 0.521569, 1) +Terminal/colors/background_color = Color(0.12549, 0.145098, 0.192157, 1) +Terminal/colors/foreground_color = Color(0.8, 0.807843, 0.827451, 1) +Terminal/font_sizes/font_size = 14 +Terminal/fonts/bold_font = ExtResource("1") +Terminal/fonts/bold_italics_font = ExtResource("1") +Terminal/fonts/italics_font = ExtResource("1") +Terminal/fonts/normal_font = ExtResource("1") diff --git a/addons/godot_xterm/themes/default_light.tres b/addons/godot_xterm/themes/default_light.tres index a1da168..30e97d6 100644 --- a/addons/godot_xterm/themes/default_light.tres +++ b/addons/godot_xterm/themes/default_light.tres @@ -1,28 +1,29 @@ -[gd_resource type="Theme" load_steps=2 format=2] +[gd_resource type="Theme" load_steps=2 format=3 uid="uid://caottjvxeiyje"] -[ext_resource path="res://addons/godot_xterm/themes/fonts/regular.tres" type="FontFile" id=4] +[ext_resource type="FontFile" uid="uid://dhmyegcx24dpo" path="res://addons/godot_xterm/themes/fonts/regular.tres" id="4"] [resource] -default_font = ExtResource( 4 ) -Terminal/colors/background = Color( 0.921569, 0.921569, 0.921569, 1 ) -Terminal/colors/black = Color( 0, 0, 0, 1 ) -Terminal/colors/blue = Color( 0.239216, 0.392157, 0.866667, 1 ) -Terminal/colors/bright_black = Color( 0.25098, 0.25098, 0.25098, 1 ) -Terminal/colors/bright_blue = Color( 0.160784, 0.545098, 1, 1 ) -Terminal/colors/bright_cyan = Color( 0.133333, 0.8, 1, 1 ) -Terminal/colors/bright_green = Color( 0, 0.760784, 0.380392, 1 ) -Terminal/colors/bright_magenta = Color( 0.658824, 0.364706, 0.913725, 1 ) -Terminal/colors/bright_red = Color( 1, 0.439216, 0.521569, 1 ) -Terminal/colors/bright_white = Color( 1, 1, 1, 1 ) -Terminal/colors/bright_yellow = Color( 1, 0.866667, 0.396078, 1 ) -Terminal/colors/cyan = Color( 0, 0.65098, 0.729412, 1 ) -Terminal/colors/foreground = Color( 0.25098, 0.25098, 0.25098, 1 ) -Terminal/colors/green = Color( 0, 0.380392, 0.188235, 1 ) -Terminal/colors/magenta = Color( 0.439216, 0.164706, 1, 1 ) -Terminal/colors/red = Color( 0.74902, 0.352941, 0.313726, 1 ) -Terminal/colors/white = Color( 0.898039, 0.898039, 0.898039, 1 ) -Terminal/colors/yellow = Color( 0.698039, 0.572549, 0.0627451, 1 ) -Terminal/fonts/bold = ExtResource( 4 ) -Terminal/fonts/bold_italic = ExtResource( 4 ) -Terminal/fonts/italic = ExtResource( 4 ) -Terminal/fonts/regular = ExtResource( 4 ) +default_font = ExtResource("4") +Terminal/colors/ansi_0_color = Color(0, 0, 0, 1) +Terminal/colors/ansi_10_color = Color(0, 0.760784, 0.380392, 1) +Terminal/colors/ansi_11_color = Color(1, 0.866667, 0.396078, 1) +Terminal/colors/ansi_12_color = Color(0.160784, 0.545098, 1, 1) +Terminal/colors/ansi_13_color = Color(0.658824, 0.364706, 0.913725, 1) +Terminal/colors/ansi_14_color = Color(0.133333, 0.8, 1, 1) +Terminal/colors/ansi_15_color = Color(1, 1, 1, 1) +Terminal/colors/ansi_1_color = Color(0.74902, 0.352941, 0.313726, 1) +Terminal/colors/ansi_2_color = Color(0, 0.380392, 0.188235, 1) +Terminal/colors/ansi_3_color = Color(0.698039, 0.572549, 0.0627451, 1) +Terminal/colors/ansi_4_color = Color(0.239216, 0.392157, 0.866667, 1) +Terminal/colors/ansi_5_color = Color(0.439216, 0.164706, 1, 1) +Terminal/colors/ansi_6_color = Color(0, 0.65098, 0.729412, 1) +Terminal/colors/ansi_7_color = Color(0.898039, 0.898039, 0.898039, 1) +Terminal/colors/ansi_8_color = Color(0.25098, 0.25098, 0.25098, 1) +Terminal/colors/ansi_9_color = Color(1, 0.439216, 0.521569, 1) +Terminal/colors/background_color = Color(0.921569, 0.921569, 0.921569, 1) +Terminal/colors/foreground_color = Color(0.25098, 0.25098, 0.25098, 1) +Terminal/font_sizes/font_size = 14 +Terminal/fonts/bold_font = ExtResource("4") +Terminal/fonts/bold_italics_font = ExtResource("4") +Terminal/fonts/italics_font = ExtResource("4") +Terminal/fonts/normal_font = ExtResource("4") diff --git a/addons/godot_xterm/themes/font_only.tres b/addons/godot_xterm/themes/font_only.tres index f9627eb..e1d75cd 100644 --- a/addons/godot_xterm/themes/font_only.tres +++ b/addons/godot_xterm/themes/font_only.tres @@ -1,11 +1,19 @@ -[gd_resource type="Theme" load_steps=2 format=2] +[gd_resource type="Theme" load_steps=2 format=3 uid="uid://de8h4xgixi83g"] -[sub_resource type="FontFile" id=1] -size = 14 -extra_spacing_bottom = 1 +[sub_resource type="FontFile" id="1"] +face_index = null +embolden = null +transform = null +cache/0/16/0/ascent = 0.0 +cache/0/16/0/descent = 0.0 +cache/0/16/0/underline_position = 0.0 +cache/0/16/0/underline_thickness = 0.0 +cache/0/16/0/scale = 1.0 +cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [resource] -Terminal/fonts/bold = null -Terminal/fonts/bold_italic = null -Terminal/fonts/italic = null -Terminal/fonts/regular = SubResource( 1 ) +Terminal/font_sizes/font_size = 14 +Terminal/fonts/bold_font = null +Terminal/fonts/bold_italics_font = null +Terminal/fonts/italics_font = null +Terminal/fonts/normal_font = SubResource("1") diff --git a/addons/godot_xterm/themes/theme_substitutions.txt b/addons/godot_xterm/themes/theme_substitutions.txt new file mode 100644 index 0000000..53f8a88 --- /dev/null +++ b/addons/godot_xterm/themes/theme_substitutions.txt @@ -0,0 +1,25 @@ +/Terminal\/colors/ s/bright_black/ansi_8_color/ +/Terminal\/colors/ s/bright_red/ansi_9_color/ +/Terminal\/colors/ s/bright_green/ansi_10_color/ +/Terminal\/colors/ s/bright_yellow/ansi_11_color/ +/Terminal\/colors/ s/bright_blue/ansi_12_color/ +/Terminal\/colors/ s/bright_magenta/ansi_13_color/ +/Terminal\/colors/ s/bright_cyan/ansi_14_color/ +/Terminal\/colors/ s/bright_white/ansi_15_color/ +/Terminal\/colors/ s/black/ansi_0_color/ +/Terminal\/colors/ s/red/ansi_1_color/ +/Terminal\/colors/ s/green/ansi_2_color/ +/Terminal\/colors/ s/yellow/ansi_3_color/ +/Terminal\/colors/ s/blue/ansi_4_color/ +/Terminal\/colors/ s/magenta/ansi_5_color/ +/Terminal\/colors/ s/cyan/ansi_6_color/ +/Terminal\/colors/ s/white/ansi_7_color/ +/Terminal\/colors/ s/background/background_color/ +/Terminal\/colors/ s/foreground/foreground_color/ + +/Terminal\/fonts/ s/regular /normal_font / +/Terminal\/fonts/ s/bold /bold_font / +/Terminal\/fonts/ s/italic /italics_font / +/Terminal\/fonts/ s/bold_italic /bold_italics_font / + +$aTerminal\/font_sizes\/font_size = 14 diff --git a/addons/godot_xterm/util/theme_substitutions.txt b/addons/godot_xterm/util/theme_substitutions.txt new file mode 100644 index 0000000..3bbc91f --- /dev/null +++ b/addons/godot_xterm/util/theme_substitutions.txt @@ -0,0 +1,25 @@ +/Terminal\/colors/ s/bright_black/ansi_8_color/ +/Terminal\/colors/ s/bright_red/ansi_9_color/ +/Terminal\/colors/ s/bright_green/ansi_10_color/ +/Terminal\/colors/ s/bright_yellow/ansi_11_color/ +/Terminal\/colors/ s/bright_blue/ansi_12_color/ +/Terminal\/colors/ s/bright_magenta/ansi_13_color/ +/Terminal\/colors/ s/bright_cyan/ansi_14_color/ +/Terminal\/colors/ s/bright_white/ansi_15_color/ +/Terminal\/colors/ s/black/ansi_0_color/ +/Terminal\/colors/ s/red/ansi_1_color/ +/Terminal\/colors/ s/green/ansi_2_color/ +/Terminal\/colors/ s/yellow/ansi_3_color/ +/Terminal\/colors/ s/blue/ansi_4_color/ +/Terminal\/colors/ s/magenta/ansi_5_color/ +/Terminal\/colors/ s/cyan/ansi_6_color/ +/Terminal\/colors/ s/white/ansi_7_color/ +/Terminal\/colors/ s/background/background_color/ +/Terminal\/colors/ s/foreground/foreground_color/ + +/Terminal\/fonts/ s/regular/normal_font/ +/Terminal\/fonts/ s/bold/bold_font/ +/Terminal\/fonts/ s/italic/italics_font/ +/Terminal\/fonts/ s/bold_italic/bold_italics_font/ + +$aTerminal\/font_sizes\/font_size = 14 diff --git a/themes/default.tres b/themes/default.tres index a167aff..88d4758 100644 --- a/themes/default.tres +++ b/themes/default.tres @@ -1,30 +1,31 @@ -[gd_resource type="Theme" load_steps=5 format=2] +[gd_resource type="Theme" load_steps=5 format=3 uid="uid://b7vd50tw2g1nl"] -[ext_resource path="res://themes/fonts/bold_italic.tres" type="FontFile" id=2] -[ext_resource path="res://themes/fonts/italic.tres" type="FontFile" id=3] -[ext_resource path="res://themes/fonts/bold.tres" type="FontFile" id=4] -[ext_resource path="res://themes/fonts/regular.tres" type="FontFile" id=5] +[ext_resource type="FontFile" path="res://themes/fonts/bold_italic.tres" id="2"] +[ext_resource type="FontFile" path="res://themes/fonts/italic.tres" id="3"] +[ext_resource type="FontFile" path="res://themes/fonts/bold.tres" id="4"] +[ext_resource type="FontFile" path="res://themes/fonts/regular.tres" id="5"] [resource] -Terminal/colors/background = Color( 0.12549, 0.145098, 0.192157, 1 ) -Terminal/colors/black = Color( 0, 0, 0, 1 ) -Terminal/colors/blue = Color( 0.341176, 0.698039, 1, 1 ) -Terminal/colors/bright_black = Color( 0.462745, 0.47451, 0.509804, 1 ) -Terminal/colors/bright_blue = Color( 0.737255, 0.878431, 1, 1 ) -Terminal/colors/bright_cyan = Color( 0.776471, 1, 0.929412, 1 ) -Terminal/colors/bright_green = Color( 0.258824, 1, 0.760784, 1 ) -Terminal/colors/bright_magenta = Color( 0.807843, 0.643137, 0.945098, 1 ) -Terminal/colors/bright_red = Color( 1, 0.439216, 0.521569, 1 ) -Terminal/colors/bright_white = Color( 1, 1, 1, 1 ) -Terminal/colors/bright_yellow = Color( 1, 0.92549, 0.627451, 1 ) -Terminal/colors/cyan = Color( 0.4, 0.901961, 1, 1 ) -Terminal/colors/foreground = Color( 0.8, 0.807843, 0.827451, 1 ) -Terminal/colors/green = Color( 0.388235, 0.760784, 0.34902, 1 ) -Terminal/colors/magenta = Color( 0.623529, 0.439216, 1, 1 ) -Terminal/colors/red = Color( 1, 0.47, 0.42, 1 ) -Terminal/colors/white = Color( 0.8, 0.807843, 0.827451, 1 ) -Terminal/colors/yellow = Color( 1, 0.866667, 0.396078, 1 ) -Terminal/fonts/bold = ExtResource( 4 ) -Terminal/fonts/bold_italic = ExtResource( 2 ) -Terminal/fonts/italic = ExtResource( 3 ) -Terminal/fonts/regular = ExtResource( 5 ) +Terminal/colors/ansi_0_color = Color(0, 0, 0, 1) +Terminal/colors/ansi_10_color = Color(0.258824, 1, 0.760784, 1) +Terminal/colors/ansi_11_color = Color(1, 0.92549, 0.627451, 1) +Terminal/colors/ansi_12_color = Color(0.737255, 0.878431, 1, 1) +Terminal/colors/ansi_13_color = Color(0.807843, 0.643137, 0.945098, 1) +Terminal/colors/ansi_14_color = Color(0.776471, 1, 0.929412, 1) +Terminal/colors/ansi_15_color = Color(1, 1, 1, 1) +Terminal/colors/ansi_1_color = Color(1, 0.47, 0.42, 1) +Terminal/colors/ansi_2_color = Color(0.388235, 0.760784, 0.34902, 1) +Terminal/colors/ansi_3_color = Color(1, 0.866667, 0.396078, 1) +Terminal/colors/ansi_4_color = Color(0.341176, 0.698039, 1, 1) +Terminal/colors/ansi_5_color = Color(0.623529, 0.439216, 1, 1) +Terminal/colors/ansi_6_color = Color(0.4, 0.901961, 1, 1) +Terminal/colors/ansi_7_color = Color(0.8, 0.807843, 0.827451, 1) +Terminal/colors/ansi_8_color = Color(0.462745, 0.47451, 0.509804, 1) +Terminal/colors/ansi_9_color = Color(1, 0.439216, 0.521569, 1) +Terminal/colors/background_color = Color(0.12549, 0.145098, 0.192157, 1) +Terminal/colors/foreground_color = Color(0.8, 0.807843, 0.827451, 1) +Terminal/font_sizes/font_size = 14 +Terminal/fonts/bold_font = ExtResource("4") +Terminal/fonts/bold_italics_font = ExtResource("2") +Terminal/fonts/italics_font = ExtResource("3") +Terminal/fonts/normal_font = ExtResource("5") diff --git a/themes/retro_green.tres b/themes/retro_green.tres index d2f8707..1b29658 100644 --- a/themes/retro_green.tres +++ b/themes/retro_green.tres @@ -1,35 +1,43 @@ -[gd_resource type="Theme" load_steps=4 format=2] +[gd_resource type="Theme" load_steps=4 format=3 uid="uid://blh56m1gdieyu"] -[ext_resource path="res://addons/godot_xterm/resources/xrdb_theme.gd" type="Script" id=1] -[ext_resource path="res://addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf" type="FontFile" id=2] +[ext_resource type="Script" path="res://addons/godot_xterm/resources/xrdb_theme.gd" id="1"] +[ext_resource type="FontFile" uid="uid://edo5q2qxos3u" path="res://addons/godot_xterm/themes/fonts/hack/hack_regular-3.003.ttf" id="2"] -[sub_resource type="FontFile" id=1] -size = 39 -extra_spacing_bottom = 1 -font_data = ExtResource( 2 ) +[sub_resource type="FontFile" id="1"] +fallbacks = [ExtResource("2")] +face_index = null +embolden = null +transform = null +cache/0/16/0/ascent = 0.0 +cache/0/16/0/descent = 0.0 +cache/0/16/0/underline_position = 0.0 +cache/0/16/0/underline_thickness = 0.0 +cache/0/16/0/scale = 1.0 +cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) [resource] -Terminal/colors/background = Color( 0.156863, 0.156863, 0.156863, 1 ) -Terminal/colors/black = Color( 0, 1, 0.4, 1 ) -Terminal/colors/blue = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_black = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_blue = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_cyan = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_green = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_magenta = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_red = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_white = Color( 0, 1, 0.4, 1 ) -Terminal/colors/bright_yellow = Color( 0, 1, 0.4, 1 ) -Terminal/colors/cursor = Color( 0, 1, 0.4, 1 ) -Terminal/colors/cyan = Color( 0, 1, 0.4, 1 ) -Terminal/colors/foreground = Color( 0, 1, 0.4, 1 ) -Terminal/colors/green = Color( 0, 1, 0.4, 1 ) -Terminal/colors/magenta = Color( 0, 1, 0.4, 1 ) -Terminal/colors/red = Color( 0, 1, 0.4, 1 ) -Terminal/colors/white = Color( 0, 1, 0.4, 1 ) -Terminal/colors/yellow = Color( 0, 1, 0.4, 1 ) -Terminal/fonts/bold = null -Terminal/fonts/bold_italic = null -Terminal/fonts/italic = null -Terminal/fonts/regular = SubResource( 1 ) -script = ExtResource( 1 ) +Terminal/colors/ansi_0_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_10_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_11_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_12_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_13_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_14_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_15_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_1_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_2_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_3_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_4_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_5_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_6_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_7_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_8_color = Color(0, 1, 0.4, 1) +Terminal/colors/ansi_9_color = Color(0, 1, 0.4, 1) +Terminal/colors/background_color = Color(0.156863, 0.156863, 0.156863, 1) +Terminal/colors/cursor = Color(0, 1, 0.4, 1) +Terminal/colors/foreground_color = Color(0, 1, 0.4, 1) +Terminal/font_sizes/font_size = 14 +Terminal/fonts/bold_font = null +Terminal/fonts/bold_italics_font = null +Terminal/fonts/italics_font = null +Terminal/fonts/normal_font = SubResource("1") +script = ExtResource("1")