sites

public wiki contents of suckless.org
git clone git://git.suckless.org/sites
Log | Files | Refs

commit 6e8ca18edc6caf6c3a007849edbb23b98fad4fd9
parent d247ba7ec43197ee97a544936618994b70b1d014
Author: Michael Buch <michaelbuch12@gmail.com>
Date:   Wed, 18 Apr 2018 02:07:25 +0100

Ported the copyurl patch to post-0.8.1 release. Mainly it involved
removing the deprecated selcopy function. I have used it for a while
and have not encountered issues. I did not address other outstanding FixMes.
and

Diffstat:
st.suckless.org/patches/copyurl/index.md | 2++
st.suckless.org/patches/copyurl/st-copyurl-20180418-7e810b5.diff | 109+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+), 0 deletions(-)

diff --git a/st.suckless.org/patches/copyurl/index.md b/st.suckless.org/patches/copyurl/index.md @@ -20,6 +20,7 @@ Download * [st-copyurl-0.7.diff](st-copyurl-0.7.diff) * [st-copyurl-20161105-8c99915.diff](st-copyurl-20161105-8c99915.diff) * [st-copyurl-20170802-e2ee5ee.diff](st-copyurl-20170802-e2ee5ee.diff) + * [st-copyurl-20180418-7e810b5.diff](st-copyurl-20180418-7e810b5.diff) Authors ------- @@ -28,3 +29,4 @@ Authors * Laslo Hunhold - <dev@frign.de> (0.6 port) * David Phillips - <david@sighup.nz> (git port) * Matthew Parnell - <matt@parnmatt.co.uk> (0.7, git ports) + * Michael Buch - <michaelbuch12@gmail.com> (0.8+ git port) diff --git a/st.suckless.org/patches/copyurl/st-copyurl-20180418-7e810b5.diff b/st.suckless.org/patches/copyurl/st-copyurl-20180418-7e810b5.diff @@ -0,0 +1,109 @@ +From 7e810b5d11e16aa8b79e6057cc4b9fa55df1fc57 Mon Sep 17 00:00:00 2001 +From: Michael Buch <michaelbuch12@gmail.com> +Date: Wed, 18 Apr 2018 01:12:09 +0100 +Subject: [PATCH] Port the copyurl patch to the 0.8.1 st release. Mainly fix + usage of depracted selcopy + +--- + config.def.h | 1 + + st.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + st.h | 1 + + 3 files changed, 64 insertions(+) + +diff --git a/config.def.h b/config.def.h +index 82b1b09..cbe923e 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -178,6 +178,7 @@ static Shortcut shortcuts[] = { + { TERMMOD, XK_Y, selpaste, {.i = 0} }, + { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, + { TERMMOD, XK_I, iso14755, {.i = 0} }, ++ { MODKEY, XK_l, copyurl, {.i = 0} }, + }; + + /* +diff --git a/st.c b/st.c +index 0628707..3df99d9 100644 +--- a/st.c ++++ b/st.c +@@ -2617,3 +2617,65 @@ redraw(void) + tfulldirt(); + draw(); + } ++ ++/* select and copy the previous url on screen (do nothing if there's no url). ++ * known bug: doesn't handle urls that span multiple lines (wontfix) ++ * known bug: only finds first url on line (mightfix) ++ */ ++void ++copyurl(const Arg *arg) { ++ /* () and [] can appear in urls, but excluding them here will reduce false ++ * positives when figuring out where a given url ends. ++ */ ++ static char URLCHARS[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" ++ "abcdefghijklmnopqrstuvwxyz" ++ "0123456789-._~:/?#@!$&'*+,;=%"; ++ ++ int i, row, startrow; ++ char *linestr = calloc(sizeof(char), term.col+1); /* assume ascii */ ++ char *c, *match = NULL; ++ ++ row = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.y-1 : term.bot; ++ LIMIT(row, term.top, term.bot); ++ startrow = row; ++ ++ /* find the start of the last url before selection */ ++ do { ++ for (i = 0; i < term.col; ++i) { ++ if (term.line[row][i].u > 127) /* assume ascii */ ++ continue; ++ linestr[i] = term.line[row][i].u; ++ } ++ linestr[term.col] = '\0'; ++ if ((match = strstr(linestr, "http://")) ++ || (match = strstr(linestr, "https://"))) ++ break; ++ if (--row < term.top) ++ row = term.bot; ++ } while (row != startrow); ++ ++ if (match) { ++ /* must happen before trim */ ++ selclear(); ++ sel.ob.x = strlen(linestr) - strlen(match); ++ ++ /* trim the rest of the line from the url match */ ++ for (c = match; *c != '\0'; ++c) ++ if (!strchr(URLCHARS, *c)) { ++ *c = '\0'; ++ break; ++ } ++ ++ /* select and copy */ ++ sel.mode = 1; ++ sel.type = SEL_REGULAR; ++ sel.oe.x = sel.ob.x + strlen(match)-1; ++ sel.ob.y = sel.oe.y = row; ++ selnormalize(); ++ tsetdirt(sel.nb.y, sel.ne.y); ++ xsetsel(getsel()); ++ xclipcopy(); ++ } ++ ++ free(linestr); ++} +diff --git a/st.h b/st.h +index dac64d8..5a58f8f 100644 +--- a/st.h ++++ b/st.h +@@ -85,6 +85,7 @@ void printscreen(const Arg *); + void printsel(const Arg *); + void sendbreak(const Arg *); + void toggleprinter(const Arg *); ++void copyurl(const Arg *); + + int tattrset(int); + void tnew(int, int); +-- +2.17.0 +