IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change union name from pty_object to object

Browse Source 
Co-Authored-By: Justin M. Keyes <justinkz@gmail.com>
This commit is contained in:
erw7 2019-11-15 12:51:41 +09:00 committed by Björn Linse
parent 5355cee77d
commit ed37d1081c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/os/pty_process_win.c
View File

@ -25,9 +25,9 @@ static void CALLBACK pty_process_finish1(void *context, BOOLEAN unused)
Process *proc = (Process *)ptyproc; Process *proc = (Process *)ptyproc;
if (ptyproc->type == PTY_TYPE_CONPTY if (ptyproc->type == PTY_TYPE_CONPTY
&& ptyproc->pty_object.conpty_object != NULL) { && ptyproc->object.conpty != NULL) {
os_conpty_free(ptyproc->pty_object.conpty_object); os_conpty_free(ptyproc->object.conpty);
ptyproc->pty_object.conpty_object = NULL; ptyproc->object.conpty = NULL;
} }
uv_timer_init(&proc->loop->uv, &ptyproc->wait_eof_timer); uv_timer_init(&proc->loop->uv, &ptyproc->wait_eof_timer);
ptyproc->wait_eof_timer.data = (void *)ptyproc; ptyproc->wait_eof_timer.data = (void *)ptyproc;
@ -184,9 +184,9 @@ int pty_process_spawn(PtyProcess *ptyproc)
} }
if (ptyproc->type == PTY_TYPE_CONPTY) { if (ptyproc->type == PTY_TYPE_CONPTY) {
ptyproc->pty_object.conpty_object = conpty_object; ptyproc->object.conpty = conpty_object;
} else { } else {
ptyproc->pty_object.winpty_object = winpty_object; ptyproc->object.winpty = winpty_object;
} }
ptyproc->process_handle = process_handle; ptyproc->process_handle = process_handle;
winpty_object = NULL; winpty_object = NULL;
@ -230,17 +230,17 @@ void pty_process_resize(PtyProcess *ptyproc, uint16_t width,
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
if (ptyproc->type == PTY_TYPE_CONPTY if (ptyproc->type == PTY_TYPE_CONPTY
&& ptyproc->pty_object.conpty_object != NULL) { && ptyproc->object.conpty != NULL) {
assert(width <= SHRT_MAX); assert(width <= SHRT_MAX);
assert(height <= SHRT_MAX); assert(height <= SHRT_MAX);
COORD size = { (int16_t)width, (int16_t)height }; COORD size = { (int16_t)width, (int16_t)height };
if (pResizePseudoConsole( if (pResizePseudoConsole(
ptyproc->pty_object.conpty_object->pty, size) != S_OK) { ptyproc->object.conpty->pty, size) != S_OK) {
ELOG("ResizePseudoConsoel failed: error code: %d", ELOG("ResizePseudoConsoel failed: error code: %d",
os_translate_sys_error((int)GetLastError())); os_translate_sys_error((int)GetLastError()));
} }
} else if (ptyproc->pty_object.winpty_object != NULL) { } else if (ptyproc->object.winpty != NULL) {
winpty_set_size(ptyproc->pty_object.winpty_object, width, height, NULL); winpty_set_size(ptyproc->object.winpty, width, height, NULL);
} }
} }
@ -260,9 +260,9 @@ void pty_process_close_master(PtyProcess *ptyproc)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
if (ptyproc->type == PTY_TYPE_WINPTY if (ptyproc->type == PTY_TYPE_WINPTY
&& ptyproc->pty_object.winpty_object != NULL) { && ptyproc->object.winpty != NULL) {
winpty_free(ptyproc->pty_object.winpty_object); winpty_free(ptyproc->object.winpty);
ptyproc->pty_object.winpty_object = NULL; ptyproc->object.winpty = NULL;
} }
} }

8
src/nvim/os/pty_process_win.h
View File

@ -18,9 +18,9 @@ typedef struct pty_process {
char *term_name; char *term_name;
uint16_t width, height; uint16_t width, height;
union { union {
winpty_t *winpty_object; winpty_t *winpty;
conpty_t *conpty_object; conpty_t *conpty;
} pty_object; } object;
pty_type_t type; pty_type_t type;
HANDLE finish_wait; HANDLE finish_wait;
HANDLE process_handle; HANDLE process_handle;
@ -40,7 +40,7 @@ static inline PtyProcess pty_process_init(Loop *loop, void *data)
rv.term_name = NULL; rv.term_name = NULL;
rv.width = 80; rv.width = 80;
rv.height = 24; rv.height = 24;
rv.pty_object.winpty_object = NULL; rv.object.winpty = NULL;
rv.type = PTY_TYPE_WINPTY; rv.type = PTY_TYPE_WINPTY;
rv.finish_wait = NULL; rv.finish_wait = NULL;
rv.process_handle = NULL; rv.process_handle = NULL;