diff options
Diffstat (limited to 'patches/st-copyurl-multiline-20220221-0.8.5.diff')
| -rw-r--r-- | patches/st-copyurl-multiline-20220221-0.8.5.diff | 156 |
1 files changed, 0 insertions, 156 deletions
diff --git a/patches/st-copyurl-multiline-20220221-0.8.5.diff b/patches/st-copyurl-multiline-20220221-0.8.5.diff deleted file mode 100644 index 7cd26e2..0000000 --- a/patches/st-copyurl-multiline-20220221-0.8.5.diff +++ /dev/null @@ -1,156 +0,0 @@ -From 30a04d9ecb3998953bdbe42e5617d00d6002869b Mon Sep 17 00:00:00 2001 -From: Santtu Lakkala <inz@inz.fi> -Date: Wed, 16 Feb 2022 20:34:20 +0200 -Subject: [PATCH] Loop through urls on screen and copy to clipboard - -Replace url detection heuristics with a DFA, enabling urls that span -multiple lines. Also fix the selection not to use snapping so that urls -are selected exactly. ---- - config.def.h | 1 + - st.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - st.h | 1 + - 3 files changed, 95 insertions(+) - -diff --git a/config.def.h b/config.def.h -index 91ab8ca..3f365c7 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -201,6 +201,7 @@ static Shortcut shortcuts[] = { - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, -+ { MODKEY, XK_l, copyurl, {.i = 0} }, - }; - - /* -diff --git a/st.c b/st.c -index 51049ba..5b6d919 100644 ---- a/st.c -+++ b/st.c -@@ -152,6 +152,11 @@ typedef struct { - int narg; /* nb of args */ - } STREscape; - -+typedef struct { -+ int state; -+ size_t length; -+} URLdfa; -+ - static void execsh(char *, char **); - static void stty(char **); - static void sigchld(int); -@@ -200,6 +205,7 @@ static void tdefutf8(char); - static int32_t tdefcolor(const int *, int *, int); - static void tdeftran(char); - static void tstrsequence(uchar); -+static int daddch(URLdfa *, char); - - static void drawregion(int, int, int, int); - -@@ -2688,3 +2694,90 @@ redraw(void) - tfulldirt(); - draw(); - } -+ -+int -+daddch(URLdfa *dfa, char c) -+{ -+ /* () and [] can appear in urls, but excluding them here will reduce false -+ * positives when figuring out where a given url ends. -+ */ -+ static const char URLCHARS[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -+ "abcdefghijklmnopqrstuvwxyz" -+ "0123456789-._~:/?#@!$&'*+,;=%"; -+ static const char RPFX[] = "//:sptth"; -+ -+ if (!strchr(URLCHARS, c)) { -+ dfa->length = 0; -+ dfa->state = 0; -+ -+ return 0; -+ } -+ -+ dfa->length++; -+ -+ if (dfa->state == 2 && c == '/') { -+ dfa->state = 0; -+ } else if (dfa->state == 3 && c == 'p') { -+ dfa->state++; -+ } else if (c != RPFX[dfa->state]) { -+ dfa->state = 0; -+ return 0; -+ } -+ -+ if (dfa->state++ == 7) { -+ dfa->state = 0; -+ return 1; -+ } -+ -+ return 0; -+} -+ -+/* -+** Select and copy the previous url on screen (do nothing if there's no url). -+*/ -+void -+copyurl(const Arg *arg) { -+ int row = 0, /* row of current URL */ -+ col = 0, /* column of current URL start */ -+ colend = 0, /* column of last occurrence */ -+ passes = 0; /* how many rows have been scanned */ -+ -+ const char *c = NULL, -+ *match = NULL; -+ URLdfa dfa = { 0 }; -+ -+ row = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.y : term.bot; -+ LIMIT(row, term.top, term.bot); -+ -+ colend = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.x : term.col; -+ LIMIT(colend, 0, term.col); -+ -+ /* -+ ** Scan from (term.row - 1,term.col - 1) to (0,0) and find -+ ** next occurrance of a URL -+ */ -+ for (passes = 0; passes < term.row; passes++) { -+ /* Read in each column of every row until -+ ** we hit previous occurrence of URL -+ */ -+ for (col = colend; col--;) -+ if (daddch(&dfa, term.line[row][col].u < 128 ? term.line[row][col].u : ' ')) -+ break; -+ -+ if (col >= 0) -+ break; -+ -+ if (--row < 0) -+ row = term.row - 1; -+ -+ colend = term.col; -+ } -+ -+ if (passes < term.row) { -+ selstart(col, row, 0); -+ selextend((col + dfa.length - 1) % term.col, row + (col + dfa.length - 1) / term.col, SEL_REGULAR, 0); -+ selextend((col + dfa.length - 1) % term.col, row + (col + dfa.length - 1) / term.col, SEL_REGULAR, 1); -+ xsetsel(getsel()); -+ xclipcopy(); -+ } -+} -diff --git a/st.h b/st.h -index 519b9bd..0458005 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.32.0 - |