summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/tmux.h
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2020-06-05 11:20:51 +0000
committernicm <nicm@openbsd.org>2020-06-05 11:20:51 +0000
commit49cd568012b14f9ad16fda08f420ae4cde079153 (patch)
tree177d4046ee6abfc5de66db6088df823ed5620165 /usr.bin/tmux/tmux.h
parentDo not take the address of a potentially unaligned member. (diff)
downloadwireguard-openbsd-49cd568012b14f9ad16fda08f420ae4cde079153.tar.xz
wireguard-openbsd-49cd568012b14f9ad16fda08f420ae4cde079153.zip
Change how panes are resized so that the code is clearer and if the pane
is resized multiple times during one event loop, it is forced to resize at the end. Also don't zoom/unzoom in switch-client if the pane hasn't changed. GitHub issue 2260.
Diffstat (limited to 'usr.bin/tmux/tmux.h')
-rw-r--r--usr.bin/tmux/tmux.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 3aca4f312f0..b8131ad7193 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1064 2020/06/05 09:32:15 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1065 2020/06/05 11:20:51 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -928,9 +928,6 @@ struct window_pane {
u_int sx;
u_int sy;
- u_int osx;
- u_int osy;
-
u_int xoff;
u_int yoff;
@@ -951,7 +948,7 @@ struct window_pane {
#define PANE_STATUSDRAWN 0x400
#define PANE_EMPTY 0x800
#define PANE_STYLECHANGED 0x1000
-#define PANE_RESIZED 0x2000
+#define PANE_RESIZENOW 0x2000
int argc;
char **argv;
@@ -969,6 +966,7 @@ struct window_pane {
size_t base_offset;
struct event resize_timer;
+ struct event force_timer;
struct input_ctx *ictx;