commit ec393a20aecd110a592a998a38b21313c8dfdce9
parent b4cd18b0c49e4c9daf2ec82a7eada6f91d59f24c
Author: David Phillips <dbphillipsnz@gmail.com>
Date: Wed, 10 Feb 2016 01:21:32 +1300
[st] Updated copyurl patch to latest git HEAD
Diffstat:
3 files changed, 91 insertions(+), 90 deletions(-)
diff --git a/st.suckless.org/patches/copyurl.md b/st.suckless.org/patches/copyurl.md
@@ -17,10 +17,11 @@ Download
--------
* [st-0.6-copyurl.diff](st-0.6-copyurl.diff)
- * [st-git-20150917-copyurl.diff](st-git-20150917-copyurl.diff)
+ * [st-git-20160210-copyurl.diff](st-git-20160210-copyurl.diff)
Authors
-------
* Brandon Mulcahy - brandon@jangler.info
- * Laslo Hunhold - dev@frign.de (st-0.6, st-git-20150917 port)
+ * Laslo Hunhold - dev@frign.de (st-0.6 port)
+ * David Phillips - dbphillipsnz@gmail.com (st-git-20160210 port)
diff --git a/st.suckless.org/patches/st-git-20150917-copyurl.diff b/st.suckless.org/patches/st-git-20150917-copyurl.diff
@@ -1,88 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index b6adc5e..54d9e7c 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -155,6 +155,7 @@ static Shortcut shortcuts[] = {
- { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
- { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
- { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
-+ { MODKEY, XK_l, copyurl, {.i = 0} },
- };
-
- /*
-diff --git a/st.c b/st.c
-index bd8b815..a5a5981 100644
---- a/st.c
-+++ b/st.c
-@@ -335,6 +335,7 @@ static void printsel(const Arg *);
- static void printscreen(const Arg *) ;
- static void toggleprinter(const Arg *);
- static void sendbreak(const Arg *);
-+static void copyurl(const Arg *);
-
- /* Config.h for applying patches and the configuration. */
- #include "config.h"
-@@ -4376,3 +4377,63 @@ run:
- return 0;
- }
-
-+/* 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(NULL);
-+ 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);
-+ selcopy(0);
-+ }
-+
-+ free(linestr);
-+}
diff --git a/st.suckless.org/patches/st-git-20160210-copyurl.diff b/st.suckless.org/patches/st-git-20160210-copyurl.diff
@@ -0,0 +1,88 @@
+diff --git a/config.def.h b/config.def.h
+index fd09d72..05fbba5 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -157,6 +157,7 @@ static Shortcut shortcuts[] = {
+ { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
+ { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
+ { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
++ { MODKEY, XK_l, copyurl, {.i = 0} },
+ };
+
+ /*
+diff --git a/st.c b/st.c
+index 41f6942..aa5ed41 100644
+--- a/st.c
++++ b/st.c
+@@ -335,6 +335,7 @@ static void printsel(const Arg *);
+ static void printscreen(const Arg *) ;
+ static void toggleprinter(const Arg *);
+ static void sendbreak(const Arg *);
++static void copyurl(const Arg *);
+
+ /* Config.h for applying patches and the configuration. */
+ #include "config.h"
+@@ -4411,3 +4412,63 @@ run:
+ return 0;
+ }
+
++/* 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(NULL);
++ 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);
++ selcopy(0);
++ }
++
++ free(linestr);
++}
