From e0fcd3b2472cb9062be9d8f53caefc3b73554ada Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 18 May 2011 20:33:24 +0000 Subject: [PATCH] Sync OpenBSD patchset 911: Use button mouse mode not any for copy mode, fixes issues with putty. From Ailin Nemui. --- window-copy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/window-copy.c b/window-copy.c index e08b0dc5..40a49890 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.130 2011-04-25 20:34:26 tcunha Exp $ */ +/* $Id: window-copy.c,v 1.131 2011-05-18 20:33:24 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -790,7 +790,7 @@ window_copy_mouse( * If already reading motion, move the cursor while buttons are still * pressed, or stop the selection on their release. */ - if (s->mode & MODE_MOUSE_ANY) { + if (s->mode & MODE_MOUSE_BUTTON) { if ((m->b & MOUSE_BUTTON) != MOUSE_UP) { window_copy_update_cursor(wp, m->x, m->y); if (window_copy_update_selection(wp)) @@ -803,7 +803,7 @@ window_copy_mouse( /* Otherwise if other buttons pressed, start selection and motion. */ if ((m->b & MOUSE_BUTTON) != MOUSE_UP) { s->mode &= ~MODE_MOUSE_STANDARD; - s->mode |= MODE_MOUSE_ANY; + s->mode |= MODE_MOUSE_BUTTON; window_copy_update_cursor(wp, m->x, m->y); window_copy_start_selection(wp); @@ -813,7 +813,7 @@ window_copy_mouse( return; reset_mode: - s->mode &= ~MODE_MOUSE_ANY; + s->mode &= ~MODE_MOUSE_BUTTON; s->mode |= MODE_MOUSE_STANDARD; if (sess != NULL) { window_copy_copy_selection(wp);