From 4289a1ebfa7479413ec5ac543b88c4ea039d00a0 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 13 Oct 2016 22:48:51 +0000 Subject: Trying to do hooks generically is way too complicated and unreliable and confusing, particularly trying to automatically figure out what target hooks should be using. So simplify it: - drop before hooks entirely, they don't seem to be very useful; - commands with special requirements now fire their own after hook (for example, if they change session or window, or if they have -t and -s and need to choose which one the hook uses as current target); - commands with no special requirements can have the CMD_AFTERHOOK flag added and they will use the -t state. At the moment new-session, new-window, split-window fire their own hook, and display-message uses the flag. The remaining commands still need to be looked at. --- cmd-split-window.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'cmd-split-window.c') diff --git a/cmd-split-window.c b/cmd-split-window.c index b09a5109..41a53c63 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -66,6 +66,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) struct layout_cell *lc; struct format_tree *ft; struct environ_entry *envent; + struct cmd_find_state fs; server_unzoom_window(w); @@ -178,15 +179,17 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) } notify_window_layout_changed(w); - cmd_find_clear_state(&cmdq->current, NULL, 0); - cmdq->current.s = s; - cmdq->current.wl = wl; - cmdq->current.w = wl->window; - cmdq->current.wp = new_wp; - cmd_find_log_state(__func__, &cmdq->current); - if (to_free != NULL) free((void *)to_free); + + cmd_find_clear_state(&fs, NULL, 0); + fs.s = s; + fs.wl = wl; + fs.w = w; + fs.wp = new_wp; + cmd_find_log_state(__func__, &fs); + if (hooks_wait(s->hooks, cmdq, &fs, "after-split-window") == 0) + return (CMD_RETURN_WAIT); return (CMD_RETURN_NORMAL); error: -- cgit