Skip to content

pty: forward client pixel size (ws_xpixel/ws_ypixel) from window size messages #1560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViktorBarzin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

pty: forward client pixel size (ws_xpixel/ws_ypixel) from window size messages #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,16 @@ static int send_initial_message(struct lws *wsi, int index) {
return lws_write(wsi, p, (size_t)n, LWS_WRITE_BINARY);
}

static json_object *parse_window_size(const char *buf, size_t len, uint16_t *cols, uint16_t *rows) {
static json_object *parse_window_size(const char *buf, size_t len, uint16_t *cols, uint16_t *rows,
uint16_t *xpixel, uint16_t *ypixel) {
json_tokener *tok = json_tokener_new();
json_object *obj = json_tokener_parse_ex(tok, buf, len);
struct json_object *o = NULL;

if (json_object_object_get_ex(obj, "columns", &o)) *cols = (uint16_t)json_object_get_int(o);
if (json_object_object_get_ex(obj, "rows", &o)) *rows = (uint16_t)json_object_get_int(o);
if (json_object_object_get_ex(obj, "xpixel", &o)) *xpixel = (uint16_t)json_object_get_int(o);
if (json_object_object_get_ex(obj, "ypixel", &o)) *ypixel = (uint16_t)json_object_get_int(o);

json_tokener_free(tok);
return obj;
Expand Down Expand Up @@ -151,11 +154,14 @@ static char **build_env(struct pss_tty *pss) {
return envp;
}

static bool spawn_process(struct pss_tty *pss, uint16_t columns, uint16_t rows) {
static bool spawn_process(struct pss_tty *pss, uint16_t columns, uint16_t rows,
uint16_t xpixel, uint16_t ypixel) {
pty_process *process = process_init((void *)pty_ctx_init(pss), server->loop, build_args(pss), build_env(pss));
if (server->cwd != NULL) process->cwd = strdup(server->cwd);
if (columns > 0) process->columns = columns;
if (rows > 0) process->rows = rows;
if (xpixel > 0) process->xpixel = xpixel;
if (ypixel > 0) process->ypixel = ypixel;
if (pty_spawn(process, process_read_cb, process_exit_cb) != 0) {
lwsl_err("pty_spawn: %d (%s)\n", errno, strerror(errno));
process_free(process);
Expand Down Expand Up @@ -320,7 +326,8 @@ int callback_tty(struct lws *wsi, enum lws_callback_reasons reason, void *user,
case RESIZE_TERMINAL:
if (pss->process == NULL) break;
json_object_put(
parse_window_size(pss->buffer + 1, pss->len - 1, &pss->process->columns, &pss->process->rows));
parse_window_size(pss->buffer + 1, pss->len - 1, &pss->process->columns, &pss->process->rows,
&pss->process->xpixel, &pss->process->ypixel));
pty_resize(pss->process);
break;
case PAUSE:
Expand All @@ -333,7 +340,9 @@ int callback_tty(struct lws *wsi, enum lws_callback_reasons reason, void *user,
if (pss->process != NULL) break;
uint16_t columns = 0;
uint16_t rows = 0;
json_object *obj = parse_window_size(pss->buffer, pss->len, &columns, &rows);
uint16_t xpixel = 0;
uint16_t ypixel = 0;
json_object *obj = parse_window_size(pss->buffer, pss->len, &columns, &rows, &xpixel, &ypixel);
if (server->credential != NULL) {
struct json_object *o = NULL;
if (json_object_object_get_ex(obj, "AuthToken", &o)) {
Expand All @@ -350,7 +359,7 @@ int callback_tty(struct lws *wsi, enum lws_callback_reasons reason, void *user,
}
}
json_object_put(obj);
if (!spawn_process(pss, columns, rows)) return 1;
if (!spawn_process(pss, columns, rows, xpixel, ypixel)) return 1;
break;
default:
lwsl_warn("ignored unknown message type: %c\n", command);
Expand Down
4 changes: 2 additions & 2 deletions src/pty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ bool pty_resize(pty_process *process) {
COORD size = {(int16_t) process->columns, (int16_t) process->rows};
return pResizePseudoConsole(process->pty, size) == S_OK;
#else
struct winsize size = {process->rows, process->columns, 0, 0};
struct winsize size = {process->rows, process->columns, process->xpixel, process->ypixel};
return ioctl(process->pty, TIOCSWINSZ, &size) == 0;
#endif
}
Expand Down Expand Up @@ -430,7 +430,7 @@ int pty_spawn(pty_process *process, pty_read_cb read_cb, pty_exit_cb exit_cb) {
uv_disable_stdio_inheritance();

int master, pid;
struct winsize size = {process->rows, process->columns, 0, 0};
struct winsize size = {process->rows, process->columns, process->xpixel, process->ypixel};
pid = forkpty(&master, NULL, NULL, &size);
if (pid < 0) {
status = -errno;
Expand Down
1 change: 1 addition & 0 deletions src/pty.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ typedef void (*pty_exit_cb)(pty_process *);
struct pty_process_ {
int pid, exit_code, exit_signal;
uint16_t columns, rows;
uint16_t xpixel, ypixel;
#ifdef _WIN32
STARTUPINFOEXW si;
HPCON pty;
Expand Down