commit 32376c8df5fe4c3d15bfd633ee2c2be4d38eb264
parent 4a8c816f58dbbbdba50bb13c49897291b0a6bfd6
Author: siduck76 <siduckk76@protonmail.com>
Date: Thu, 10 Jun 2021 13:55:39 +0530
default st
Diffstat:
| M | Makefile | | | 2 | +- |
| M | README.md | | | 8 | ++------ |
| M | config.def.h | | | 19 | ++----------------- |
| M | config.h | | | 20 | +------------------- |
| M | st.c | | | 353 | +++++++++++++++++++++++++++++++++++++------------------------------------------ |
| M | st.h | | | 2 | -- |
| M | win.h | | | 1 | - |
| M | x.c | | | 51 | ++++++++++++--------------------------------------- |
8 files changed, 184 insertions(+), 272 deletions(-)
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ config.h:
.c.o:
$(CC) $(STCFLAGS) -c $<
-st.o: config.h st.h win.h normalMode.h normalMode.c utils.h
+st.o: config.h st.h win.h
x.o: arg.h config.h st.h win.h hb.h
hb.o: st.h
boxdraw.o: config.h st.h boxdraw_data.h
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
# st (Simple Terminal)
-This is a custom suckless st build (credits to lukesmith's build for ligatures patch) and I've added some additional patches like newterm , rightclick paste , desktop entry ,sixel, live-reload xresources , st-history etc!.
+This is a custom suckless st build (credits to lukesmith's build for ligatures patch) and I've added some additional patches like newterm , rightclick paste , desktop entry ,sixel, live-reload xresources , dynamic cursor etc!.
## Patches:
@@ -62,11 +62,7 @@ apt install build-essential libxft-dev libharfbuzz-dev
## Ram comparison with other terminals and speed test
-
-St heavily customized + configured vs default other terminals
-<img src="https://raw.githubusercontent.com/siduck76/dotfiles/master/rice%20flex/terminal_ramUsage.jpg">
-(Tested on my old system having 1.6 GHZ N7310 Pentium CPU , 4gb ram)
- <br><br>
+<img src="https://raw.githubusercontent.com/siduck76/dotfiles/master/rice%20flex/terminal_ramUsage.jpg"> <br><br>
<img src="https://raw.githubusercontent.com/siduck76/dotfiles/master/rice%20flex/speedTest.png"> <br><br>
<img src="https://raw.githubusercontent.com/siduck76/dotfiles/master/rice%20flex/speedTest1.png"> <br><br>
diff --git a/config.def.h b/config.def.h
@@ -138,7 +138,7 @@ static const char *colorname[] = {
/* more colors can be added after 255 to use with DefaultXX */
"#add8e6", /* 256 -> cursor */
"#555555", /* 257 -> rev cursor*/
- "#282c34", /* 258 -> bg */
+ "#282828", /* 258 -> bg */
"#ffffff", /* 259 -> fg */
};
@@ -152,21 +152,6 @@ unsigned int defaultbg = 258;
unsigned int defaultcs = 256;
unsigned int defaultrcs = 257;
-unsigned int const currentBg = 6, buffSize = 2048;
-/// Enable double / triple click yanking / selection of word / line.
-int const mouseYank = 1, mouseSelect = 0;
-/// [Vim Browse] Colors for search results currently on screen.
-unsigned int const highlightBg = 258, highlightFg = 15;
-char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t";
-char *nmKeys [] = { ///< Shortcusts executed in normal mode
- "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n",
- "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf"
-};
-unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys);
-/// Style of the {command, search} string shown in the right corner (y,v,V,/)
-Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16};
-Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11},
- {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}};
/*
* Default shape of cursor
* 2: Block ("█")
@@ -302,7 +287,7 @@ static Shortcut shortcuts[] = {
{ MODKEY, XK_y, externalpipe, {.v = copyurlcmd } },
{ MODKEY, XK_o, externalpipe, {.v = copyoutput } },
{ TERMMOD, XK_Return, newterm, {.i = 0} },
- { MODKEY, XK_c, normalMode, {.i = 0} },
+
};
/*
diff --git a/config.h b/config.h
@@ -138,7 +138,7 @@ static const char *colorname[] = {
/* more colors can be added after 255 to use with DefaultXX */
"#add8e6", /* 256 -> cursor */
"#555555", /* 257 -> rev cursor*/
- "#282c34", /* 258 -> bg */
+ "#282828", /* 258 -> bg */
"#ffffff", /* 259 -> fg */
};
@@ -152,23 +152,6 @@ unsigned int defaultbg = 258;
unsigned int defaultcs = 256;
unsigned int defaultrcs = 257;
-unsigned int const currentBg = 0, buffSize = 2048;
-/// Enable double / triple click yanking / selection of word / line.
-int const mouseYank = 1, mouseSelect = 0;
-/// [Vim Browse] Colors for search results currently on screen.
-unsigned int const highlightBg = 250, highlightFg = 250;
-
-char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t";
-char *nmKeys [] = { ///< Shortcusts executed in normal mode
- "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n",
- "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf"
-};
-unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys);
-/// Style of the {command, search} string shown in the right corner (y,v,V,/)
-Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16};
-Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11},
- {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}};
-
/*
* Default shape of cursor
* 2: Block ("█")
@@ -280,7 +263,6 @@ static Shortcut shortcuts[] = {
{ ControlMask | ShiftMask, XK_V, clippaste, {.i = 0} },
{ XK_ANY_MOD, Button2, selpaste, {.i = 0} },
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
- { MODKEY, XK_c, normalMode, {.i = 0} },
{ MODKEY, XK_Control_L, iso14755, {.i = 0} },
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
diff --git a/st.c b/st.c
@@ -1,5 +1,4 @@
/* See LICENSE for license details. */
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -46,8 +45,6 @@
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
-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; }
#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
term.scr + HISTSIZE + 1) % HISTSIZE] : \
term.line[(y) - term.scr])
@@ -111,7 +108,6 @@ typedef struct {
int mode;
int type;
int snap;
- int swap;
/*
* Selection variables:
* nb – normalized coordinates of the beginning of the selection
@@ -198,6 +194,7 @@ static void tdeleteline(int);
static void tinsertblank(int);
static void tinsertblankline(int);
static int tlinelen(int);
+static void tmoveto(int, int);
static void tmoveato(int, int);
static void tnewline(int);
static void tputtab(int);
@@ -224,6 +221,7 @@ static void drawregion(int, int, int, int);
static void selnormalize(void);
static void selscroll(int, int);
+static void selsnap(int *, int *, int);
static size_t utf8decode(const char *, Rune *, size_t);
static Rune utf8decodebyte(char, size_t *);
@@ -276,14 +274,6 @@ tinsync(uint timeout)
return su;
}
-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();}
-
ssize_t
xwrite(int fd, const char *s, size_t len)
{
@@ -485,118 +475,6 @@ tlinehistlen(int y)
return i;
}
-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;
-}
-
-#include "normalMode.c"
-
-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);
-}
-
void
selstart(int col, int row, int snap)
{
@@ -606,14 +484,19 @@ selstart(int col, int row, int snap)
sel.alt = IS_SET(MODE_ALTSCREEN);
sel.snap = snap;
sel.oe.x = sel.ob.x = col;
- sel.oe.y = sel.ob.y = row + !sel.alt * (histMode ? histOff : insertOff);
- if (sel.snap != 0) sel.mode = SEL_READY;
+ sel.oe.y = sel.ob.y = row;
selnormalize();
+
+ if (sel.snap != 0)
+ sel.mode = SEL_READY;
+ tsetdirt(sel.nb.y, sel.ne.y);
}
void
selextend(int col, int row, int type, int done)
{
+ int oldey, oldex, oldsby, oldsey, oldtype;
+
if (sel.mode == SEL_IDLE)
return;
if (done && sel.mode == SEL_EMPTY) {
@@ -621,13 +504,51 @@ selextend(int col, int row, int type, int done)
return;
}
+ oldey = sel.oe.y;
+ oldex = sel.oe.x;
+ oldsby = sel.nb.y;
+ oldsey = sel.ne.y;
+ oldtype = sel.type;
+
sel.oe.x = col;
- sel.oe.y = row + (sel.alt ? 0 : (histMode ? histOff : insertOff));
+ sel.oe.y = row;
selnormalize();
sel.type = type;
+
+ 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));
+
sel.mode = done ? SEL_IDLE : SEL_READY;
}
+void
+selnormalize(void)
+{
+ int i;
+
+ if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
+ sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
+ sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
+ } else {
+ sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+ sel.ne.x = MAX(sel.ob.x, sel.oe.x);
+ }
+ sel.nb.y = MIN(sel.ob.y, sel.oe.y);
+ sel.ne.y = MAX(sel.ob.y, sel.oe.y);
+
+ selsnap(&sel.nb.x, &sel.nb.y, -1);
+ selsnap(&sel.ne.x, &sel.ne.y, +1);
+
+ /* expand selection over line breaks */
+ if (sel.type == SEL_RECTANGULAR)
+ return;
+ i = tlinelen(sel.nb.y);
+ if (i < sel.nb.x)
+ sel.nb.x = i;
+ if (tlinelen(sel.ne.y) <= sel.ne.x)
+ sel.ne.x = term.col - 1;
+}
+
int
selected(int x, int y)
{
@@ -638,49 +559,120 @@ selected(int x, int y)
if (sel.type == SEL_RECTANGULAR)
return BETWEEN(y, sel.nb.y, sel.ne.y)
&& BETWEEN(x, sel.nb.x, sel.ne.x);
- 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);
+
+ 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);
+}
+
+void
+selsnap(int *x, int *y, int direction)
+{
+ int newx, newy, xt, yt;
+ int delim, prevdelim;
+ Glyph *gp, *prevgp;
+
+ switch (sel.snap) {
+ case SNAP_WORD:
+ /*
+ * Snap around if the word wraps around at the end or
+ * beginning of a line.
+ */
+ prevgp = &TLINE(*y)[*x];
+ prevdelim = ISDELIM(prevgp->u);
+ for (;;) {
+ newx = *x + direction;
+ newy = *y;
+ if (!BETWEEN(newx, 0, term.col - 1)) {
+ newy += direction;
+ newx = (newx + term.col) % term.col;
+ if (!BETWEEN(newy, 0, term.row - 1))
+ break;
+
+ if (direction > 0)
+ yt = *y, xt = *x;
+ else
+ yt = newy, xt = newx;
+ if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
+ break;
+ }
+
+ if (newx >= tlinelen(newy))
+ break;
+
+ gp = &TLINE(newy)[newx];
+ delim = ISDELIM(gp->u);
+ if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+ || (delim && gp->u != prevgp->u)))
+ break;
+
+ *x = newx;
+ *y = newy;
+ prevgp = gp;
+ prevdelim = delim;
+ }
+ break;
+ case SNAP_LINE:
+ /*
+ * Snap around if the the previous line or the current one
+ * has set ATTR_WRAP at its end. Then the whole next or
+ * previous line will be selected.
+ */
+ *x = (direction < 0) ? 0 : term.col - 1;
+ if (direction < 0) {
+ for (; *y > 0; *y += direction) {
+ if (!(TLINE(*y-1)[term.col-1].mode
+ & ATTR_WRAP)) {
+ break;
+ }
+ }
+ } else if (direction > 0) {
+ for (; *y < term.row-1; *y += direction) {
+ if (!(TLINE(*y)[term.col-1].mode
+ & ATTR_WRAP)) {
+ break;
+ }
+ }
+ }
+ break;
+ }
}
char *
getsel(void)
{
char *str, *ptr;
- int y, yy, bufsize, lastx;
+ int y, bufsize, lastx, linelen;
Glyph *gp, *last;
if (sel.ob.x == -1)
return NULL;
- 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);
-
+ bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
ptr = str = xmalloc(bufsize);
/* append every set & selected glyph to the selection */
- for (y = start; y <= endy; y++) {
- yy = y % h;
+ for (y = sel.nb.y; y <= sel.ne.y; y++) {
+ if ((linelen = tlinelen(y)) == 0) {
+ *ptr++ = '\n';
+ continue;
+ }
if (sel.type == SEL_RECTANGULAR) {
- gp = &cbuf[yy][sel.nb.x];
+ gp = &TLINE(y)[sel.nb.x];
lastx = sel.ne.x;
} else {
- gp = &cbuf[yy][start == y ? sel.nb.x : 0];
- lastx = (endy == y) ? sel.ne.x : term.col-1;
+ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
+ lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
}
- last = &cbuf[yy][lastx];
- if (!(cbuf[yy][term.col - 1].mode & ATTR_WRAP))
- while (last > gp && last->u == ' ') --last;
+ last = &TLINE(y)[MIN(lastx, linelen-1)];
+ while (last >= gp && last->u == ' ')
+ --last;
for ( ; gp <= last; ++gp) {
-
- if (gp->mode & ATTR_WDUMMY) continue;
+ if (gp->mode & ATTR_WDUMMY)
+ continue;
+
ptr += utf8encode(gp->u, ptr);
}
@@ -693,7 +685,7 @@ getsel(void)
* st.
* FIXME: Fix the computer world.
*/
- if ((y < endy || lastx == term.col - 1) && !(last->mode & ATTR_WRAP))
+ if ((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
*ptr++ = '\n';
}
*ptr = 0;
@@ -707,7 +699,7 @@ selclear(void)
return;
sel.mode = SEL_IDLE;
sel.ob.x = -1;
- selnormalize();
+ tsetdirt(sel.nb.y, sel.ne.y);
}
void
@@ -1055,7 +1047,8 @@ tfulldirt(void)
void
tcursor(int mode)
{
- int alt = (histOp) ? 0 : (IS_SET(MODE_ALTSCREEN) + 1);
+ static TCursor c[2];
+ int alt = IS_SET(MODE_ALTSCREEN);
if (mode == CURSOR_SAVE) {
c[alt] = term.c;
@@ -1174,7 +1167,6 @@ kscrollup(const Arg* a)
void
tscrolldown(int orig, int n, int copyhist)
{
- if (!orig && historyBufferScroll(-n)) return;
int i;
Line temp;
@@ -1202,7 +1194,6 @@ tscrolldown(int orig, int n, int copyhist)
void
tscrollup(int orig, int n, int copyhist)
{
- if (!orig && historyBufferScroll(n)) return;
int i;
Line temp;
@@ -1377,8 +1368,8 @@ tclearregion(int x1, int y1, int x2, int y2)
if (y1 > y2)
temp = y1, y1 = y2, y2 = temp;
- LIMIT(x1, 0, buffCols-1);
- LIMIT(x2, 0, buffCols-1);
+ LIMIT(x1, 0, term.col-1);
+ LIMIT(x2, 0, term.col-1);
LIMIT(y1, 0, term.row-1);
LIMIT(y2, 0, term.row-1);
@@ -2638,6 +2629,8 @@ check_control_code:
*/
return;
}
+ if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+ selclear();
gp = &term.line[term.c.y][term.c.x];
if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
@@ -2713,10 +2706,8 @@ void
tresize(int col, int row)
{
int i, j;
- 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);
+ int minrow = MIN(row, term.row);
+ int mincol = MIN(col, term.col);
int *bp;
TCursor c;
@@ -2725,7 +2716,6 @@ tresize(int col, int row)
"tresize: error resizing to %dx%d\n", col, row);
return;
}
- if (alt) tswapscreen();
/*
* slide screen to keep cursor where we expect it -
@@ -2733,21 +2723,23 @@ tresize(int col, int row)
* memmove because we're freeing the earlier lines
*/
for (i = 0; i <= term.c.y - row; i++) {
+ free(term.line[i]);
free(term.alt[i]);
}
/* ensure that both src and dst are not NULL */
if (i > 0) {
+ memmove(term.line, term.line + i, row * sizeof(Line));
memmove(term.alt, term.alt + i, row * sizeof(Line));
}
for (i += row; i < term.row; i++) {
+ free(term.line[i]);
free(term.alt[i]);
}
/* resize to new height */
- buf = xrealloc(buf, (buffSize + row) * sizeof(Line));
+ term.line = xrealloc(term.line, row * sizeof(Line));
term.alt = xrealloc(term.alt, row * sizeof(Line));
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
- mark = xrealloc(mark, col * row * sizeof(*mark));
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
for (i = 0; i < HISTSIZE; i++) {
@@ -2760,35 +2752,27 @@ tresize(int col, int row)
/* resize each row to new width, zero-pad if needed */
for (i = 0; i < minrow; i++) {
+ term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph));
}
/* allocate any new rows */
for (/* i = minrow */; i < row; i++) {
+ term.line[i] = xmalloc(col * sizeof(Glyph));
term.alt[i] = xmalloc(col * sizeof(Glyph));
}
- if (col > buffCols) {
- bp = term.tabs + buffCols;
+ if (col > term.col) {
+ bp = term.tabs + term.col;
- memset(bp, 0, sizeof(*term.tabs) * (col - buffCols));
+ memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
while (--bp > term.tabs && !*bp)
/* nothing */ ;
for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
*bp = 1;
}
- 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));
/* update terminal size */
- term.col = colSet;
- buffCols = col;
+ term.col = col;
term.row = row;
- if (alt) tswapscreen();
/* reset scrolling region */
tsetscroll(0, row-1);
/* make use of the LIMIT in tmoveto */
@@ -2817,16 +2801,14 @@ resettitle(void)
void
drawregion(int x1, int y1, int x2, int y2)
{
- if (altToggle && histMode && !histOp)
- memset(term.dirty, 0, sizeof(*term.dirty) * term.row);
- int const o = !IS_SET(MODE_ALTSCREEN) && histMode && !histOp, h =rows();
int y;
for (y = y1; y < y2; y++) {
- 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);
+ if (!term.dirty[y])
+ continue;
+
+ term.dirty[y] = 0;
+ xdrawline(TLINE(y), x1, y, x2);
}
- memset(&term.dirty[y1], 0, sizeof(*term.dirty) * (y2 - y1));
}
void
@@ -2845,10 +2827,7 @@ draw(void)
if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
cx--;
- if (histMode) historyPreDraw();
drawregion(0, 0, term.col, term.row);
- if (!histMode)
-
if (term.scr == 0)
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
term.ocx, term.ocy, term.line[term.ocy][term.ocx],
diff --git a/st.h b/st.h
@@ -8,7 +8,6 @@
#define MAX(a, b) ((a) < (b) ? (b) : (a))
#define LEN(a) (sizeof(a) / sizeof(a)[0])
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
-#define OUT(x, a, b) ((a) <= (x) || (x) <= (b))
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
@@ -111,7 +110,6 @@ int tattrset(int);
int tisaltscr(void);
void tnew(int, int);
void tresize(int, int);
-void tmoveto(int x, int y);
void tsetdirtattr(int);
void ttyhangup(void);
int ttynew(char *, char *, char *, char **);
diff --git a/win.h b/win.h
@@ -19,7 +19,6 @@ enum win_mode {
MODE_MOUSEMANY = 1 << 15,
MODE_BRCKTPASTE = 1 << 16,
MODE_NUMLOCK = 1 << 17,
- MODE_NORMAL = 1 << 18,
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|MODE_MOUSEMANY,
};
diff --git a/x.c b/x.c
@@ -20,7 +20,6 @@ static char *argv0;
#include "arg.h"
#include "st.h"
#include "win.h"
-#include "normalMode.h"
#include "hb.h"
/* types used in config.h */
@@ -274,7 +273,6 @@ clipcopy(const Arg *dummy)
free(xsel.clipboard);
xsel.clipboard = NULL;
- xsetsel(getsel());
if (xsel.primary != NULL) {
xsel.clipboard = xstrdup(xsel.primary);
@@ -455,6 +453,7 @@ bpress(XEvent *e)
struct timespec now;
MouseShortcut *ms;
MouseKey *mk;
+ int snap;
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
mousereport(e);
@@ -485,34 +484,17 @@ bpress(XEvent *e)
* snapping behaviour is exposed.
*/
clock_gettime(CLOCK_MONOTONIC, &now);
- int const tripleClick = TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout,
- doubleClick = TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout;
- if ((mouseYank || mouseSelect) && (tripleClick || doubleClick)) {
- if (!IS_SET(MODE_NORMAL)) normalMode();
- historyOpToggle(1, 1);
- tmoveto(evcol(e), evrow(e));
- if (tripleClick) {
- if (mouseYank) pressKeys("dVy", 3);
- if (mouseSelect) pressKeys("dV", 2);
- } else if (doubleClick) {
- if (mouseYank) pressKeys("dyiW", 4);
- if (mouseSelect) {
- tmoveto(evcol(e), evrow(e));
- pressKeys("viW", 3);
- }
- }
- historyOpToggle(-1, 1);
+ if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) {
+ snap = SNAP_LINE;
+ } else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) {
+ snap = SNAP_WORD;
} else {
- if (!IS_SET(MODE_NORMAL)) selstart(evcol(e), evrow(e), 0);
- else {
- historyOpToggle(1, 1);
- tmoveto(evcol(e), evrow(e));
- pressKeys("v", 1);
- historyOpToggle(-1, 1);
- }
+ snap = 0;
}
xsel.tclick2 = xsel.tclick1;
xsel.tclick1 = now;
+
+ selstart(evcol(e), evrow(e), snap);
}
}
@@ -717,7 +699,8 @@ brelease(XEvent *e)
if (e->xbutton.button == Button3)
selpaste(NULL);
- if (e->xbutton.button == Button1 && !IS_SET(MODE_NORMAL)) mousesel(e, 1); // bruh
+ else if (e->xbutton.button == Button1)
+ mousesel(e, 1);
}
void
@@ -800,8 +783,6 @@ xloadcolor(int i, const char *name, Color *ncolor)
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
}
-void normalMode() { historyModeToggle((win.mode ^=MODE_NORMAL) & MODE_NORMAL); }
-
void
xloadcols(void)
{
@@ -1367,10 +1348,8 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
for (i = 0, xp = winx, yp = winy + font->ascent + win.cyo; i < len; ++i) {
/* Fetch rune and mode for current glyph. */
- Glyph g = glyphs[i];
- historyOverlay(x+i, y, &g);
- rune = g.u;
- mode = g.mode;
+ rune = glyphs[i].u;
+ mode = glyphs[i].mode;
/* Skip dummy wide-character spacing. */
if (mode & ATTR_WDUMMY)
@@ -1762,7 +1741,6 @@ xdrawline(Line line, int x1, int y1, int x2)
i = ox = 0;
for (x = x1; x < x2 && i < numspecs; x++) {
new = line[x];
- historyOverlay(x, y1, &new);
if (new.mode == ATTR_WDUMMY)
continue;
if (selected(x, y1))
@@ -1949,11 +1927,6 @@ kpress(XEvent *ev)
return;
len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
- if (IS_SET(MODE_NORMAL)) {
- if (kPressHist(buf, len, match(ControlMask, e->state), &ksym)
- == finish) normalMode();
- return;
- }
/* 1. shortcuts */
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
if (ksym == bp->keysym && match(bp->mod, e->state)) {
