From cf4566b47b184abbb28e1cf4a05df6ce0ce2da96 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 15 May 2019 19:25:53 +0000 Subject: [PATCH] Fix dragging when in view mode rather than copy mode, GitHub issue 1740 from Brad Town. --- window-copy.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/window-copy.c b/window-copy.c index 84bef8e4..d4985062 100644 --- a/window-copy.c +++ b/window-copy.c @@ -3477,7 +3477,9 @@ window_copy_move_mouse(struct mouse_event *m) if (wp == NULL) return; wme = TAILQ_FIRST(&wp->modes); - if (wme == NULL || wme->mode != &window_copy_mode) + if (wme == NULL) + return; + if (wme->mode != &window_copy_mode && wme->mode != &window_view_mode) return; if (cmd_mouse_at(wp, m, &x, &y, 0) != 0) @@ -3500,7 +3502,9 @@ window_copy_start_drag(struct client *c, struct mouse_event *m) if (wp == NULL) return; wme = TAILQ_FIRST(&wp->modes); - if (wme == NULL || wme->mode != &window_copy_mode) + if (wme == NULL) + return; + if (wme->mode != &window_copy_mode && wme->mode != &window_view_mode) return; if (cmd_mouse_at(wp, m, &x, &y, 1) != 0) @@ -3534,7 +3538,9 @@ window_copy_drag_update(struct client *c, struct mouse_event *m) if (wp == NULL) return; wme = TAILQ_FIRST(&wp->modes); - if (wme == NULL || wme->mode != &window_copy_mode) + if (wme == NULL) + return; + if (wme->mode != &window_copy_mode && wme->mode != &window_view_mode) return; data = wme->data; @@ -3573,7 +3579,9 @@ window_copy_drag_release(struct client *c, struct mouse_event *m) if (wp == NULL) return; wme = TAILQ_FIRST(&wp->modes); - if (wme == NULL || wme->mode != &window_copy_mode) + if (wme == NULL) + return; + if (wme->mode != &window_copy_mode && wme->mode != &window_view_mode) return; data = wme->data;