Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2025-06-29 10:45:31 +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

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

@ -20,7 +20,7 @@
#include "pty.h"
#include "libuv_utils.h"
#include <FuncRef.hpp>
#include <godot_cpp/variant/callable.hpp>
#include <uv.h>
#include <errno.h>
@ -89,7 +89,7 @@ using namespace godot;
*/
struct pty_baton {
Ref<FuncRef> cb;
Callable cb;
int exit_code;
int signal_code;
pid_t pid;
@ -119,11 +119,11 @@ static void pty_after_waitpid(uv_async_t *);
static void pty_after_close(uv_handle_t *);
Array PTYUnix::fork(String p_file, int _ignored, PoolStringArray p_args,
PoolStringArray p_env, String p_cwd, int p_cols, int p_rows,
int p_uid, int p_gid, bool p_utf8, Ref<FuncRef> p_on_exit) {
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) {
// file
char *file = p_file.alloc_c_string();
char *file = strdup(p_file.utf8().get_data());
// args
int i = 0;
@ -133,7 +133,7 @@ Array PTYUnix::fork(String p_file, int _ignored, PoolStringArray p_args,
argv[0] = strdup(file);
argv[argl - 1] = NULL;
for (; i < argc; i++) {
char *arg = p_args[i].alloc_c_string();
char *arg = strdup(p_args[i].utf8().get_data());
argv[i + 1] = strdup(arg);
}
@ -143,12 +143,12 @@ Array PTYUnix::fork(String p_file, int _ignored, PoolStringArray p_args,
char **env = new char *[envc + 1];
env[envc] = NULL;
for (; i < envc; i++) {
char *pairs = p_env[i].alloc_c_string();
char *pairs = strdup(p_env[i].utf8().get_data());
env[i] = strdup(pairs);
}
// cwd
char *cwd = strdup(p_cwd.alloc_c_string());
char *cwd = strdup(p_cwd.utf8().get_data());
// size
struct winsize winp;
@ -240,7 +240,7 @@ Array PTYUnix::fork(String p_file, int _ignored, PoolStringArray p_args,
switch (pid) {
case -1:
ERR_PRINT("forkpty(3) failed.");
return Array::make(GODOT_FAILED);
return Array::make(FAILED);
case 0:
if (strlen(cwd)) {
if (chdir(cwd) == -1) {
@ -267,10 +267,10 @@ Array PTYUnix::fork(String p_file, int _ignored, PoolStringArray p_args,
default:
if (pty_nonblock(master) == -1) {
ERR_PRINT("Could not set master fd to nonblocking.");
return Array::make(GODOT_FAILED);
return Array::make(FAILED);
}
Dictionary result = Dictionary::make();
Dictionary result;
result["fd"] = (int)master;
result["pid"] = (int)pid;
result["pty"] = ptsname(master);
@ -286,10 +286,10 @@ Array PTYUnix::fork(String p_file, int _ignored, PoolStringArray p_args,
uv_thread_create(&baton->tid, pty_waitpid, static_cast<void *>(baton));
return Array::make(GODOT_OK, result);
return Array::make(OK, result);
}
return Array::make(GODOT_FAILED);
return Array::make(FAILED);
}
Array PTYUnix::open(int p_cols, int p_rows) {
@ -306,28 +306,28 @@ Array PTYUnix::open(int p_cols, int p_rows) {
if (ret == -1) {
ERR_PRINT("openpty(3) failed.");
return Array::make(GODOT_FAILED);
return Array::make(FAILED);
}
if (pty_nonblock(master) == -1) {
ERR_PRINT("Could not set master fd to nonblocking.");
return Array::make(GODOT_FAILED);
return Array::make(FAILED);
}
if (pty_nonblock(slave) == -1) {
ERR_PRINT("Could not set slave fd to nonblocking.");
return Array::make(GODOT_FAILED);
return Array::make(FAILED);
}
Dictionary dict = Dictionary::make();
Dictionary dict;
dict["master"] = master;
dict["slave"] = slave;
dict["pty"] = ptsname(master);
return Array::make(GODOT_OK, dict);
return Array::make(OK, dict);
}
godot_error PTYUnix::resize(int p_fd, int p_cols, int p_rows) {
Error PTYUnix::resize(int p_fd, int p_cols, int p_rows) {
int fd = p_fd;
struct winsize winp;
@ -348,10 +348,10 @@ godot_error PTYUnix::resize(int p_fd, int p_cols, int p_rows) {
RETURN_UV_ERR(UV_ENOTTY);
}
ERR_PRINT("ioctl(2) failed");
return GODOT_FAILED;
return FAILED;
}
return GODOT_OK;
return OK;
}
/**
@ -360,7 +360,7 @@ godot_error PTYUnix::resize(int p_fd, int p_cols, int p_rows) {
String PTYUnix::process(int p_fd, String p_tty) {
int fd = p_fd;
char *tty = p_tty.alloc_c_string();
char *tty = strdup(p_tty.utf8().get_data());
char *name = pty_getproc(fd, tty);
std::free(tty);
@ -445,9 +445,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()) {
baton->cb->call_funcv(argv);
baton->cb = (Ref<FuncRef>)nullptr;
if (baton->cb != nullptr && baton->cb.is_valid()) {
baton->cb.callv(argv);
baton->cb = (Variant)nullptr;
}
uv_close((uv_handle_t *)async, pty_after_close);
@ -663,12 +663,12 @@ static pid_t pty_forkpty(int *amaster, char *name, const struct termios *termp,
* Init
*/
void PTYUnix::_register_methods() {
register_method("_init", &PTYUnix::_init);
register_method("fork", &PTYUnix::fork);
register_method("open", &PTYUnix::open);
register_method("resize", &PTYUnix::resize);
register_method("process", &PTYUnix::process);
void PTYUnix::_bind_methods() {
ClassDB::bind_method(D_METHOD("_init"), &PTYUnix::_init);
ClassDB::bind_method(D_METHOD("fork"), &PTYUnix::fork);
ClassDB::bind_method(D_METHOD("open"), &PTYUnix::open);
ClassDB::bind_method(D_METHOD("resize"), &PTYUnix::resize);
ClassDB::bind_method(D_METHOD("process"), &PTYUnix::process);
}
void PTYUnix::_init() {}
void PTYUnix::_init() {}

21
addons/godot_xterm/native/src/node_pty/unix/pty.h
View file

@ -1,29 +1,32 @@
// Copyright (c) 2021, Leroy Hopson (MIT License).
// SPDX-FileCopyrightText: 2021-2022 Leroy Hopson <godot-xterm@leroy.geek.nz>
// SPDX-License-Identifier: MIT
#ifndef GODOT_XTERM_PTY_H
#define GODOT_XTERM_PTY_H
#include <FuncRef.hpp>
#include <Godot.hpp>
#include <godot_cpp/classes/ref_counted.hpp>
#include <godot_cpp/variant/callable.hpp>
namespace godot {
class PTYUnix : public Reference {
GODOT_CLASS(PTYUnix, Reference)
class PTYUnix : public RefCounted {
GDCLASS(PTYUnix, RefCounted)
public:
Array fork(String file,
int _ignored, /* FIXME: For some reason Pipe throws
ENOTSOCK in read callback if args (or another non-empty,
non-zero) value is in this position. */
PoolStringArray args, PoolStringArray env, String cwd, int cols,
int rows, int uid, int gid, bool utf8, Ref<FuncRef> on_exit);
PackedStringArray args, PackedStringArray env, String cwd, int cols,
int rows, int uid, int gid, bool utf8, Callable on_exit);
Array open(int cols, int rows);
godot_error resize(int fd, int cols, int rows);
Error resize(int fd, int cols, int rows);
String process(int fd, String tty);
void _init();
static void _register_methods();
protected:
static void _bind_methods();
};
} // namespace godot

17
addons/godot_xterm/native/src/node_pty/win/conpty.h
View file

@ -1,15 +1,16 @@
// Copyright (c) 2021, Leroy Hopson (MIT License).
// SPDX-FileCopyrightText: 2021 Leroy Hopson <godot-xterm@leroy.geek.nz>
// SPDX-License-Identifier: MIT
#ifndef GODOT_XTERM_CONPTY_H
#define GODOT_XTERM_CONPTY_H
#include <FuncRef.hpp>
#include <Godot.hpp>
#include <godot_cpp/classes/ref_counted.hpp>
#include <godot_cpp/variant/callable.hpp>
namespace godot {
class ConPTY : public Reference {
GODOT_CLASS(ConPTY, Reference)
class ConPTY : public RefCounted {
GDCLASS(ConPTY, RefCounted)
public:
// Array fork(String file,
@ -25,9 +26,11 @@ public:
// String process(int fd, String tty);
void _init();
static void _register_methods();
protected:
static void _bind_methods();
};
} // namespace godot
#endif // GODOT_XTERM_CONPTY_H
#endif // GODOT_XTERM_CONPTY_H