From fa49834347d479392324b08603f1a9226ce69173 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sun, 7 Apr 2024 09:35:14 +1200 Subject: [PATCH] feat(theme): update themes --- .../terminal/editor_terminal.tscn | 4 +-- addons/godot_xterm/themes/default.tres | 29 --------------- addons/godot_xterm/themes/default_light.tres | 29 --------------- addons/godot_xterm/themes/font_only.tres | 19 ---------- examples/asciicast/asciicast.tscn | 9 +++-- examples/menu/menu.tscn | 4 +-- examples/socat_terminal/socat_terminal.tscn | 4 ++- examples/terminal/terminal.tscn | 6 ++-- examples/web_console/web_console.tscn | 5 +-- export_presets.cfg | 2 +- test/scenes/theme.tscn | 6 ++-- test/visual_regression/baseline/emoji.png | Bin 0 -> 11478 bytes .../test_visual_regression.gd | 10 ++++++ theme_map.gd | 22 ++++++++++++ themes/default.tres | 31 ---------------- themes/demo.tres | 25 +++++++++++++ themes/demo_full.tres | 33 ++++++++++++++++++ themes/fonts/bold.tres | 20 +++++------ themes/fonts/bold_italic.tres | 20 +++++------ themes/fonts/italic.tres | 20 +++++------ themes/fonts/regular.tres | 31 +++------------- themes/retro_green.tres | 23 +++++++++--- 22 files changed, 157 insertions(+), 195 deletions(-) delete mode 100644 addons/godot_xterm/themes/default.tres delete mode 100644 addons/godot_xterm/themes/default_light.tres delete mode 100644 addons/godot_xterm/themes/font_only.tres create mode 100644 test/visual_regression/baseline/emoji.png create mode 100644 theme_map.gd delete mode 100644 themes/default.tres create mode 100644 themes/demo.tres create mode 100644 themes/demo_full.tres diff --git a/addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn b/addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn index afc4539..7e35003 100644 --- a/addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn +++ b/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="."] diff --git a/addons/godot_xterm/themes/default.tres b/addons/godot_xterm/themes/default.tres deleted file mode 100644 index 0a3225a..0000000 --- a/addons/godot_xterm/themes/default.tres +++ /dev/null @@ -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") diff --git a/addons/godot_xterm/themes/default_light.tres b/addons/godot_xterm/themes/default_light.tres deleted file mode 100644 index 30e97d6..0000000 --- a/addons/godot_xterm/themes/default_light.tres +++ /dev/null @@ -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") diff --git a/addons/godot_xterm/themes/font_only.tres b/addons/godot_xterm/themes/font_only.tres deleted file mode 100644 index e1d75cd..0000000 --- a/addons/godot_xterm/themes/font_only.tres +++ /dev/null @@ -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") diff --git a/examples/asciicast/asciicast.tscn b/examples/asciicast/asciicast.tscn index a74df80..c382fb7 100644 --- a/examples/asciicast/asciicast.tscn +++ b/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" -playback_speed = 2.0 -method_call_mode = 1 +callback_mode_method = 1 libraries = { "": SubResource("AnimationLibrary_eb6bs") } +autoplay = "example" diff --git a/examples/menu/menu.tscn b/examples/menu/menu.tscn index 776b625..a7d51a4 100644 --- a/examples/menu/menu.tscn +++ b/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") diff --git a/examples/socat_terminal/socat_terminal.tscn b/examples/socat_terminal/socat_terminal.tscn index 904b453..5d3f524 100644 --- a/examples/socat_terminal/socat_terminal.tscn +++ b/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") diff --git a/examples/terminal/terminal.tscn b/examples/terminal/terminal.tscn index 2b52368..a8defc0 100644 --- a/examples/terminal/terminal.tscn +++ b/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="."] diff --git a/examples/web_console/web_console.tscn b/examples/web_console/web_console.tscn index 3437d52..02b4bf9 100644 --- a/examples/web_console/web_console.tscn +++ b/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"] diff --git a/export_presets.cfg b/export_presets.cfg index 1425c90..3e6e76a 100644 --- a/export_presets.cfg +++ b/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" diff --git a/test/scenes/theme.tscn b/test/scenes/theme.tscn index 9d921d4..e6275a0 100644 --- a/test/scenes/theme.tscn +++ b/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"] -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 +[node name="Terminal2" type="Terminal"] +custom_minimum_size = Vector2(200, 100) script = ExtResource("1") diff --git a/test/visual_regression/baseline/emoji.png b/test/visual_regression/baseline/emoji.png new file mode 100644 index 0000000000000000000000000000000000000000..5a175fab44ecb41c35e549ecd248d1830549baf8 GIT binary patch literal 11478 zcmb8Vbx`J-Q8V+yF+jfaJ=vL)!o(A{c}^Z zGrd(?TQgnV(@#Isk&5zCNbq>@001C;|0b^dIgflkrm*0jqwM~%?&k#NqAVo}R80|_ z000T_U0g)fGxNgF%N0}Y;iEWtGr^S?Bmf4kMIsCyujHtRD1wT%Vv3>k9Ndxn={2i#|;~dAmXSf(vOWU3T{gJt8xBBzIeIJyIZL2#Fcju^y}BwMB03I zLW0V@{zkLvR@>!b`KwpT*vN=5s)(-L%*P2dPGMf_TXx(%TYiZ zoQSU6KMk6tDG(pEY%1zP4h#p+?E~l?Naf3Kwy+s`ntCKESi^N) z#B>7@z>n2+Fb+Uf;EVzZBk)ks$|nheRzPr0LXdbrCC3MKDg zi-3L}blBXDxTMSGk|*`8kE&|oq`3_}KIkk?sZ-_2eN* z=Sxg#F!7JFTlvi9h!RHd@~(ec6Kwr~=zj2RK+1bxXW_jVHc*RLdx}G%nK1-4p59c2 z4H^+Cy@&=@9i~zVT|bZ{5aTZjkJpm%FI&6wbiJI_6Xn4?+#B;~g}jMbx$&1oqC|I?E^<-$uTCzQpqu zo7_yX6gaFFH!sJ3+Wq0&0VYk7dgD6#Que>Lq8ax__#S26F@xks#bdurJ}zS6L$)Z2 z4#&MQbvIL{eDtahP8VD#!?y-=KpoFIV=+kdbA}!X&{6ECe1aj70tZO-=VaWaYnI9seOa%hoE?vCe zJLb72e*K*-xt`U5QLDJr*yKDbA6?9VPFzFc=Ihu$eJGi?RH{hzXYBxyXZEC>XNd=4 z2?#0*~u%g&k|ln?>Ag00`7 z%A>T6@yhg;Nx{nW$EcKr>WXwch02O!!YUhzL+E3gVfOFEyrmvH>rPnJ{CH!U@JF%v zrZ+*=ek6yddl;0~1t({M?S^a_06Qlhc^~<}-H-fN0FYp%Q~xKEZR&SoBys&{G`JP+ zcN;|I7r&T*#rmG!M7hS}V?rzX-zGTCrh339prr%7tSw`eB;9x!>n%dAyFuiJ$9O4z zjeA{1g+oeWK**z_DL$V1R?1BI!I4()OxKDouB~6?n&P->oS~;!=i%s`C<+}21n~H> zeJ_3TRx|+E=fUci@Ywg5((FxM=rdjc7H;Fb#6>V^mQhHMGBgiDSkV_eb_v=8R7h?f z7R;ai-UG_sMPNN1^~3~iuC;=dDI4E)W80jv{V1rSV19Z3&QoK%?fvTR^D%*S<_!i+ zymBOpy7z~NYG(A692jo+(QYo^R6JY`duL0FN{*L&Ygfl-$~qJXyKV)ps?m_`Qgzfp zk_Lexjc3wvyfN5=W1FwLLg+-YEmbgsibW~i2kET~XtWQ|K4PIxf`a*LQ(wS<%mf^6 z@SJL8IK%Vn`7QH1o5Sa{P)eYS;1|_lQ)r9hLFY{1c$2g&wRlcPn>6c)rZku)Kas?Z zh~X@SWoh7JpLnY)9S@}mEiOVB^thrkHUUa#&>QjmpL>Rc9*U{Wy_6Uuy8D( zbC6IT3qpie3cU4q2W#jBPT93Fql-?o)XpB31o6WysV0tnSm zBYIln9+AHh>p1eJCkG`XDVCS($t$RP89}TXXjpR$lYuKpHB`J&2pH9_*s{wB-P4Bs zj6VMzQs4B`2(4RdoDMi?_7Is;hQ}@Z6;uR7V0cC4_RfHr*JTP*)~M}XN0r)u6$sA8 zx9^uj?e=ydphJXjJEDaHhEH-_&!(lSbiF$_nME;d5+@~M2BBb%Z7hxzqb3a#FfxJq zb_mTE=znnV*=>CKdI8HO&N=qNILGd->*-{|w^k~o9XqK19Oe0o`-H+SZeM|{y_kX1 z1j@)))tJm55dpdUE+tz%g!f?*N8`))=k;G(v#H08TpE+^_3g49aa(Mg>z0e>cNhr& zE=grf7O9uJ@q$QTe=-pC?1b6!W**osHBm-Cbqa-!YR@+=0tZQ- z{U+?z&cz`6{dcO4LsDv?S+&AZOjREv{IzQDT=?aefT!4NT2>|Fs>eY$$!11k?j|)8 z-Fx%VFvyX49(R3K&jeuf!{ zK#Yz5&H#Oth3=91)iR93c6wf6RP>BT{aUcHwYL+|XuKSLCclCB1$$4{wVP&8hfbFW zDdfmbo*K>o=fWX=;WK*Sbs-dxZQ5mJ9x*87-7$xM{Q0fC#1Sefc}h_~A(zZ^6DHs6 zuu!rbbLu1~w^WTCdqoke^DZXqDlTW&KiIz#Gzdrf(e>9qdmx($i?RJl#<2J4DCH8j zNteyWM(d$W${&`5zO_m44ylpPW0Ur6pEN#rDIulG03El*2$V>AuU?Yk4Qz@61npxe6^*=b6;kd3r*7)1g~J?W8s5hbF9C;wd5J zR+2?m6!zQ{?V0!j6Uo){tQGQmqX&%0dsP_Z>i71|MgZB=DYGR#`)@ozUCd>_&60Bd zU23T6t_0(%QPaEL7Y_IJ)9slQDhKvrfBYe2Ck<8>X>49tLkoG($Hw-<2#hk2VsT`{ zoK`v=FoGFacV}Eu3rfHNM&3Gbnjto)6!{fO3k`6*qeh)NnEtB0a=Wbi=7NT_r7s6vzbaN7P^4S)fT6{3a$FCr(FbK zS>Na4mrWIq_xT^5t%feMbhr*ptVWga)bg9YHQ#)018F_fn+|qh zJNDk%W$ImC0`u68o?mD|nhp;92H=5tC1~`}c}TIBhBUbK&-BBcDp<%cN;EV8wY#fgu>V+|E8_A3~XWAXYY8?tX9SY-m3%t?!ko9C9U64?Ziy8)$ zApq*-e>5`igDQG30d_mhg2HphI3UJHURmJ76b3srz+<`uaqYGwD`1Xx7*Y^2kOC## z9CIZ6!|7?Jl>*9Bwm7a8W4bgY}hwnen*DSCV*}^n2zrIqLOCs?bez;muJ6H7iyF$5shuP-om;$T)3gf3`KI|HU)vBd0vXl!Clk>6v9p%!P`$(ri`~@ZUy)2>O`yA5 z--zF5NY^P#i3VqrnH4jv917_8e$a;5<@5e4j@aWioEU`t^0tS&4h5PifkgGL9H>FX z$LDi7oT#f~yG}G)X=rHR`FzV3`e?uG!oa`{JK1O#V-g^$0W6aXnd+Nv4LlxUfjz;_ z3ireYN=&)L$NkPh1l2`0)q}#0T%`bbb{)HLkN3B?$7ODU*Z`st2*qFRw{ILa zvN1&SadOPUdny3 zOfB2*VTEH^7sBx0)AhjFbskMwz{k5o$2D}ITn1;OU43!)k&MhBL|=Qky}i3o^*asL ze74=68^mH6dAHQbWEmWPuU@!#$nB9aIdX5w{Z`q(n$mpwoFN>7teEWaaC*92Ai!k+AM<`YH>0!R1_7N zuQl1VyI-JVR9g~+lxT*a@~&6k)@s~Bm`OXQLs7%@qBvEU)T|N`OoP>EGN`wc-`%km z&%^cXIBQ?bLC^rbf6*D>HPnt5x<6Wv$O$Q%gA7MAnyR}zz-iWTC0!0M&(QzLGGzPS zjB?m4&9KYCw({jYz6n%8Y&&vpxxWuLZ~15Bm5@ut67af~RFdpKRY{wz_GSuBLTsNY z98)8Kk%n=U#iQc`Hk)hd`}o2Xn?g~i#);NHo<+4ZT@z)orRUiRCV@m!JQJ-nCf2O_ zbl1r1G?cTou~Xtk2uB;Wl}4+4og&;}kIC7)$>^4Dc;L&yRZDbu8G46VMtVA+s;cU_ zsXEY(lv7kRl<;jN=`EH4=yP$^EQhMR)8Yh#D%B}Hrvk3~ zzY3>yGvZY}rope-g{xtQ>sjSO@;y4Sg#rdc4Q|%ocb1V&o4YCkW61eQnT%-}peTkO zS65eYznY)_sWtg{f5WGmzAm`jXxBJT=^kx2^tir<=P}3MQh>Bsh?T_%K-x(4FPhYz z5;d)&jZjHvN(R2$4Sw9`8yPo2GttXMG@oVb(*779n{(8b4Gb~%>c5)Iw&)@}=V?q) z?;pphaY)=#R4YIG)XPvDv4N&0jW(4CDwAH@!pw~0mfz#S;bBx{2x|T;3d%f+Ca`ig zuMq3DReIh!spe+C(ednrANX~v?a^dsA}Hc59-H2$KX7mPy4#fUTYxp^Ig?qavUJmODJ~Y8N`>WptlUFlT&HleM#&}Btx=!FL(rgXA)0I7JXDtL}6oo^kiFgoe3@rjCpz=1N3U}pZv#(BB{fhd z?Qe_DIV5w{op5xr+I|frzAR!6(!gE|ou6_`jaA|fK* z-n{)R!6aW|hBOTP77Z@q9peIdGT59;P5f8Lsp+Z%w2VIzVo5AiB>%4eD|<}H{#Xr8 zhJhnjN#FEi9n;nmbbbTAi%dy?Idba(mZA|eY)6zK5hpYx6cTB zC+3U8NV_RnknHaL__tE=340DL;_cqI|C7)GP&3y0c+$@#eMv+l?4+q6TMz|227xTr!;|32-pnT4Ky4ai+r_v zmTB4twgfFJp8S5M!Fe9hR%o9vfAb%cf9S|cBCC(^iA%oi&}AmW-coRLQLmz#|GIj2 z(saEV$+IL#6Oy=lec^xr&%y z;46cuvYUF9?#ju~6RC=8kN`U1-0q@xZeW@Ip7*}4&pX2zKn6>?JnhBX1Eoe;JQlD) zpXPSlN;kPJE;Dy>;yPoYXZ?QN zu|I$O%rSmb==Gsr{$QZcx_QMkp|!qGL!t^;+^Je6Kya)(RH&Q4TAV| zXf3eqm%2Ei=Y5P(8;Z00SpNAFbvJo+SLUT7)7GDI!SjU?ku2}81%Jb2hX=j2R9l`k zot|diW5N-h%zXmUd6gVu&5RnBT)Terp})WdW~38Y&^(%aB%C6p=RzU)wErUwn(@KB zY{I&XPEZh&lW{p%j&t<|Gq;jDB^kW0la$FUzUSjLw! zQ8DbnZ5Ly9V4s}$dn~y<{_4i5dwELvy}Fy9HM#Hj)BnsCgsgl8Rt12THm|T zpDb#97V7*3gS|EDBp5WV@8YpnBu-%s;jqA_DaM%`Qn^)zjA$iOR;fKA%AzW3$n`UV zk_NsVaFu@=(^N;ussSh~E1OSe$<4FN%{Om)pPhPaqA7TFy}=4;M5!}?&Y;`U790E|$tlw` z){p#hDCV|Gqq4PG=fG9MLB92InBkD+|8f$K?m&^c6-yRfH z-kwrvX=$JSF0G(|1KO&_)&v@)?FBuD)Erj4s1et|gp1}C;c+eM;5jYWW;~H$J-aE; zFs7o{DOBE-Q=|^x6i~r^9R=wP^7gnnKn2AdhDT%Cy=kb&$i*H@%MyZ4q{J3TY75A z7pGWJ*p;seeQvSp?FQz=nsXf=EJr8HdU0BU+PS0YhW^(MW$jciW>>LIRH3kJz@ycr z66zq#;XN?LBH<8L@yDG;iNNRLr@BJdNCu$N27Cy=}^r`7uBxLhdq@?8vkCVc2!zro{+_(qiX z)zcb}05)@F$Gv9nEGsK8Ay1$|NJ5O#|o+OX@z2U_my8Qa%hCM8{0;G zHYv$(RWcZrfXTR9b_~igQ1@YIihkSSgP#15laPmcbgp%T^KEbrzbCc~l(0v2oVf!) zx3F2CSYQ7k_N7tYEqy#QD)y2Bg=G}Foby&W*5`e6A_LBN-Lga|+ofVs?|OO&Iga(g z4%@m&=q5EuBi^z;X!H8)AR+zs0}V=ecRe=>BoqEw!iJM+36t5)9l=C31ndIdobo6)40K|`$ml=%Z<{nlRYS*BLQ$0i?0=C9>C6&e^@GCU+r&*D%SC9a%oMSh`lc4Rpn1SwRE!e@kTbH6Rt&vQZ& zp~dV%Ha$r5dlkp^e%e@_MSu2uJTAe?1* z{&6sge;nAgY25i@q*c{M1)K)KeMz0E*`r}Wwfn*>=%{%rSs@3n>wMrdO5fesXH#i1 z*K?S18Bw>S`eXtlAuj#}F%0M3IU>&o9=Rf0Ti~Ny6ZnniFPe@E`H|_#ZlMyUU(NM} zBKX6*S*zeU0yUBs>~BGY$mlYGP=G4ai1gG8^p0Q0BQ|LP2!|`%E?~RR6m&@Vc^B-v zDFo6@jsHTb()jCg^&r_X?){XjoXwzhFUVcz>a5PXYPO7Uak{=3Q)4;vK7erx{=eUs zB$a9h3&VAco1dfZnLPx~c?C3b{ngqwf{~D2w`FUZ)<&xh&=1ny5`8};kn^Z2rmyhd z)A6afkL}xpLt`sk2JM45_d=2VJ4b36d^@ad;|1`9$xZx9k2DCMe}3^ybKU6+{bXko z_X*!VGni>X9}Wo7{4)l^JwktjA8rO)^S`n8rzSNXq81RX2Al9*+ZTehEO40<=dZut zHDXG9jJx``lMo`+v|kY$pEL}r?Gd^miX_W_7FFcHSp8?rH$e5jUU!*>8bRvF5S#g5 zMHl}kLTpKQ2)&+W#!>xURbvV?%zfR@>a+l(6vwns{oIT8Rds<52W84q5EPb~=5>f~m}Q(9vIlEt$MqrA0T6KfW{H5GIMOEm%tmhL=bKM51{{A^|; zL2RF~p|6!N$}&b&$ZKSDBg);ZGdCi_d~p?Pp2<~r0KX#d&66yMv{Dldu2xD2``xqL z+SJ;tT|#`q=i4{@`M+i%&BVStccX5}5k!&YMcG!5-o)$J^eN+5D(35M^?#!X`4@KV zsg+yX#6-IJ&vQ09=R6*rVQ`=9q~kp+vg5I~xi)RIM)Nq>KC%8)f!<0X zd6bl3CR{o=s{gof|3gR7)-(jF5DZlE{ZP*zYXE#&FZP0;c4wft4x0Sc^PDT<(a&z88x3wjKch;!f#GH^_osz&U6qk z7V>zCl(Qpx&=;VOdl2FB$AO4%)2Nw`Fm{b<(@CNZXmIjBDUIiTxYPR};=XI&eA_kN z{p|jrOh{p+6>26b`_F=l^#&XN0OKZ#d1&GFJ8a}Qh6lEwz@nZO7`6ZgLO>#cFi;isX^|Q%_8vTQ)MtH2ougSC}nx-mbMui?gETnDuS^zt*o4;L`3$wKV1rG2>ZIoUPQI*K$~a5ZwrI z42}OO8i$a16IUJY1o9;6x)aNKe{lPU`1#8FM*o1(F!p-@XHjjZ8w zNK}G<2mKB*@1+xNmc8iKsif?%n|VY3+N-z4~DpL2i5V=$^TEXP?~tJHahn@ z5|!JL$r1UA=}I1!z*A#8+(fnI7s#c4-p1tdJTs%36;IoeLw)EB@>{cIdsenjamWQsaU(%&$F6@wC2w(&HHjvpu<^ z?(lNZdh+K*FJ+>Sm_lZ(sf{Odmmeg33Si7UNnpH)QKg}yEHTjK?OoHyr@{t@MXH=Q z*t)>ts!$mM@sry@302=qR{s?s{cNDjDR7rgs!hzY0vzWv#*z8oc6VCqY0|sg##b-R zg-Vo5Etk5L(4L@waMa}981BlHgOFb%Hw=>AyewCvP{1lcT&?8608KA^13S5ZNT1su z{03>ks(*KX_3ige$;G^P|;+fd>BE!kS`hLLXm`ShN;{5CSCbEyE-0&n5O7#F~0YjovCgL%Q(3Mn0 zP(Bl6f7JCVyd6r@gxuqy(9QkUUkrk`^G~{wZKXT|aUrBIB%!zb(_XH1kAugltE-ci zks1DptMZvl8Td1CaA5T`H79=(->WEL57akn#C#~#Im8!Tm#FeU@8lLc@ANpb;0fNN zOltJvcFOAiTvOfI`sWu%lJ-T3eVf6|_;8tA_c zi|6c@Ab}+T|FVoCLnqZic0s=eJ_Q#J^op)z2t$r=3=AlN*8gn9EJ;QvX)|&*Hto6K zT!ly*mIDmW*1b(%S$&EX?o7?3>5^fJzBrX(k|3K!;6ctsn z0!gxcaz%4-sx`<=_rYS*$pAj{k(J#1*2l>Be)z7*OQdVXPcS@D*%pG?i0JCduX`C}PI3hd{LokkpvjBp zKnSoY;V*w0-axr|pUoh0E9`TFzJu*k}Z-Z^I^lwQ?9yaRD+q0X9(2TMwo{qnQY%oCQhQ+~_z&ZGl!Y!xQiuv;#p^kZtl0Pem7K&;UmyqYwE|msYNL8 z$7RIz%#ks$ni!#>VwFiU6ybXILc9`8(S+qCqYokYYVRwQ5*h;vE~83d9_*1Zw%vyaxgU@Z>VsvUfakz&YxEfT5J(-31Abfu56AsqR zE{#~NMzFM5WM&o_+M=KS)Sdh+Xi~7mY3TGat+=yTfLP>|r$zH>XM`mc;`f8^VWd|< zb97V1(=%Fi6=~YLcI?24W=mA70G*6V`(C+l^0w*?f|FcT8Dueo|MJj(-*4(VPPcLX zRfrK{0O_~+@~ literal 0 HcmV?d00001 diff --git a/test/visual_regression/test_visual_regression.gd b/test/visual_regression/test_visual_regression.gd index d406b6b..717fd64 100644 --- a/test/visual_regression/test_visual_regression.gd +++ b/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") diff --git a/theme_map.gd b/theme_map.gd new file mode 100644 index 0000000..5efeb26 --- /dev/null +++ b/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", +} diff --git a/themes/default.tres b/themes/default.tres deleted file mode 100644 index af554b4..0000000 --- a/themes/default.tres +++ /dev/null @@ -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") diff --git a/themes/demo.tres b/themes/demo.tres new file mode 100644 index 0000000..0d1dfff --- /dev/null +++ b/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 diff --git a/themes/demo_full.tres b/themes/demo_full.tres new file mode 100644 index 0000000..65dfb64 --- /dev/null +++ b/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") diff --git a/themes/fonts/bold.tres b/themes/fonts/bold.tres index 371d274..44c52b4 100644 --- a/themes/fonts/bold.tres +++ b/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 path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" type="FontFile" id=2] -[ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=3] -[ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" 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://uxbe3orgyw06" path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold-2.304.ttf" 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="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://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="4"] +[ext_resource type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="5"] [resource] -size = 14 -font_data = ExtResource( 1 ) -fallback/0 = ExtResource( 2 ) -fallback/1 = ExtResource( 3 ) -fallback/2 = ExtResource( 4 ) -fallback/3 = ExtResource( 5 ) +fallbacks = Array[Font]([ExtResource("2"), ExtResource("3"), ExtResource("4"), ExtResource("5")]) +base_font = ExtResource("1") diff --git a/themes/fonts/bold_italic.tres b/themes/fonts/bold_italic.tres index ac8ad88..cf4d008 100644 --- a/themes/fonts/bold_italic.tres +++ b/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 path="res://themes/fonts/jet_brains_mono/jet_brains_mono_nl-bold_italic-2.304.ttf" type="FontFile" id=2] -[ext_resource path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=3] -[ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" 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://se3tefc5lv6m" path="res://themes/fonts/nerd_fonts/symbols_2048_em_nerd_font_complete-2.1.0.ttf" id="1"] +[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 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://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="4"] +[ext_resource type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="5"] [resource] -size = 14 -font_data = ExtResource( 2 ) -fallback/0 = ExtResource( 1 ) -fallback/1 = ExtResource( 3 ) -fallback/2 = ExtResource( 4 ) -fallback/3 = ExtResource( 5 ) +fallbacks = Array[Font]([ExtResource("1"), ExtResource("3"), ExtResource("4"), ExtResource("5")]) +base_font = ExtResource("2") diff --git a/themes/fonts/italic.tres b/themes/fonts/italic.tres index 26a95f5..30b4598 100644 --- a/themes/fonts/italic.tres +++ b/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 path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" type="FontFile" id=2] -[ext_resource path="res://themes/fonts/unifont/unifont-13.0.06.ttf" type="FontFile" 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 path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" type="FontFile" id=5] +[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 type="FontFile" uid="uid://bh6ce4yiqcvwi" path="res://themes/fonts/noto_color_emoji/noto_color_emoji-20201206-phase3.ttf" id="2"] +[ext_resource type="FontFile" uid="uid://b84quud02s6rq" path="res://themes/fonts/unifont/unifont-13.0.06.ttf" id="3"] +[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 type="FontFile" uid="uid://b4ovh83nuj3d0" path="res://themes/fonts/unifont/unifont_upper-13.0.06.ttf" id="5"] [resource] -size = 14 -font_data = ExtResource( 4 ) -fallback/0 = ExtResource( 1 ) -fallback/1 = ExtResource( 2 ) -fallback/2 = ExtResource( 3 ) -fallback/3 = ExtResource( 5 ) +fallbacks = Array[Font]([ExtResource("1"), ExtResource("2"), ExtResource("3"), ExtResource("5")]) +base_font = ExtResource("4") diff --git a/themes/fonts/regular.tres b/themes/fonts/regular.tres index af8cc72..d913615 100644 --- a/themes/fonts/regular.tres +++ b/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")]) -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/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) +fallbacks = Array[Font]([ExtResource("5"), ExtResource("3"), ExtResource("2"), ExtResource("1")]) +base_font = ExtResource("1_0ovio") diff --git a/themes/retro_green.tres b/themes/retro_green.tres index 34f7d2f..85c2840 100644 --- a/themes/retro_green.tres +++ b/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")] -face_index = null -embolden = null -transform = null +fallbacks = Array[Font]([ExtResource("2")]) 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)