You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
168 lines
4.3 KiB
Diff
168 lines
4.3 KiB
Diff
1 year ago
|
From 7405bdc89e4c43cfbeabd0d4d822bc62d1e76730 Mon Sep 17 00:00:00 2001
|
||
|
From: Gildasio Junior <gildasiojunior@riseup.net>
|
||
|
Date: Thu, 6 Apr 2023 14:51:06 -0300
|
||
|
Subject: [PATCH] Loop through urls on screen in both directions
|
||
|
|
||
|
Using previous patches one can loop through urls in the screen in one
|
||
|
direction: botton-up. This patch add a way that can go in the opposite
|
||
|
direction: top-down.
|
||
|
|
||
|
This is usefull in a screen with lots of urls.
|
||
|
---
|
||
|
config.def.h | 2 +
|
||
|
st.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||
|
st.h | 1 +
|
||
|
3 files changed, 104 insertions(+)
|
||
|
|
||
|
diff --git a/config.def.h b/config.def.h
|
||
|
index 91ab8ca..4df78eb 100644
|
||
|
--- a/config.def.h
|
||
|
+++ b/config.def.h
|
||
|
@@ -201,6 +201,8 @@ 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} },
|
||
|
+ { MODKEY|ShiftMask, XK_L, copyurl, {.i = 1} },
|
||
|
};
|
||
|
|
||
|
/*
|
||
|
diff --git a/st.c b/st.c
|
||
|
index 134e724..c451015 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);
|
||
|
@@ -201,6 +206,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);
|
||
|
|
||
|
@@ -2666,3 +2672,98 @@ 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;
|
||
|
+
|
||
|
+ /* .i = 0 --> botton-up
|
||
|
+ * .i = 1 --> top-down
|
||
|
+ */
|
||
|
+ if (!arg->i) {
|
||
|
+ if (--row < 0)
|
||
|
+ row = term.row - 1;
|
||
|
+ } else {
|
||
|
+ if (++row >= term.row)
|
||
|
+ row = 0;
|
||
|
+ }
|
||
|
+
|
||
|
+ 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 fd3b0d8..baa8f29 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.40.0
|
||
|
|