diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-06-17 16:57:12 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-06-17 16:57:12 +0000 |
| commit | 6d5f5b9f7a716f7ca19a43f0d2357887e020d641 (patch) | |
| tree | 929c5a11ad907032eb9e785da444d01b73a6cd86 /main.c | |
| parent | TIOCSWINSZ: set ws_xpixel and ws_ypixel (diff) | |
wip: vt parsing
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -40,7 +40,6 @@ struct wayland { struct context { bool quit; - int ptmx; cairo_scaled_font_t *font; cairo_font_extents_t fextents; @@ -213,7 +212,7 @@ resize(struct context *c, int width, int height) setenv("LINES", rows_s, 1); /* SIignal TIOCSWINSZ */ - if (ioctl(c->ptmx, TIOCSWINSZ, + if (ioctl(c->term.ptmx, TIOCSWINSZ, &(struct winsize){ .ws_row = c->term.grid.rows, .ws_col = c->term.grid.cols, @@ -380,8 +379,8 @@ main(int argc, const char *const *argv) struct context c = { .quit = false, - .ptmx = posix_openpt(O_RDWR | O_NOCTTY), .term = { + .ptmx = posix_openpt(O_RDWR | O_NOCTTY), .vt = { .state = 1, }, @@ -401,7 +400,7 @@ main(int argc, const char *const *argv) c.fextents.height, c.fextents.max_x_advance); assert(c.fextents.max_y_advance == 0); - if (c.ptmx == -1) { + if (c.term.ptmx == -1) { LOG_ERRNO("failed to open pseudo terminal"); goto out; } @@ -468,7 +467,7 @@ main(int argc, const char *const *argv) case 0: /* Child */ - slave_spawn(c.ptmx); + slave_spawn(c.term.ptmx); assert(false); break; @@ -480,7 +479,7 @@ main(int argc, const char *const *argv) while (true) { struct pollfd fds[] = { {.fd = wl_display_get_fd(c.wl.display), .events = POLLIN}, - {.fd = c.ptmx, .events = POLLIN}, + {.fd = c.term.ptmx, .events = POLLIN}, }; wl_display_flush(c.wl.display); @@ -501,7 +500,7 @@ main(int argc, const char *const *argv) if (fds[1].revents & POLLIN) { uint8_t data[1024]; - ssize_t count = read(c.ptmx, data, sizeof(data)); + ssize_t count = read(c.term.ptmx, data, sizeof(data)); if (count < 0) { LOG_ERRNO("failed to read from pseudo terminal"); break; @@ -544,8 +543,8 @@ out: if (c.font != NULL) cairo_scaled_font_destroy(c.font); - if (c.ptmx != -1) - close(c.ptmx); + if (c.term.ptmx != -1) + close(c.term.ptmx); cairo_debug_reset_static_data(); return ret; |
