mirror of
https://github.com/neovim/neovim.git
synced 2025-10-16 23:06:14 +00:00
Justin M. Keyes
@@ -111,6 +111,9 @@ foreach(sfile ${NVIM_SOURCES})
|
||||
if(WIN32 AND ${f} MATCHES "^(pty_process_unix.c)$")
|
||||
list(APPEND to_remove ${sfile})
|
||||
endif()
|
||||
if(NOT WIN32 AND ${f} MATCHES "^(pty_process_win.c)$")
|
||||
list(APPEND to_remove ${sfile})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
list(REMOVE_ITEM NVIM_SOURCES ${to_remove})
|
||||
@@ -350,6 +353,10 @@ if(Iconv_LIBRARIES)
|
||||
list(APPEND NVIM_LINK_LIBRARIES ${Iconv_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
list(APPEND NVIM_LINK_LIBRARIES ${WINPTY_LIBRARIES})
|
||||
endif()
|
||||
|
||||
# Put these last on the link line, since multiple things may depend on them.
|
||||
list(APPEND NVIM_LINK_LIBRARIES
|
||||
${LIBUV_LIBRARIES}
|
||||
@@ -415,6 +422,7 @@ if(WIN32)
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/tee.exe" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/tidy.exe" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/win32yank.exe" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/winpty-agent.exe" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/D3Dcompiler_47.dll" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/libEGL.dll" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
@@ -428,6 +436,7 @@ if(WIN32)
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/Qt5Network.dll" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/Qt5Svg.dll" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/Qt5Widgets.dll" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/winpty.dll" ${PROJECT_BINARY_DIR}/windows_runtime_deps/
|
||||
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${DEPS_PREFIX}/bin/platforms/qwindows.dll" ${PROJECT_BINARY_DIR}/windows_runtime_deps/platforms/
|
||||
)
|
||||
@@ -526,6 +535,7 @@ endfunction()
|
||||
|
||||
set(NO_SINGLE_CHECK_HEADERS
|
||||
os/win_defs.h
|
||||
os/pty_process_win.h
|
||||
regexp_defs.h
|
||||
syntax_defs.h
|
||||
terminal.h
|
||||
|
||||
410
src/nvim/os/pty_process_win.c
Normal file
410
src/nvim/os/pty_process_win.c
Normal file
@@ -0,0 +1,410 @@
|
||||
#include <assert.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <winpty_constants.h>
|
||||
|
||||
#include "nvim/os/os.h"
|
||||
#include "nvim/ascii.h"
|
||||
#include "nvim/memory.h"
|
||||
#include "nvim/mbyte.h" // for utf8_to_utf16, utf16_to_utf8
|
||||
#include "nvim/os/pty_process_win.h"
|
||||
|
||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||
# include "os/pty_process_win.c.generated.h"
|
||||
#endif
|
||||
|
||||
static void CALLBACK pty_process_finish1(void *context, BOOLEAN unused)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
PtyProcess *ptyproc = (PtyProcess *)context;
|
||||
Process *proc = (Process *)ptyproc;
|
||||
|
||||
uv_timer_init(&proc->loop->uv, &ptyproc->wait_eof_timer);
|
||||
ptyproc->wait_eof_timer.data = (void *)ptyproc;
|
||||
uv_timer_start(&ptyproc->wait_eof_timer, wait_eof_timer_cb, 200, 200);
|
||||
}
|
||||
|
||||
/// @returns zero on success, or negative error code.
|
||||
int pty_process_spawn(PtyProcess *ptyproc)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
Process *proc = (Process *)ptyproc;
|
||||
int status = 0;
|
||||
winpty_error_ptr_t err = NULL;
|
||||
winpty_config_t *cfg = NULL;
|
||||
winpty_spawn_config_t *spawncfg = NULL;
|
||||
winpty_t *winpty_object = NULL;
|
||||
char *in_name = NULL;
|
||||
char *out_name = NULL;
|
||||
HANDLE process_handle = NULL;
|
||||
uv_connect_t *in_req = NULL;
|
||||
uv_connect_t *out_req = NULL;
|
||||
wchar_t *cmd_line = NULL;
|
||||
wchar_t *cwd = NULL;
|
||||
const char *emsg = NULL;
|
||||
|
||||
assert(!proc->err);
|
||||
|
||||
cfg = winpty_config_new(WINPTY_FLAG_ALLOW_CURPROC_DESKTOP_CREATION, &err);
|
||||
if (cfg == NULL) {
|
||||
emsg = "Failed, winpty_config_new.";
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
winpty_config_set_initial_size(cfg, ptyproc->width, ptyproc->height);
|
||||
winpty_object = winpty_open(cfg, &err);
|
||||
if (winpty_object == NULL) {
|
||||
emsg = "Failed, winpty_open.";
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
status = utf16_to_utf8(winpty_conin_name(winpty_object), &in_name);
|
||||
if (status != 0) {
|
||||
emsg = "Failed to convert in_name from utf16 to utf8.";
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
status = utf16_to_utf8(winpty_conout_name(winpty_object), &out_name);
|
||||
if (status != 0) {
|
||||
emsg = "Failed to convert out_name from utf16 to utf8.";
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (proc->in != NULL) {
|
||||
in_req = xmalloc(sizeof(uv_connect_t));
|
||||
uv_pipe_connect(
|
||||
in_req,
|
||||
&proc->in->uv.pipe,
|
||||
in_name,
|
||||
pty_process_connect_cb);
|
||||
}
|
||||
|
||||
if (proc->out != NULL) {
|
||||
out_req = xmalloc(sizeof(uv_connect_t));
|
||||
uv_pipe_connect(
|
||||
out_req,
|
||||
&proc->out->uv.pipe,
|
||||
out_name,
|
||||
pty_process_connect_cb);
|
||||
}
|
||||
|
||||
if (proc->cwd != NULL) {
|
||||
status = utf8_to_utf16(proc->cwd, &cwd);
|
||||
if (status != 0) {
|
||||
emsg = "Failed to convert pwd form utf8 to utf16.";
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
status = build_cmd_line(proc->argv, &cmd_line,
|
||||
os_shell_is_cmdexe(proc->argv[0]));
|
||||
if (status != 0) {
|
||||
emsg = "Failed to convert cmd line form utf8 to utf16.";
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
spawncfg = winpty_spawn_config_new(
|
||||
WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN,
|
||||
NULL, // Optional application name
|
||||
cmd_line,
|
||||
cwd,
|
||||
NULL, // Optional environment variables
|
||||
&err);
|
||||
if (spawncfg == NULL) {
|
||||
emsg = "Failed winpty_spawn_config_new.";
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
DWORD win_err = 0;
|
||||
if (!winpty_spawn(winpty_object,
|
||||
spawncfg,
|
||||
&process_handle,
|
||||
NULL, // Optional thread handle
|
||||
&win_err,
|
||||
&err)) {
|
||||
if (win_err) {
|
||||
status = (int)win_err;
|
||||
emsg = "Failed spawn process.";
|
||||
} else {
|
||||
emsg = "Failed winpty_spawn.";
|
||||
}
|
||||
goto cleanup;
|
||||
}
|
||||
proc->pid = GetProcessId(process_handle);
|
||||
|
||||
if (!RegisterWaitForSingleObject(
|
||||
&ptyproc->finish_wait,
|
||||
process_handle,
|
||||
pty_process_finish1,
|
||||
ptyproc,
|
||||
INFINITE,
|
||||
WT_EXECUTEDEFAULT | WT_EXECUTEONLYONCE)) {
|
||||
abort();
|
||||
}
|
||||
|
||||
// Wait until pty_process_connect_cb is called.
|
||||
while ((in_req != NULL && in_req->handle != NULL)
|
||||
|| (out_req != NULL && out_req->handle != NULL)) {
|
||||
uv_run(&proc->loop->uv, UV_RUN_ONCE);
|
||||
}
|
||||
|
||||
ptyproc->winpty_object = winpty_object;
|
||||
ptyproc->process_handle = process_handle;
|
||||
winpty_object = NULL;
|
||||
process_handle = NULL;
|
||||
|
||||
cleanup:
|
||||
if (status) {
|
||||
// In the case of an error of MultiByteToWideChar or CreateProcessW.
|
||||
ELOG("%s error code: %d", emsg, status);
|
||||
status = os_translate_sys_error(status);
|
||||
} else if (err != NULL) {
|
||||
status = (int)winpty_error_code(err);
|
||||
ELOG("%s error code: %d", emsg, status);
|
||||
status = translate_winpty_error(status);
|
||||
}
|
||||
winpty_error_free(err);
|
||||
winpty_config_free(cfg);
|
||||
winpty_spawn_config_free(spawncfg);
|
||||
winpty_free(winpty_object);
|
||||
xfree(in_name);
|
||||
xfree(out_name);
|
||||
if (process_handle != NULL) {
|
||||
CloseHandle(process_handle);
|
||||
}
|
||||
xfree(in_req);
|
||||
xfree(out_req);
|
||||
xfree(cmd_line);
|
||||
xfree(cwd);
|
||||
return status;
|
||||
}
|
||||
|
||||
void pty_process_resize(PtyProcess *ptyproc, uint16_t width,
|
||||
uint16_t height)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
if (ptyproc->winpty_object != NULL) {
|
||||
winpty_set_size(ptyproc->winpty_object, width, height, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
void pty_process_close(PtyProcess *ptyproc)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
Process *proc = (Process *)ptyproc;
|
||||
|
||||
pty_process_close_master(ptyproc);
|
||||
|
||||
if (proc->internal_close_cb) {
|
||||
proc->internal_close_cb(proc);
|
||||
}
|
||||
}
|
||||
|
||||
void pty_process_close_master(PtyProcess *ptyproc)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
if (ptyproc->winpty_object != NULL) {
|
||||
winpty_free(ptyproc->winpty_object);
|
||||
ptyproc->winpty_object = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void pty_process_teardown(Loop *loop)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
}
|
||||
|
||||
static void pty_process_connect_cb(uv_connect_t *req, int status)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
assert(status == 0);
|
||||
req->handle = NULL;
|
||||
}
|
||||
|
||||
static void wait_eof_timer_cb(uv_timer_t *wait_eof_timer)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
PtyProcess *ptyproc = wait_eof_timer->data;
|
||||
Process *proc = (Process *)ptyproc;
|
||||
|
||||
if (!proc->out || !uv_is_readable(proc->out->uvstream)) {
|
||||
uv_timer_stop(&ptyproc->wait_eof_timer);
|
||||
pty_process_finish2(ptyproc);
|
||||
}
|
||||
}
|
||||
|
||||
static void pty_process_finish2(PtyProcess *ptyproc)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
Process *proc = (Process *)ptyproc;
|
||||
|
||||
UnregisterWaitEx(ptyproc->finish_wait, NULL);
|
||||
uv_close((uv_handle_t *)&ptyproc->wait_eof_timer, NULL);
|
||||
|
||||
DWORD exit_code = 0;
|
||||
GetExitCodeProcess(ptyproc->process_handle, &exit_code);
|
||||
proc->status = (int)exit_code;
|
||||
|
||||
CloseHandle(ptyproc->process_handle);
|
||||
ptyproc->process_handle = NULL;
|
||||
|
||||
proc->internal_exit_cb(proc);
|
||||
}
|
||||
|
||||
/// Build the command line to pass to CreateProcessW.
|
||||
///
|
||||
/// @param[in] argv Array with string arguments.
|
||||
/// @param[out] cmd_line Location where saved builded cmd line.
|
||||
///
|
||||
/// @returns zero on success, or error code of MultiByteToWideChar function.
|
||||
///
|
||||
static int build_cmd_line(char **argv, wchar_t **cmd_line, bool is_cmdexe)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
size_t utf8_cmd_line_len = 0;
|
||||
size_t argc = 0;
|
||||
QUEUE args_q;
|
||||
|
||||
QUEUE_INIT(&args_q);
|
||||
while (*argv) {
|
||||
size_t buf_len = is_cmdexe ? (strlen(*argv) + 1) : (strlen(*argv) * 2 + 3);
|
||||
ArgNode *arg_node = xmalloc(sizeof(*arg_node));
|
||||
arg_node->arg = xmalloc(buf_len);
|
||||
if (is_cmdexe) {
|
||||
xstrlcpy(arg_node->arg, *argv, buf_len);
|
||||
} else {
|
||||
quote_cmd_arg(arg_node->arg, buf_len, *argv);
|
||||
}
|
||||
utf8_cmd_line_len += strlen(arg_node->arg);
|
||||
QUEUE_INIT(&arg_node->node);
|
||||
QUEUE_INSERT_TAIL(&args_q, &arg_node->node);
|
||||
argc++;
|
||||
argv++;
|
||||
}
|
||||
|
||||
utf8_cmd_line_len += argc;
|
||||
char *utf8_cmd_line = xmalloc(utf8_cmd_line_len);
|
||||
*utf8_cmd_line = NUL;
|
||||
while (1) {
|
||||
QUEUE *head = QUEUE_HEAD(&args_q);
|
||||
QUEUE_REMOVE(head);
|
||||
ArgNode *arg_node = QUEUE_DATA(head, ArgNode, node);
|
||||
xstrlcat(utf8_cmd_line, arg_node->arg, utf8_cmd_line_len);
|
||||
xfree(arg_node->arg);
|
||||
xfree(arg_node);
|
||||
if (QUEUE_EMPTY(&args_q)) {
|
||||
break;
|
||||
} else {
|
||||
xstrlcat(utf8_cmd_line, " ", utf8_cmd_line_len);
|
||||
}
|
||||
}
|
||||
|
||||
int result = utf8_to_utf16(utf8_cmd_line, cmd_line);
|
||||
xfree(utf8_cmd_line);
|
||||
return result;
|
||||
}
|
||||
|
||||
/// Emulate quote_cmd_arg of libuv and quotes command line argument.
|
||||
/// Most of the code came from libuv.
|
||||
///
|
||||
/// @param[out] dest Location where saved quotes argument.
|
||||
/// @param dest_remaining Destination buffer size.
|
||||
/// @param[in] src Pointer to argument.
|
||||
///
|
||||
static void quote_cmd_arg(char *dest, size_t dest_remaining, const char *src)
|
||||
FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
size_t src_len = strlen(src);
|
||||
bool quote_hit = true;
|
||||
char *start = dest;
|
||||
|
||||
if (src_len == 0) {
|
||||
// Need double quotation for empty argument.
|
||||
snprintf(dest, dest_remaining, "\"\"");
|
||||
return;
|
||||
}
|
||||
|
||||
if (NULL == strpbrk(src, " \t\"")) {
|
||||
// No quotation needed.
|
||||
xstrlcpy(dest, src, dest_remaining);
|
||||
return;
|
||||
}
|
||||
|
||||
if (NULL == strpbrk(src, "\"\\")) {
|
||||
// No embedded double quotes or backlashes, so I can just wrap quote marks.
|
||||
// around the whole thing.
|
||||
snprintf(dest, dest_remaining, "\"%s\"", src);
|
||||
return;
|
||||
}
|
||||
|
||||
// Expected input/output:
|
||||
// input : hello"world
|
||||
// output: "hello\"world"
|
||||
// input : hello""world
|
||||
// output: "hello\"\"world"
|
||||
// input : hello\world
|
||||
// output: hello\world
|
||||
// input : hello\\world
|
||||
// output: hello\\world
|
||||
// input : hello\"world
|
||||
// output: "hello\\\"world"
|
||||
// input : hello\\"world
|
||||
// output: "hello\\\\\"world"
|
||||
// input : hello world\
|
||||
// output: "hello world\\"
|
||||
|
||||
assert(dest_remaining--);
|
||||
*(dest++) = NUL;
|
||||
assert(dest_remaining--);
|
||||
*(dest++) = '"';
|
||||
for (size_t i = src_len; i > 0; i--) {
|
||||
assert(dest_remaining--);
|
||||
*(dest++) = src[i - 1];
|
||||
if (quote_hit && src[i - 1] == '\\') {
|
||||
assert(dest_remaining--);
|
||||
*(dest++) = '\\';
|
||||
} else if (src[i - 1] == '"') {
|
||||
quote_hit = true;
|
||||
assert(dest_remaining--);
|
||||
*(dest++) = '\\';
|
||||
} else {
|
||||
quote_hit = false;
|
||||
}
|
||||
}
|
||||
assert(dest_remaining);
|
||||
*dest = '"';
|
||||
|
||||
while (start < dest) {
|
||||
char tmp = *start;
|
||||
*start = *dest;
|
||||
*dest = tmp;
|
||||
start++;
|
||||
dest--;
|
||||
}
|
||||
}
|
||||
|
||||
/// Translate winpty error code to libuv error.
|
||||
///
|
||||
/// @param[in] winpty_errno Winpty error code returned by winpty_error_code
|
||||
/// function.
|
||||
///
|
||||
/// @returns Error code of libuv error.
|
||||
int translate_winpty_error(int winpty_errno)
|
||||
{
|
||||
if (winpty_errno <= 0) {
|
||||
return winpty_errno; // If < 0 then it's already a libuv error.
|
||||
}
|
||||
|
||||
switch (winpty_errno) {
|
||||
case WINPTY_ERROR_OUT_OF_MEMORY: return UV_ENOMEM;
|
||||
case WINPTY_ERROR_SPAWN_CREATE_PROCESS_FAILED: return UV_EAI_FAIL;
|
||||
case WINPTY_ERROR_LOST_CONNECTION: return UV_ENOTCONN;
|
||||
case WINPTY_ERROR_AGENT_EXE_MISSING: return UV_ENOENT;
|
||||
case WINPTY_ERROR_UNSPECIFIED: return UV_UNKNOWN;
|
||||
case WINPTY_ERROR_AGENT_DIED: return UV_ESRCH;
|
||||
case WINPTY_ERROR_AGENT_TIMEOUT: return UV_ETIMEDOUT;
|
||||
case WINPTY_ERROR_AGENT_CREATION_FAILED: return UV_EAI_FAIL;
|
||||
default: return UV_UNKNOWN;
|
||||
}
|
||||
}
|
||||
@@ -1,20 +1,27 @@
|
||||
#ifndef NVIM_OS_PTY_PROCESS_WIN_H
|
||||
#define NVIM_OS_PTY_PROCESS_WIN_H
|
||||
|
||||
#include "nvim/event/libuv_process.h"
|
||||
#include <uv.h>
|
||||
#include <winpty.h>
|
||||
|
||||
#include "nvim/event/process.h"
|
||||
#include "nvim/lib/queue.h"
|
||||
|
||||
typedef struct pty_process {
|
||||
Process process;
|
||||
char *term_name;
|
||||
uint16_t width, height;
|
||||
winpty_t *winpty_object;
|
||||
HANDLE finish_wait;
|
||||
HANDLE process_handle;
|
||||
uv_timer_t wait_eof_timer;
|
||||
} PtyProcess;
|
||||
|
||||
#define pty_process_spawn(job) libuv_process_spawn((LibuvProcess *)job)
|
||||
#define pty_process_close(job) libuv_process_close((LibuvProcess *)job)
|
||||
#define pty_process_close_master(job) libuv_process_close((LibuvProcess *)job)
|
||||
#define pty_process_resize(job, width, height) ( \
|
||||
(void)job, (void)width, (void)height, 0)
|
||||
#define pty_process_teardown(loop) ((void)loop, 0)
|
||||
// Structure used by build_cmd_line()
|
||||
typedef struct arg_node {
|
||||
char *arg; // pointer to argument.
|
||||
QUEUE node; // QUEUE structure.
|
||||
} ArgNode;
|
||||
|
||||
static inline PtyProcess pty_process_init(Loop *loop, void *data)
|
||||
{
|
||||
@@ -23,7 +30,14 @@ static inline PtyProcess pty_process_init(Loop *loop, void *data)
|
||||
rv.term_name = NULL;
|
||||
rv.width = 80;
|
||||
rv.height = 24;
|
||||
rv.winpty_object = NULL;
|
||||
rv.finish_wait = NULL;
|
||||
rv.process_handle = NULL;
|
||||
return rv;
|
||||
}
|
||||
|
||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||
# include "os/pty_process_win.h.generated.h"
|
||||
#endif
|
||||
|
||||
#endif // NVIM_OS_PTY_PROCESS_WIN_H
|
||||
|
||||
Reference in New Issue
Block a user