summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/cmd-display-menu.c4
-rw-r--r--usr.bin/tmux/format-draw.c4
-rw-r--r--usr.bin/tmux/job.c9
-rw-r--r--usr.bin/tmux/options-table.c8
-rw-r--r--usr.bin/tmux/paste.c11
-rw-r--r--usr.bin/tmux/popup.c11
-rw-r--r--usr.bin/tmux/server.c3
-rw-r--r--usr.bin/tmux/tmux.17
-rw-r--r--usr.bin/tmux/tmux.c3
-rw-r--r--usr.bin/tmux/tmux.h7
-rw-r--r--usr.bin/tmux/window-buffer.c136
11 files changed, 188 insertions, 15 deletions
diff --git a/usr.bin/tmux/cmd-display-menu.c b/usr.bin/tmux/cmd-display-menu.c
index 0ce222cce63..e97537cf5d2 100644
--- a/usr.bin/tmux/cmd-display-menu.c
+++ b/usr.bin/tmux/cmd-display-menu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-display-menu.c,v 1.18 2020/04/13 20:51:57 nicm Exp $ */
+/* $OpenBSD: cmd-display-menu.c,v 1.19 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -313,7 +313,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
else if (args_has(args, 'E'))
flags |= POPUP_CLOSEEXIT;
if (popup_display(flags, item, px, py, w, h, nlines, lines, shellcmd,
- cmd, cwd, tc, target) != 0)
+ cmd, cwd, tc, target, NULL, NULL) != 0)
return (CMD_RETURN_NORMAL);
return (CMD_RETURN_WAIT);
}
diff --git a/usr.bin/tmux/format-draw.c b/usr.bin/tmux/format-draw.c
index 866cbca4829..15940c12d4f 100644
--- a/usr.bin/tmux/format-draw.c
+++ b/usr.bin/tmux/format-draw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format-draw.c,v 1.16 2020/04/09 15:35:27 nicm Exp $ */
+/* $OpenBSD: format-draw.c,v 1.17 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -738,7 +738,7 @@ format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
/*
* Draw the screens. How they are arranged depends on where the list
- * appearsq.
+ * appears.
*/
switch (list_align) {
case STYLE_ALIGN_DEFAULT:
diff --git a/usr.bin/tmux/job.c b/usr.bin/tmux/job.c
index 6d5f5f90f5a..def796c05e5 100644
--- a/usr.bin/tmux/job.c
+++ b/usr.bin/tmux/job.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.57 2020/03/24 08:09:44 nicm Exp $ */
+/* $OpenBSD: job.c,v 1.58 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <sys/wait.h>
#include <fcntl.h>
#include <paths.h>
@@ -285,6 +286,12 @@ job_check_died(pid_t pid, int status)
}
if (job == NULL)
return;
+ if (WIFSTOPPED(status)) {
+ if (WSTOPSIG(status) == SIGTTIN || WSTOPSIG(status) == SIGTTOU)
+ return;
+ killpg(job->pid, SIGCONT);
+ return;
+ }
log_debug("job died %p: %s, pid %ld", job, job->cmd, (long) job->pid);
job->status = status;
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index 96b34779fd5..5295113e0e5 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.124 2020/05/16 15:11:52 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.125 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -210,6 +210,12 @@ const struct options_table_entry options_table[] = {
.default_str = "screen"
},
+ { .name = "editor",
+ .type = OPTIONS_TABLE_STRING,
+ .scope = OPTIONS_TABLE_SERVER,
+ .default_str = _PATH_VI
+ },
+
{ .name = "escape-time",
.type = OPTIONS_TABLE_NUMBER,
.scope = OPTIONS_TABLE_SERVER,
diff --git a/usr.bin/tmux/paste.c b/usr.bin/tmux/paste.c
index a6b925b05f0..48cab16721f 100644
--- a/usr.bin/tmux/paste.c
+++ b/usr.bin/tmux/paste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: paste.c,v 1.40 2019/04/02 09:03:39 nicm Exp $ */
+/* $OpenBSD: paste.c,v 1.41 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -297,6 +297,15 @@ paste_set(char *data, size_t size, const char *name, char **cause)
return (0);
}
+/* Set paste data without otherwise changing it. */
+void
+paste_replace(struct paste_buffer *pb, char *data, size_t size)
+{
+ free(pb->data);
+ pb->data = data;
+ pb->size = size;
+}
+
/* Convert start of buffer into a nice string. */
char *
paste_make_sample(struct paste_buffer *pb)
diff --git a/usr.bin/tmux/popup.c b/usr.bin/tmux/popup.c
index d6a9ef3fe70..5d0254beb75 100644
--- a/usr.bin/tmux/popup.c
+++ b/usr.bin/tmux/popup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popup.c,v 1.13 2020/04/13 18:59:41 nicm Exp $ */
+/* $OpenBSD: popup.c,v 1.14 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -40,6 +40,8 @@ struct popup_data {
struct job *job;
struct input_ctx *ictx;
int status;
+ popup_close_cb cb;
+ void *arg;
u_int px;
u_int py;
@@ -150,6 +152,9 @@ popup_free_cb(struct client *c)
struct cmdq_item *item = pd->item;
u_int i;
+ if (pd->cb != NULL)
+ pd->cb(pd->status, pd->arg);
+
if (item != NULL) {
if (pd->ictx != NULL &&
cmdq_get_client(item) != NULL &&
@@ -403,7 +408,7 @@ int
popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
u_int sy, u_int nlines, const char **lines, const char *shellcmd,
const char *cmd, const char *cwd, struct client *c,
- struct cmd_find_state *fs)
+ struct cmd_find_state *fs, popup_close_cb cb, void *arg)
{
struct popup_data *pd;
u_int i;
@@ -422,6 +427,8 @@ popup_display(int flags, struct cmdq_item *item, u_int px, u_int py, u_int sx,
pd->c = c;
pd->c->references++;
+ pd->cb = cb;
+ pd->arg = arg;
pd->status = 128 + SIGHUP;
if (fs != NULL)
diff --git a/usr.bin/tmux/server.c b/usr.bin/tmux/server.c
index 67ecdb08767..28dcccc6695 100644
--- a/usr.bin/tmux/server.c
+++ b/usr.bin/tmux/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.188 2020/03/12 09:26:34 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.189 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -481,4 +481,5 @@ server_child_stopped(pid_t pid, int status)
}
}
}
+ job_check_died(pid, status);
}
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index d7695354fac..078070c50dc 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.758 2020/05/16 15:16:36 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.759 2020/05/16 15:24:28 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
@@ -3113,6 +3113,10 @@ Set the time in milliseconds for which
waits after an escape is input to determine if it is part of a function or meta
key sequences.
The default is 500 milliseconds.
+.It Ic editor Ar shell-command
+Set the command used when
+.Nm
+runs an editor.
.It Xo Ic exit-empty
.Op Ic on | off
.Xc
@@ -5339,6 +5343,7 @@ The following keys may be used in buffer mode:
.It Li "P" Ta "Paste tagged buffers"
.It Li "d" Ta "Delete selected buffer"
.It Li "D" Ta "Delete tagged buffers"
+.It Li "e" Ta "Open the buffer in an editor"
.It Li "f" Ta "Enter a format to filter items"
.It Li "O" Ta "Change sort field"
.It Li "r" Ta "Reverse sort order"
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index d00cee56545..214bbfebb4c 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.199 2020/05/16 14:26:33 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.200 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -443,6 +443,7 @@ main(int argc, char **argv)
/* Override keys to vi if VISUAL or EDITOR are set. */
if ((s = getenv("VISUAL")) != NULL || (s = getenv("EDITOR")) != NULL) {
+ options_set_string(global_options, "editor", 0, "%s", s);
if (strrchr(s, '/') != NULL)
s = strrchr(s, '/') + 1;
if (strstr(s, "vi") != NULL)
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index bbcd85d3eec..b5469035f29 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1028 2020/05/16 15:16:37 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1029 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1806,6 +1806,7 @@ void paste_free(struct paste_buffer *);
void paste_add(const char *, char *, size_t);
int paste_rename(const char *, const char *, char **);
int paste_set(char *, size_t, const char *, char **);
+void paste_replace(struct paste_buffer *, char *, size_t);
char *paste_make_sample(struct paste_buffer *);
/* format.c */
@@ -2813,12 +2814,14 @@ int menu_display(struct menu *, int, struct cmdq_item *, u_int,
#define POPUP_WRITEKEYS 0x1
#define POPUP_CLOSEEXIT 0x2
#define POPUP_CLOSEEXITZERO 0x4
+typedef void (*popup_close_cb)(int, void *);
u_int popup_width(struct cmdq_item *, u_int, const char **,
struct client *, struct cmd_find_state *);
u_int popup_height(u_int, const char **);
int popup_display(int, struct cmdq_item *, u_int, u_int, u_int,
u_int, u_int, const char **, const char *, const char *,
- const char *, struct client *, struct cmd_find_state *);
+ const char *, struct client *, struct cmd_find_state *,
+ popup_close_cb, void *);
/* style.c */
int style_parse(struct style *,const struct grid_cell *,
diff --git a/usr.bin/tmux/window-buffer.c b/usr.bin/tmux/window-buffer.c
index f2b91633c26..3c9c02b2948 100644
--- a/usr.bin/tmux/window-buffer.c
+++ b/usr.bin/tmux/window-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-buffer.c,v 1.27 2020/05/16 14:10:29 nicm Exp $ */
+/* $OpenBSD: window-buffer.c,v 1.28 2020/05/16 15:24:28 nicm Exp $ */
/*
* Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -18,9 +18,12 @@
#include <sys/types.h>
+#include <paths.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <unistd.h>
#include <vis.h>
#include "tmux.h"
@@ -95,6 +98,13 @@ struct window_buffer_modedata {
u_int item_size;
};
+struct window_buffer_editdata {
+ u_int wp_id;
+ char *path;
+ char *name;
+ struct paste_buffer *pb;
+};
+
static struct window_buffer_itemdata *
window_buffer_add_item(struct window_buffer_modedata *data)
{
@@ -354,6 +364,126 @@ window_buffer_do_paste(void *modedata, void *itemdata, struct client *c,
}
static void
+window_buffer_finish_edit(struct window_buffer_editdata *ed)
+{
+ unlink(ed->path);
+ free(ed->path);
+ free(ed->name);
+ free(ed);
+}
+
+static void
+window_buffer_edit_close_cb(int status, void *arg)
+{
+ struct window_buffer_editdata *ed = arg;
+ FILE *f;
+ off_t len;
+ char *buf;
+ size_t oldlen;
+ const char *oldbuf;
+ struct paste_buffer *pb;
+ struct window_pane *wp;
+ struct window_buffer_modedata *data;
+ struct window_mode_entry *wme;
+
+ if (status != 0) {
+ window_buffer_finish_edit(ed);
+ return;
+ }
+
+ pb = paste_get_name(ed->name);
+ if (pb == NULL || pb != ed->pb) {
+ window_buffer_finish_edit(ed);
+ return;
+ }
+
+ f = fopen(ed->path, "r");
+ if (f != NULL) {
+ fseeko(f, 0, SEEK_END);
+ len = ftello(f);
+ fseeko(f, 0, SEEK_SET);
+
+ if (len > 0 &&
+ (uintmax_t)len <= (uintmax_t)SIZE_MAX &&
+ (buf = malloc(len)) != NULL &&
+ fread(buf, len, 1, f) == 1) {
+ oldbuf = paste_buffer_data(pb, &oldlen);
+ if (oldlen != '\0' &&
+ oldbuf[oldlen - 1] != '\n' &&
+ buf[len - 1] == '\n')
+ len--;
+ if (len != 0)
+ paste_replace(pb, buf, len);
+ }
+ fclose(f);
+ }
+
+ wp = window_pane_find_by_id(ed->wp_id);
+ if (wp != NULL) {
+ wme = TAILQ_FIRST(&wp->modes);
+ if (wme->mode == &window_buffer_mode) {
+ data = wme->data;
+ mode_tree_build(data->data);
+ mode_tree_draw(data->data);
+ }
+ wp->flags |= PANE_REDRAW;
+ }
+ window_buffer_finish_edit(ed);
+}
+
+static void
+window_buffer_start_edit(struct window_buffer_modedata *data,
+ struct window_buffer_itemdata *item, struct client *c)
+{
+ struct paste_buffer *pb;
+ int fd;
+ FILE *f;
+ const char *buf;
+ size_t len;
+ struct window_buffer_editdata *ed;
+ char *cmd;
+ char path[] = _PATH_TMP "tmux.XXXXXXXX";
+ const char *editor;
+ u_int px, py, sx, sy;
+
+ if ((pb = paste_get_name(item->name)) == NULL)
+ return;
+ buf = paste_buffer_data(pb, &len);
+
+ editor = options_get_string(global_options, "editor");
+ if (*editor == '\0')
+ return;
+
+ fd = mkstemp(path);
+ if (fd == -1)
+ return;
+ f = fdopen(fd, "w");
+ if (fwrite(buf, len, 1, f) != 1) {
+ fclose(f);
+ return;
+ }
+ fclose(f);
+
+ ed = xcalloc(1, sizeof *ed);
+ ed->wp_id = data->wp->id;
+ ed->path = xstrdup(path);
+ ed->name = xstrdup(paste_buffer_name(pb));
+ ed->pb = pb;
+
+ sx = c->tty.sx * 9 / 10;
+ sy = c->tty.sy * 9 / 10;
+ px = (c->tty.sx / 2) - (sx / 2);
+ py = (c->tty.sy / 2) - (sy / 2);
+
+ xasprintf(&cmd, "%s %s", editor, path);
+ if (popup_display(POPUP_WRITEKEYS|POPUP_CLOSEEXIT, NULL, px, py, sx, sy,
+ 0, NULL, cmd, NULL, _PATH_TMP, c, NULL, window_buffer_edit_close_cb,
+ ed) != 0)
+ window_buffer_finish_edit(ed);
+ free(cmd);
+}
+
+static void
window_buffer_key(struct window_mode_entry *wme, struct client *c,
__unused struct session *s, __unused struct winlink *wl, key_code key,
struct mouse_event *m)
@@ -366,6 +496,10 @@ window_buffer_key(struct window_mode_entry *wme, struct client *c,
finished = mode_tree_key(mtd, c, &key, m, NULL, NULL);
switch (key) {
+ case 'e':
+ item = mode_tree_get_current(mtd);
+ window_buffer_start_edit(data, item, c);
+ break;
case 'd':
item = mode_tree_get_current(mtd);
window_buffer_do_delete(data, item, c, key);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 00:23:30 +0000