aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-17 07:34:51 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-17 07:34:51 +0000
commitac42ce43032fc2bbabc2c1b132942d3933fe9f49 (patch)
tree3013a8a2d262d86a15c54b53ff48d6de9fb0499f /input.c
parentwayland: don't assume data-device globals are added before seats (diff)
parentMerge branch 'master' into pipe-grid-to-external-tool (diff)
Merge branch 'pipe-grid-to-external-tool'
Closes https://codeberg.org/dnkl/foot/issues/29
Diffstat (limited to 'input.c')
-rw-r--r--input.c179
1 files changed, 161 insertions, 18 deletions
diff --git a/input.c b/input.c
index 79491f8f..0e4cb675 100644
--- a/input.c
+++ b/input.c
@@ -5,10 +5,12 @@
#include <signal.h>
#include <threads.h>
#include <locale.h>
+#include <errno.h>
#include <sys/mman.h>
#include <sys/time.h>
#include <sys/timerfd.h>
#include <sys/epoll.h>
+#include <fcntl.h>
#include <linux/input-event-codes.h>
@@ -28,13 +30,54 @@
#include "render.h"
#include "search.h"
#include "selection.h"
+#include "spawn.h"
#include "terminal.h"
+#include "tokenize.h"
#include "util.h"
#include "vt.h"
+struct pipe_context {
+ char *text;
+ size_t idx;
+ size_t left;
+};
+
+static bool
+fdm_write_pipe(struct fdm *fdm, int fd, int events, void *data)
+{
+ struct pipe_context *ctx = data;
+
+ if (events & EPOLLHUP)
+ goto pipe_closed;
+
+ assert(events & EPOLLOUT);
+ ssize_t written = write(fd, &ctx->text[ctx->idx], ctx->left);
+
+ if (written < 0) {
+ LOG_WARN("failed to write to pipe: %s", strerror(errno));
+ goto pipe_closed;
+ }
+
+ assert(written <= ctx->left);
+ ctx->idx += written;
+ ctx->left -= written;
+
+ if (ctx->left == 0)
+ goto pipe_closed;
+
+ return true;
+
+pipe_closed:
+ free(ctx->text);
+ free(ctx);
+ fdm_del(fdm, fd);
+ return true;
+}
+
static void
execute_binding(struct seat *seat, struct terminal *term,
- enum bind_action_normal action, uint32_t serial)
+ enum bind_action_normal action, const char *pipe_cmd,
+ uint32_t serial)
{
switch (action) {
case BIND_ACTION_NONE:
@@ -101,6 +144,104 @@ execute_binding(struct seat *seat, struct terminal *term,
xdg_toplevel_set_fullscreen(term->window->xdg_toplevel, NULL);
break;
+ case BIND_ACTION_PIPE_SCROLLBACK:
+ case BIND_ACTION_PIPE_VIEW: {
+ if (pipe_cmd == NULL)
+ break;
+
+ struct pipe_context *ctx = NULL;
+
+ char *cmd = strdup(pipe_cmd);
+ char **argv = NULL;
+
+ if (!tokenize_cmdline(cmd, &argv))
+ goto pipe_err;
+
+ int pipe_fd[2] = {-1, -1};
+ if (pipe(pipe_fd) < 0) {
+ LOG_ERRNO("failed to create pipe");
+ goto pipe_err;
+ }
+
+ int stdout_fd = open("/dev/null", O_WRONLY);
+ int stderr_fd = open("/dev/null", O_WRONLY);
+
+ if (stdout_fd < 0 || stderr_fd < 0) {
+ LOG_ERRNO("failed to open /dev/null");
+ goto pipe_err;
+ }
+
+ char *text;
+ size_t len;
+
+ bool success = action == BIND_ACTION_PIPE_SCROLLBACK
+ ? term_scrollback_to_text(term, &text, &len)
+ : term_view_to_text(term, &text, &len);
+
+ if (!success)
+ goto pipe_err;
+
+ /* Make write-end non-blocking; required by the FDM */
+ {
+ int flags = fcntl(pipe_fd[1], F_GETFL);
+ if (flags < 0 ||
+ fcntl(pipe_fd[1], F_SETFL, flags | O_NONBLOCK) < 0)
+ {
+ LOG_ERRNO("failed to make write-end of pipe non-blocking");
+ goto pipe_err;
+ }
+ }
+
+ /* Make sure write-end is closed on exec() - or the spawned
+ * program may not terminate*/
+ {
+ int flags = fcntl(pipe_fd[1], F_GETFD);
+ if (flags < 0 ||
+ fcntl(pipe_fd[1], F_SETFD, flags | FD_CLOEXEC) < 0)
+ {
+ LOG_ERRNO("failed to set FD_CLOEXEC on writeend of pipe");
+ goto pipe_err;
+ }
+ }
+
+ if (!spawn(term->reaper, NULL, argv, pipe_fd[0], stdout_fd, stderr_fd))
+ goto pipe_err;
+
+ /* Not needed anymore */
+ free(argv); argv = NULL;
+ free(cmd); cmd = NULL;
+
+ /* Close read end */
+ close(pipe_fd[0]);
+
+ ctx = malloc(sizeof(*ctx));
+ *ctx = (struct pipe_context){
+ .text = text,
+ .left = len,
+ };
+
+ /* Asynchronously write the output to the pipe */
+ if (!fdm_add(term->fdm, pipe_fd[1], EPOLLOUT, &fdm_write_pipe, ctx))
+ goto pipe_err;
+
+ break;
+
+ pipe_err:
+ if (stdout_fd >= 0)
+ close(stdout_fd);
+ if (stderr_fd >= 0)
+ close(stderr_fd);
+ if (pipe_fd[0] >= 0)
+ close(pipe_fd[0]);
+ if (pipe_fd[1] >= 0)
+ close(pipe_fd[1]);
+ free(text);
+ free(argv);
+ free(cmd);
+ free(ctx);
+ break;
+ }
+
case BIND_ACTION_COUNT:
assert(false);
break;
@@ -192,7 +333,8 @@ input_parse_key_binding(struct xkb_keymap *keymap, const char *combos,
};
tll_push_back(*bindings, binding);
- }
+ } else
+ tll_free(key_codes);
}
free(copy);
@@ -270,31 +412,33 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard,
munmap(map_str, size);
close(fd);
- for (enum bind_action_normal i = 0; i < BIND_ACTION_COUNT; i++) {
+ tll_foreach(wayl->conf->bindings.key, it) {
key_binding_list_t bindings = tll_init();
input_parse_key_binding(
- seat->kbd.xkb_keymap, wayl->conf->bindings.key[i], &bindings);
+ seat->kbd.xkb_keymap, it->item.key, &bindings);
- tll_foreach(bindings, it) {
+ tll_foreach(bindings, it2) {
tll_push_back(
seat->kbd.bindings.key,
- ((struct key_binding_normal){.bind = it->item, .action = i}));
+ ((struct key_binding_normal){
+ .bind = it2->item,
+ .action = it->item.action,
+ .pipe_cmd = it->item.pipe_cmd}));
}
-
tll_free(bindings);
}
- for (enum bind_action_search i = 0; i < BIND_ACTION_SEARCH_COUNT; i++) {
+ tll_foreach(wayl->conf->bindings.search, it) {
key_binding_list_t bindings = tll_init();
input_parse_key_binding(
- seat->kbd.xkb_keymap, wayl->conf->bindings.search[i], &bindings);
+ seat->kbd.xkb_keymap, it->item.key, &bindings);
- tll_foreach(bindings, it) {
+ tll_foreach(bindings, it2) {
tll_push_back(
seat->kbd.bindings.search,
- ((struct key_binding_search){.bind = it->item, .action = i}));
+ ((struct key_binding_search){
+ .bind = it2->item, .action = it->item.action}));
}
-
tll_free(bindings);
}
}
@@ -596,14 +740,14 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
/* Match symbol */
if (it->item.bind.sym == sym) {
- execute_binding(seat, term, it->item.action, serial);
+ execute_binding(seat, term, it->item.action, it->item.pipe_cmd, serial);
goto maybe_repeat;
}
/* Match raw key code */
tll_foreach(it->item.bind.key_codes, code) {
if (code->item == key) {
- execute_binding(seat, term, it->item.action, serial);
+ execute_binding(seat, term, it->item.action, it->item.pipe_cmd, serial);
goto maybe_repeat;
}
}
@@ -1239,9 +1383,8 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
}
else {
- for (size_t i = 0; i < ALEN(wayl->conf->bindings.mouse); i++) {
- const struct mouse_binding *binding =
- &wayl->conf->bindings.mouse[i];
+ tll_foreach(wayl->conf->bindings.mouse, it) {
+ const struct mouse_binding *binding = &it->item;
if (binding->button != button) {
/* Wrong button */
@@ -1253,7 +1396,7 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
continue;
}
- execute_binding(seat, term, binding->action, serial);
+ execute_binding(seat, term, binding->action, NULL, serial);
break;
}
}