Apply copyurl patch

diff --git a/config.def.h b/config.def.h
index 6f05dce6aaec83db925b9ec9af40284b4bf13fd7..d598b7056a136eb0cf6b43bd0347179f8770e9b5 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -199,6 +199,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/config.h b/config.h
index eb7f5ba941ec8e8780e4f636323dbf850429aa3a..894f1eee187029739f4ea0a995588f12708f50ce 100644 (file)
--- a/config.h
+++ b/config.h
@@ -199,6 +199,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 01fe0aa7f2c8a3a3584f1a1ec08caaef054b16bf..754cf96aefa2d33ece7bd6ff5a80f7e540518050 100644 (file)
--- a/st.c
+++ b/st.c
@@ -200,6 +200,8 @@ static void tdefutf8(char);
 static int32_t tdefcolor(const int *, int *, int);
 static void tdeftran(char);
 static void tstrsequence(uchar);
+static void tsetcolor(int, int, int, uint32_t, uint32_t);
+static char * findlastany(char *, const char**, size_t);
 
 static void drawregion(int, int, int, int);
 
@@ -2606,3 +2608,127 @@ 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
+tsetcolor( int row, int start, int end, uint32_t fg, uint32_t bg )
+{
+       int i = start;
+       for( ; i < end; ++i )
+       {
+               term.line[row][i].fg = fg;
+               term.line[row][i].bg = bg;
+       }
+}
+
+char *
+findlastany(char *str, const char** find, size_t len)
+{
+       char* found = NULL;
+       int i = 0;
+       for(found = str + strlen(str) - 1; found >= str; --found) {
+               for(i = 0; i < len; i++) {
+                       if(strncmp(found, find[i], strlen(find[i])) == 0) {
+                               return found;
+                       }
+               }
+       }
+
+       return NULL;
+}
+
+/*
+** Select and copy the previous url on screen (do nothing if there's no url).
+**
+** FIXME: doesn't handle urls that span multiple lines; will need to add support
+**        for multiline "getsel()" first
+*/
+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-._~:/?#@!$&'*+,;=%";
+
+       static const char* URLSTRINGS[] = {"http://", "https://"};
+
+       /* remove highlighting from previous selection if any */
+       if(sel.ob.x >= 0 && sel.oe.x >= 0)
+               tsetcolor(sel.nb.y, sel.ob.x, sel.oe.x + 1, defaultfg, defaultbg);
+
+       int i = 0,
+               row = 0, /* row of current URL */
+               col = 0, /* column of current URL start */
+               startrow = 0, /* row of last occurrence */
+               colend = 0, /* column of last occurrence */
+               passes = 0; /* how many rows have been scanned */
+
+       char *linestr = calloc(term.col+1, sizeof(Rune));
+       char *c = NULL,
+                *match = NULL;
+
+       row = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.y : term.bot;
+       LIMIT(row, term.top, term.bot);
+       startrow = row;
+
+       colend = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.x : term.col;
+       LIMIT(colend, 0, term.col);
+
+       /*
+       ** Scan from (term.bot,term.col) to (0,0) and find
+       ** next occurrance of a URL
+       */
+       while(passes !=term.bot + 2) {
+               /* Read in each column of every row until
+               ** we hit previous occurrence of URL
+               */
+               for (col = 0, i = 0; col < colend; ++col,++i) {
+                       linestr[i] = term.line[row][col].u;
+               }
+               linestr[term.col] = '\0';
+
+               if ((match = findlastany(linestr, URLSTRINGS,
+                                               sizeof(URLSTRINGS)/sizeof(URLSTRINGS[0]))))
+                       break;
+
+               if (--row < term.top)
+                       row = term.bot;
+
+               colend = term.col;
+               passes++;
+       };
+
+       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;
+                       }
+
+               /* highlight selection by inverting terminal colors */
+               tsetcolor(row, sel.ob.x, sel.ob.x + strlen( match ), defaultbg, defaultfg);
+
+               /* 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 ddc0d2161e7b7713e1c454dd1202d90bf3befbc7..62181c4c750d429dd9012c447f70add55876cf56 100644 (file)
--- a/st.h
+++ b/st.h
@@ -87,6 +87,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);