aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-02-06 11:13:27 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-02-06 11:13:27 +0000
commit0a302265ec36b1cbdeb752ed9a87cb19b188017c (patch)
treecbe215dad8862bd348c4233dd6469ac6732561f4 /input.c
parentMerge branch 'modifiers' (diff)
parentgrid: resize with reflow: reflow FTCS_COMMAND_{EXECUTED,FINISHED} (diff)
Merge branch 'pipe-command-output'
Diffstat (limited to 'input.c')
-rw-r--r--input.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/input.c b/input.c
index dc0eec93..166ad70b 100644
--- a/input.c
+++ b/input.c
@@ -227,7 +227,8 @@ execute_binding(struct seat *seat, struct terminal *term,
break;
/* FALLTHROUGH */
case BIND_ACTION_PIPE_VIEW:
- case BIND_ACTION_PIPE_SELECTED: {
+ case BIND_ACTION_PIPE_SELECTED:
+ case BIND_ACTION_PIPE_COMMAND_OUTPUT: {
if (binding->aux->type != BINDING_AUX_PIPE)
return true;
@@ -269,6 +270,10 @@ execute_binding(struct seat *seat, struct terminal *term,
len = text != NULL ? strlen(text) : 0;
break;
+ case BIND_ACTION_PIPE_COMMAND_OUTPUT:
+ success = term_command_output_to_text(term, &text, &len);
+ break;
+
default:
BUG("Unhandled action type");
success = false;
@@ -377,7 +382,7 @@ execute_binding(struct seat *seat, struct terminal *term,
const struct row *row = grid->rows[r_abs];
xassert(row != NULL);
- if (!row->prompt_marker)
+ if (!row->shell_integration.prompt_marker)
continue;
grid->view = r_abs;
@@ -409,7 +414,7 @@ execute_binding(struct seat *seat, struct terminal *term,
const struct row *row = grid->rows[r_abs];
xassert(row != NULL);
- if (!row->prompt_marker) {
+ if (!row->shell_integration.prompt_marker) {
if (r_abs == grid->offset + term->rows - 1) {
/* We’ve reached the bottom of the scrollback */
break;