aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-03 18:58:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-03 18:58:32 +0000
commit8f4ec9aa479c5414661a7507543e6a59e4e1f6da (patch)
treea21b12280d7df2797f475db28e23c331bbaeb25a /terminal.c
parentfcft: update to 1.1.0 (diff)
Implement --hold
When specified, we don't exit when the slave/client process exits.
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c32
1 files changed, 20 insertions, 12 deletions
diff --git a/terminal.c b/terminal.c
index 26c2163f..69f3c5d2 100644
--- a/terminal.c
+++ b/terminal.c
@@ -36,6 +36,11 @@ static const char *const XCURSOR_HAND2 = "hand2";
bool
term_to_slave(struct terminal *term, const void *_data, size_t len)
{
+ if (term->ptmx < 0) {
+ /* We're probably in "hold" */
+ return false;
+ }
+
size_t async_idx = 0;
if (tll_length(term->ptmx_buffer) > 0) {
/* With a non-empty queue, EPOLLOUT has already been enabled */
@@ -128,25 +133,22 @@ fdm_ptmx(struct fdm *fdm, int fd, int events, void *data)
{
struct terminal *term = data;
- bool pollin = events & EPOLLIN;
- bool pollout = events & EPOLLOUT;
- bool hup = events & EPOLLHUP;
-
- if (hup) {
- /* TODO: should we *not* ignore pollin? */
- return term_shutdown(term);
- }
+ const bool pollin = events & EPOLLIN;
+ const bool pollout = events & EPOLLOUT;
+ const bool hup = events & EPOLLHUP;
if (pollout) {
if (!fdm_ptmx_out(fdm, fd, events, data))
return false;
}
+#if 0
if (!pollin)
return true;
+#endif
uint8_t buf[24 * 1024];
- ssize_t count = read(term->ptmx, buf, sizeof(buf));
+ ssize_t count = pollin ? read(term->ptmx, buf, sizeof(buf)) : 0;
if (count < 0) {
LOG_ERRNO("failed to read from pseudo terminal");
@@ -225,9 +227,14 @@ fdm_ptmx(struct fdm *fdm, int fd, int events, void *data)
} else
term->render.pending = true;
- if (events & EPOLLHUP)
- return term_shutdown(term);
-
+ if (hup) {
+ if (term->hold_at_exit) {
+ fdm_del(fdm, fd);
+ term->ptmx = -1;
+ return true;
+ } else
+ return term_shutdown(term);
+ }
return true;
}
@@ -672,6 +679,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
.lower_fd = delay_lower_fd,
.upper_fd = delay_upper_fd,
},
+ .hold_at_exit = conf->hold_at_exit,
.shutdown_cb = shutdown_cb,
.shutdown_data = shutdown_data,
.foot_exe = strdup(foot_exe),