diff options
| author |   nicm <nicm@openbsd.org> | 2012-03-03 08:55:56 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2012-03-03 08:55:56 +0000 |
| commit | bc9218f0f2db364ea742bbfc284dfdb31f8dead7 (patch) | |
| tree | 9a772eb76581390a0b12ca9be0fbc470703d80c8 | |
| parent | Remove unused variable, from Michael W Bombardieri who also got an ok (diff) | |
| download | wireguard-openbsd-bc9218f0f2db364ea742bbfc284dfdb31f8dead7.tar.xz wireguard-openbsd-bc9218f0f2db364ea742bbfc284dfdb31f8dead7.zip | |
The wlmouse offset should be part of the client, not the server. From
Ailin Nemui.
| -rw-r--r-- | usr.bin/tmux/status.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 22b6686499c..2e70107e246 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.87 2012/01/29 09:37:02 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.88 2012/03/03 08:55:56 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -141,7 +141,7 @@ status_set_window_at(struct client *c, u_int x) struct session *s = c->session; struct winlink *wl; - x += s->wlmouse; + x += c->wlmouse; RB_FOREACH(wl, winlinks, &s->windows) { if (x < wl->status_width && session_select(s, wl->idx) == 0) { @@ -356,7 +356,7 @@ draw: wloffset++; /* Copy the window list. */ - s->wlmouse = -wloffset + wlstart; + c->wlmouse = -wloffset + wlstart; screen_write_cursormove(&ctx, wloffset, 0); screen_write_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 d34fd78ed1f..f3ffbf6f4ff 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.315 2012/03/03 08:31:18 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.316 2012/03/03 08:55:56 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -975,8 +975,6 @@ struct session { struct environ environ; - int wlmouse; - int references; TAILQ_ENTRY(session) gentry; @@ -1199,6 +1197,8 @@ struct client { struct mouse_event last_mouse; + int wlmouse; + int references; }; ARRAY_DECL(clients, struct client *); |