Adding vim browse patch ref. #21
This commit is contained in:
bakkeby
parent
e139d1fd75
commit
e039854635
13 changed files with 769 additions and 23 deletions
341
st.c
341
st.c
|
|
@ -20,6 +20,10 @@
|
|||
#include "st.h"
|
||||
#include "win.h"
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
#include <assert.h>
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
#if KEYBOARDSELECT_PATCH
|
||||
#include <X11/keysym.h>
|
||||
#include <X11/X.h>
|
||||
|
|
@ -54,6 +58,10 @@
|
|||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
||||
#if VIM_BROWSE_PATCH
|
||||
static inline int max(int a, int b) { return a > b ? a : b; }
|
||||
static inline int min(int a, int b) { return a < b ? a : b; }
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
enum term_mode {
|
||||
MODE_WRAP = 1 << 0,
|
||||
|
|
@ -106,6 +114,9 @@ typedef struct {
|
|||
int mode;
|
||||
int type;
|
||||
int snap;
|
||||
#if VIM_BROWSE_PATCH
|
||||
int swap;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
/*
|
||||
* Selection variables:
|
||||
* nb – normalized coordinates of the beginning of the selection
|
||||
|
|
@ -174,7 +185,9 @@ static void tdeleteline(int);
|
|||
static void tinsertblank(int);
|
||||
static void tinsertblankline(int);
|
||||
static int tlinelen(int);
|
||||
#if !VIM_BROWSE_PATCH
|
||||
static void tmoveto(int, int);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
static void tmoveato(int, int);
|
||||
static void tnewline(int);
|
||||
static void tputtab(int);
|
||||
|
|
@ -202,7 +215,9 @@ static void tdeftran(char);
|
|||
static void tstrsequence(uchar);
|
||||
static void selnormalize(void);
|
||||
static void selscroll(int, int);
|
||||
#if !VIM_BROWSE_PATCH
|
||||
static void selsnap(int *, int *, int);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
static size_t utf8decode(const char *, Rune *, size_t);
|
||||
static Rune utf8decodebyte(char, size_t *);
|
||||
|
|
@ -233,6 +248,16 @@ static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
|||
static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
||||
static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
int buffCols;
|
||||
extern int const buffSize;
|
||||
int histOp, histMode, histOff, insertOff, altToggle, *mark;
|
||||
Line *buf = NULL;
|
||||
static TCursor c[3];
|
||||
static inline int rows() { return IS_SET(MODE_ALTSCREEN) ? term.row : buffSize;}
|
||||
static inline int rangeY(int i) { while (i < 0) i += rows(); return i % rows();}
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
#include "patch/st_include.h"
|
||||
|
||||
ssize_t
|
||||
|
|
@ -435,6 +460,118 @@ tlinelen(int y)
|
|||
return i;
|
||||
}
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
void historyOpToggle(int start, int paint) {
|
||||
if ((!histOp == !(histOp + start)) && ((histOp += start) || 1)) return;
|
||||
if (histMode && paint && (!IS_SET(MODE_ALTSCREEN) || altToggle)) draw();
|
||||
tcursor(CURSOR_SAVE);
|
||||
histOp += start;
|
||||
if (histMode && altToggle) {
|
||||
tswapscreen();
|
||||
memset(term.dirty,0,sizeof(*term.dirty)*term.row);
|
||||
}
|
||||
tcursor(CURSOR_LOAD);
|
||||
*(!IS_SET(MODE_ALTSCREEN)?&term.line:&term.alt)=&buf[histOp?histOff:insertOff];
|
||||
}
|
||||
|
||||
void historyModeToggle(int start) {
|
||||
if (!(histMode = (histOp = !!start))) {
|
||||
selnormalize();
|
||||
tfulldirt();
|
||||
} else {
|
||||
tcursor(CURSOR_SAVE);
|
||||
histOp = 0;
|
||||
histOff = insertOff;
|
||||
}
|
||||
}
|
||||
|
||||
int historyBufferScroll(int n) {
|
||||
if (IS_SET(MODE_ALTSCREEN) || !n) return histOp;
|
||||
int p=abs(n=(n<0) ? max(n,-term.row) : min(n,term.row)), r=term.row-p,
|
||||
s=sizeof(*term.dirty), *ptr=histOp?&histOff:&insertOff;
|
||||
if (!histMode || histOp) tfulldirt(); else {
|
||||
memmove(&term.dirty[-min(n,0)], &term.dirty[max(n,0)], s*r);
|
||||
memset(&term.dirty[n>0 ? r : 0], 0, s * p);
|
||||
}
|
||||
term.line = &buf[*ptr = (buffSize+*ptr+n) % buffSize];
|
||||
// Cut part of selection removed from buffer, and update sel.ne/b.
|
||||
int const prevOffBuf = sel.alt ? 0 : insertOff + term.row;
|
||||
if (sel.ob.x != -1 && !histOp && n) {
|
||||
int const offBuf = sel.alt ? 0 : insertOff + term.row,
|
||||
pb = rangeY(sel.ob.y - prevOffBuf),
|
||||
pe = rangeY(sel.oe.y - prevOffBuf);
|
||||
int const b = rangeY(sel.ob.y - offBuf), nln = n < 0,
|
||||
e = rangeY(sel.oe.y - offBuf), last = offBuf - nln;
|
||||
if (pb != b && ((pb < b) != nln)) sel.ob.y = last;
|
||||
if (pe != e && ((pe < e) != nln)) sel.oe.y = last;
|
||||
if (sel.oe.y == last && sel.ob.y == last) selclear();
|
||||
}
|
||||
selnormalize();
|
||||
// Clear the new region exposed by the shift.
|
||||
if (!histOp) tclearregion(0, n>0?r+1:0, buffCols-1, n>0?term.row:p-1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int historyMove(int x, int y, int ly) {
|
||||
historyOpToggle(1, 1);
|
||||
y += ((term.c.x += x) < 0 ?term.c.x-term.col :term.c.x) / term.col;//< x
|
||||
if ((term.c.x %= term.col) < 0) term.c.x += term.col;
|
||||
if ((term.c.y += y) >= term.row) ly += term.c.y - term.row + 1; //< y
|
||||
else if (term.c.y < 0) ly += term.c.y;
|
||||
term.c.y = MIN(MAX(term.c.y, 0), term.row - 1);
|
||||
// Check if scroll is necessary / arrived at top / bottom of terminal history
|
||||
int t = 0, b = 0, finTop = ly < 0, finBot = ly > 0;
|
||||
if (!IS_SET(MODE_ALTSCREEN)) {
|
||||
b=rangeY(insertOff-histOff), t=-rangeY(-term.row-(insertOff-histOff));
|
||||
finBot = ly > b, finTop=histMode&&((-ly>-t));
|
||||
}
|
||||
if ((finTop || finBot) && (x||y)) term.c.x = finBot ? term.col-1 : 0;
|
||||
historyBufferScroll(finBot ? b : (finTop ? t : ly));
|
||||
historyOpToggle(-1, 1);
|
||||
return finTop || finBot;
|
||||
}
|
||||
|
||||
void selnormalize(void) {
|
||||
historyOpToggle(1, 1);
|
||||
|
||||
int const oldb = sel.nb.y, olde = sel.ne.y;
|
||||
if (sel.ob.x == -1) {
|
||||
sel.ne.y = sel.nb.y = -1;
|
||||
} else {
|
||||
int const offsetBuffer = sel.alt ? 0 : insertOff + term.row;
|
||||
int const off = sel.alt ? 0 : (histMode ? histOff : insertOff);
|
||||
int const nby = rangeY(sel.ob.y - off),
|
||||
ney = rangeY(sel.oe.y - off);
|
||||
sel.swap = rangeY(sel.ob.y - offsetBuffer)
|
||||
> rangeY(sel.oe.y - offsetBuffer);
|
||||
sel.nb.y = sel.swap ? ney : nby;
|
||||
sel.ne.y = !sel.swap ? ney : nby;
|
||||
int const cnb = sel.nb.y < term.row, cne = sel.ne.y < term.row;
|
||||
if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
|
||||
if (cnb) sel.nb.x = (!sel.swap) ? sel.ob.x : sel.oe.x;
|
||||
if (cne) sel.ne.x = (!sel.swap) ? sel.oe.x : sel.ob.x;
|
||||
} else {
|
||||
if (cnb) sel.nb.x = MIN(sel.ob.x, sel.oe.x);
|
||||
if (cne) sel.ne.x = MAX(sel.ob.x, sel.oe.x);
|
||||
}
|
||||
}
|
||||
int const nBet=sel.nb.y<=sel.ne.y, oBet=oldb<=olde;
|
||||
for (int i = 0; i < term.row; ++i) {
|
||||
int const n = nBet ? BETWEEN(i, sel.nb.y, sel.ne.y)
|
||||
: OUT(i, sel.nb.y, sel.ne.y);
|
||||
term.dirty[i] |= (sel.type == SEL_RECTANGULAR && n) ||
|
||||
(n != (oBet ? BETWEEN(i,oldb,olde) : OUT(i,oldb,olde)));
|
||||
|
||||
}
|
||||
if (BETWEEN(oldb, 0, term.row - 1)) term.dirty[oldb] = 1;
|
||||
if (BETWEEN(olde, 0, term.row - 1)) term.dirty[olde] = 1;
|
||||
if (BETWEEN(sel.nb.y, 0, term.row - 1)) term.dirty[sel.nb.y] = 1;
|
||||
if (BETWEEN(sel.ne.y, 0, term.row - 1)) term.dirty[sel.ne.y] = 1;
|
||||
|
||||
historyOpToggle(-1, 1);
|
||||
}
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
void
|
||||
selstart(int col, int row, int snap)
|
||||
{
|
||||
|
|
@ -444,18 +581,27 @@ selstart(int col, int row, int snap)
|
|||
sel.alt = IS_SET(MODE_ALTSCREEN);
|
||||
sel.snap = snap;
|
||||
sel.oe.x = sel.ob.x = col;
|
||||
#if VIM_BROWSE_PATCH
|
||||
sel.oe.y = sel.ob.y = row + !sel.alt * (histMode ? histOff : insertOff);
|
||||
if (sel.snap != 0) sel.mode = SEL_READY;
|
||||
#else
|
||||
sel.oe.y = sel.ob.y = row;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
selnormalize();
|
||||
|
||||
#if !VIM_BROWSE_PATCH
|
||||
if (sel.snap != 0)
|
||||
sel.mode = SEL_READY;
|
||||
tsetdirt(sel.nb.y, sel.ne.y);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
}
|
||||
|
||||
void
|
||||
selextend(int col, int row, int type, int done)
|
||||
{
|
||||
#if !VIM_BROWSE_PATCH
|
||||
int oldey, oldex, oldsby, oldsey, oldtype;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
if (sel.mode == SEL_IDLE)
|
||||
return;
|
||||
|
|
@ -464,23 +610,32 @@ selextend(int col, int row, int type, int done)
|
|||
return;
|
||||
}
|
||||
|
||||
#if !VIM_BROWSE_PATCH
|
||||
oldey = sel.oe.y;
|
||||
oldex = sel.oe.x;
|
||||
oldsby = sel.nb.y;
|
||||
oldsey = sel.ne.y;
|
||||
oldtype = sel.type;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
sel.oe.x = col;
|
||||
#if VIM_BROWSE_PATCH
|
||||
sel.oe.y = row + (sel.alt ? 0 : (histMode ? histOff : insertOff));
|
||||
#else
|
||||
sel.oe.y = row;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
selnormalize();
|
||||
sel.type = type;
|
||||
|
||||
#if !VIM_BROWSE_PATCH
|
||||
if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY)
|
||||
tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
sel.mode = done ? SEL_IDLE : SEL_READY;
|
||||
}
|
||||
|
||||
#if !VIM_BROWSE_PATCH
|
||||
void
|
||||
selnormalize(void)
|
||||
{
|
||||
|
|
@ -508,6 +663,7 @@ selnormalize(void)
|
|||
if (tlinelen(sel.ne.y) <= sel.ne.x)
|
||||
sel.ne.x = term.col - 1;
|
||||
}
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
int
|
||||
selected(int x, int y)
|
||||
|
|
@ -520,11 +676,19 @@ selected(int x, int y)
|
|||
return BETWEEN(y, sel.nb.y, sel.ne.y)
|
||||
&& BETWEEN(x, sel.nb.x, sel.ne.x);
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
return ((sel.nb.y > sel.ne.y) ? OUT(y, sel.nb.y, sel.ne.y)
|
||||
: BETWEEN(y, sel.nb.y, sel.ne.y)) &&
|
||||
(y != sel.nb.y || x >= sel.nb.x) &&
|
||||
(y != sel.ne.y || x <= sel.ne.x);
|
||||
#else
|
||||
return BETWEEN(y, sel.nb.y, sel.ne.y)
|
||||
&& (y != sel.nb.y || x >= sel.nb.x)
|
||||
&& (y != sel.ne.y || x <= sel.ne.x);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
}
|
||||
|
||||
#if !VIM_BROWSE_PATCH
|
||||
void
|
||||
selsnap(int *x, int *y, int direction)
|
||||
{
|
||||
|
|
@ -594,22 +758,22 @@ selsnap(int *x, int *y, int direction)
|
|||
if (direction < 0) {
|
||||
for (; *y > 0; *y += direction) {
|
||||
#if SCROLLBACK_PATCH
|
||||
if (!(TLINE(*y-1)[term.col-1].mode
|
||||
if (!(TLINE(*y-1)[term.col-1].mode & ATTR_WRAP))
|
||||
#else
|
||||
if (!(term.line[*y-1][term.col-1].mode
|
||||
if (!(term.line[*y-1][term.col-1].mode & ATTR_WRAP))
|
||||
#endif // SCROLLBACK_PATCH
|
||||
& ATTR_WRAP)) {
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (direction > 0) {
|
||||
for (; *y < term.row-1; *y += direction) {
|
||||
#if SCROLLBACK_PATCH
|
||||
if (!(TLINE(*y)[term.col-1].mode
|
||||
if (!(TLINE(*y)[term.col-1].mode & ATTR_WRAP))
|
||||
#else
|
||||
if (!(term.line[*y][term.col-1].mode
|
||||
if (!(term.line[*y][term.col-1].mode & ATTR_WRAP))
|
||||
#endif // SCROLLBACK_PATCH
|
||||
& ATTR_WRAP)) {
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -617,49 +781,87 @@ selsnap(int *x, int *y, int direction)
|
|||
break;
|
||||
}
|
||||
}
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
char *
|
||||
getsel(void)
|
||||
{
|
||||
char *str, *ptr;
|
||||
#if VIM_BROWSE_PATCH
|
||||
int y, yy, bufsize, lastx;
|
||||
#else
|
||||
int y, bufsize, lastx, linelen;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
Glyph *gp, *last;
|
||||
|
||||
if (sel.ob.x == -1)
|
||||
return NULL;
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
int const start = sel.swap ? sel.oe.y : sel.ob.y, h = rows();
|
||||
int endy = (sel.swap ? sel.ob.y : sel.oe.y);
|
||||
for (; endy < start; endy += h);
|
||||
Line * const cbuf = IS_SET(MODE_ALTSCREEN) ? term.line : buf;
|
||||
bufsize = (term.col+1) * (endy-start+1 ) * UTF_SIZ;
|
||||
assert(bufsize > 0);
|
||||
#else
|
||||
bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
ptr = str = xmalloc(bufsize);
|
||||
|
||||
/* append every set & selected glyph to the selection */
|
||||
for (y = sel.nb.y; y <= sel.ne.y; y++) {
|
||||
#if VIM_BROWSE_PATCH
|
||||
for (y = start; y <= endy; y++)
|
||||
#else
|
||||
for (y = sel.nb.y; y <= sel.ne.y; y++)
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
{
|
||||
#if VIM_BROWSE_PATCH
|
||||
yy = y % h;
|
||||
#else
|
||||
if ((linelen = tlinelen(y)) == 0) {
|
||||
*ptr++ = '\n';
|
||||
continue;
|
||||
}
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
if (sel.type == SEL_RECTANGULAR) {
|
||||
#if SCROLLBACK_PATCH
|
||||
#if VIM_BROWSE_PATCH
|
||||
gp = &cbuf[yy][sel.nb.x];
|
||||
#elif SCROLLBACK_PATCH
|
||||
gp = &TLINE(y)[sel.nb.x];
|
||||
#else
|
||||
gp = &term.line[y][sel.nb.x];
|
||||
#endif // SCROLLBACK_PATCH
|
||||
lastx = sel.ne.x;
|
||||
} else {
|
||||
#if SCROLLBACK_PATCH
|
||||
#if VIM_BROWSE_PATCH
|
||||
gp = &cbuf[yy][start == y ? sel.nb.x : 0];
|
||||
#elif SCROLLBACK_PATCH
|
||||
gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
|
||||
#else
|
||||
gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
|
||||
#endif // SCROLLBACK_PATCH
|
||||
#if VIM_BROWSE_PATCH
|
||||
lastx = (endy == y) ? sel.ne.x : term.col-1;
|
||||
#else
|
||||
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
}
|
||||
#if SCROLLBACK_PATCH
|
||||
#if VIM_BROWSE_PATCH
|
||||
last = &cbuf[yy][lastx];
|
||||
#elif SCROLLBACK_PATCH
|
||||
last = &TLINE(y)[MIN(lastx, linelen-1)];
|
||||
#else
|
||||
last = &term.line[y][MIN(lastx, linelen-1)];
|
||||
#endif // SCROLLBACK_PATCH
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (!(cbuf[yy][term.col - 1].mode & ATTR_WRAP))
|
||||
while (last > gp && last->u == ' ') --last;
|
||||
#else
|
||||
while (last >= gp && last->u == ' ')
|
||||
--last;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
for ( ; gp <= last; ++gp) {
|
||||
if (gp->mode & ATTR_WDUMMY)
|
||||
|
|
@ -677,8 +879,13 @@ getsel(void)
|
|||
* st.
|
||||
* FIXME: Fix the computer world.
|
||||
*/
|
||||
if ((y < sel.ne.y || lastx >= linelen) &&
|
||||
(!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR))
|
||||
if (
|
||||
#if VIM_BROWSE_PATCH
|
||||
(y < endy || lastx == term.col - 1)
|
||||
#else
|
||||
(y < sel.ne.y || lastx >= linelen)
|
||||
#endif //
|
||||
&& (!(last->mode & ATTR_WRAP) || sel.type == SEL_RECTANGULAR))
|
||||
*ptr++ = '\n';
|
||||
}
|
||||
*ptr = 0;
|
||||
|
|
@ -692,7 +899,11 @@ selclear(void)
|
|||
return;
|
||||
sel.mode = SEL_IDLE;
|
||||
sel.ob.x = -1;
|
||||
#if VIM_BROWSE_PATCH
|
||||
selnormalize();
|
||||
#else
|
||||
tsetdirt(sel.nb.y, sel.ne.y);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1094,8 +1305,12 @@ tfulldirt(void)
|
|||
void
|
||||
tcursor(int mode)
|
||||
{
|
||||
#if VIM_BROWSE_PATCH
|
||||
int alt = (histOp) ? 0 : (IS_SET(MODE_ALTSCREEN) + 1);
|
||||
#else
|
||||
static TCursor c[2];
|
||||
int alt = IS_SET(MODE_ALTSCREEN);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
if (mode == CURSOR_SAVE) {
|
||||
c[alt] = term.c;
|
||||
|
|
@ -1173,6 +1388,10 @@ tscrolldown(int orig, int n, int copyhist)
|
|||
tscrolldown(int orig, int n)
|
||||
#endif // SCROLLBACK_PATCH
|
||||
{
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (!orig && historyBufferScroll(-n))
|
||||
return;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
int i;
|
||||
Line temp;
|
||||
#if SIXEL_PATCH
|
||||
|
|
@ -1223,6 +1442,10 @@ tscrollup(int orig, int n, int copyhist)
|
|||
tscrollup(int orig, int n)
|
||||
#endif // SCROLLBACK_PATCH
|
||||
{
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (!orig && historyBufferScroll(n))
|
||||
return;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
int i;
|
||||
Line temp;
|
||||
#if SIXEL_PATCH
|
||||
|
|
@ -1439,8 +1662,13 @@ tclearregion(int x1, int y1, int x2, int y2)
|
|||
if (y1 > y2)
|
||||
temp = y1, y1 = y2, y2 = temp;
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
LIMIT(x1, 0, buffCols-1);
|
||||
LIMIT(x2, 0, buffCols-1);
|
||||
#else
|
||||
LIMIT(x1, 0, term.col-1);
|
||||
LIMIT(x2, 0, term.col-1);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
LIMIT(y1, 0, term.row-1);
|
||||
LIMIT(y2, 0, term.row-1);
|
||||
|
||||
|
|
@ -2812,8 +3040,10 @@ check_control_code:
|
|||
*/
|
||||
return;
|
||||
}
|
||||
#if !VIM_BROWSE_PATCH
|
||||
if (selected(term.c.x, term.c.y))
|
||||
selclear();
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
gp = &term.line[term.c.y][term.c.x];
|
||||
if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
|
||||
|
|
@ -2902,8 +3132,15 @@ tresize(int col, int row)
|
|||
#if SCROLLBACK_PATCH
|
||||
int j;
|
||||
#endif // SCROLLBACK_PATCH
|
||||
#if VIM_BROWSE_PATCH
|
||||
int const colSet = col, alt = IS_SET(MODE_ALTSCREEN), ini = buf == NULL;
|
||||
col = MAX(col, buffCols);
|
||||
row = MIN(row, buffSize);
|
||||
int const minrow = MIN(row, term.row), mincol = MIN(col, buffCols);
|
||||
#else
|
||||
int minrow = MIN(row, term.row);
|
||||
int mincol = MIN(col, term.col);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
int *bp;
|
||||
TCursor c;
|
||||
|
||||
|
|
@ -2918,27 +3155,43 @@ tresize(int col, int row)
|
|||
return;
|
||||
}
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (alt)
|
||||
tswapscreen();
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
/*
|
||||
* slide screen to keep cursor where we expect it -
|
||||
* tscrollup would work here, but we can optimize to
|
||||
* memmove because we're freeing the earlier lines
|
||||
*/
|
||||
for (i = 0; i <= term.c.y - row; i++) {
|
||||
#if !VIM_BROWSE_PATCH
|
||||
free(term.line[i]);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
free(term.alt[i]);
|
||||
}
|
||||
/* ensure that both src and dst are not NULL */
|
||||
if (i > 0) {
|
||||
#if !VIM_BROWSE_PATCH
|
||||
memmove(term.line, term.line + i, row * sizeof(Line));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
memmove(term.alt, term.alt + i, row * sizeof(Line));
|
||||
}
|
||||
for (i += row; i < term.row; i++) {
|
||||
#if !VIM_BROWSE_PATCH
|
||||
free(term.line[i]);
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
free(term.alt[i]);
|
||||
}
|
||||
|
||||
/* resize to new height */
|
||||
#if VIM_BROWSE_PATCH
|
||||
buf = xrealloc(buf, (buffSize + row) * sizeof(Line));
|
||||
mark = xrealloc(mark, col * row * sizeof(*mark));
|
||||
#else
|
||||
term.line = xrealloc(term.line, row * sizeof(Line));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
term.alt = xrealloc(term.alt, row * sizeof(Line));
|
||||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
||||
|
|
@ -2955,27 +3208,60 @@ tresize(int col, int row)
|
|||
|
||||
/* resize each row to new width, zero-pad if needed */
|
||||
for (i = 0; i < minrow; i++) {
|
||||
#if !VIM_BROWSE_PATCH
|
||||
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
|
||||
}
|
||||
|
||||
/* allocate any new rows */
|
||||
for (/* i = minrow */; i < row; i++) {
|
||||
#if !VIM_BROWSE_PATCH
|
||||
term.line[i] = xmalloc(col * sizeof(Glyph));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
term.alt[i] = xmalloc(col * sizeof(Glyph));
|
||||
}
|
||||
if (col > term.col) {
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (col > buffCols)
|
||||
#else
|
||||
if (col > term.col)
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
{
|
||||
#if VIM_BROWSE_PATCH
|
||||
bp = term.tabs + buffCols;
|
||||
memset(bp, 0, sizeof(*term.tabs) * (col - buffCols));
|
||||
#else
|
||||
bp = term.tabs + term.col;
|
||||
|
||||
memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
while (--bp > term.tabs && !*bp)
|
||||
/* nothing */ ;
|
||||
for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
|
||||
*bp = 1;
|
||||
}
|
||||
#if VIM_BROWSE_PATCH
|
||||
Glyph g=(Glyph){.bg=term.c.attr.bg, .fg=term.c.attr.fg, .u=' ', .mode=0};
|
||||
for (i = 0; i < buffSize; ++i) {
|
||||
buf[i] = xrealloc(ini ? NULL : buf[i], col*sizeof(Glyph));
|
||||
for (int j = ini ? 0 : buffCols; j < col; ++j) buf[i][j] = g;
|
||||
}
|
||||
for (i = 0; i < row; ++i) buf[buffSize + i] = buf[i];
|
||||
term.line = &buf[*(histOp?&histOff:&insertOff) +=MAX(term.c.y-row+1,0)];
|
||||
memset(mark, 0, col * row * sizeof(*mark));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
/* update terminal size */
|
||||
#if VIM_BROWSE_PATCH
|
||||
term.col = colSet;
|
||||
buffCols = col;
|
||||
#else
|
||||
term.col = col;
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
term.row = row;
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (alt)
|
||||
tswapscreen();
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
/* reset scrolling region */
|
||||
tsetscroll(0, row-1);
|
||||
/* make use of the LIMIT in tmoveto */
|
||||
|
|
@ -3004,9 +3290,19 @@ resettitle(void)
|
|||
void
|
||||
drawregion(int x1, int y1, int x2, int y2)
|
||||
{
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (altToggle && histMode && !histOp)
|
||||
memset(term.dirty, 0, sizeof(*term.dirty) * term.row);
|
||||
int const o = !IS_SET(MODE_ALTSCREEN) && histMode && !histOp, h =rows();
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
int y;
|
||||
|
||||
for (y = y1; y < y2; y++) {
|
||||
#if VIM_BROWSE_PATCH
|
||||
int const oy = o ? (y + insertOff - histOff + h) % h : y;
|
||||
if (!BETWEEN(oy, 0, term.row-1) || !term.dirty[y]) continue;
|
||||
xdrawline(term.line[y], x1, oy, x2);
|
||||
#else
|
||||
if (!term.dirty[y])
|
||||
continue;
|
||||
|
||||
|
|
@ -3016,9 +3312,15 @@ drawregion(int x1, int y1, int x2, int y2)
|
|||
#else
|
||||
xdrawline(term.line[y], x1, y, x2);
|
||||
#endif // SCROLLBACK_PATCH
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
}
|
||||
#if VIM_BROWSE_PATCH
|
||||
memset(&term.dirty[y1], 0, sizeof(*term.dirty) * (y2 - y1));
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
}
|
||||
|
||||
#include "patch/st_include.c"
|
||||
|
||||
void
|
||||
draw(void)
|
||||
{
|
||||
|
|
@ -3035,9 +3337,16 @@ draw(void)
|
|||
if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
|
||||
cx--;
|
||||
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (histMode)
|
||||
historyPreDraw();
|
||||
#endif // VIM_BROWSE_PATCH
|
||||
|
||||
drawregion(0, 0, term.col, term.row);
|
||||
|
||||
#if SCROLLBACK_PATCH
|
||||
#if VIM_BROWSE_PATCH
|
||||
if (!histMode)
|
||||
#elif SCROLLBACK_PATCH
|
||||
if (term.scr == 0)
|
||||
#endif // SCROLLBACK_PATCH
|
||||
#if LIGATURES_PATCH
|
||||
|
|
@ -3061,5 +3370,3 @@ redraw(void)
|
|||
tfulldirt();
|
||||
draw();
|
||||
}
|
||||
|
||||
#include "patch/st_include.c"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue