Merge branch 'obsd-master'

1 files changed, 11 insertions, 5 deletions

diff --git a/window.c b/window.c
index e0e39a0c..e51bc068 100644
--- a/window.c
+++ b/window.c
@@ -1200,17 +1200,23 @@ window_pane_key(struct window_pane *wp, struct client *c, struct session *s,
 }
 
 int
-window_pane_visible(struct window_pane *wp)
+window_pane_outside(struct window_pane *wp)
 {
 	struct window	*w = wp->window;
 
-	if (wp->layout_cell == NULL)
-		return (0);
 	if (wp->xoff >= w->sx || wp->yoff >= w->sy)
-		return (0);
+		return (1);
 	if (wp->xoff + wp->sx > w->sx || wp->yoff + wp->sy > w->sy)
+		return (1);
+	return (0);
+}
+
+int
+window_pane_visible(struct window_pane *wp)
+{
+	if (wp->layout_cell == NULL)
 		return (0);
-	return (1);
+	return (!window_pane_outside(wp));
 }
 
 char *