From 503c6a33770358ec94f99fe71a99a993c56f8563 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Mon, 29 Jun 2009 22:04:07 +0000 Subject: [PATCH] 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. --- cmd-copy-mode.c | 10 ++++++---- cmd-scroll-mode.c | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index b5642a45..bba05e3a 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -1,4 +1,4 @@ -/* $Id: cmd-copy-mode.c,v 1.16 2009-02-25 21:56:46 nicm Exp $ */ +/* $OpenBSD: cmd-copy-mode.c,v 1.2 2009/06/29 07:11:20 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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 e6f9d721..bb156a7f 100644 --- a/cmd-scroll-mode.c +++ b/cmd-scroll-mode.c @@ -1,4 +1,4 @@ -/* $Id: cmd-scroll-mode.c,v 1.16 2009-01-27 23:35:44 nicm Exp $ */ +/* $OpenBSD: cmd-scroll-mode.c,v 1.2 2009/06/29 07:11:20 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -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); }