commit afc7f1005f5f6d548738428272316765a764f486
parent 262cbd21e10a9c67378018079facb2201b900ba4
Author: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Thu, 5 Jan 2017 00:06:34 +0100
[st][scrollback] move define to st.c, simplifies patch
Diffstat:
1 file changed, 42 insertions(+), 89 deletions(-)
diff --git a/st.suckless.org/patches/st-scrollback-20170104-c63a87c.diff b/st.suckless.org/patches/st-scrollback-20170104-c63a87c.diff
@@ -1,16 +1,8 @@
diff --git a/config.def.h b/config.def.h
-index a719e36..0f25e8b 100644
+index a719e36..9b51988 100644
--- a/config.def.h
+++ b/config.def.h
-@@ -7,6 +7,7 @@
- */
- static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
- static int borderpx = 2;
-+#define histsize 2000
-
- /*
- * What program is execed by st depends of these precedence rules:
-@@ -178,6 +179,8 @@ static Shortcut shortcuts[] = {
+@@ -178,6 +178,8 @@ static Shortcut shortcuts[] = {
{ MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
{ MODKEY, XK_Control_L, iso14755, {.i = 0} },
@@ -20,10 +12,18 @@ index a719e36..0f25e8b 100644
/*
diff --git a/st.c b/st.c
-index fbcd9e0..3db7b78 100644
+index fbcd9e0..64bc208 100644
--- a/st.c
+++ b/st.c
-@@ -87,6 +87,8 @@ char *argv0;
+@@ -61,6 +61,7 @@ char *argv0;
+ #define XK_ANY_MOD UINT_MAX
+ #define XK_NO_MOD 0
+ #define XK_SWITCH_MOD (1<<13)
++#define histsize 2000
+
+ /* macros */
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
+@@ -87,6 +88,8 @@ char *argv0;
#define TRUERED(x) (((x) & 0xff0000) >> 8)
#define TRUEGREEN(x) (((x) & 0xff00))
#define TRUEBLUE(x) (((x) & 0xff) << 8)
@@ -32,34 +32,17 @@ index fbcd9e0..3db7b78 100644
/* constants */
#define ISO14755CMD "dmenu -w %lu -p codepoint: </dev/null"
-@@ -235,26 +237,6 @@ typedef struct {
- int narg; /* nb of args */
- } STREscape;
-
--/* Internal representation of the screen */
--typedef struct {
-- int row; /* nb row */
-- int col; /* nb col */
-- Line *line; /* screen */
-- Line *alt; /* alternate screen */
-- int *dirty; /* dirtyness of lines */
-- XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
-- TCursor c; /* cursor */
-- int top; /* top scroll limit */
-- int bot; /* bottom scroll limit */
-- int mode; /* terminal mode flags */
-- int esc; /* escape state flags */
-- char trantbl[4]; /* charset table translation */
-- int charset; /* current charset */
-- int icharset; /* selected charset for sequence */
-- int numlock; /* lock numbers in keyboard */
-- int *tabs;
--} Term;
--
- /* Purely graphic info */
- typedef struct {
- Display *dpy;
-@@ -334,6 +316,8 @@ typedef struct {
+@@ -241,6 +244,9 @@ typedef struct {
+ int col; /* nb col */
+ Line *line; /* screen */
+ Line *alt; /* alternate screen */
++ Line hist[histsize]; /* history buffer */
++ int histi; /* history index */
++ int scr; /* scroll back */
+ int *dirty; /* dirtyness of lines */
+ XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
+ TCursor c; /* cursor */
+@@ -334,6 +340,8 @@ typedef struct {
/* function definitions used in config.h */
static void clipcopy(const Arg *);
static void clippaste(const Arg *);
@@ -68,37 +51,7 @@ index fbcd9e0..3db7b78 100644
static void numlock(const Arg *);
static void selpaste(const Arg *);
static void xzoom(const Arg *);
-@@ -370,6 +354,29 @@ typedef struct {
- GC gc;
- } DC;
-
-+/* Internal representation of the screen */
-+typedef struct {
-+ int row; /* nb row */
-+ int col; /* nb col */
-+ Line *line; /* screen */
-+ Line *alt; /* alternate screen */
-+ Line hist[histsize]; /* history buffer */
-+ int histi; /* history index */
-+ int scr; /* scroll back */
-+ int *dirty; /* dirtyness of lines */
-+ XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
-+ TCursor c; /* cursor */
-+ int top; /* top scroll limit */
-+ int bot; /* bottom scroll limit */
-+ int mode; /* terminal mode flags */
-+ int esc; /* escape state flags */
-+ char trantbl[4]; /* charset table translation */
-+ int charset; /* current charset */
-+ int icharset; /* selected charset for sequence */
-+ int numlock; /* lock numbers in keyboard */
-+ int *tabs;
-+} Term;
-+
- static void die(const char *, ...);
- static void draw(void);
- static void redraw(void);
-@@ -409,8 +416,8 @@ static void tputtab(int);
+@@ -409,8 +417,8 @@ static void tputtab(int);
static void tputc(Rune);
static void treset(void);
static void tresize(int, int);
@@ -109,7 +62,7 @@ index fbcd9e0..3db7b78 100644
static void tsetattr(int *, int);
static void tsetchar(Rune, Glyph *, int, int);
static void tsetscroll(int, int);
-@@ -742,10 +749,10 @@ tlinelen(int y)
+@@ -742,10 +750,10 @@ tlinelen(int y)
{
int i = term.col;
@@ -122,7 +75,7 @@ index fbcd9e0..3db7b78 100644
--i;
return i;
-@@ -807,7 +814,7 @@ selsnap(int *x, int *y, int direction)
+@@ -807,7 +815,7 @@ selsnap(int *x, int *y, int direction)
* Snap around if the word wraps around at the end or
* beginning of a line.
*/
@@ -131,7 +84,7 @@ index fbcd9e0..3db7b78 100644
prevdelim = ISDELIM(prevgp->u);
for (;;) {
newx = *x + direction;
-@@ -822,14 +829,14 @@ selsnap(int *x, int *y, int direction)
+@@ -822,14 +830,14 @@ selsnap(int *x, int *y, int direction)
yt = *y, xt = *x;
else
yt = newy, xt = newx;
@@ -148,7 +101,7 @@ index fbcd9e0..3db7b78 100644
delim = ISDELIM(gp->u);
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|| (delim && gp->u != prevgp->u)))
-@@ -850,14 +857,14 @@ selsnap(int *x, int *y, int direction)
+@@ -850,14 +858,14 @@ selsnap(int *x, int *y, int direction)
*x = (direction < 0) ? 0 : term.col - 1;
if (direction < 0) {
for (; *y > 0; *y += direction) {
@@ -165,7 +118,7 @@ index fbcd9e0..3db7b78 100644
& ATTR_WRAP)) {
break;
}
-@@ -1023,13 +1030,13 @@ getsel(void)
+@@ -1023,13 +1031,13 @@ getsel(void)
}
if (sel.type == SEL_RECTANGULAR) {
@@ -182,7 +135,7 @@ index fbcd9e0..3db7b78 100644
while (last >= gp && last->u == ' ')
--last;
-@@ -1513,6 +1520,9 @@ ttyread(void)
+@@ -1513,6 +1521,9 @@ ttyread(void)
if (buflen > 0)
memmove(buf, ptr, buflen);
@@ -192,7 +145,7 @@ index fbcd9e0..3db7b78 100644
return ret;
}
-@@ -1522,6 +1532,9 @@ ttywrite(const char *s, size_t n)
+@@ -1522,6 +1533,9 @@ ttywrite(const char *s, size_t n)
fd_set wfd, rfd;
ssize_t r;
size_t lim = 256;
@@ -202,7 +155,7 @@ index fbcd9e0..3db7b78 100644
/*
* Remember that we are using a pty, which might be a modem line.
-@@ -1724,13 +1737,53 @@ tswapscreen(void)
+@@ -1724,13 +1738,53 @@ tswapscreen(void)
}
void
@@ -257,7 +210,7 @@ index fbcd9e0..3db7b78 100644
tsetdirt(orig, term.bot-n);
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-@@ -1744,13 +1797,20 @@ tscrolldown(int orig, int n)
+@@ -1744,13 +1798,20 @@ tscrolldown(int orig, int n)
}
void
@@ -279,7 +232,7 @@ index fbcd9e0..3db7b78 100644
tclearregion(0, orig, term.col-1, orig+n-1);
tsetdirt(orig+n, term.bot);
-@@ -1799,7 +1859,7 @@ tnewline(int first_col)
+@@ -1799,7 +1860,7 @@ tnewline(int first_col)
int y = term.c.y;
if (y == term.bot) {
@@ -288,7 +241,7 @@ index fbcd9e0..3db7b78 100644
} else {
y++;
}
-@@ -1964,14 +2024,14 @@ void
+@@ -1964,14 +2025,14 @@ void
tinsertblankline(int n)
{
if (BETWEEN(term.c.y, term.top, term.bot))
@@ -305,7 +258,7 @@ index fbcd9e0..3db7b78 100644
}
int32_t
-@@ -2405,11 +2465,11 @@ csihandle(void)
+@@ -2405,11 +2466,11 @@ csihandle(void)
break;
case 'S': /* SU -- Scroll <n> line up */
DEFAULT(csiescseq.arg[0], 1);
@@ -319,7 +272,7 @@ index fbcd9e0..3db7b78 100644
break;
case 'L': /* IL -- Insert <n> blank lines */
DEFAULT(csiescseq.arg[0], 1);
-@@ -2945,7 +3005,7 @@ eschandle(uchar ascii)
+@@ -2945,7 +3006,7 @@ eschandle(uchar ascii)
return 0;
case 'D': /* IND -- Linefeed */
if (term.c.y == term.bot) {
@@ -328,7 +281,7 @@ index fbcd9e0..3db7b78 100644
} else {
tmoveto(term.c.x, term.c.y+1);
}
-@@ -2958,7 +3018,7 @@ eschandle(uchar ascii)
+@@ -2958,7 +3019,7 @@ eschandle(uchar ascii)
break;
case 'M': /* RI -- Reverse index */
if (term.c.y == term.top) {
@@ -337,7 +290,7 @@ index fbcd9e0..3db7b78 100644
} else {
tmoveto(term.c.x, term.c.y-1);
}
-@@ -3145,7 +3205,7 @@ check_control_code:
+@@ -3145,7 +3206,7 @@ check_control_code:
void
tresize(int col, int row)
{
@@ -346,7 +299,7 @@ index fbcd9e0..3db7b78 100644
int minrow = MIN(row, term.row);
int mincol = MIN(col, term.col);
int *bp;
-@@ -3185,6 +3245,14 @@ tresize(int col, int row)
+@@ -3185,6 +3246,14 @@ tresize(int col, int row)
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
@@ -361,7 +314,7 @@ index fbcd9e0..3db7b78 100644
/* 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));
-@@ -4112,11 +4180,11 @@ drawregion(int x1, int y1, int x2, int y2)
+@@ -4112,11 +4181,11 @@ drawregion(int x1, int y1, int x2, int y2)
term.dirty[y] = 0;
specs = term.specbuf;
@@ -375,7 +328,7 @@ index fbcd9e0..3db7b78 100644
if (new.mode == ATTR_WDUMMY)
continue;
if (ena_sel && selected(x, y))
-@@ -4136,7 +4204,9 @@ drawregion(int x1, int y1, int x2, int y2)
+@@ -4136,7 +4205,9 @@ drawregion(int x1, int y1, int x2, int y2)
if (i > 0)
xdrawglyphfontspecs(specs, base, i, ox, y);
}
