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

Convert from GDNative to GDExtension

Browse source 
Work in progress.
This commit is contained in:
Leroy Hopson 2022-12-29 22:52:13 +13:00
parent 6b47d35835
commit 44f7e3801c
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
25 changed files with 408 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

4
addons/godot_xterm/nodes/pty/libuv_utils.gd
View file

@ -6,14 +6,12 @@ extends Object
# GDNative does not currently support registering static functions so we fake it.
# Only the static functions of this class should be called.
const LibuvUtils = preload("./libuv_utils.gdns")
static func get_os_environ() -> Dictionary:
# While Godot has OS.get_environment(), I could see a way to get all environent
# variables, other than by OS.execute() which would require to much platform
# specific code. Easier to use libuv's utility function.
return LibuvUtils.new().get_os_environ()
return LibuvUtils.get_os_environ()
static func get_cwd() -> String:

26
addons/godot_xterm/nodes/pty/unix/pty_unix.gd
View file

@ -6,10 +6,6 @@
@tool
extends "../pty_native.gd"
const LibuvUtils := preload("../libuv_utils.gd")
const Pipe := preload("../pipe.gdns")
const PTYUnix = preload("./pty_unix.gdns")
const DEFAULT_NAME := "xterm-256color"
const DEFAULT_COLS := 80
const DEFAULT_ROWS := 24
@ -25,7 +21,7 @@ const FALLBACK_FILE = "sh"
# Any signal_number can be sent to the pty's process using the kill() function,
# these are just the signals with numbers specified in the POSIX standard.
enum Signal {
enum IPCSignal {
SIGHUP = 1, # Hangup
SIGINT = 2, # Terminal interrupt signal
SIGQUIT = 3, # Terminal quit signal
@ -68,10 +64,7 @@ var _exit_cb: Callable
# Writes data to the socket.
# data: The data to write.
func write(data) -> void:
assert(
data is PackedByteArray or data is String,
"Invalid type for argument 'data'. Should be of type PackedByteArray or String"
)
assert(data is PackedByteArray or data is String, "Invalid type for argument 'data'. Should be of type PackedByteArray or String")
if _pipe:
_pipe.write(data if data is PackedByteArray else data.to_utf8_buffer())
@ -81,7 +74,7 @@ func resize(cols: int, rows: int) -> void:
PTYUnix.new().resize(_fd, cols, rows)
func kill(signum: int = Signal.SIGHUP) -> void:
func kill(signum: int = IPCSignal.SIGHUP) -> void:
if _pipe:
_pipe.close()
if _pid > 0:
@ -133,13 +126,12 @@ func fork(
var parsed_env: PackedStringArray = _parse_env(final_env)
# Exit callback.
_exit_cb = Callable.new()
_exit_cb.set_instance(self)
_exit_cb.set_function("_on_exit")
_exit_cb = Callable(self, "on_exit")
# Actual fork.
var result = PTYUnix.new().fork( # VERY IMPORTANT: The must be set null or 0, otherwise will get an ENOTSOCK error after connecting our pipe to the fd.
file, null, args, parsed_env, cwd, cols, rows, uid, gid, utf8, _exit_cb
var result = PTYUnix.new().fork(
# VERY IMPORTANT: The second argument must be 0, otherwise will get an ENOTSOCK error after connecting our pipe to the fd.
file, 0, args, parsed_env, cwd, cols, rows, uid, gid, utf8, _exit_cb
)
if result[0] != OK:
@ -154,7 +146,7 @@ func fork(
_pid = result[1].pid
_pipe = Pipe.new()
_pipe.open(_fd)
_pipe.open(_fd, true) # FIXME: _pipe.open(_fd) should be sufficient but requires two args.
# Must connect to signal AFTER opening, otherwise we will get error ENOTSOCK.
_pipe.connect("data_received",Callable(self,"_on_pipe_data_received"))
@ -169,7 +161,7 @@ func open(cols: int = DEFAULT_COLS, rows: int = DEFAULT_ROWS) -> Array:
func _exit_tree():
_exit_cb = null
if _pid > 1:
LibuvUtils.kill(_pid, Signal.SIGHUP)
LibuvUtils.kill(_pid, IPCSignal.SIGHUP)
if _pipe:
while _pipe.get_status() != 0:
continue

9
addons/godot_xterm/nodes/terminal/viewport.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://c62updkby54f3"]
[sub_resource type="GDScript" id="1"]
[sub_resource type="GDScript" id="GDScript_d8lvm"]
script/source = "@tool
extends SubViewport
"
@ -11,12 +11,13 @@ handle_input_locally = false
gui_snap_controls_to_pixels = false
size = Vector2i(2, 2)
render_target_clear_mode = 1
script = SubResource("1")
script = SubResource("GDScript_d8lvm")
[node name="Terminal" type="Control" parent="."]
layout_mode = 3
[node name="Terminal" type="Terminal" parent="."]
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_right = -2.0
offset_bottom = -2.0
grow_horizontal = 2
grow_vertical = 2