circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-07 02:04:22 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Remove popups and all the associated overlay machinery (they were the last user of it). display-popup stays but becomes an (undocumented) compatibility command to open a floating pane.
  Fix typo (too few 0s) in CLIENT_CONTROL_DISCARD, from someone in GitHub issue 5622.
This commit is contained in:
Nicholas Marriott
2026-09-21 12:03:10 +01:00
parent 81794f3047 34cd5da4e3
commit 5aa17a0cfa
15 changed files with 307 additions and 1663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
window.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window.c,v 1.375 2026/09/20 07:35:06 nicm Exp $ */
/* $OpenBSD: window.c,v 1.376 2026/09/21 10:22:31 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -691,7 +691,6 @@ window_pane_update_focus(struct window_pane *wp)
c->session->attached != 0 &&
(c->flags & CLIENT_FOCUSED) &&
c->session->curw->window == wp->window &&
c->overlay_draw == NULL &&
wp->window->menu == NULL) {
focused = 1;
break;
@@ -1633,7 +1632,7 @@ window_pane_set_event(struct window_pane *wp)
NULL, window_pane_error_callback, wp);
if (wp->event == NULL)
fatalx("out of memory");
wp->ictx = input_init(wp, wp->event, &wp->palette, NULL);
wp->ictx = input_init(wp, wp->event, &wp->palette);
bufferevent_enable(wp->event, EV_READ|EV_WRITE);
}