feat(theme): update themes

addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=4 format=3 uid="uid://bkcyv0w3setep"]
 
 [ext_resource type="Script" path="res://addons/godot_xterm/editor_plugins/terminal/editor_terminal.gd" id="1"]
+[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://themes/demo.tres" id="1_h7osn"]
 [ext_resource type="Script" path="res://addons/godot_xterm/pty.gd" id="2"]
-[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://addons/godot_xterm/themes/default.tres" id="3"]
 
 [node name="Terminal" type="Terminal"]
 anchors_preset = 15
@@ -13,7 +13,7 @@ grow_vertical = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 focus_mode = 1
-theme = ExtResource("3")
+theme = ExtResource("1_h7osn")
 script = ExtResource("1")
 
 [node name="PTY" type="Node" parent="."]

addons/godot_xterm/themes/default.tres

@@ -1,29 +0,0 @@
-[gd_resource type="Theme" load_steps=2 format=3 uid="uid://0gk8swmcldbg"]
-
-[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/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")

addons/godot_xterm/themes/default_light.tres

@@ -1,29 +0,0 @@
-[gd_resource type="Theme" load_steps=2 format=3 uid="uid://caottjvxeiyje"]
-
-[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/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")

addons/godot_xterm/themes/font_only.tres

@@ -1,19 +0,0 @@
-[gd_resource type="Theme" load_steps=2 format=3 uid="uid://de8h4xgixi83g"]
-
-[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/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")

examples/asciicast/asciicast.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://did1ipako11pd"]
 
-[ext_resource type="Theme" uid="uid://b7vd50tw2g1nl" path="res://themes/default.tres" id="1_nsh8i"]
+[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://themes/demo.tres" id="1_nv54h"]
 [ext_resource type="Animation" uid="uid://dcgqvylq0648u" path="res://examples/asciicast/example.cast" id="2_3048a"]
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_eb6bs"]
@@ -15,12 +15,11 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 focus_mode = 1
-theme = ExtResource("1_nsh8i")
+theme = ExtResource("1_nv54h")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-autoplay = "example"
+callback_mode_method = 1
-playback_speed = 2.0
-method_call_mode = 1
 libraries = {
 "": SubResource("AnimationLibrary_eb6bs")
 }
+autoplay = "example"

examples/menu/menu.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://brjrtf5fpptw8"]
 
 [ext_resource type="Script" path="res://examples/menu/menu.gd" id="2"]
-[ext_resource type="Theme" uid="uid://b7vd50tw2g1nl" path="res://themes/default.tres" id="2_o1653"]
+[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://themes/demo.tres" id="2_7f2wl"]
 
 [node name="Menu" type="Control"]
 layout_mode = 3
@@ -19,4 +19,4 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("2_o1653")
+theme = ExtResource("2_7f2wl")

examples/socat_terminal/socat_terminal.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=2 format=3 uid="uid://bc5o6m6ty0ejn"]
+[gd_scene load_steps=3 format=3 uid="uid://bc5o6m6ty0ejn"]
 
 [ext_resource type="Script" path="res://examples/socat_terminal/socat_terminal.gd" id="1"]
+[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://themes/demo.tres" id="1_rw2ub"]
 
 [node name="Terminal" type="Terminal"]
 anchors_preset = 15
@@ -8,4 +9,5 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+theme = ExtResource("1_rw2ub")
 script = ExtResource("1")

examples/terminal/terminal.tscn

@@ -1,17 +1,17 @@
 [gd_scene load_steps=5 format=3 uid="uid://cysad55lwtnc6"]
 
 [ext_resource type="AudioStream" uid="uid://n0hqjfxltbm0" path="res://themes/audio/bell.wav" id="1"]
-[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://addons/godot_xterm/themes/default.tres" id="1_uci3c"]
+[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://themes/demo.tres" id="1_osky4"]
 [ext_resource type="Script" path="res://addons/godot_xterm/pty.gd" id="2"]
 [ext_resource type="Script" path="res://examples/terminal/terminal.gd" id="3"]
 
-[node name="Terminal" type="Terminal"]
+[node name="Terminal3" type="Terminal"]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("1_uci3c")
+theme = ExtResource("1_osky4")
 script = ExtResource("3")
 
 [node name="PTY" type="Node" parent="."]

examples/web_console/web_console.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://d3xc4utggdchf"]
 
-[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://addons/godot_xterm/themes/default.tres" id="1_28w8r"]
+[ext_resource type="Theme" uid="uid://0gk8swmcldbg" path="res://themes/demo.tres" id="1_tut8o"]
 [ext_resource type="Script" path="res://examples/web_console/web_console.gd" id="3"]
 
 [node name="WebConsole" type="Control"]
@@ -10,12 +10,13 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme = ExtResource("1_28w8r")
+theme = ExtResource("1_tut8o")
 script = ExtResource("3")
 
 [node name="Terminal" type="Terminal" parent="."]
 layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
+theme = ExtResource("1_tut8o")
 
 [connection signal="key_pressed" from="Terminal" to="." method="_on_Terminal_key_pressed"]

export_presets.cfg

@@ -6,7 +6,7 @@ runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="resources"
-export_files=PackedStringArray("res://addons/godot_xterm/shaders/foreground.gdshader", "res://addons/godot_xterm/native/godot-xterm.gdextension", "res://addons/godot_xterm/shaders/background.gdshader", "res://addons/godot_xterm/shaders/common.gdshaderinc", "res://examples/web_console/web_console.gd", "res://examples/web_console/web_console.tscn", "res://examples/menu/menu.gd", "res://examples/menu/menu.tscn", "res://examples/asciicast/asciicast.tscn", "res://examples/asciicast/example.cast", "res://addons/godot_xterm/util/tput.gd", "res://examples/terminal/terminal.tscn", "res://examples/terminal/terminal.gd")
+export_files=PackedStringArray("res://addons/godot_xterm/shaders/foreground.gdshader", "res://addons/godot_xterm/native/godot-xterm.gdextension", "res://addons/godot_xterm/shaders/background.gdshader", "res://addons/godot_xterm/shaders/common.gdshaderinc", "res://examples/web_console/web_console.gd", "res://examples/web_console/web_console.tscn", "res://examples/menu/menu.gd", "res://examples/menu/menu.tscn", "res://examples/asciicast/asciicast.tscn", "res://examples/asciicast/example.cast", "res://addons/godot_xterm/util/tput.gd", "res://examples/terminal/terminal.tscn", "res://examples/terminal/terminal.gd", "res://addons/godot_xterm/themes/fonts/regular.tres", "res://addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf", "res://themes/demo.tres")
 include_filter="addons/godot_xterm/native/bin/*.wasm"
 exclude_filter=""
 export_path="docs/demo/index.html"

test/scenes/theme.tscn

@@ -2,8 +2,6 @@
 
 [ext_resource type="Script" path="res://test/scenes/theme.gd" id="1"]
 
-[node name="Terminal" type="Terminal"]
+[node name="Terminal2" type="Terminal"]
-anchors_preset = 15
+custom_minimum_size = Vector2(200, 100)
-anchor_right = 1.0
-anchor_bottom = 1.0
 script = ExtResource("1")

test/visual_regression/test_visual_regression.gd

@@ -94,3 +94,13 @@ class TestVisualRegression:
 		subject.write("fg green, 50% transparency")
 		await wait_frames(30)
 		assert_match("transparency")
+
+	func test_emoji():
+		subject.add_theme_font_override("normal_font", preload("res://themes/fonts/regular.tres"))
+		subject.write("👇😑😩👿👅🥺🙄😧😫😢\r\n")
+		subject.write("👾😠🥳😭👅😫🤩🙃👽😫\r\n")
+		subject.write("😟🤏😛🤖🤗👻😳👐😤👀\r\n")
+		subject.write("😆🤳🤫😊😜😻😏👿🥶👻\r\n")
+		subject.write("👈🤮👉💩👃😍🤥😤🙏🤟")
+		await wait_frames(30)
+		assert_match("emoji")

theme_map.gd

@@ -0,0 +1,22 @@
+extends Node
+
+var map = {
+	"background_color": "highlighting/background_color",
+	"foreground_color": "highlighting/text_color",
+	"ansi_0_color": "highlighting/caret_background_color",
+	"ansi_1_color": "highlighting/brace_mismatch_color",
+	"ansi_2_color": "gdscript/node_reference_color",
+	"ansi_3_color": "highlighting/executing_line_color",
+	"ansi_4_color": "highlighting/bookmark_color",
+	"ansi_5_color": "highlighting/control_flow_keyword_color",
+	"ansi_6_color": "highlighting/engine_type_color",
+	"ansi_7_color": "highlighting/comment_color",
+	"ansi_8_color": "highlighting/completion_background_color",
+	"ansi_9_color": "highlighting/keyword_color",
+	"ansi_10_color": "highlighting/base_type_color",
+	"ansi_11_color": "highlighting/string_color",
+	"ansi_12_color": "highlighting/function_color",
+	"ansi_13_color": "gdscript/global_function_color",
+	"ansi_14_color": "gdscript/function_definition_color",
+	"ansi_15_color": "highlighting/caret_color",
+}

themes/default.tres

@@ -1,31 +0,0 @@
-[gd_resource type="Theme" load_steps=5 format=3 uid="uid://b7vd50tw2g1nl"]
-
-[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" uid="uid://65pw442xps67" path="res://themes/fonts/regular.tres" id="5"]
-
-[resource]
-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")

themes/demo.tres

@@ -0,0 +1,25 @@
+[gd_resource type="Theme" load_steps=2 format=3 uid="uid://0gk8swmcldbg"]
+
+[ext_resource type="FontVariation" uid="uid://vmgmcu8gc6nt" path="res://addons/godot_xterm/themes/fonts/regular.tres" id="1_aigbn"]
+
+[resource]
+default_font = ExtResource("1_aigbn")
+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.929412, 0.631373, 1)
+Terminal/colors/ansi_12_color = Color(0.341176, 0.701961, 1, 1)
+Terminal/colors/ansi_13_color = Color(0.639216, 0.639216, 0.960784, 1)
+Terminal/colors/ansi_14_color = Color(0.4, 0.901961, 1, 1)
+Terminal/colors/ansi_15_color = Color(1, 1, 1, 1)
+Terminal/colors/ansi_1_color = Color(1, 0.470588, 0.419608, 1)
+Terminal/colors/ansi_2_color = Color(0.388235, 0.760784, 0.34902, 1)
+Terminal/colors/ansi_3_color = Color(0.980392, 0.890196, 0.270588, 1)
+Terminal/colors/ansi_4_color = Color(0.0784314, 0.490196, 0.980392, 1)
+Terminal/colors/ansi_5_color = Color(1, 0.54902, 0.8, 1)
+Terminal/colors/ansi_6_color = Color(0.560784, 1, 0.858824, 1)
+Terminal/colors/ansi_7_color = Color(0.803922, 0.811765, 0.823529, 0.501961)
+Terminal/colors/ansi_8_color = Color(0.211765, 0.239216, 0.290196, 1)
+Terminal/colors/ansi_9_color = Color(1, 0.439216, 0.521569, 1)
+Terminal/colors/background_color = Color(0.113725, 0.133333, 0.160784, 1)
+Terminal/colors/foreground_color = Color(0.803922, 0.811765, 0.823529, 1)
+Terminal/font_sizes/font_size = 14

themes/demo_full.tres

@@ -0,0 +1,33 @@
+[gd_resource type="Theme" load_steps=6 format=3 uid="uid://c7vj5543645y4"]
+
+[ext_resource type="FontVariation" uid="uid://bic8m0k54oyy5" path="res://themes/fonts/bold.tres" id="1_0fs6o"]
+[ext_resource type="FontVariation" uid="uid://ddjoc6kuuq1bh" path="res://themes/fonts/bold_italic.tres" id="2_vxvx6"]
+[ext_resource type="FontVariation" uid="uid://bvoyrkgr4mipq" path="res://themes/fonts/italic.tres" id="3_0wjcg"]
+[ext_resource type="FontVariation" uid="uid://ckq73bs2fwsie" path="res://themes/fonts/regular.tres" id="4_ldymn"]
+[ext_resource type="FontVariation" uid="uid://vmgmcu8gc6nt" path="res://addons/godot_xterm/themes/fonts/regular.tres" id="5_s2il6"]
+
+[resource]
+default_font = ExtResource("5_s2il6")
+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.929412, 0.631373, 1)
+Terminal/colors/ansi_12_color = Color(0.341176, 0.701961, 1, 1)
+Terminal/colors/ansi_13_color = Color(0.639216, 0.639216, 0.960784, 1)
+Terminal/colors/ansi_14_color = Color(0.4, 0.901961, 1, 1)
+Terminal/colors/ansi_15_color = Color(1, 1, 1, 1)
+Terminal/colors/ansi_1_color = Color(1, 0.470588, 0.419608, 1)
+Terminal/colors/ansi_2_color = Color(0.388235, 0.760784, 0.34902, 1)
+Terminal/colors/ansi_3_color = Color(0.980392, 0.890196, 0.270588, 1)
+Terminal/colors/ansi_4_color = Color(0.0784314, 0.490196, 0.980392, 1)
+Terminal/colors/ansi_5_color = Color(1, 0.54902, 0.8, 1)
+Terminal/colors/ansi_6_color = Color(0.560784, 1, 0.858824, 1)
+Terminal/colors/ansi_7_color = Color(0.803922, 0.811765, 0.823529, 0.501961)
+Terminal/colors/ansi_8_color = Color(0.211765, 0.239216, 0.290196, 1)
+Terminal/colors/ansi_9_color = Color(1, 0.439216, 0.521569, 1)
+Terminal/colors/background_color = Color(0.113725, 0.133333, 0.160784, 1)
+Terminal/colors/foreground_color = Color(0.803922, 0.811765, 0.823529, 1)
+Terminal/font_sizes/font_size = 14
+Terminal/fonts/bold_font = ExtResource("1_0fs6o")
+Terminal/fonts/bold_italics_font = ExtResource("2_vxvx6")
+Terminal/fonts/italics_font = ExtResource("3_0wjcg")
+Terminal/fonts/normal_font = ExtResource("4_ldymn")

themes/fonts/bold.tres

@@ -1,15 +1,11 @@
-[gd_resource type="FontFile" load_steps=6 format=2]
+[gd_resource type="FontVariation" load_steps=6 format=3 uid="uid://bic8m0k54oyy5"]
 
-[ext_resource path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf" type="FontFile" id=1]
+[ext_resource type="FontFile" uid="uid://uxbe3orgyw06" path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf" id="1"]
-[ext_resource path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=2]
+[ext_resource type="FontFile" uid="uid://se3tefc5lv6m" path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" id="2"]
-[ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=3]
+[ext_resource type="FontFile" uid="uid://bh6ce4yiqcvwi" path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" id="3"]
-[ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" id=4]
+[ext_resource type="FontFile" uid="uid://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="4"]
-[ext_resource path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" type="FontFile" id=5]
+[ext_resource type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="5"]
 
 [resource]
-size = 14
+fallbacks = Array[Font]([ExtResource("2"), ExtResource("3"), ExtResource("4"), ExtResource("5")])
-font_data = ExtResource( 1 )
+base_font = ExtResource("1")
-fallback/0 = ExtResource( 2 )
-fallback/1 = ExtResource( 3 )
-fallback/2 = ExtResource( 4 )
-fallback/3 = ExtResource( 5 )

themes/fonts/bold_italic.tres

@@ -1,15 +1,11 @@
-[gd_resource type="FontFile" load_steps=6 format=2]
+[gd_resource type="FontVariation" load_steps=6 format=3 uid="uid://ddjoc6kuuq1bh"]
 
-[ext_resource path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=1]
+[ext_resource type="FontFile" uid="uid://se3tefc5lv6m" path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" id="1"]
-[ext_resource path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf" type="FontFile" id=2]
+[ext_resource type="FontFile" uid="uid://d13vs8hwu22p" path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf" id="2"]
-[ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=3]
+[ext_resource type="FontFile" uid="uid://bh6ce4yiqcvwi" path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" id="3"]
-[ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" id=4]
+[ext_resource type="FontFile" uid="uid://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="4"]
-[ext_resource path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" type="FontFile" id=5]
+[ext_resource type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="5"]
 
 [resource]
-size = 14
+fallbacks = Array[Font]([ExtResource("1"), ExtResource("3"), ExtResource("4"), ExtResource("5")])
-font_data = ExtResource( 2 )
+base_font = ExtResource("2")
-fallback/0 = ExtResource( 1 )
-fallback/1 = ExtResource( 3 )
-fallback/2 = ExtResource( 4 )
-fallback/3 = ExtResource( 5 )

themes/fonts/italic.tres

@@ -1,15 +1,11 @@
-[gd_resource type="FontFile" load_steps=6 format=2]
+[gd_resource type="FontVariation" load_steps=6 format=3 uid="uid://bvoyrkgr4mipq"]
 
-[ext_resource path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=1]
+[ext_resource type="FontFile" uid="uid://se3tefc5lv6m" path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" id="1"]
-[ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=2]
+[ext_resource type="FontFile" uid="uid://bh6ce4yiqcvwi" path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" id="2"]
-[ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" id=3]
+[ext_resource type="FontFile" uid="uid://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="3"]
-[ext_resource path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf" type="FontFile" id=4]
+[ext_resource type="FontFile" uid="uid://4n72113e12uq" path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-italic-2.304.ttf" id="4"]
-[ext_resource path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" type="FontFile" id=5]
+[ext_resource type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="5"]
 
 [resource]
-size = 14
+fallbacks = Array[Font]([ExtResource("1"), ExtResource("2"), ExtResource("3"), ExtResource("5")])
-font_data = ExtResource( 4 )
+base_font = ExtResource("4")
-fallback/0 = ExtResource( 1 )
-fallback/1 = ExtResource( 2 )
-fallback/2 = ExtResource( 3 )
-fallback/3 = ExtResource( 5 )

themes/fonts/regular.tres

@@ -1,34 +1,11 @@
-[gd_resource type="FontFile" load_steps=6 format=3 uid="uid://65pw442xps67"]
+[gd_resource type="FontVariation" load_steps=6 format=3 uid="uid://ckq73bs2fwsie"]
 
 [ext_resource type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="1"]
+[ext_resource type="FontVariation" uid="uid://vmgmcu8gc6nt" path="res://addons/godot_xterm/themes/fonts/regular.tres" id="1_0ovio"]
 [ext_resource type="FontFile" uid="uid://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="2"]
 [ext_resource type="FontFile" uid="uid://bh6ce4yiqcvwi" path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" id="3"]
-[ext_resource type="FontFile" uid="uid://c51gnbjamppg" path="res://addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf" id="4"]
 [ext_resource type="FontFile" uid="uid://se3tefc5lv6m" path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" id="5"]
 
 [resource]
-fallbacks = Array[Font]([ExtResource("4"), ExtResource("5"), ExtResource("3"), ExtResource("2"), ExtResource("1")])
+fallbacks = Array[Font]([ExtResource("5"), ExtResource("3"), ExtResource("2"), ExtResource("1")])
-cache/0/11/0/ascent = 0.0
+base_font = ExtResource("1_0ovio")
-cache/0/11/0/descent = 0.0
-cache/0/11/0/underline_position = 0.0
-cache/0/11/0/underline_thickness = 0.0
-cache/0/11/0/scale = 1.0
-cache/0/11/0/kerning_overrides/11/0 = Vector2(0, 0)
-cache/0/11/0/kerning_overrides/14/0 = Vector2(0, 0)
-cache/0/11/0/kerning_overrides/16/0 = Vector2(0, 0)
-cache/0/14/0/ascent = 0.0
-cache/0/14/0/descent = 0.0
-cache/0/14/0/underline_position = 0.0
-cache/0/14/0/underline_thickness = 0.0
-cache/0/14/0/scale = 1.0
-cache/0/14/0/kerning_overrides/11/0 = Vector2(0, 0)
-cache/0/14/0/kerning_overrides/14/0 = Vector2(0, 0)
-cache/0/14/0/kerning_overrides/16/0 = Vector2(0, 0)
-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/11/0 = Vector2(0, 0)
-cache/0/16/0/kerning_overrides/14/0 = Vector2(0, 0)
-cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0)

themes/retro_green.tres

@@ -4,16 +4,31 @@
 [ext_resource type="FontFile" uid="uid://c51gnbjamppg" path="res://addons/godot_xterm/themes/fonts/jet_brains_mono/jet_brains_mono_nl-regular-2.304.ttf" id="2"]
 
 [sub_resource type="FontFile" id="FontFile_tdf0u"]
-fallbacks = [ExtResource("2")]
+fallbacks = Array[Font]([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)
+cache/0/16/0/kerning_overrides/11/0 = Vector2(0, 0)
+cache/0/16/0/kerning_overrides/14/0 = Vector2(0, 0)
+cache/0/11/0/ascent = 0.0
+cache/0/11/0/descent = 0.0
+cache/0/11/0/underline_position = 0.0
+cache/0/11/0/underline_thickness = 0.0
+cache/0/11/0/scale = 1.0
+cache/0/11/0/kerning_overrides/16/0 = Vector2(0, 0)
+cache/0/11/0/kerning_overrides/11/0 = Vector2(0, 0)
+cache/0/11/0/kerning_overrides/14/0 = Vector2(0, 0)
+cache/0/14/0/ascent = 0.0
+cache/0/14/0/descent = 0.0
+cache/0/14/0/underline_position = 0.0
+cache/0/14/0/underline_thickness = 0.0
+cache/0/14/0/scale = 1.0
+cache/0/14/0/kerning_overrides/16/0 = Vector2(0, 0)
+cache/0/14/0/kerning_overrides/11/0 = Vector2(0, 0)
+cache/0/14/0/kerning_overrides/14/0 = Vector2(0, 0)
 
 [resource]
 Terminal/colors/ansi_0_color = Color(0, 1, 0.4, 1)