Replace the notification system with events. Events can carry a payload of

additional payload (to reduce problems with lifetime of objects) and are delivered to one or more event sinks. This is more powerful and reduces the complex dependencies between control mode and hooks. Events are now used for hooks, control mode notifications and for monitors (set-hook -B). wait-for can now wait for an event to fire (-E flag, with -F to for filter), with -v to print the payload, as well as listing (-l) waiting clients on an event and forcing one to wake (-w). A few additional hooks are also now available (pane-created, pane-resized, etc) and some of the existing ones have additional format variables available.
2026-10-15 16:04:34 +00:00 · 2026-07-10 13:38:45 +00:00
parent 1508bec957
commit d29aa12117
153 changed files with 2543 additions and 1787 deletions
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD$ */
+/* $OpenBSD: window.c,v 1.359 2026/07/10 13:38:45 nicm Exp $ */

 /*
 * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -75,8 +75,8 @@ static struct window_pane *window_pane_create(struct window *, u_int, u_int,
 static void	window_pane_destroy(struct window_pane *);
 static void	window_pane_free(struct window_pane *);
 static void	window_pane_scrollbar_timer(int, short, void *);
-static void	window_pane_full_size_offset(struct window_pane *wp,
-		    int *xoff, int *yoff, u_int *sx, u_int *sy);
+static void	window_pane_full_size_offset(struct window_pane *, int *, int *,
+		    u_int *, u_int *);

 RB_GENERATE(windows, window, entry, window_cmp);
 RB_GENERATE(winlinks, winlink, entry, winlink_cmp);
@@ -88,6 +88,7 @@ struct window_pane_prompt {
 	status_prompt_input_cb	 inputcb;
 	prompt_free_cb		 freecb;
 	void			*data;
+	enum prompt_type	 type;
 };

 int
@@ -96,6 +97,78 @@ window_cmp(struct window *w1, struct window *w2)
 	return (w1->id - w2->id);
 }

+static void
+window_fire_renamed(struct window *w, const char *old_name)
+{
+	struct event_payload	*ep;
+	struct cmd_find_state	 fs;
+
+	ep = event_payload_create();
+	cmd_find_from_window(&fs, w, 0);
+	event_payload_set_target(ep, &fs);
+	event_payload_set_window(ep, "window", w);
+	event_payload_set_string(ep, "old_name", "%s", old_name);
+	event_payload_set_string(ep, "new_name", "%s", w->name);
+	events_fire("window-renamed", ep);
+}
+
+static void
+window_fire_pane_changed(struct window *w, struct window_pane *wp,
+    struct window_pane *lastwp)
+{
+	struct event_payload	*ep;
+	struct cmd_find_state	 fs;
+
+	ep = event_payload_create();
+	cmd_find_from_pane(&fs, wp, 0);
+	event_payload_set_target(ep, &fs);
+	event_payload_set_window(ep, "window", w);
+	event_payload_set_pane(ep, "pane", wp);
+	event_payload_set_pane(ep, "new_pane", wp);
+	if (lastwp != NULL)
+		event_payload_set_pane(ep, "old_pane", lastwp);
+	events_fire("window-pane-changed", ep);
+}
+
+static void
+window_fire_pane_mode_changed(const char *name, struct window_pane *wp,
+    const char *previous, const char *current, int entered)
+{
+	struct event_payload	*ep;
+	struct cmd_find_state	 fs;
+
+	ep = event_payload_create();
+	cmd_find_from_pane(&fs, wp, 0);
+	event_payload_set_target(ep, &fs);
+	event_payload_set_pane(ep, "pane", wp);
+	event_payload_set_window(ep, "window", wp->window);
+
+	if (current != NULL)
+		event_payload_set_string(ep, "current_mode", "%s", current);
+	if (previous != NULL)
+		event_payload_set_string(ep, "previous_mode", "%s", previous);
+	event_payload_set_int(ep, "mode_entered", entered);
+
+	events_fire(name, ep);
+}
+
+static void
+window_fire_pane_prompt(const char *name, struct window_pane *wp,
+    enum prompt_type type)
+{
+	struct event_payload	*ep;
+	struct cmd_find_state	 fs;
+	const char		*type_string = prompt_type_string(type);
+
+	ep = event_payload_create();
+	cmd_find_from_pane(&fs, wp, 0);
+	event_payload_set_target(ep, &fs);
+	event_payload_set_pane(ep, "pane", wp);
+	event_payload_set_window(ep, "window", wp->window);
+	event_payload_set_string(ep, "prompt_type", "%s", type_string);
+	events_fire(name, ep);
+}
+
 int
 winlink_cmp(struct winlink *wl1, struct winlink *wl2)
 {
@@ -446,13 +519,15 @@ window_pane_remove_ref(struct window_pane *wp, const char *from)
 void
 window_set_name(struct window *w, const char *new_name, int untrusted)
 {
-	char	*name;
+	char	*last, *name;

 	name = clean_name(new_name, untrusted);
 	if (name != NULL) {
+		last = xstrdup(w->name);
 		free(w->name);
 		w->name = name;
-		notify_window("window-renamed", w);
+		window_fire_renamed(w, last);
+		free(last);
 	}
 }

@@ -553,13 +628,13 @@ window_pane_update_focus(struct window_pane *wp)
 			log_debug("%s: %%%u focus out", __func__, wp->id);
 			if (wp->base.mode & MODE_FOCUSON)
 				bufferevent_write(wp->event, "\033[O", 3);
-			notify_pane("pane-focus-out", wp);
+			events_fire_pane("pane-focus-out", wp);
 			wp->flags &= ~PANE_FOCUSED;
 		} else if (focused && (~wp->flags & PANE_FOCUSED)) {
 			log_debug("%s: %%%u focus in", __func__, wp->id);
 			if (wp->base.mode & MODE_FOCUSON)
 				bufferevent_write(wp->event, "\033[I", 3);
-			notify_pane("pane-focus-in", wp);
+			events_fire_pane("pane-focus-in", wp);
 			wp->flags |= PANE_FOCUSED;
 		} else
 			log_debug("%s: %%%u focus unchanged", __func__, wp->id);
@@ -595,7 +670,7 @@ window_set_active_pane(struct window *w, struct window_pane *wp, int notify)
 	server_redraw_window(w);

 	if (notify)
-		notify_window("window-pane-changed", w);
+		window_fire_pane_changed(w, w->active, lastwp);
 	return (1);
 }

@@ -785,7 +860,8 @@ window_zoom(struct window_pane *wp)
 	w->saved_layout_root = w->layout_root;
 	layout_init(w, wp);
 	w->flags |= WINDOW_ZOOMED;
-	notify_window("window-layout-changed", w);
+	events_fire_window("window-zoomed", w);
+	events_fire_window("window-layout-changed", w);

 	redraw_invalidate_scene(w);
 	return (0);
@@ -811,8 +887,10 @@ window_unzoom(struct window *w, int notify)
 	}
 	layout_fix_panes(w, NULL);

-	if (notify)
-		notify_window("window-layout-changed", w);
+	if (notify) {
+		events_fire_window("window-unzoomed", w);
+		events_fire_window("window-layout-changed", w);
+	}

 	redraw_invalidate_scene(w);
 	return (0);
@@ -894,7 +972,7 @@ window_lost_pane(struct window *w, struct window_pane *wp)
 		if (w->active != NULL) {
 			window_pane_stack_remove(&w->last_panes, w->active);
 			w->active->flags |= PANE_CHANGED;
-			notify_window("window-pane-changed", w);
+			events_fire_window("window-pane-changed", w);
 			window_update_focus(w);
 		}
 	}
@@ -1223,9 +1301,9 @@ window_pane_destroy(struct window_pane *wp)
 	window_pane_wait_finish(wp);
 	spawn_editor_finish(wp);

-	window_pane_clear_prompt(wp);
 	RB_REMOVE(window_pane_tree, &all_window_panes, wp);
 	wp->flags |= PANE_DESTROYED;
+	window_pane_clear_prompt(wp);

 	window_pane_free_modes(wp);
 	screen_write_clear_dirty(wp);
@@ -1352,6 +1430,8 @@ window_pane_resize(struct window_pane *wp, u_int sx, u_int sy)
 {
 	struct window_mode_entry	*wme;
 	struct window_pane_resize	*r;
+	struct event_payload		*ep;
+	struct cmd_find_state		 fs;

 	if (sx == wp->sx && sy == wp->sy)
 		return;
@@ -1374,6 +1454,17 @@ window_pane_resize(struct window_pane *wp, u_int sx, u_int sy)
 	wme = TAILQ_FIRST(&wp->modes);
 	if (wme != NULL && wme->mode->resize != NULL)
 		wme->mode->resize(wme, sx, sy);
+
+	ep = event_payload_create();
+	cmd_find_from_pane(&fs, wp, 0);
+	event_payload_set_target(ep, &fs);
+	event_payload_set_pane(ep, "pane", wp);
+	event_payload_set_window(ep, "window", wp->window);
+	event_payload_set_uint(ep, "width", sx);
+	event_payload_set_uint(ep, "height", sy);
+	event_payload_set_uint(ep, "old_width", r->osx);
+	event_payload_set_uint(ep, "old_height", r->osy);
+	events_fire("pane-resized", ep);
 }

 int
@@ -1383,9 +1474,13 @@ window_pane_set_mode(struct window_pane *wp, struct window_pane *swp,
 {
 	struct window_mode_entry	*wme;
 	struct window			*w = wp->window;
+	const char			*name = mode->name, *p = NULL;

-	if (!TAILQ_EMPTY(&wp->modes) && TAILQ_FIRST(&wp->modes)->mode == mode)
-		return (1);
+	if (!TAILQ_EMPTY(&wp->modes)) {
+		if (TAILQ_FIRST(&wp->modes)->mode == mode)
+			return (1);
+		p = TAILQ_FIRST(&wp->modes)->mode->name;
+	}

 	TAILQ_FOREACH(wme, &wp->modes, entry) {
 		if (wme->mode == mode)
@@ -1411,7 +1506,9 @@ window_pane_set_mode(struct window_pane *wp, struct window_pane *swp,

 	server_redraw_window_borders(wp->window);
 	server_status_window(wp->window);
-	notify_pane("pane-mode-changed", wp);
+
+	window_fire_pane_mode_changed("pane-mode-entered", wp, p, name, 1);
+	window_fire_pane_mode_changed("pane-mode-changed", wp, p, name, 1);

 	return (0);
 }
@@ -1422,11 +1519,13 @@ window_pane_reset_mode(struct window_pane *wp)
 	struct window_mode_entry	*wme, *next;
 	struct window			*w = wp->window;
 	int				 kill;
+	const char			*name, *p;

 	if (TAILQ_EMPTY(&wp->modes))
 		return;

 	wme = TAILQ_FIRST(&wp->modes);
+	p = wme->mode->name;
 	kill = wme->kill;
 	TAILQ_REMOVE(&wp->modes, wme, entry);
 	wme->mode->free(wme);
@@ -1443,13 +1542,16 @@ window_pane_reset_mode(struct window_pane *wp)
 		if (next->mode->resize != NULL)
 			next->mode->resize(next, wp->sx, wp->sy);
 	}
+	name = (next == NULL ? NULL : next->mode->name);

 	wp->flags |= (PANE_REDRAW|PANE_REDRAWSCROLLBAR|PANE_CHANGED);
 	layout_fix_panes(w, NULL);

 	server_redraw_window_borders(wp->window);
 	server_status_window(wp->window);
-	notify_pane("pane-mode-changed", wp);
+
+	window_fire_pane_mode_changed("pane-mode-exited", wp, p, name, 0);
+	window_fire_pane_mode_changed("pane-mode-changed", wp, p, name, 0);

 	if (kill)
 		server_kill_pane(wp);
@@ -1512,6 +1614,7 @@ window_pane_set_prompt(struct window_pane *wp, struct client *c,
 	wpp->inputcb = inputcb;
 	wpp->freecb = freecb;
 	wpp->data = data;
+	wpp->type = type;

 	memset(&pd, 0, sizeof pd);
 	prompt_set_options(&pd, s);
@@ -1529,19 +1632,28 @@ window_pane_set_prompt(struct window_pane *wp, struct client *c,
 	wp->flags |= PANE_REDRAW;

 	prompt_incremental_start(wp->prompt);
+	window_fire_pane_prompt("pane-prompt-opened", wp, type);
 }

 /* Close a pane prompt. */
 void
 window_pane_clear_prompt(struct window_pane *wp)
 {
-	struct prompt	*prompt = wp->prompt;
+	struct prompt			*prompt = wp->prompt;
+	struct window_pane_prompt	*wpp = wp->prompt_data;
+	enum prompt_type		 type = PROMPT_TYPE_INVALID;

-	if (prompt == NULL)
-		return;
-	wp->prompt = NULL;
-	prompt_free(prompt);
-	wp->flags |= PANE_REDRAW;
+	if (prompt != NULL) {
+		if (wpp != NULL)
+			type = wpp->type;
+
+		wp->prompt = NULL;
+		prompt_free(prompt);
+		wp->flags |= PANE_REDRAW;
+
+		if (~wp->flags & PANE_DESTROYED)
+			window_fire_pane_prompt("pane-prompt-closed", wp, type);
+	}
 }

 /* Does this pane have an open prompt? */