src/usr.bin/tmux/window-tree.c - diff

Return to window-tree.c CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/window-tree.c between version 1.20 and 1.21

version 1.20, 2017/10/22 13:16:54

version 1.21, 2017/10/25 11:26:11

Line 95

struct window_tree_itemdata **item_list;

u_int item_size;

struct client *client;

const char *entered;

struct cmd_find_state fs;

Line 898

Line 897

}

static void

window_tree_command_each(void* modedata, void* itemdata, __unused key_code key)

window_tree_command_each(void* modedata, void* itemdata, struct client *c,

__unused key_code key)

{

struct window_tree_modedata *data = modedata;

struct window_tree_itemdata *item = itemdata;

Line 907

name = window_tree_get_target(item, &fs);

if (name != NULL)

mode_tree_run_command(data->client, &fs, data->entered, name);

mode_tree_run_command(c, &fs, data->entered, name);

free(name);

}

Line 934

if (data->dead)

return (0);

data->client = c;

data->entered = s;

mode_tree_each_tagged(data->data, window_tree_command_each, c,

mode_tree_each_tagged(data->data, window_tree_command_each, KEYC_NONE,

KEYC_NONE, 1);

1);

data->client = NULL;

data->entered = NULL;

data->references++;

Line 963

Line 959

{

struct window_tree_modedata *data = wp->modedata;

struct window_tree_itemdata *item;

char *command, *name, *prompt;

char *name, *prompt;

struct cmd_find_state fs;

int finished;

u_int tagged;

Line 992

Line 988

break;

case '\r':

item = mode_tree_get_current(data->data);

command = xstrdup(data->command);

name = window_tree_get_target(item, &fs);

window_pane_reset_mode(wp);

if (name != NULL)

mode_tree_run_command(c, NULL, command, name);

mode_tree_run_command(c, NULL, data->command, name);

finished = 1;

free(name);

free(command);

break;

return;

}

if (finished)

window_pane_reset_mode(wp);