From: nicm <nicm@openbsd.org>
Date: Mon, 20 Aug 2018 20:41:58 +0000 (+0000)
Subject: Move offset of window list into status struct.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=325b7c96632ceeee15fab315a49757516fe9b572;p=openbsd

Move offset of window list into status struct.
---

diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c
index 2574a09f53b..01726687a9f 100644
--- a/usr.bin/tmux/status.c
+++ b/usr.bin/tmux/status.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.177 2018/08/19 16:45:03 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.178 2018/08/20 20:41:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -284,7 +284,7 @@ status_get_window_at(struct client *c, u_int x)
 	const char	*sep;
 	size_t		 seplen;
 
-	x += c->wlmouse;
+	x += c->status.window_list_offset;
 	RB_FOREACH(wl, winlinks, &s->windows) {
 		oo = wl->window->options;
 
@@ -506,7 +506,7 @@ draw:
 		wloffset++;
 
 	/* Copy the window list. */
-	c->wlmouse = -wloffset + wlstart;
+	c->status.window_list_offset = -wloffset + wlstart;
 	screen_write_cursormove(&ctx, wloffset, 0);
 	screen_write_fast_copy(&ctx, &window_list, wlstart, 0, wlwidth, 1);
 	screen_free(&window_list);
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index c34eab2ca1c..83989cbceee 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.841 2018/08/19 20:13:07 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.842 2018/08/20 20:41:58 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1278,8 +1278,11 @@ struct cmd_entry {
 /* Status line. */
 struct status_line {
 	struct event	 timer;
+
 	struct screen	 status;
 	struct screen	*old_status;
+
+	int		 window_list_offset;
 };
 
 /* Client connection. */