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

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

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Switch menus also to be attached to the window instead of an overlay and drawn as part of the client's scene. This means removing the popup menu.
This commit is contained in:
tmux update bot
2026-07-14 22:13:52 +00:00
parent 11496010c0 ad6832e697
commit 4e586ed0b8
9 changed files with 567 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
window.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window.c,v 1.362 2026/07/14 17:17:18 nicm Exp $ */
/* $OpenBSD: window.c,v 1.363 2026/07/14 19:07:03 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -460,6 +460,7 @@ window_destroy(struct window *w)
layout_free_cell(w->saved_layout_root, 0);
free(w->old_layout);
menu_destroy(w);
window_destroy_panes(w);
if (event_initialized(&w->name_event))
@@ -568,6 +569,11 @@ window_resize(struct window *w, u_int sx, u_int sy, int xpixel, int ypixel)
ypixel == -1 ? w->ypixel : (u_int)ypixel);
w->sx = sx;
w->sy = sy;
if (w->menu != NULL) {
menu_resize(w->menu, w);
redraw_invalidate_scene(w);
server_redraw_window(w);
}
if (xpixel != -1)
w->xpixel = xpixel;
if (ypixel != -1)
@@ -651,7 +657,8 @@ 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) {
c->overlay_draw == NULL &&
wp->window->menu == NULL) {
focused = 1;
break;
}