Merge remote-tracking branch 'origin/master' into command_parser

# Conflicts:
#	cmd-queue.c
#	notify.c
#	options.c
This commit is contained in:
Nicholas Marriott
2026-07-13 11:12:46 +01:00
247 changed files with 12071 additions and 2193 deletions

View File

@@ -1,4 +1,4 @@
/* $OpenBSD$ */
/* $OpenBSD: server-client.c,v 1.486 2026/07/10 13:38:45 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -429,7 +429,7 @@ server_client_set_session(struct client *c, struct session *s)
alerts_check_session(s);
tty_update_client_offset(c);
status_timer_start(c);
notify_client("client-session-changed", c);
events_fire_client("client-session-changed", c);
server_redraw_client(c);
}
@@ -464,7 +464,7 @@ server_client_lost(struct client *c)
if (c->flags & CLIENT_ATTACHED) {
server_client_attached_lost(c);
notify_client("client-detached", c);
events_fire_client("client-detached", c);
}
if (c->flags & CLIENT_CONTROL)
@@ -1193,6 +1193,8 @@ server_client_update_theme_colours(struct client *c)
format_defaults(ft, c, NULL, NULL, NULL);
theme = c->theme;
if (theme == THEME_UNKNOWN)
theme = colour_totheme(c->tty.bg);
if (option == 2)
theme = THEME_LIGHT;
else if (option == 3)
@@ -1282,7 +1284,7 @@ server_client_update_latest(struct client *c)
if (options_get_number(w->options, "window-size") == WINDOW_SIZE_LATEST)
recalculate_size(w, 0);
notify_client("client-active", c);
events_fire_client("client-active", c);
}
/* Get repeat time. */
@@ -2466,7 +2468,7 @@ server_client_dispatch(struct imsg *imsg, void *arg)
c->overlay_resize(c, c->overlay_data);
server_redraw_client(c);
if (c->session != NULL)
notify_client("client-resized", c);
events_fire_client("client-resized", c);
break;
case MSG_EXITING:
if (datalen != 0)
@@ -3061,10 +3063,10 @@ server_client_report_theme(struct client *c, enum client_theme theme)
if (theme == THEME_LIGHT) {
c->theme = THEME_LIGHT;
notify_client("client-light-theme", c);
events_fire_client("client-light-theme", c);
} else {
c->theme = THEME_DARK;
notify_client("client-dark-theme", c);
events_fire_client("client-dark-theme", c);
}
/*