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

Make the cmd_find_* functions more obvious when looking for a client,

Browse Source 
rather than having it inside other functions. Should be no change to the
way targets are resolved just yet.
This commit is contained in:
nicm
2017-04-21 20:26:34 +00:00
parent 2ad09ab5af
commit efaf4c16cf
7 changed files with 188 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
notify.c
View File

@@ -44,9 +44,9 @@ notify_hook(struct cmdq_item *item, struct notify_entry *ne)
struct session *s = ne->session;
struct window *w = ne->window;
cmd_find_clear_state(&fs, NULL, 0);
cmd_find_clear_state(&fs, 0);
if (cmd_find_empty_state(&ne->fs) || !cmd_find_valid_state(&ne->fs))
cmd_find_current(&fs, item, CMD_FIND_QUIET);
cmd_find_from_nothing(&fs);
else
cmd_find_copy_state(&fs, &ne->fs);
@@ -164,10 +164,7 @@ notify_client(const char *name, struct client *c)
{
struct cmd_find_state fs;
if (c->session != NULL)
cmd_find_from_session(&fs, c->session);
else
cmd_find_current(&fs, NULL, CMD_FIND_QUIET);
cmd_find_from_client(&fs, c);
notify_add(name, &fs, c, NULL, NULL, NULL);
}
@@ -179,7 +176,7 @@ notify_session(const char *name, struct session *s)
if (session_alive(s))
cmd_find_from_session(&fs, s);
else
cmd_find_current(&fs, NULL, CMD_FIND_QUIET);
cmd_find_from_nothing(&fs);
notify_add(name, &fs, NULL, s, NULL, NULL);
}