mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 17:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-05-12 11:02:25 +01:00
parent 69c59c52b6 a131655235
commit 180bbab1fc
8 changed files with 209 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
window-buffer.c
View File

@@ -38,6 +38,19 @@ static void window_buffer_key(struct window_mode_entry *,
#define WINDOW_BUFFER_DEFAULT_FORMAT \
"#{buffer_size} bytes (#{t:buffer_created})"
#define WINDOW_BUFFER_MENU \
"Paste,p,|" \
"Paste Tagged,P,|" \
"|" \
"Tag,t,|" \
"Tag All,C-t,|" \
"Tag None,T,|" \
"|" \
"Delete,d,|" \
"Delete Tagged,D,|" \
"|" \
"Cancel,q,"
const struct window_mode window_buffer_mode = {
.name = "buffer-mode",
.default_format = WINDOW_BUFFER_DEFAULT_FORMAT,
@@ -66,7 +79,9 @@ struct window_buffer_itemdata {
};
struct window_buffer_modedata {
struct window_pane *wp;
struct cmd_find_state fs;
struct mode_tree_data *data;
char *command;
char *format;
@@ -263,6 +278,19 @@ window_buffer_search(__unused void *modedata, void *itemdata, const char *ss)
return (memmem(bufdata, bufsize, ss, strlen(ss)) != NULL);
}
static void
window_buffer_menu(void *modedata, struct client *c, key_code key)
{
struct window_buffer_modedata *data = modedata;
struct window_pane *wp = data->wp;
struct window_mode_entry *wme;
wme = TAILQ_FIRST(&wp->modes);
if (wme == NULL || wme->data != modedata)
return;
window_buffer_key(wme, c, NULL, NULL, key, NULL);
}
static struct screen *
window_buffer_init(struct window_mode_entry *wme, struct cmd_find_state *fs,
struct args *args)
@@ -272,6 +300,7 @@ window_buffer_init(struct window_mode_entry *wme, struct cmd_find_state *fs,
struct screen *s;
wme->data = data = xcalloc(1, sizeof *data);
data->wp = wp;
cmd_find_copy_state(&data->fs, fs);
if (args == NULL || !args_has(args, 'F'))
@@ -284,8 +313,9 @@ window_buffer_init(struct window_mode_entry *wme, struct cmd_find_state *fs,
data->command = xstrdup(args->argv[0]);
data->data = mode_tree_start(wp, args, window_buffer_build,
window_buffer_draw, window_buffer_search, data,
window_buffer_sort_list, nitems(window_buffer_sort_list), &s);
window_buffer_draw, window_buffer_search, window_buffer_menu, data,
WINDOW_BUFFER_MENU, window_buffer_sort_list,
nitems(window_buffer_sort_list), &s);
mode_tree_zoom(data->data, args);
mode_tree_build(data->data);