Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2025-05-05 12:44:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade min compatible Godot version to 4.2.1

Browse source
This commit is contained in:
Leroy Hopson 2024-01-06 22:42:07 +13:00
parent 52a89827c9
commit fac6361898
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
16 changed files with 39 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
addons/godot_xterm/godot_xterm.gdextension
View file

@ -1,8 +1,10 @@
[configuration]
entry_symbol = "godot_xterm_library_init"
compatibility_minimum = "4.2.1"
[libraries]
linux.debug.x86_64 = "res://addons/godot_xterm/native/bin/libgodot-xterm.linux.template_debug.x86_64.so"
linux.release.x86_64 = "res://addons/godot_xterm/native/bin/libgodot-xterm.linux.template_release.x86_64.so"
linux.debug.x86_32 = "res://addons/godot_xterm/native/bin/libgodot-xterm.linux.template_debug.x86_32.so"

9
addons/godot_xterm/native/src/node_pty/unix/pty.cc
View file

@ -120,8 +120,9 @@ static void pty_after_waitpid(uv_async_t *);
static void pty_after_close(uv_handle_t *);
Array PTYUnix::fork(String p_file, int _ignored, PackedStringArray p_args,
PackedStringArray p_env, String p_cwd, int p_cols, int p_rows,
int p_uid, int p_gid, bool p_utf8, Callable p_on_exit) {
PackedStringArray p_env, String p_cwd, int p_cols,
int p_rows, int p_uid, int p_gid, bool p_utf8,
Callable p_on_exit) {
// file
char *file = strdup(p_file.utf8().get_data());
@ -445,9 +446,9 @@ static void pty_after_waitpid(uv_async_t *async) {
Array argv = Array::make(baton->exit_code, baton->signal_code);
if (baton->cb != nullptr && baton->cb.is_valid()) {
if (baton->cb.is_valid()) {
baton->cb.callv(argv);
baton->cb = (Variant)nullptr;
baton->cb = (Variant) nullptr;
}
uv_close((uv_handle_t *)async, pty_after_close);

27
addons/godot_xterm/native/src/register_types.cpp
View file

@ -1,11 +1,5 @@
#include "register_types.h"
#include <gdextension_interface.h>
#include <godot_cpp/core/class_db.hpp>
#include <godot_cpp/core/defs.hpp>
#include <godot_cpp/godot.hpp>
#include "terminal.h"
#if !defined(_PTY_DISABLED)
@ -15,10 +9,14 @@
#include "node_pty/unix/pty.h"
#endif
#if defined(__WIN32)
//#include "node_pty/win/conpty.h"
// #include "node_pty/win/conpty.h"
#endif
#endif
#include <gdextension_interface.h>
#include <godot_cpp/core/defs.hpp>
#include <godot_cpp/godot.hpp>
using namespace godot;
void initialize_godot_xterm_module(ModuleInitializationLevel p_level) {
@ -45,13 +43,13 @@ void uninitialize_godot_xterm_module(ModuleInitializationLevel p_level) {
}
}
extern "C"
// Initialization
GDExtensionBool GDE_EXPORT
godot_xterm_library_init(const GDExtensionInterface *p_interface,
GDExtensionClassLibraryPtr p_library,
GDExtensionInitialization *r_initialization) {
godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library,
extern "C" {
// Initialization
GDExtensionBool GDE_EXPORT
godot_xterm_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address,
const GDExtensionClassLibraryPtr p_library,
GDExtensionInitialization *r_initialization) {
godot::GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library,
r_initialization);
init_obj.register_initializer(initialize_godot_xterm_module);
@ -61,3 +59,4 @@ extern "C"
return init_obj.init();
}
}

2
addons/godot_xterm/native/thirdparty/godot-cpp vendored

@ -1 +1 @@
Subproject commit 516fad14e45d341211121832bb3daa172aebd6e1
Subproject commit 78ffea5b136f3178c31cddb28f6b963ceaa89420

2
addons/godot_xterm/native/thirdparty/libtsm vendored

@ -1 +1 @@
Subproject commit 0102bc2c5480773bf64c1edbdfb5d1ddb3b63954
Subproject commit d7b39db8180c6df4b0c9f59a0ce7fbcdb11de60e

2
addons/godot_xterm/nodes/pty/pty_icon.svg.import
View file

@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/pty_icon.svg-e9e42570b4744b3370a02d174395c793
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false

2
addons/godot_xterm/nodes/terminal/terminal_icon.svg.import
View file

@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/terminal_icon.svg-a0706fd47bb880823b1242c2241
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false