Adding reflow patch (#120)
This commit is contained in:
parent
9a41526bfb
commit
3b87b07404
21 changed files with 2347 additions and 82 deletions
|
|
@ -1,8 +1,10 @@
|
|||
#if !REFLOW_PATCH
|
||||
#if SCROLLBACK_PATCH
|
||||
#define TLINEURL(y) TLINE(y)
|
||||
#else
|
||||
#define TLINEURL(y) term.line[y]
|
||||
#endif // SCROLLBACK_PATCH
|
||||
#endif // REFLOW_PATCH
|
||||
|
||||
int url_x1, url_y1, url_x2, url_y2 = -1;
|
||||
int url_draw, url_click, url_maxcol;
|
||||
|
|
@ -20,6 +22,20 @@ isvalidurlchar(Rune u)
|
|||
}
|
||||
|
||||
/* find the end of the wrapped line */
|
||||
#if REFLOW_PATCH
|
||||
static int
|
||||
findeowl(Line line)
|
||||
{
|
||||
int i = term.col - 1;
|
||||
|
||||
do {
|
||||
if (line[i].mode & ATTR_WRAP)
|
||||
return i;
|
||||
} while (!(line[i].mode & ATTR_SET) && --i >= 0);
|
||||
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
static int
|
||||
findeowl(int row)
|
||||
{
|
||||
|
|
@ -35,6 +51,7 @@ findeowl(int row)
|
|||
} while (TLINEURL(row)[col].u == ' ' && --col >= 0);
|
||||
return -1;
|
||||
}
|
||||
#endif // REFLOW_PATCH
|
||||
|
||||
void
|
||||
clearurl(void)
|
||||
|
|
@ -44,6 +61,84 @@ clearurl(void)
|
|||
url_y2 = -1;
|
||||
}
|
||||
|
||||
#if REFLOW_PATCH
|
||||
char *
|
||||
detecturl(int col, int row, int draw)
|
||||
{
|
||||
static char url[2048];
|
||||
Line line;
|
||||
int x1, y1, x2, y2;
|
||||
int i = sizeof(url)/2+1, j = sizeof(url)/2;
|
||||
int row_start = row, col_start = col;
|
||||
int minrow = tisaltscr() ? 0 : term.scr - term.histf;
|
||||
int maxrow = tisaltscr() ? term.row - 1 : term.scr + term.row - 1;
|
||||
|
||||
/* clear previously underlined url */
|
||||
if (draw)
|
||||
clearurl();
|
||||
|
||||
url_maxcol = 0;
|
||||
line = TLINE(row);
|
||||
|
||||
if (!isvalidurlchar(line[col].u))
|
||||
return NULL;
|
||||
|
||||
/* find the first character of url */
|
||||
do {
|
||||
x1 = col_start, y1 = row_start;
|
||||
url_maxcol = MAX(url_maxcol, x1);
|
||||
url[--i] = line[col_start].u;
|
||||
if (--col_start < 0) {
|
||||
if (--row_start < minrow || (col_start = findeowl(TLINE(row_start))) < 0)
|
||||
break;
|
||||
line = TLINE(row_start);
|
||||
}
|
||||
} while (isvalidurlchar(line[col_start].u) && i > 0);
|
||||
|
||||
/* early detection */
|
||||
if (url[i] != 'h')
|
||||
return NULL;
|
||||
|
||||
/* find the last character of url */
|
||||
line = TLINE(row);
|
||||
do {
|
||||
x2 = col, y2 = row;
|
||||
url_maxcol = MAX(url_maxcol, x2);
|
||||
url[j++] = line[col].u;
|
||||
if (line[col++].mode & ATTR_WRAP) {
|
||||
if (++row > maxrow)
|
||||
break;
|
||||
col = 0;
|
||||
line = TLINE(row);
|
||||
}
|
||||
} while (col < term.col && isvalidurlchar(line[col].u) && j < sizeof(url)-1);
|
||||
|
||||
url[j] = 0;
|
||||
|
||||
if (strncmp("https://", &url[i], 8) && strncmp("http://", &url[i], 7))
|
||||
return NULL;
|
||||
|
||||
/* Ignore some trailing characters to improve detection. */
|
||||
/* Alacritty and many other terminals also ignore these. */
|
||||
if (strchr(",.;:?!", (int)(url[j-1])) != NULL) {
|
||||
x2 = MAX(x2-1, 0);
|
||||
url[j-1] = 0;
|
||||
}
|
||||
|
||||
/* underline url (see xdrawglyphfontspecs() in x.c) */
|
||||
if (draw) {
|
||||
url_x1 = (y1 >= 0) ? x1 : 0;
|
||||
url_x2 = (y2 < term.row) ? x2 : url_maxcol;
|
||||
url_y1 = MAX(y1, 0);
|
||||
url_y2 = MIN(y2, term.row-1);
|
||||
url_draw = 1;
|
||||
for (y1 = url_y1; y1 <= url_y2; y1++)
|
||||
term.dirty[y1] = 1;
|
||||
}
|
||||
|
||||
return &url[i];
|
||||
}
|
||||
#else
|
||||
char *
|
||||
detecturl(int col, int row, int draw)
|
||||
{
|
||||
|
|
@ -52,6 +147,7 @@ detecturl(int col, int row, int draw)
|
|||
int row_start = row;
|
||||
int col_start = col;
|
||||
int i = sizeof(url)/2+1, j = sizeof(url)/2;
|
||||
|
||||
#if SCROLLBACK_PATCH
|
||||
int minrow = term.scr - term.histn, maxrow = term.scr + term.row - 1;
|
||||
/* Fixme: MODE_ALTSCREEN is not defined here, I had to use the magic number 1<<2 */
|
||||
|
|
@ -59,7 +155,7 @@ detecturl(int col, int row, int draw)
|
|||
minrow = 0, maxrow = term.row - 1;
|
||||
#else
|
||||
int minrow = 0, maxrow = term.row - 1;
|
||||
#endif // scrollback_patch
|
||||
#endif // SCROLLBACK_PATCH
|
||||
url_maxcol = 0;
|
||||
|
||||
/* clear previously underlined url */
|
||||
|
|
@ -119,6 +215,7 @@ detecturl(int col, int row, int draw)
|
|||
|
||||
return &url[i];
|
||||
}
|
||||
#endif // REFLOW_PATCH
|
||||
|
||||
void
|
||||
openUrlOnClick(int col, int row, char* url_opener)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue