cleaned up
This commit is contained in:
WanderingPenwing
parent
dd0b463434
commit
1a61e0c697
253
FAQ
253
FAQ
|
|
@ -1,253 +0,0 @@
|
||||||
## Why does st not handle utmp entries?
|
|
||||||
|
|
||||||
Use the excellent tool of [utmp](https://git.suckless.org/utmp/) for this task.
|
|
||||||
|
|
||||||
|
|
||||||
## Some _random program_ complains that st is unknown/not recognised/unsupported/whatever!
|
|
||||||
|
|
||||||
It means that st doesn’t have any terminfo entry on your system. Chances are
|
|
||||||
you did not `make install`. If you just want to test it without installing it,
|
|
||||||
you can manually run `tic -sx st.info`.
|
|
||||||
|
|
||||||
|
|
||||||
## Nothing works, and nothing is said about an unknown terminal!
|
|
||||||
|
|
||||||
* Some programs just assume they’re running in xterm i.e. they don’t rely on
|
|
||||||
terminfo. What you see is the current state of the “xterm compliance”.
|
|
||||||
* Some programs don’t complain about the lacking st description and default to
|
|
||||||
another terminal. In that case see the question about terminfo.
|
|
||||||
|
|
||||||
|
|
||||||
## How do I scroll back up?
|
|
||||||
|
|
||||||
* Using a terminal multiplexer.
|
|
||||||
* `st -e tmux` using C-b [
|
|
||||||
* `st -e screen` using C-a ESC
|
|
||||||
* Using the excellent tool of [scroll](https://git.suckless.org/scroll/).
|
|
||||||
* Using the scrollback [patch](https://st.suckless.org/patches/scrollback/).
|
|
||||||
|
|
||||||
|
|
||||||
## I would like to have utmp and/or scroll functionality by default
|
|
||||||
|
|
||||||
You can add the absolute path of both programs in your config.h file. You only
|
|
||||||
have to modify the value of utmp and scroll variables.
|
|
||||||
|
|
||||||
|
|
||||||
## Why doesn't the Del key work in some programs?
|
|
||||||
|
|
||||||
Taken from the terminfo manpage:
|
|
||||||
|
|
||||||
If the terminal has a keypad that transmits codes when the keys
|
|
||||||
are pressed, this information can be given. Note that it is not
|
|
||||||
possible to handle terminals where the keypad only works in
|
|
||||||
local (this applies, for example, to the unshifted HP 2621 keys).
|
|
||||||
If the keypad can be set to transmit or not transmit, give these
|
|
||||||
codes as smkx and rmkx. Otherwise the keypad is assumed to
|
|
||||||
always transmit.
|
|
||||||
|
|
||||||
In the st case smkx=E[?1hE= and rmkx=E[?1lE>, so it is mandatory that
|
|
||||||
applications which want to test against keypad keys send these
|
|
||||||
sequences.
|
|
||||||
|
|
||||||
But buggy applications (like bash and irssi, for example) don't do this. A fast
|
|
||||||
solution for them is to use the following command:
|
|
||||||
|
|
||||||
$ printf '\033[?1h\033=' >/dev/tty
|
|
||||||
|
|
||||||
or
|
|
||||||
$ tput smkx
|
|
||||||
|
|
||||||
In the case of bash, readline is used. Readline has a different note in its
|
|
||||||
manpage about this issue:
|
|
||||||
|
|
||||||
enable-keypad (Off)
|
|
||||||
When set to On, readline will try to enable the
|
|
||||||
application keypad when it is called. Some systems
|
|
||||||
need this to enable arrow keys.
|
|
||||||
|
|
||||||
Adding this option to your .inputrc will fix the keypad problem for all
|
|
||||||
applications using readline.
|
|
||||||
|
|
||||||
If you are using zsh, then read the zsh FAQ
|
|
||||||
<http://zsh.sourceforge.net/FAQ/zshfaq03.html#l25>:
|
|
||||||
|
|
||||||
It should be noted that the O / [ confusion can occur with other keys
|
|
||||||
such as Home and End. Some systems let you query the key sequences
|
|
||||||
sent by these keys from the system's terminal database, terminfo.
|
|
||||||
Unfortunately, the key sequences given there typically apply to the
|
|
||||||
mode that is not the one zsh uses by default (it's the "application"
|
|
||||||
mode rather than the "raw" mode). Explaining the use of terminfo is
|
|
||||||
outside of the scope of this FAQ, but if you wish to use the key
|
|
||||||
sequences given there you can tell the line editor to turn on
|
|
||||||
"application" mode when it starts and turn it off when it stops:
|
|
||||||
|
|
||||||
function zle-line-init () { echoti smkx }
|
|
||||||
function zle-line-finish () { echoti rmkx }
|
|
||||||
zle -N zle-line-init
|
|
||||||
zle -N zle-line-finish
|
|
||||||
|
|
||||||
Putting these lines into your .zshrc will fix the problems.
|
|
||||||
|
|
||||||
|
|
||||||
## How can I use meta in 8bit mode?
|
|
||||||
|
|
||||||
St supports meta in 8bit mode, but the default terminfo entry doesn't
|
|
||||||
use this capability. If you want it, you have to use the 'st-meta' value
|
|
||||||
in TERM.
|
|
||||||
|
|
||||||
|
|
||||||
## I cannot compile st in OpenBSD
|
|
||||||
|
|
||||||
OpenBSD lacks librt, despite it being mandatory in POSIX
|
|
||||||
<http://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html#tag_20_11_13>.
|
|
||||||
If you want to compile st for OpenBSD you have to remove -lrt from config.mk, and
|
|
||||||
st will compile without any loss of functionality, because all the functions are
|
|
||||||
included in libc on this platform.
|
|
||||||
|
|
||||||
|
|
||||||
## The Backspace Case
|
|
||||||
|
|
||||||
St is emulating the Linux way of handling backspace being delete and delete being
|
|
||||||
backspace.
|
|
||||||
|
|
||||||
This is an issue that was discussed in suckless mailing list
|
|
||||||
<https://lists.suckless.org/dev/1404/20697.html>. Here is why some old grumpy
|
|
||||||
terminal users wants its backspace to be how he feels it:
|
|
||||||
|
|
||||||
Well, I am going to comment why I want to change the behaviour
|
|
||||||
of this key. When ASCII was defined in 1968, communication
|
|
||||||
with computers was done using punched cards, or hardcopy
|
|
||||||
terminals (basically a typewriter machine connected with the
|
|
||||||
computer using a serial port). ASCII defines DELETE as 7F,
|
|
||||||
because, in punched-card terms, it means all the holes of the
|
|
||||||
card punched; it is thus a kind of 'physical delete'. In the
|
|
||||||
same way, the BACKSPACE key was a non-destructive backspace,
|
|
||||||
as on a typewriter. So, if you wanted to delete a character,
|
|
||||||
you had to BACKSPACE and then DELETE. Another use of BACKSPACE
|
|
||||||
was to type accented characters, for example 'a BACKSPACE `'.
|
|
||||||
The VT100 had no BACKSPACE key; it was generated using the
|
|
||||||
CONTROL key as another control character (CONTROL key sets to
|
|
||||||
0 b7 b6 b5, so it converts H (code 0x48) into BACKSPACE (code
|
|
||||||
0x08)), but it had a DELETE key in a similar position where
|
|
||||||
the BACKSPACE key is located today on common PC keyboards.
|
|
||||||
All the terminal emulators emulated the difference between
|
|
||||||
these keys correctly: the backspace key generated a BACKSPACE
|
|
||||||
(^H) and delete key generated a DELETE (^?).
|
|
||||||
|
|
||||||
But a problem arose when Linus Torvalds wrote Linux. Unlike
|
|
||||||
earlier terminals, the Linux virtual terminal (the terminal
|
|
||||||
emulator integrated in the kernel) returned a DELETE when
|
|
||||||
backspace was pressed, due to the VT100 having a DELETE key in
|
|
||||||
the same position. This created a lot of problems (see [1]
|
|
||||||
and [2]). Since Linux has become the king, a lot of terminal
|
|
||||||
emulators today generate a DELETE when the backspace key is
|
|
||||||
pressed in order to avoid problems with Linux. The result is
|
|
||||||
that the only way of generating a BACKSPACE on these systems
|
|
||||||
is by using CONTROL + H. (I also think that emacs had an
|
|
||||||
important point here because the CONTROL + H prefix is used
|
|
||||||
in emacs in some commands (help commands).)
|
|
||||||
|
|
||||||
From point of view of the kernel, you can change the key
|
|
||||||
for deleting a previous character with stty erase. When you
|
|
||||||
connect a real terminal into a machine you describe the type
|
|
||||||
of terminal, so getty configures the correct value of stty
|
|
||||||
erase for this terminal. In the case of terminal emulators,
|
|
||||||
however, you don't have any getty that can set the correct
|
|
||||||
value of stty erase, so you always get the default value.
|
|
||||||
For this reason, it is necessary to add 'stty erase ^H' to your
|
|
||||||
profile if you have changed the value of the backspace key.
|
|
||||||
Of course, another solution is for st itself to modify the
|
|
||||||
value of stty erase. I usually have the inverse problem:
|
|
||||||
when I connect to non-Unix machines, I have to press CONTROL +
|
|
||||||
h to get a BACKSPACE. The inverse problem occurs when a user
|
|
||||||
connects to my Unix machines from a different system with a
|
|
||||||
correct backspace key.
|
|
||||||
|
|
||||||
[1] http://www.ibb.net/~anne/keyboard.html
|
|
||||||
[2] http://www.tldp.org/HOWTO/Keyboard-and-Console-HOWTO-5.html
|
|
||||||
|
|
||||||
|
|
||||||
## But I really want the old grumpy behaviour of my terminal
|
|
||||||
|
|
||||||
Apply [1].
|
|
||||||
|
|
||||||
[1] https://st.suckless.org/patches/delkey
|
|
||||||
|
|
||||||
|
|
||||||
## Why do images not work in st using the w3m image hack?
|
|
||||||
|
|
||||||
w3mimg uses a hack that draws an image on top of the terminal emulator Drawable
|
|
||||||
window. The hack relies on the terminal to use a single buffer to draw its
|
|
||||||
contents directly.
|
|
||||||
|
|
||||||
st uses double-buffered drawing so the image is quickly replaced and may show a
|
|
||||||
short flicker effect.
|
|
||||||
|
|
||||||
Below is a patch example to change st double-buffering to a single Drawable
|
|
||||||
buffer.
|
|
||||||
|
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -732,10 +732,6 @@ xresize(int col, int row)
|
|
||||||
win.tw = col * win.cw;
|
|
||||||
win.th = row * win.ch;
|
|
||||||
|
|
||||||
- XFreePixmap(xw.dpy, xw.buf);
|
|
||||||
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
||||||
- DefaultDepth(xw.dpy, xw.scr));
|
|
||||||
- XftDrawChange(xw.draw, xw.buf);
|
|
||||||
xclear(0, 0, win.w, win.h);
|
|
||||||
|
|
||||||
/* resize to new width */
|
|
||||||
@@ -1148,8 +1144,7 @@ xinit(int cols, int rows)
|
|
||||||
gcvalues.graphics_exposures = False;
|
|
||||||
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
|
||||||
&gcvalues);
|
|
||||||
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
||||||
- DefaultDepth(xw.dpy, xw.scr));
|
|
||||||
+ xw.buf = xw.win;
|
|
||||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
|
||||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
|
||||||
|
|
||||||
@@ -1632,8 +1627,6 @@ xdrawline(Line line, int x1, int y1, int x2)
|
|
||||||
void
|
|
||||||
xfinishdraw(void)
|
|
||||||
{
|
|
||||||
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
|
|
||||||
- win.h, 0, 0);
|
|
||||||
XSetForeground(xw.dpy, dc.gc,
|
|
||||||
dc.col[IS_SET(MODE_REVERSE)?
|
|
||||||
defaultfg : defaultbg].pixel);
|
|
||||||
|
|
||||||
|
|
||||||
## BadLength X error in Xft when trying to render emoji
|
|
||||||
|
|
||||||
Xft makes st crash when rendering color emojis with the following error:
|
|
||||||
|
|
||||||
"X Error of failed request: BadLength (poly request too large or internal Xlib length error)"
|
|
||||||
Major opcode of failed request: 139 (RENDER)
|
|
||||||
Minor opcode of failed request: 20 (RenderAddGlyphs)
|
|
||||||
Serial number of failed request: 1595
|
|
||||||
Current serial number in output stream: 1818"
|
|
||||||
|
|
||||||
This is a known bug in Xft (not st) which happens on some platforms and
|
|
||||||
combination of particular fonts and fontconfig settings.
|
|
||||||
|
|
||||||
See also:
|
|
||||||
https://gitlab.freedesktop.org/xorg/lib/libxft/issues/6
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=107534
|
|
||||||
https://bugzilla.redhat.com/show_bug.cgi?id=1498269
|
|
||||||
|
|
||||||
The solution is to remove color emoji fonts or disable this in the fontconfig
|
|
||||||
XML configuration. As an ugly workaround (which may work only on newer
|
|
||||||
fontconfig versions (FC_COLOR)), the following code can be used to mask color
|
|
||||||
fonts:
|
|
||||||
|
|
||||||
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
|
|
||||||
|
|
||||||
Please don't bother reporting this bug to st, but notify the upstream Xft
|
|
||||||
developers about fixing this bug.
|
|
||||||
|
|
||||||
As of 2022-09-05 this now seems to be finally fixed in libXft 2.3.5:
|
|
||||||
https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS
|
|
||||||
17
LEGACY
17
LEGACY
|
|
@ -1,17 +0,0 @@
|
||||||
A STATEMENT ON LEGACY SUPPORT
|
|
||||||
|
|
||||||
In the terminal world there is much cruft that comes from old and unsup‐
|
|
||||||
ported terminals that inherit incompatible modes and escape sequences
|
|
||||||
which noone is able to know, except when he/she comes from that time and
|
|
||||||
developed a graphical vt100 emulator at that time.
|
|
||||||
|
|
||||||
One goal of st is to only support what is really needed. When you en‐
|
|
||||||
counter a sequence which you really need, implement it. But while you
|
|
||||||
are at it, do not add the other cruft you might encounter while sneek‐
|
|
||||||
ing at other terminal emulators. History has bloated them and there is
|
|
||||||
no real evidence that most of the sequences are used today.
|
|
||||||
|
|
||||||
|
|
||||||
Christoph Lohmann <20h@r-36.net>
|
|
||||||
2012-09-13T07:00:36.081271045+02:00
|
|
||||||
|
|
||||||
28
TODO
28
TODO
|
|
@ -1,28 +0,0 @@
|
||||||
vt emulation
|
|
||||||
------------
|
|
||||||
|
|
||||||
* double-height support
|
|
||||||
|
|
||||||
code & interface
|
|
||||||
----------------
|
|
||||||
|
|
||||||
* add a simple way to do multiplexing
|
|
||||||
|
|
||||||
drawing
|
|
||||||
-------
|
|
||||||
* add diacritics support to xdraws()
|
|
||||||
* switch to a suckless font drawing library
|
|
||||||
* make the font cache simpler
|
|
||||||
* add better support for brightening of the upper colors
|
|
||||||
|
|
||||||
bugs
|
|
||||||
----
|
|
||||||
|
|
||||||
* fix shift up/down (shift selection in emacs)
|
|
||||||
* remove DEC test sequence when appropriate
|
|
||||||
|
|
||||||
misc
|
|
||||||
----
|
|
||||||
|
|
||||||
$ grep -nE 'XXX|TODO' st.c
|
|
||||||
|
|
||||||
|
|
@ -1,351 +0,0 @@
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 6f05dce..93cbcc0 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -199,6 +199,8 @@ static Shortcut shortcuts[] = {
|
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
|
|
||||||
+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff --git a/st.c b/st.c
|
|
||||||
index 76b7e0d..edec064 100644
|
|
||||||
--- a/st.c
|
|
||||||
+++ b/st.c
|
|
||||||
@@ -35,6 +35,7 @@
|
|
||||||
#define ESC_ARG_SIZ 16
|
|
||||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
|
||||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
|
||||||
+#define HISTSIZE 2000
|
|
||||||
|
|
||||||
/* macros */
|
|
||||||
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
|
||||||
@@ -42,6 +43,9 @@
|
|
||||||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
|
||||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
|
||||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
|
||||||
+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
|
||||||
+ term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
|
||||||
+ term.line[(y) - term.scr])
|
|
||||||
|
|
||||||
enum term_mode {
|
|
||||||
MODE_WRAP = 1 << 0,
|
|
||||||
@@ -115,6 +119,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 */
|
|
||||||
TCursor c; /* cursor */
|
|
||||||
int ocx; /* old cursor col */
|
|
||||||
@@ -184,8 +191,8 @@ static void tnewline(int);
|
|
||||||
static void tputtab(int);
|
|
||||||
static void tputc(Rune);
|
|
||||||
static void treset(void);
|
|
||||||
-static void tscrollup(int, int);
|
|
||||||
-static void tscrolldown(int, int);
|
|
||||||
+static void tscrollup(int, int, int);
|
|
||||||
+static void tscrolldown(int, int, int);
|
|
||||||
static void tsetattr(int *, int);
|
|
||||||
static void tsetchar(Rune, Glyph *, int, int);
|
|
||||||
static void tsetdirt(int, int);
|
|
||||||
@@ -414,10 +421,10 @@ tlinelen(int y)
|
|
||||||
{
|
|
||||||
int i = term.col;
|
|
||||||
|
|
||||||
- if (term.line[y][i - 1].mode & ATTR_WRAP)
|
|
||||||
+ if (TLINE(y)[i - 1].mode & ATTR_WRAP)
|
|
||||||
return i;
|
|
||||||
|
|
||||||
- while (i > 0 && term.line[y][i - 1].u == ' ')
|
|
||||||
+ while (i > 0 && TLINE(y)[i - 1].u == ' ')
|
|
||||||
--i;
|
|
||||||
|
|
||||||
return i;
|
|
||||||
@@ -526,7 +533,7 @@ selsnap(int *x, int *y, int direction)
|
|
||||||
* Snap around if the word wraps around at the end or
|
|
||||||
* beginning of a line.
|
|
||||||
*/
|
|
||||||
- prevgp = &term.line[*y][*x];
|
|
||||||
+ prevgp = &TLINE(*y)[*x];
|
|
||||||
prevdelim = ISDELIM(prevgp->u);
|
|
||||||
for (;;) {
|
|
||||||
newx = *x + direction;
|
|
||||||
@@ -541,14 +548,14 @@ selsnap(int *x, int *y, int direction)
|
|
||||||
yt = *y, xt = *x;
|
|
||||||
else
|
|
||||||
yt = newy, xt = newx;
|
|
||||||
- if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
|
||||||
+ if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (newx >= tlinelen(newy))
|
|
||||||
break;
|
|
||||||
|
|
||||||
- gp = &term.line[newy][newx];
|
|
||||||
+ gp = &TLINE(newy)[newx];
|
|
||||||
delim = ISDELIM(gp->u);
|
|
||||||
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
|
||||||
|| (delim && gp->u != prevgp->u)))
|
|
||||||
@@ -569,14 +576,14 @@ selsnap(int *x, int *y, int direction)
|
|
||||||
*x = (direction < 0) ? 0 : term.col - 1;
|
|
||||||
if (direction < 0) {
|
|
||||||
for (; *y > 0; *y += direction) {
|
|
||||||
- if (!(term.line[*y-1][term.col-1].mode
|
|
||||||
+ if (!(TLINE(*y-1)[term.col-1].mode
|
|
||||||
& ATTR_WRAP)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (direction > 0) {
|
|
||||||
for (; *y < term.row-1; *y += direction) {
|
|
||||||
- if (!(term.line[*y][term.col-1].mode
|
|
||||||
+ if (!(TLINE(*y)[term.col-1].mode
|
|
||||||
& ATTR_WRAP)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
@@ -607,13 +614,13 @@ getsel(void)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sel.type == SEL_RECTANGULAR) {
|
|
||||||
- gp = &term.line[y][sel.nb.x];
|
|
||||||
+ gp = &TLINE(y)[sel.nb.x];
|
|
||||||
lastx = sel.ne.x;
|
|
||||||
} else {
|
|
||||||
- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
|
|
||||||
+ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
|
|
||||||
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
|
|
||||||
}
|
|
||||||
- last = &term.line[y][MIN(lastx, linelen-1)];
|
|
||||||
+ last = &TLINE(y)[MIN(lastx, linelen-1)];
|
|
||||||
while (last >= gp && last->u == ' ')
|
|
||||||
--last;
|
|
||||||
|
|
||||||
@@ -848,6 +855,9 @@ void
|
|
||||||
ttywrite(const char *s, size_t n, int may_echo)
|
|
||||||
{
|
|
||||||
const char *next;
|
|
||||||
+ Arg arg = (Arg) { .i = term.scr };
|
|
||||||
+
|
|
||||||
+ kscrolldown(&arg);
|
|
||||||
|
|
||||||
if (may_echo && IS_SET(MODE_ECHO))
|
|
||||||
twrite(s, n, 1);
|
|
||||||
@@ -1059,13 +1069,53 @@ tswapscreen(void)
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
-tscrolldown(int orig, int n)
|
|
||||||
+kscrolldown(const Arg* a)
|
|
||||||
+{
|
|
||||||
+ int n = a->i;
|
|
||||||
+
|
|
||||||
+ if (n < 0)
|
|
||||||
+ n = term.row + n;
|
|
||||||
+
|
|
||||||
+ if (n > term.scr)
|
|
||||||
+ n = term.scr;
|
|
||||||
+
|
|
||||||
+ if (term.scr > 0) {
|
|
||||||
+ term.scr -= n;
|
|
||||||
+ selscroll(0, -n);
|
|
||||||
+ tfulldirt();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+kscrollup(const Arg* a)
|
|
||||||
+{
|
|
||||||
+ int n = a->i;
|
|
||||||
+
|
|
||||||
+ if (n < 0)
|
|
||||||
+ n = term.row + n;
|
|
||||||
+
|
|
||||||
+ if (term.scr <= HISTSIZE-n) {
|
|
||||||
+ term.scr += n;
|
|
||||||
+ selscroll(0, n);
|
|
||||||
+ tfulldirt();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+tscrolldown(int orig, int n, int copyhist)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
Line temp;
|
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
|
||||||
|
|
||||||
+ if (copyhist) {
|
|
||||||
+ term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
|
|
||||||
+ temp = term.hist[term.histi];
|
|
||||||
+ term.hist[term.histi] = term.line[term.bot];
|
|
||||||
+ term.line[term.bot] = temp;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
tsetdirt(orig, term.bot-n);
|
|
||||||
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
|
||||||
|
|
||||||
@@ -1075,17 +1125,28 @@ tscrolldown(int orig, int n)
|
|
||||||
term.line[i-n] = temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
- selscroll(orig, n);
|
|
||||||
+ if (term.scr == 0)
|
|
||||||
+ selscroll(orig, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
-tscrollup(int orig, int n)
|
|
||||||
+tscrollup(int orig, int n, int copyhist)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
Line temp;
|
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
|
||||||
|
|
||||||
+ if (copyhist) {
|
|
||||||
+ term.histi = (term.histi + 1) % HISTSIZE;
|
|
||||||
+ temp = term.hist[term.histi];
|
|
||||||
+ term.hist[term.histi] = term.line[orig];
|
|
||||||
+ term.line[orig] = temp;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (term.scr > 0 && term.scr < HISTSIZE)
|
|
||||||
+ term.scr = MIN(term.scr + n, HISTSIZE-1);
|
|
||||||
+
|
|
||||||
tclearregion(0, orig, term.col-1, orig+n-1);
|
|
||||||
tsetdirt(orig+n, term.bot);
|
|
||||||
|
|
||||||
@@ -1095,7 +1156,8 @@ tscrollup(int orig, int n)
|
|
||||||
term.line[i+n] = temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
- selscroll(orig, -n);
|
|
||||||
+ if (term.scr == 0)
|
|
||||||
+ selscroll(orig, -n);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -1124,7 +1186,7 @@ tnewline(int first_col)
|
|
||||||
int y = term.c.y;
|
|
||||||
|
|
||||||
if (y == term.bot) {
|
|
||||||
- tscrollup(term.top, 1);
|
|
||||||
+ tscrollup(term.top, 1, 1);
|
|
||||||
} else {
|
|
||||||
y++;
|
|
||||||
}
|
|
||||||
@@ -1289,14 +1351,14 @@ void
|
|
||||||
tinsertblankline(int n)
|
|
||||||
{
|
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
|
||||||
- tscrolldown(term.c.y, n);
|
|
||||||
+ tscrolldown(term.c.y, n, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
tdeleteline(int n)
|
|
||||||
{
|
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
|
||||||
- tscrollup(term.c.y, n);
|
|
||||||
+ tscrollup(term.c.y, n, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t
|
|
||||||
@@ -1733,11 +1795,11 @@ csihandle(void)
|
|
||||||
break;
|
|
||||||
case 'S': /* SU -- Scroll <n> line up */
|
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
|
||||||
- tscrollup(term.top, csiescseq.arg[0]);
|
|
||||||
+ tscrollup(term.top, csiescseq.arg[0], 0);
|
|
||||||
break;
|
|
||||||
case 'T': /* SD -- Scroll <n> line down */
|
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
|
||||||
- tscrolldown(term.top, csiescseq.arg[0]);
|
|
||||||
+ tscrolldown(term.top, csiescseq.arg[0], 0);
|
|
||||||
break;
|
|
||||||
case 'L': /* IL -- Insert <n> blank lines */
|
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
|
||||||
@@ -2241,7 +2303,7 @@ eschandle(uchar ascii)
|
|
||||||
return 0;
|
|
||||||
case 'D': /* IND -- Linefeed */
|
|
||||||
if (term.c.y == term.bot) {
|
|
||||||
- tscrollup(term.top, 1);
|
|
||||||
+ tscrollup(term.top, 1, 1);
|
|
||||||
} else {
|
|
||||||
tmoveto(term.c.x, term.c.y+1);
|
|
||||||
}
|
|
||||||
@@ -2254,7 +2316,7 @@ eschandle(uchar ascii)
|
|
||||||
break;
|
|
||||||
case 'M': /* RI -- Reverse index */
|
|
||||||
if (term.c.y == term.top) {
|
|
||||||
- tscrolldown(term.top, 1);
|
|
||||||
+ tscrolldown(term.top, 1, 1);
|
|
||||||
} else {
|
|
||||||
tmoveto(term.c.x, term.c.y-1);
|
|
||||||
}
|
|
||||||
@@ -2464,7 +2526,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
|
|
||||||
void
|
|
||||||
tresize(int col, int row)
|
|
||||||
{
|
|
||||||
- int i;
|
|
||||||
+ int i, j;
|
|
||||||
int minrow = MIN(row, term.row);
|
|
||||||
int mincol = MIN(col, term.col);
|
|
||||||
int *bp;
|
|
||||||
@@ -2501,6 +2563,14 @@ tresize(int col, int row)
|
|
||||||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
|
||||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
|
||||||
|
|
||||||
+ for (i = 0; i < HISTSIZE; i++) {
|
|
||||||
+ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
|
|
||||||
+ for (j = mincol; j < col; j++) {
|
|
||||||
+ term.hist[i][j] = term.c.attr;
|
|
||||||
+ term.hist[i][j].u = ' ';
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* 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));
|
|
||||||
@@ -2559,7 +2629,7 @@ drawregion(int x1, int y1, int x2, int y2)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
term.dirty[y] = 0;
|
|
||||||
- xdrawline(term.line[y], x1, y, x2);
|
|
||||||
+ xdrawline(TLINE(y), x1, y, x2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2580,8 +2650,9 @@ draw(void)
|
|
||||||
cx--;
|
|
||||||
|
|
||||||
drawregion(0, 0, term.col, term.row);
|
|
||||||
- xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
|
||||||
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
|
||||||
+ 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]);
|
|
||||||
term.ocx = cx;
|
|
||||||
term.ocy = term.c.y;
|
|
||||||
xfinishdraw();
|
|
||||||
diff --git a/st.h b/st.h
|
|
||||||
index 3d351b6..f44e1d3 100644
|
|
||||||
--- a/st.h
|
|
||||||
+++ b/st.h
|
|
||||||
@@ -81,6 +81,8 @@ void die(const char *, ...);
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
|
|
||||||
+void kscrolldown(const Arg *);
|
|
||||||
+void kscrollup(const Arg *);
|
|
||||||
void printscreen(const Arg *);
|
|
||||||
void printsel(const Arg *);
|
|
||||||
void sendbreak(const Arg *);
|
|
||||||
13
st.c.rej
13
st.c.rej
|
|
@ -1,13 +0,0 @@
|
||||||
--- st.c
|
|
||||||
+++ st.c
|
|
||||||
@@ -191,8 +198,8 @@ static void tnewline(int);
|
|
||||||
static void tputtab(int);
|
|
||||||
static void tputc(Rune);
|
|
||||||
static void treset(void);
|
|
||||||
-static void tscrollup(int, int);
|
|
||||||
-static void tscrolldown(int, int);
|
|
||||||
+static void tscrollup(int, int, int);
|
|
||||||
+static void tscrolldown(int, int, int);
|
|
||||||
static void tsetattr(int *, int);
|
|
||||||
static void tsetchar(Rune, Glyph *, int, int);
|
|
||||||
static void tsetdirt(int, int);
|
|
||||||
Loading…
Reference in a new issue