From bb74585c20156614919e4fd261e53e7960ce25c4 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 22 May 2022 11:37:22 +0700
Subject: [PATCH] Update target Godot version: 3.3.2-stable -> 3.4.4-stable

---
 .github/workflows/main.yml                     |  6 +-----
 CHANGELOG.md                                   |  1 +
 addons/godot_xterm/native/src/terminal.cpp     | 15 +++++++--------
 addons/godot_xterm/native/thirdparty/godot-cpp |  2 +-
 misc/export_templates/godot                    |  2 +-
 project.godot                                  |  8 +++++++-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 436f626..3489f99 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,10 +6,6 @@ on:
     - cron: 0 11 * * *
 
 env:
-  GODOT: Godot_v3.4.3-stable
-  GODOT_VERSION: 3.4.3
-  GODOT_RELEASE: stable
-
   # Caches should be automatically invalidated when versions change,
   # but invalidation can be forced by incrementing these numbers.
   EMSCRIPTEN_CACHE_VERSION: 1
@@ -309,7 +305,7 @@ jobs:
       matrix:
         os: [ windows-latest, macos-latest, ubuntu-latest ]
         bits: [ 64, 32 ]
-        godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4.3-stable', 'v3.5-beta1' ]
+        godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4.4-stable', 'v3.5-beta1' ]
         exclude:
           - os: macos-latest
             bits: 32
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 097de6f..f026a47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `--docker` option to `build.sh` script, in order to build Linux binaries inside a docker container with an older GLIBC version.
 
 ### Changed
+- Target Godot version from 3.3.2-stable -> 3.4.4-stable.
 - GitHub Actions workflow to build Linux debug/release binaries inside docker container in order to target older GLIBC versions.
 
 ### Fixed
diff --git a/addons/godot_xterm/native/src/terminal.cpp b/addons/godot_xterm/native/src/terminal.cpp
index 700ecfc..0d67f81 100644
--- a/addons/godot_xterm/native/src/terminal.cpp
+++ b/addons/godot_xterm/native/src/terminal.cpp
@@ -8,6 +8,7 @@
 #include <ResourceLoader.hpp>
 #include <Theme.hpp>
 #include <algorithm>
+#include <string>
 #include <xkbcommon/xkbcommon-keysyms.h>
 
 // For _populate_key_list(), see below.
@@ -418,14 +419,12 @@ void Terminal::update_theme() {
                                                  Color default_color) -> void {
     Color c;
 
-    c = has_color(theme_color, "Terminal")
-            ? get_color(theme_color, "Terminal")
-            : has_color_override(theme_color)
-                  ? get_color(theme_color, "")
-                  : (default_theme != nullptr &&
-                     default_theme->has_color(theme_color, "Terminal"))
-                        ? default_theme->get_color(theme_color, "Terminal")
-                        : default_color;
+    c = has_color(theme_color, "Terminal") ? get_color(theme_color, "Terminal")
+        : has_color_override(theme_color)  ? get_color(theme_color, "")
+        : (default_theme != nullptr &&
+           default_theme->has_color(theme_color, "Terminal"))
+            ? default_theme->get_color(theme_color, "Terminal")
+            : default_color;
 
     color_palette[color][0] = c.get_r8();
     color_palette[color][1] = c.get_g8();
diff --git a/addons/godot_xterm/native/thirdparty/godot-cpp b/addons/godot_xterm/native/thirdparty/godot-cpp
index 26d4df4..f4f6fac 160000
--- a/addons/godot_xterm/native/thirdparty/godot-cpp
+++ b/addons/godot_xterm/native/thirdparty/godot-cpp
@@ -1 +1 @@
-Subproject commit 26d4df4e174124e1174c624d770661b1394fcf5f
+Subproject commit f4f6fac4c784da8c973ade0dbc64a9d8400ee247
diff --git a/misc/export_templates/godot b/misc/export_templates/godot
index 45eaa2d..419e713 160000
--- a/misc/export_templates/godot
+++ b/misc/export_templates/godot
@@ -1 +1 @@
-Subproject commit 45eaa2daf1e3d2571a9f31a3421911262ec82f51
+Subproject commit 419e713a29f20bd3351a54d1e6c4c5af7ef4b253
diff --git a/project.godot b/project.godot
index 95424ee..1be5023 100644
--- a/project.godot
+++ b/project.godot
@@ -8,8 +8,14 @@
 
 config_version=4
 
-_global_script_classes=[  ]
+_global_script_classes=[ {
+"base": "Reference",
+"class": "GutHookScript",
+"language": "GDScript",
+"path": "res://addons/gut/hook_script.gd"
+} ]
 _global_script_class_icons={
+"GutHookScript": ""
 }
 
 [application]