From ec72bbe23e78e94167d72db27b3bbb4afd643672 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Wed, 11 Mar 2020 09:59:02 -0400 Subject: [PATCH 1/3] adding @ to regex --- config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.h b/config.h index 6ee8ea9..c875eda 100644 --- a/config.h +++ b/config.h @@ -214,11 +214,11 @@ MouseKey mkeys[] = { }; static char *openurlcmd[] = { "/bin/sh", "-c", - "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)'| uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -i -p 'Follow which url?' -l 10 | xargs -r xdg-open", + "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)'| uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -w $(xdotool getactivewindow) -i -p 'Follow which url?' -l 10 | xargs -r xdg-open", "externalpipe", NULL }; static char *copyurlcmd[] = { "/bin/sh", "-c", - "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", + "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -w $(xdotool getactivewindow) -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", "externalpipe", NULL }; static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL }; From 7917ec930a6487d3dc03d3a71eb4d61c9c597b4c Mon Sep 17 00:00:00 2001 From: Eugene Date: Wed, 1 Apr 2020 13:37:57 +0300 Subject: [PATCH 2/3] Do not copy text to clipboard after selecting This behaviour was introduced in https://github.com/LukeSmithxyz/st/commit/683341140065b3096ee9e7e3e3b042f9c52230a6 Resolves: #177 --- x.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/x.c b/x.c index c09392b..1ee015e 100644 --- a/x.c +++ b/x.c @@ -661,8 +661,6 @@ setsel(char *str, Time t) XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) selclear(); - - clipcopy(NULL); } void From 689add8aad04680b3882e08583ba9cbb7d91ca88 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Wed, 1 Apr 2020 09:40:53 -0400 Subject: [PATCH 3/3] middle click pastes selection again --- config.h | 3 +-- x.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config.h b/config.h index 58632e2..0c2115b 100644 --- a/config.h +++ b/config.h @@ -240,10 +240,9 @@ static Shortcut shortcuts[] = { { TERMMOD, XK_Prior, zoom, {.f = +1} }, { TERMMOD, XK_Next, zoom, {.f = -1} }, { MODKEY, XK_Home, zoomreset, {.f = 0} }, - { ShiftMask, XK_Insert, clippaste, {.i = 0} }, { MODKEY, XK_c, clipcopy, {.i = 0} }, + { ShiftMask, XK_Insert, clippaste, {.i = 0} }, { MODKEY, XK_v, clippaste, {.i = 0} }, - { MODKEY, XK_p, selpaste, {.i = 0} }, { XK_ANY_MOD, Button2, selpaste, {.i = 0} }, { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, { MODKEY, XK_Control_L, iso14755, {.i = 0} }, diff --git a/x.c b/x.c index 1ee015e..93ba648 100644 --- a/x.c +++ b/x.c @@ -678,7 +678,7 @@ brelease(XEvent *e) } if (e->xbutton.button == Button2) - clippaste(NULL); + selpaste(NULL); else if (e->xbutton.button == Button1) mousesel(e, 1); }