summaryrefslogtreecommitdiff
path: root/st.c.rej
diff options
context:
space:
mode:
authorxAlpharax <42233094+xAlpharax@users.noreply.github.com>2023-08-14 01:37:39 +0300
committerxAlpharax <42233094+xAlpharax@users.noreply.github.com>2023-08-14 01:37:39 +0300
commitb40ce8559698d1442ced6e537fb18091f1343fb8 (patch)
tree6f9a6bbf23982030b078a619709e9d805458dad7 /st.c.rej
parent7028eccc1955a6e0b0a46c0d3adc80b644a51b31 (diff)
Complete migration and clean installation.
Up to date with the upstream and the latest patches. Personal configuration merged. Changes to be committed: modified: Makefile new file: boxdraw.c new file: boxdraw.o new file: boxdraw_data.h modified: config.def.h new file: config.def.h.orig new file: config.def.h.rej new file: config.h modified: config.mk new file: patches/st-alpha-20220206-0.8.5.diff new file: patches/st-anysize-20220718-baa9357.diff new file: patches/st-boxdraw_v2-0.8.5.diff new file: patches/st-clipboard-0.8.3.diff new file: patches/st-copyurl-multiline-20230406-211964d.diff new file: patches/st-font2-0.8.5.diff new file: patches/st-scrollback-20210507-4536f46.diff new file: patches/st-scrollback-mouse-20220127-2c5edf2-after-scrollback.diff modified: st.c new file: st.c.orig new file: st.c.rej modified: st.h new file: st.h.orig new file: st.h.rej new file: st.o modified: x.c new file: x.c.orig new file: x.o
Diffstat (limited to 'st.c.rej')
-rw-r--r--st.c.rej121
1 files changed, 121 insertions, 0 deletions
diff --git a/st.c.rej b/st.c.rej
new file mode 100644
index 0000000..ca81ac7
--- /dev/null
+++ b/st.c.rej
@@ -0,0 +1,121 @@
+--- st.c
++++ 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();
++ }
++}