From 7127a0a6c393ee888a7b640c5481e191e0744519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Mon, 27 Jul 2020 16:44:41 +0200
Subject: [PATCH] selection: extending a selection is now interactive

That is, a selection extension can be resized just like an ordinary
extension.
---
 CHANGELOG.md |  4 +++-
 input.c      |  2 +-
 selection.c  | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 764e8f46..53c2462a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,13 +37,15 @@
   outside it.
 * Scrollback search to focus match, that requires a viewport change,
   roughly in the center of the screen.
+* Extending a selection with the right mouse button now works while
+  dragging the mouse.
 
 
 ### Deprecated
 ### Removed
 ### Fixed
 
-* Crash in scrollback search
+* Crash in scrollback search.
 * Crash when a **pipe-visible** or **pipe-scrollback** command
   contained an unclosed quote
   (https://codeberg.org/dnkl/foot/issues/49).
diff --git a/input.c b/input.c
index 442cd322..c7f4b073 100644
--- a/input.c
+++ b/input.c
@@ -1171,7 +1171,7 @@ wl_pointer_motion(void *data, struct wl_pointer *wl_pointer,
         if (col < 0 || row < 0 || col >= term->cols || row >= term->rows)
             return;
 
-        bool update_selection = seat->mouse.button == BTN_LEFT;
+        bool update_selection = seat->mouse.button == BTN_LEFT || seat->mouse.button == BTN_RIGHT;
         bool update_selection_early = term->selection.end.row == -1;
 
         if (update_selection && update_selection_early)
diff --git a/selection.c b/selection.c
index d5add464..354f6f53 100644
--- a/selection.c
+++ b/selection.c
@@ -372,8 +372,8 @@ selection_extend_normal(struct terminal *term, int col, int row, uint32_t serial
 
     if (row < start->row || (row == start->row && col < start->col)) {
         /* Extend selection to start *before* current start */
-        new_start = (struct coord){col, row};
-        new_end = *end;
+        new_start = *end;
+        new_end = (struct coord){col, row};
     }
 
     else if (row > end->row || (row == end->row && col > end->col)) {
@@ -391,8 +391,8 @@ selection_extend_normal(struct terminal *term, int col, int row, uint32_t serial
             abs(linear - (end->row * term->cols + end->col)))
         {
             /* Move start point */
-            new_start = (struct coord){col, row};
-            new_end = *end;
+            new_start = *end;
+            new_end = (struct coord){col, row};
         }
 
         else {
@@ -440,13 +440,13 @@ selection_extend_block(struct terminal *term, int col, int row, uint32_t serial)
         /* Move one of the top corners */
 
         if (abs(col - top_left.col) < abs(col - top_right.col)) {
-            new_start = (struct coord){col, row};
-            new_end = bottom_right;
+            new_start = bottom_right;
+            new_end = (struct coord){col, row};
         }
 
         else {
-            new_start = (struct coord){col, row};
-            new_end = bottom_left;
+            new_start = bottom_left;
+            new_end = (struct coord){col, row};
         }
     }