sites

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

commit 1f96c60c0e4453fc9c105551d58455936b0784d9
parent 3a09feb9d2549e4cbb548bfe6e71d3e97ba0a2c4
Author: Michael Buch <michaelbuch12@gmail.com>
Date:   Mon, 14 May 2018 23:33:31 +0100

[st][patch][copyurl] Prevent url highlighting from occasional crash after resizing terminal. Also fix occasional partial highlighting. Will replace the previous patch on the wiki site

Diffstat:
st.suckless.org/patches/copyurl/index.md | 4++--
st.suckless.org/patches/copyurl/st-copyurl-20180427-70b7059.diff | 139-------------------------------------------------------------------------------
st.suckless.org/patches/copyurl/st-copyurl-20180514-a7bd977.diff | 143+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 145 insertions(+), 141 deletions(-)

diff --git a/st.suckless.org/patches/copyurl/index.md b/st.suckless.org/patches/copyurl/index.md @@ -22,9 +22,9 @@ Download * [st-copyurl-20170802-e2ee5ee.diff](st-copyurl-20170802-e2ee5ee.diff) * [st-copyurl-20180418-7e810b5.diff](st-copyurl-20180418-7e810b5.diff) -Following is the first patch that highlights selected urls: +Following patches also highlight the selected urls: - * [st-copyurl-20180427-70b7059.diff](st-copyurl-20180427-70b7059.diff) + * [st-copyurl-20180514-a7bd977.diff](st-copyurl-20180514-a7bd977.diff) Authors ------- diff --git a/st.suckless.org/patches/copyurl/st-copyurl-20180427-70b7059.diff b/st.suckless.org/patches/copyurl/st-copyurl-20180427-70b7059.diff @@ -1,139 +0,0 @@ -From 70b70594bd1e86a5efe83dad66516464ceca8a04 Mon Sep 17 00:00:00 2001 -From: Michael Buch <michaelbuch12@gmail.com> -Date: Fri, 27 Apr 2018 00:48:03 +0100 -Subject: [PATCH] [st][patch] copyurl patch to highlight selected urls. Simply - invert terminal default colors when a url is copied to the clipboard. - ---- - config.def.h | 1 + - st.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - st.h | 1 + - 3 files changed, 80 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..f1ac7b6 100644 ---- a/st.c -+++ b/st.c -@@ -204,6 +204,7 @@ static void tdefutf8(char); - static int32_t tdefcolor(int *, int *, int); - static void tdeftran(char); - static void tstrsequence(uchar); -+static void tsetcolor(int, int, int, uint32_t, uint32_t); - - static void drawregion(int, int, int, int); - -@@ -1600,6 +1601,17 @@ tsetmode(int priv, int set, int *args, int narg) - } - } - -+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; -+ } -+} -+ - void - csihandle(void) - { -@@ -2617,3 +2629,69 @@ 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-._~:/?#@!$&'*+,;=%"; -+ -+ tsetcolor( sel.nb.y, sel.ob.x, sel.oe.x - sel.ob.x + 1, defaultfg, defaultbg ); -+ -+ 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; -+ } -+ -+ tsetcolor( row, 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 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 - diff --git a/st.suckless.org/patches/copyurl/st-copyurl-20180514-a7bd977.diff b/st.suckless.org/patches/copyurl/st-copyurl-20180514-a7bd977.diff @@ -0,0 +1,143 @@ +From a7bd977e7f53d53223dc0a844406ad706d5fb803 Mon Sep 17 00:00:00 2001 +From: Michael Buch <michaelbuch12@gmail.com> +Date: Mon, 14 May 2018 23:27:09 +0100 +Subject: [PATCH] [st][patch][copyurl] Prevent url highlighting from occasional + crash after resizing terminal. Also fix occasional partial highlighting. Will + replace the previous patch on the wiki site + +--- + config.def.h | 1 + + st.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + st.h | 1 + + 3 files changed, 83 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..afe3d9a 100644 +--- a/st.c ++++ b/st.c +@@ -204,6 +204,7 @@ static void tdefutf8(char); + static int32_t tdefcolor(int *, int *, int); + static void tdeftran(char); + static void tstrsequence(uchar); ++static void tsetcolor(int, int, int, uint32_t, uint32_t); + + static void drawregion(int, int, int, int); + +@@ -1600,6 +1601,17 @@ tsetmode(int priv, int set, int *args, int narg) + } + } + ++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; ++ } ++} ++ + void + csihandle(void) + { +@@ -2617,3 +2629,72 @@ 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-._~:/?#@!$&'*+,;=%"; ++ ++ // 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, 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; ++ } ++ ++ // 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 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 +