circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 05:21:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-03-28 22:02:37 +00:00
parent 6b38334b28 08bc226527
commit 2c4f2393ec
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
window-buffer.c
View File

@ -66,6 +66,7 @@ struct window_buffer_itemdata {
};
struct window_buffer_modedata {
struct cmd_find_state fs;
struct mode_tree_data *data;
char *command;
char *format;
@ -137,6 +138,9 @@ window_buffer_build(void *modedata, u_int sort_type, __unused uint64_t *tag,
struct paste_buffer *pb;
char *text, *cp;
struct format_tree *ft;
struct session *s = NULL;
struct winlink *wl = NULL;
struct window_pane *wp = NULL;
for (i = 0; i < data->item_size; i++)
window_buffer_free_item(data->item_list[i]);
@ -167,6 +171,12 @@ window_buffer_build(void *modedata, u_int sort_type, __unused uint64_t *tag,
break;
}
if (cmd_find_valid_state(&data->fs)) {
s = data->fs.s;
wl = data->fs.wl;
wp = data->fs.wp;
}
for (i = 0; i < data->item_size; i++) {
item = data->item_list[i];
@ -174,6 +184,7 @@ window_buffer_build(void *modedata, u_int sort_type, __unused uint64_t *tag,
if (pb == NULL)
continue;
ft = format_create(NULL, NULL, FORMAT_NONE, 0);
format_defaults(ft, NULL, s, wl, wp);
format_defaults_paste_buffer(ft, pb);
if (filter != NULL) {
@ -253,14 +264,15 @@ window_buffer_search(__unused void *modedata, void *itemdata, const char *ss)
}
static struct screen *
window_buffer_init(struct window_mode_entry *wme,
__unused struct cmd_find_state *fs, struct args *args)
window_buffer_init(struct window_mode_entry *wme, struct cmd_find_state *fs,
struct args *args)
{
struct window_pane *wp = wme->wp;
struct window_buffer_modedata *data;
struct screen *s;
wme->data = data = xcalloc(1, sizeof *data);
cmd_find_copy_state(&data->fs, fs);
if (args == NULL || !args_has(args, 'F'))
data->format = xstrdup(WINDOW_BUFFER_DEFAULT_FORMAT);