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

Merge branch 'master' into 4902-image-support

Browse Source 
# Conflicts:
#	Makefile.am
#	configure.ac
#	format.c
#	image-sixel.c
#	regress/tty-keys-replies.sh
#	resize.c
#	screen-redraw.c
#	screen-write.c
#	screen.c
#	tmux.1
#	tmux.h
#	tty-features.c
#	tty.c
This commit is contained in:
Nicholas Marriott
2026-10-12 17:01:36 +01:00
parent f988a7bc0b 58eb73a6d1
commit 2da1e0f30c
37 changed files with 781 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
resize.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: resize.c,v 1.59 2026/08/20 09:19:24 nicm Exp $ */
/* $OpenBSD: resize.c,v 1.60 2026/10/12 13:08:19 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -159,8 +159,10 @@ clients_calculate_size(int type, int current, struct client *c,
*/
*xpixel = w->xpixel;
*ypixel = w->ypixel;
} else
*xpixel = *ypixel = 0;
} else {
*xpixel = 0;
*ypixel = 0;
}
/*
* For latest, count the number of clients with this window. We only
@@ -388,21 +390,31 @@ recalculate_size(struct window *w, int now)
/* Look for a suitable client and get the new size. */
changed = clients_calculate_size(type, current, NULL, NULL, w,
recalculate_size_skip_client, &sx, &sy, &xpixel, &ypixel);
if (xpixel == 0)
xpixel = DEFAULT_XPIXEL;
if (ypixel == 0)
ypixel = DEFAULT_YPIXEL;
/*
* Make sure the size has actually changed. If the window has already
* got a resize scheduled, then use the new size; otherwise the old.
*/
if (w->flags & WINDOW_RESIZE) {
if (!now && changed && w->new_sx == sx && w->new_sy == sy &&
w->new_xpixel == xpixel && w->new_ypixel == ypixel) {
if (!now &&
changed &&
w->new_sx == sx &&
w->new_sy == sy &&
w->new_xpixel == xpixel &&
w->new_ypixel == ypixel)
changed = 0;
}
} else {
if (!now && changed && w->sx == sx && w->sy == sy &&
w->xpixel == xpixel && w->ypixel == ypixel) {
if (!now &&
changed &&
w->sx == sx &&
w->sy == sy &&
w->xpixel == xpixel &&
w->ypixel == ypixel)
changed = 0;
}
}
/*