aboutsummaryrefslogtreecommitdiff
path: root/window-copy.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2010-09-18 15:41:18 +0000
committerTiago Cunha <tcunha@gmx.com>2010-09-18 15:41:18 +0000
commit59dc08a7a0e6c640a650ffd938bde870cefc41ca (patch)
treebe02a6f72bfee6458d0db469bc3b9dbf28dd260c /window-copy.c
parentfe3621cbc5385ac8ed9179f3c011c4e8dd789307 (diff)
downloadrtmux-59dc08a7a0e6c640a650ffd938bde870cefc41ca.tar.gz
rtmux-59dc08a7a0e6c640a650ffd938bde870cefc41ca.tar.bz2
rtmux-59dc08a7a0e6c640a650ffd938bde870cefc41ca.zip
Sync OpenBSD patchset 760:
When resizing the copy mode screen, don't allow it to end up with the viewable position beyond the size of the history.
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/window-copy.c b/window-copy.c
index 78c33736..2ef93278 100644
--- a/window-copy.c
+++ b/window-copy.c
@@ -1,4 +1,4 @@
-/* $Id: window-copy.c,v 1.123 2010-09-10 13:34:12 tcunha Exp $ */
+/* $Id: window-copy.c,v 1.124 2010-09-18 15:41:18 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -342,6 +342,8 @@ window_copy_resize(struct window_pane *wp, u_int sx, u_int sy)
data->cy = sy - 1;
if (data->cx > sx)
data->cx = sx;
+ if (data->oy > screen_hsize(data->backing))
+ data->oy = screen_hsize(data->backing);
window_copy_clear_selection(wp);