Linux: Fix wayland not being used when not starting GDRE with any CLI flags

spirv-interop/spirv-transpiler.h

@@ -1,4 +1,5 @@
 
+#include <cstdint>
 #include <optional>
 #include <string>
 #include <vector>

standalone/gdre_icons/gdre_Close.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Close.svg-6a694d57a40b6b67ed00f3d03bcb58
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_File.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_File.svg-2a8ee674ab13ea3c8b688fd221f5e1f
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_FileBroken.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileBroken.svg-47f2470a73614cd1e3f592d93
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_FileBrowse.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileBrowse.svg-85768795b621c9574e535334d
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_FileEncrypted.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileEncrypted.svg-8fc6ab154ff862f14557ff
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_FileOk.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileOk.svg-6aa8e831f296fcecee3ec7b00dac9
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_FileWarning.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_FileWarning.svg-2689194bc355c9e337ec3d85
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_GuiTabMenuHl.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_GuiTabMenuHl.svg-6ed85db88d8026812387151
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Import.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Import.svg-1115eb7d8044d7d233fa4679f307d
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Logo.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Logo.svg-03c78c677d3ee90e9fbfc520e5118ed
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_LogoBig.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_LogoBig.svg-6ca6b5fcea192f7868ddf57e050b
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_MaterialPreviewLight1.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_MaterialPreviewLight1.svg-4cf0b0e5e2d2ef
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_MaterialPreviewLight2.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_MaterialPreviewLight2.svg-2709caafd924ed
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Pack.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Pack.svg-d44c57dd9ce66a00aa09c1dfae57e62
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Pause.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Pause.svg-370ca5d2688558a108c081589218a4
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Play.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Play.svg-c9be634537fad3835afce9acf68d1bc
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Reload.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Reload.svg-f61f040c5c388c741094b60afdb58
 base_scale=1.6
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_ResBT.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_ResBT.svg-f69b579f4913cd80591ac91026e46d
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_ResOther.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_ResOther.svg-67d527b79a9c135b8e85c8ed2f5
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_ResTB.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_ResTB.svg-f441a2a09b3b59642aa6947531d27a
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Script.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Script.svg-4c68c9c5e02f5e7a41dddea59a95e
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Search.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Search.svg-db6d735e485abd390d4286d5e840e
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Stop.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Stop.svg-5e008734a41f86d1d6dd922429f3373
 base_scale=2.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

standalone/gdre_icons/gdre_Translation.svg.import

@@ -15,4 +15,6 @@ dest_files=["res://.godot/imported/gdre_Translation.svg-46b428564f905f308174bad7
 base_scale=1.0
 saturation=1.0
 color_map={}
+fix_alpha_border=false
+premult_alpha=false
 compress=true

utility/cli_helper.h

@@ -28,6 +28,7 @@ static void print_version() {
 	print_line("Godot RE Tools " + String(GDRE_VERSION));
 }
 
+[[maybe_unused]]
 static void remove_flag(List<String> *args, const String &flag, bool has_value = false) {
 	for (List<String>::Element *E = args->front(); E; E = E->next()) {
 		auto arg_and_value = E->get().split("=", true, 1);
@@ -42,16 +43,21 @@ static void remove_flag(List<String> *args, const String &flag, bool has_value =
 	}
 }
 
+[[maybe_unused]]
 static void insert_flag_at_front(List<String> *args, const String &flag, const String &value = "") {
 	for (List<String>::Element *E = args->front(); E; E = E->next()) {
 		if (E->get().begins_with("-")) {
 			auto inserted = args->insert_before(E, flag);
 			if (!value.is_empty()) {
 				args->insert_after(inserted, value);
 			}
-			break;
+			return;
 		}
 	}
+	auto inserted = args->push_back(flag);
+	if (!value.is_empty()) {
+		args->insert_after(inserted, value);
+	}
 }
 
 static void add_wayland_args(List<String> *args) {
@@ -68,6 +74,7 @@ static bool modify_cli_args(List<String> *args, List<String> *user_args) {
 	Vector<String> engine_args;
 	bool found_help = false;
 	String path = "";
+	bool display_driver_chosen = false;
 	for (List<String>::Element *E = args->front(); E; E = E->next()) {
 		String arg = E->get();
 		if (arg == "--path" && E->next()) {
@@ -87,6 +94,8 @@ static bool modify_cli_args(List<String> *args, List<String> *user_args) {
 			user_args->clear();
 			args->push_back("--help");
 			return false;
+		} else if (arg == "--headless" || arg == "--display-driver") {
+			display_driver_chosen = true;
 		}
 	}
 	if (found_help) {
@@ -113,7 +122,9 @@ static bool modify_cli_args(List<String> *args, List<String> *user_args) {
 			break;
 		}
 	}
-	add_wayland_args(args);
+	if (!display_driver_chosen) {
+		add_wayland_args(args);
+	}
 	return false;
 }
 } //namespace gdre