summaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2018-02-21 23:54:29 -0600
committerDevin J. Pohly <djpohly@gmail.com>2018-02-25 21:53:24 -0600
commitcfc7acdfd923924ae150a32061fb95987697b159 (patch)
tree81b6e86f3f21c1263c58880ccc0e45ac885cf627 /st.c
parentbcb5d3adbe57ead05a829e5144c2ba1dc465865f (diff)
Move remaining selection mode logic into selextend
The "done" parameter indicates a change which finalizes the selection (e.g. a mouse button release as opposed to motion). Signed-off-by: Devin J. Pohly <djpohly@gmail.com>
Diffstat (limited to 'st.c')
-rw-r--r--st.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/st.c b/st.c
index 21cba9e..b7e215e 100644
--- a/st.c
+++ b/st.c
@@ -167,11 +167,11 @@ static ssize_t xwrite(int, const char *, size_t);
/* Globals */
Term term;
-Selection sel;
int cmdfd;
pid_t pid;
int oldbutton = 3; /* button event on startup: 3 = release */
+static Selection sel;
static CSIEscape csiescseq;
static STREscape strescseq;
static int iofd = 1;
@@ -402,9 +402,17 @@ selstart(int col, int row, int snap)
}
void
-selextend(int col, int row, int type)
+selextend(int col, int row, int type, int done)
{
int oldey, oldex, oldsby, oldsey, oldtype;
+
+ if (!sel.mode)
+ return;
+ if (done && sel.mode == SEL_EMPTY) {
+ selclear();
+ return;
+ }
+
oldey = sel.oe.y;
oldex = sel.oe.x;
oldsby = sel.nb.y;
@@ -419,6 +427,8 @@ selextend(int col, int row, int type)
if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type)
tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
+
+ sel.mode = done ? SEL_IDLE : SEL_READY;
}
void