circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-20 17:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge master into floating_panes

Browse Source
This commit is contained in:
Dane Jensen
2026-06-11 12:05:11 -07:00
parent 57641f67dd 3d7f421809
commit 8497b588a2
8 changed files with 193 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server-client.c
View File

@@ -1619,7 +1619,7 @@ server_client_resize_timer(__unused int fd, __unused short events, void *data)
static void
server_client_check_pane_resize(struct window_pane *wp)
{
struct window_pane_resize *r, *r1, *first, *last;
struct window_pane_resize *r, *first, *last;
struct timeval tv = { .tv_usec = 250000 };
if (TAILQ_EMPTY(&wp->resize_queue))
@@ -1659,10 +1659,7 @@ server_client_check_pane_resize(struct window_pane *wp)
} else if (last->sx != first->osx || last->sy != first->osy) {
/* Multiple resizes ending up with a different size. */
window_pane_send_resize(wp, last->sx, last->sy);
TAILQ_FOREACH_SAFE(r, &wp->resize_queue, entry, r1) {
TAILQ_REMOVE(&wp->resize_queue, r, entry);
free(r);
}
window_pane_clear_resizes(wp, NULL);
} else {
/*
* Multiple resizes ending up with the same size. There will
@@ -1673,12 +1670,7 @@ server_client_check_pane_resize(struct window_pane *wp)
*/
r = TAILQ_PREV(last, window_pane_resizes, entry);
window_pane_send_resize(wp, r->sx, r->sy);
TAILQ_FOREACH_SAFE(r, &wp->resize_queue, entry, r1) {
if (r == last)
break;
TAILQ_REMOVE(&wp->resize_queue, r, entry);
free(r);
}
window_pane_clear_resizes(wp, last);
tv.tv_usec = 10000;
}
evtimer_add(&wp->resize_timer, &tv);