summaryrefslogtreecommitdiffstats
path: root/window-copy.c
diff options
context:
space:
mode:
authornicm <nicm>2019-05-15 19:25:53 +0000
committernicm <nicm>2019-05-15 19:25:53 +0000
commitcf4566b47b184abbb28e1cf4a05df6ce0ce2da96 (patch)
treed7bb7fb8f306fdbefc2f9186f5ff2d364ee3490d /window-copy.c
parent38b8a198bac62c16d351c54ed83ead29a2e0ecc8 (diff)
Fix dragging when in view mode rather than copy mode, GitHub issue 1740
from Brad Town.
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c16
1 files 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;