diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-06-29 07:11:20 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-06-29 07:11:20 +0000 |
| commit | 003e8e65f7a3613a3f3004091ad1c57298dbf507 (patch) | |
| tree | f560a99cf16bba1fbac4b01af8fe8aeda28739d4 | |
| parent | 710393e388c0adf8b36854b60c466b21f1a9eb12 (diff) | |
| download | rtmux-003e8e65f7a3613a3f3004091ad1c57298dbf507.tar.gz rtmux-003e8e65f7a3613a3f3004091ad1c57298dbf507.tar.bz2 rtmux-003e8e65f7a3613a3f3004091ad1c57298dbf507.zip | |
Don't try to page up with scroll-mode -u or copy-mode -u unless the mode was
successfully changed - if already in a different mode, it would corrupt the
mode data.
| -rw-r--r-- | cmd-copy-mode.c | 8 | ||||
| -rw-r--r-- | cmd-scroll-mode.c | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index af83e10c..681f8ba7 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -44,13 +44,15 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct winlink *wl; + struct window_pane *wp; if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); + wp = wl->window->active; - window_pane_set_mode(wl->window->active, &window_copy_mode); - if (data->flags & CMD_UFLAG) - window_copy_pageup(wl->window->active); + window_pane_set_mode(wp, &window_copy_mode); + if (wp->mode == &window_copy_mode && data->flags & CMD_UFLAG) + window_copy_pageup(wp); return (0); } diff --git a/cmd-scroll-mode.c b/cmd-scroll-mode.c index c34f9bd6..0d1f2291 100644 --- a/cmd-scroll-mode.c +++ b/cmd-scroll-mode.c @@ -60,13 +60,15 @@ cmd_scroll_mode_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct winlink *wl; + struct window_pane *wp; if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); + wp = wl->window->active; - window_pane_set_mode(wl->window->active, &window_scroll_mode); - if (data->flags & CMD_UFLAG) - window_scroll_pageup(wl->window->active); + window_pane_set_mode(wp, &window_scroll_mode); + if (wp->mode == &window_scroll_mode && data->flags & CMD_UFLAG) + window_scroll_pageup(wp); return (0); } |