Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

* refs/remotes/tmux-openbsd/master:
  Do not let a stuck client prevent the server from exiting - give up after 10 seconds. GitHub issue 5444 from Ben Maurer.
This commit is contained in:
tmux update bot
2026-08-03 21:33:23 +00:00
3 changed files with 68 additions and 5 deletions

5
tmux.h
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tmux.h,v 1.1420 2026/08/03 13:38:42 nicm Exp $ */
/* $OpenBSD: tmux.h,v 1.1421 2026/08/03 20:18:20 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -2243,6 +2243,8 @@ struct client {
struct event click_timer;
int click_loc;
int click_wp;
struct event exit_timer;
u_int click_button;
struct mouse_event click_event;
@@ -4020,6 +4022,7 @@ time_t monitor_get_fire_time(struct monitor_set *, const char *);
/* control.c */
void control_discard(struct client *);
void control_discard_all(struct client *);
void control_start(struct client *);
void control_ready(struct client *);
void control_stop(struct client *);