summaryrefslogtreecommitdiffstats
path: root/st.c (follow)
AgeCommit message (Collapse)AuthorFilesLines
2024-08-12patch: selection-unfuckHEADmasterMalfurious1-1/+4
This patch addresses two issues with selections in st. First, the SelectionClear signal from X is no longer ignored. So, if another selection is made in another window, st's selection will disappear. Second (and this one is more of a personal preference), new selections that begin after the end of a line are now considered to begin at the start of the following line. This makes selecting a group of lines easier for either copy/paste or readability in the terminal. Previously, the newline character from the preceeding line would be included in the clipboard and the dead-space at the end of that line would be highlighted.
2024-08-12patch: scrollback-mouse-altscreenMalfurious1-0/+5
Apply the following patch on top of the previous two to allow scrollback using mouse wheel only when not in MODE_ALTSCREEN. For example the content is being scrolled instead of the scrollback buffer in less. Consequently the Shift modifier for scrolling is not needed anymore. The mouse and altscreen patches 20191024-a2c479c (and later, including this one) are simpler and more robust because st gained better support for customized mouse shortcuts. As a result, the altscreen patch doesn't really need the mouse patch. However to keep it simple the instructions stay the same: the alrscreen patch still applies on top of the (now very minimal) mouse patch.
2024-08-12patch: scrollbackMalfurious1-27/+98
Scroll back through terminal output using Shift+{PageUp, PageDown}.
2024-08-12patch: newterm (orphan version)Malfurious1-0/+32
Ctrl-Shift-Return now creates a new st terminal, whose CWD is the same as the parent st's CWD. This version of the patch does a double fork, a technique commonly used by daemons to spawn orphan processes. This solution is specific to the swallow patch for dwm which traverses the process tree to determine if the new window is a decendant of a terminal window, in which case the new window should take the place of the terminal window. The way the original newterm patch worked the new st terminal would be a direct decendant of the parent st terminal process, which could lead to the wrong terminal window being swallowed. The double fork method avoids this by leaving all new st terminals as orphans, i.e. they will have no parent process.
2024-08-12patch: colortermMalfurious1-0/+1
Support COLORTERM env variable Several programs and terminal emulators (see links further down), are using this variable to indicate truecolor support. https://github.com/termstandard/colors https://gitlab.com/gnachman/iterm2/-/issues/5294 https://codeberg.org/dnkl/foot/wiki#24-bit-color-support-in-emacs https://neovim.io/doc/user/term.html#true-color This patch is taken manually from the suckless mailing list, as it was never applied to mainline st. https://lists.suckless.org/hackers/2205/18350.html
2024-05-01support colons in SGR character attributesHiltjo Posthuma1-1/+4
Patch by Mikhail Kot <to@myrrc.dev> With some modifications to behave more like xterm (see note below). Example: printf '\033[48;2;255:0:0mtest\n' https://invisible-island.net/xterm/ctlseqs/ctlseqs.html Some notes: "CSI Pm m Character Attributes (SGR). [...] o xterm allows either colons (standard) or semicolons (legacy) to separate the subparameters (but after the first colon, colons must be used).
2024-03-30Revert "Fix cursor move with wide glyphs"Hiltjo Posthuma1-7/+3
This reverts commit 7473a8d1a57e5f9aba41b953f4e498c35e1c9dc5. This patch needs some more work. It caused regressions with programs that use GNU readline, etc. Original test-case example from Tim Culverhouse <tim@timculverhouse.com>: printf " 😀" && sleep 2 && printf "\e[D" && sleep 2 && printf "\e[D" && sleep 2 After the patch it caused regressions, example test-case: printf "A字\bB\n"
2024-03-04set upper limit for REP escape sequence argumentTommi Hirvola1-1/+1
Previously, printf 'L\033[2147483647b' would call tputc('L') 2^31 times, making st unresponsive. This commit allows repeating the last character at most 65535 times in order to prevent freezing and DoS attacks.
2024-02-25Fix cursor move with wide glyphsQuentin Rameau1-3/+7
st would always move back 1 column, even with wide glyhps (using more than a single column). The glyph rune is set on its first column, and the other ones are to 0, so loop until we detect the start of the previous glyph.
2024-02-18csi: check for private marker in 'S' caseTim Culverhouse1-0/+1
The handler for 'S' final character does not check for a private marker. This can cause a conflict with a sequence called 'XTSMGRAPHICS' which also has an 'S' final character, but uses the private marker '?'. Without checking for a private marker, st will perform a scroll up operation when XTSMGRAPHICS is seen, which can cause unexpected display artifacts.
2023-10-07Unhide cursor on RIS (\033c)Peter Hofmann1-0/+1
It is unclear if it's "required" to do this on RIS, but it's useful when calling reset(1) after interactive programs have crashed and garbled up the screen. FWIW, other terminals do it as well (tested with XTerm, VTE, Kitty, Alacritty, Linux VT).
2023-10-07Fix wide glyphs breaking "nowrap" modePeter Hofmann1-1/+4
Consider the following example: printf '\e[?7l';\ for i in $(seq $(($(tput cols) - 1))); do printf a; done;\ printf '🙈\n';\ printf '\e[?7h' Even though MODE_WRAP has been disabled, the emoji appeared on the next line. This patch keeps wide glyphs on the same line and moves them to the right-most possible position.
2023-10-07Don't scroll selection on the other screenPeter Hofmann1-1/+1
Fixes garbage selections when switching to/from the alternate screen. How to reproduce: - Be in primary screen. - Select something. - Run this (switches to alternate screen, positions the cursor at the bottom, triggers selscroll(), and then goes back to primary screen): tput smcup; tput cup $(tput lines) 0; echo foo; tput rmcup - Notice how the (visual) selection now covers a different line. The reason is that selscroll() calls selnormalize() and that cannot find the original range anymore. It's all empty lines now, so it snaps to "select the whole line".
2023-06-25Fix for wide character being incorrectly cleared on MODE_INSERTShi Tian1-1/+3
Under insert mode, when inserting a normal character in front of a wide character, the affected region is shifted to the right by one cell. However, the empty cell is reset as if being a part of a wide character, causing the following cell being mishandled as a dummy cell. To reproduce the bug: printf '\033[4h' # set MODE_INSERT printf 妳好 printf '\033[4D' printf 'x' printf '\033[4l\n'
2023-02-07ignore C1 control characters in UTF-8 modeHiltjo Posthuma1-0/+3
Ignore processing and printing C1 control characters in UTF-8 mode. These are in the range: 0x80 - 0x9f. By default in st the mode is set to UTF-8. This matches more the behaviour of xterm with the options -u8 or +u8 also. Also see the xterm resource "allowC1Printable". Let me know if this breaks something, in most cases I don't think so. As usual a very good reference is: https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
2023-02-07Add support for DSR response "OK" escape sequenceAdam Price1-3/+10
"VT100 defines an escape sequence [1] called Device Status Report (DSR). When the DSR sequence received is `csi 5n`, an "OK" response `csi 0n` is returned. This patch adds that "OK" response. I encountered this missing sequence when I noticed that fzf [2] would clobber my prompt whenever completing a find. To test that ST doesn't currently respond to `csi 5n`, use fzf's shell extension in ST's repo to complete the path for a file. my-fancy-prompt $ vim **<tab> <select a file> st.c Select a file with <enter>, and notice that fzf clobbers some or all of your prompt. After applying this patch, do the same test as above and notice that fzf has no longer clobbered your prompt by placing the file name in the correct position in your command. my-fancy-prompt $ vim **<tab> <select a file> my-fancy prompt $ vim st.c Thank you for considering my first patch submission. [1] https://www.xfree86.org/current/ctlseqs.html#VT100%20Mode [2] https://github.com/junegunn/fzf " Patch slightly adapted with input from the mailinglist,
2023-02-05Fixed OSC color reset without parameter->resets all colorsHiltjo Posthuma1-1/+3
Adapted from (garbled) patch by wim <wim@thinkerwim.org> Additional notes: it should reset all the colors using xloadcols(). To reproduce: set a different (theme) color using some escape code, then reset it: printf '\x1b]104\x07'
2022-08-18st: use `void' to indicate an empty parameter listTom Schwindl1-1/+1
2022-04-19code-golfing: cleanup osc color related codeNRK1-58/+32
* adds missing function prototype * move xgetcolor() prototype to win.h (that's where all the other x.c func prototype seems to be declared at) * check for snprintf error/truncation * reduces code duplication for osc 10/11/12 * unify osc_color_response() and osc4_color_response() into a single function the latter two was suggested by Quentin Rameau in his patch review on the hackers list.
2022-03-18base64_digits: reduce scope, implicit zero, +1 sizeNRK1-15/+7
the array is not accessed outside of base64dec() so it makes sense to limit it's scope to the related function. the static-storage duration of the array is kept intact. this also removes unnecessary explicit zeroing from the start and end of the array. anything that wasn't explicitly zero-ed will now be implicitly zero-ed instead. the validity of the new array can be easily confirmed via running this trivial loop: for (int i = 0; i < 255; ++i) assert(base64_digits[i] == base64_digits_old[i]); lastly, as pointed out by Roberto, the array needs to have 256 elements in order to able access it as any unsigned char as an index; the previous array had 255. however, this array will only be accessed at indexes which are isprint() || '=' (see `base64dec_getc()`), so reducing the size of the array to the highest printable ascii char (127 AFAIK) + 1 might also be a valid strategy.
2022-03-18avoid potential UB when using isprint()NRK1-1/+1
all the ctype.h functions' argument must be representable as an unsigned char or as EOF, otherwise the behavior is undefined.
2022-02-18Delay redrawals on palette changesSanttu Lakkala1-4/+4
Build on auto-sync and only mark window dirty on palette changes and let the event handler do the actual draw.
2021-12-30Fix overtyping wide characters.jamin1-0/+4
Overtyping the first half of a wide character with the second half of a wide character results in display garbage. This is because the trailing dummy is not cleaned up. i.e. ATTR_WIDE, ATTR_WDUMMY, ATTR_WDUMMY Here is a short script for demonstrating the behavior: #!/bin/sh alias printf=/usr/bin/printf printf こんにちは!; sleep 2 printf '\x1b[5D'; sleep 2 printf へ; sleep 2 printf ' '; sleep 2 echo
2021-12-27Fix null pointer access in strhandleJochen Sprickerhof1-2/+2
According to the spec the argument is optional for 104, so p can be NULL as can be tested with printf '\x1b]104\x07'. This is a regression of 8e31030.
2021-12-26follow-up fix for OSC color sequences, returnHiltjo Posthuma1-3/+3
Otherwise the message "erresc: unknown str" is printed.
2021-12-26Add support for OSC color sequencesRaheman Vaiya1-1/+79
2021-08-24fix a problem that the standard streams are unexpectedly closedKoichi Murase1-2/+3
In the current implementation, the slave PTY (assigned to the variable `s') is always closed after duplicating it to file descriptors of standard streams (0, 1, and 2). However, when the allocated slave PTY `s' is already one of 0, 1, or 2, this causes unexpected closing of a standard stream. The same problem occurs when the file descriptor of the master PTY (the variable `m') is one of 0, 1, or 2. In this patch, the original master PTY (m) is closed before it would be overwritten by duplicated slave PTYs. The original slave PTY (s) is closed only when it is not one of the stanrad streams.
2021-05-06Mild const-correctness improvements.Markus F.X.J. Oberhumer1-21/+23
Only touch a few things, the main focus is to improve code readability.
2020-10-18remove unused variable from previous patchHiltjo Posthuma1-1/+0
2020-10-18ST: Add WM_ICON_NAME property supportJohn Collis1-0/+9
Also added _NET_WM_ICON_NAME.
2020-06-17remove sixel stub codeHiltjo Posthuma1-21/+5
Remove stub code that was used for an experiment of adding sixel code to st from the commit f7398434.
2020-06-17fix unicode glitch in DCS strings, patch by Tim AllenHiltjo Posthuma1-1/+0
Reported on the mailinglist: " I discovered recently that if an application running inside st tries to send a DCS string, subsequent Unicode characters get messed up. For example, consider the following test-case: printf '\303\277\033P\033\\\303\277' ...where: - \303\277 is the UTF-8 encoding of U+00FF LATIN SMALL LETTER Y WITH DIAERESIS (ÿ). - \033P is ESC P, the token that begins a DCS string. - \033\\ is ESC \, a token that ends a DCS string. - \303\277 is the same ÿ character again. If I run the above command in a VTE-based terminal, or xterm, or QTerminal, or pterm (PuTTY), I get the output: ÿÿ ...which is to say, the empty DCS string is ignored. However, if I run that command inside st (as of commit 9ba7ecf), I get: ÿÿ ...where those last two characters are \303\277 interpreted as ISO8859-1 characters, instead of UTF-8. I spent some time tracing through the state machines in st.c, and so far as I can tell, this is how it works currently: - ESC P sets the "ESC_DCS" and "ESC_STR" flags, indicating that incoming bytes should be collected into the strescseq buffer, rather than being interpreted. - ESC \ sets the "ESC_STR_END" flag (when ESC is received), and then calls strhandle() (when \ is received) to interpret the collected bytes. - If the collected bytes begin with 'P' (i.e. if this was a DCS string) strhandle() sets the "ESC_DCS" flag again, confusing the state machine. If my understanding is correct, fixing the problem should be as easy as removing the line that sets ESC_DCS from strhandle(): diff --git a/st.c b/st.c index ef8abd5..b5b805a 100644 --- a/st.c +++ b/st.c @@ -1897,7 +1897,6 @@ strhandle(void) xsettitle(strescseq.args[0]); return; case 'P': /* DCS -- Device Control String */ - term.mode |= ESC_DCS; case '_': /* APC -- Application Program Command */ case '^': /* PM -- Privacy Message */ return; I've tried the above patch and it fixes my problem, but I don't know if it introduces any others. "
2020-05-30config.def.h: add an option allowwindowops, by default off (secure)Hiltjo Posthuma1-1/+1
Similar to the xterm AllowWindowOps option, this is an option to allow or disallow certain (non-interactive) operations that can be insecure or exploited. NOTE: xsettitle() is not guarded by this because st does not support printing the window title. Else this could be exploitable (arbitrary code execution). Similar problems have been found in the past in other terminal emulators. The sequence for base64-encoded clipboard copy is now guarded because it allows a sequence written to the terminal to manipulate the clipboard of the running user non-interactively, for example: printf '\x1b]52;0;ZWNobyBoaQ0=\a'
2020-05-30tiny style fixHiltjo Posthuma1-2/+1
2020-05-30Partially add back in "support REP (repeat) escape sequence"Hiltjo Posthuma1-0/+10
Add the functionality back in for xterm compatibility, but do not expose the capability in st.info (yet). Some notes: It was reverted because it caused some issues with ncurses in some configurations, namely when using BSD padding (--enable-bsdpad, BSD_TPUTS) in ncurses it caused issues with repeating digits. A fix has been upstreamed in ncurses since snapshot 20200523. The fix is also backported to OpenBSD -current.
2020-05-16Revert "support REP (repeat) escape sequence"Hiltjo Posthuma1-10/+0
This reverts commit e8392b282c2eaa28725241a9612804fb55113da4. There is currently a bug in older ncurses versions (like on OpenBSD) where a fix for a bug with REP is not backported yet. Most likely in tty/tty_update.c: Noticed while using lynx (which uses ncurses/curses). To reproduce using lynx: echo "Z0000000" | lynx -stdin or using the program: int main(void) { WINDOW *win; win = initscr(); printw("Z0000000"); refresh(); sleep(5); return 0; } This prints "ZZZZZZZ" (incorrectly).
2020-05-16support REP (repeat) escape sequenceAvi Halachmi (:avih)1-0/+10
The sequence \e[Nb prints the last printed char N (more) times if it's printable, and it's ignored after newline or other control chars. This is Ecma-048/ANSI-X3.6 sequence and not DEC VT. It's supported by xterm, and ncurses uses it when possible, e.g. when TERM is xterm* (and with this commit also st*). xterm supports only codepoints<=255, possibly due to internal limits. We support any value/codepoint which was placed in a cell. To test: - tput rep 65 4 -> prints 'AAAA' - printf "\342\225\246\033[4b" -> prints U+2566 1+4 times.
2020-05-12Fix selection: selscrollJakub Leszczak1-18/+8
2020-05-12Fix selection: ignore ATTR_WRAP when rectangular selection in getselJakub Leszczak1-1/+2
2020-05-12Fix selection: selclear in tputcJakub Leszczak1-1/+1
2020-05-09code-style: add fallthrough commentHiltjo Posthuma1-0/+1
Patch by Steve Ward, thanks.
2020-05-09optimize column width calculation and utf-8 encode for ASCIIHiltjo Posthuma1-1/+1
In particular on OpenBSD and on glibc wcwidth() is quite expensive. On musl there is little difference.
2020-05-09fix for incorrect (partial) written sequences when libc wcwidth() == -1Hiltjo Posthuma1-3/+1
Fix an issue with incorrect (partial) written sequences when libc wcwidth() == -1. The sequence is updated to on wcwidth(u) == -1: c = "\357\277\275" but len isn't. A way to reproduce in practise: * st -o dump.txt * In the terminal: printf '\xcd\xb8' - This is codepoint 888, on OpenBSD it reports wcwidth() == -1. - Quit the terminal. - Look in dump.txt (partial written sequence of "UTF_INVALID"). This was introduced in: " commit 11625c7166b7e4dad414606227acec2de1c36464 Author: czarkoff@gmail.com <czarkoff@gmail.com> Date: Tue Oct 28 12:55:28 2014 +0100 Replace character with U+FFFD if wcwidth() is -1 Helpful when new Unicode codepoints are not recognized by libc." Change: Remove setting the sequence. If this happens to break something, another solution could be setting len = 3 for the sequence.
2020-05-09tiny code-style and typo-fix in commentHiltjo Posthuma1-3/+3
2020-04-30replace exit(3) by _exit(2) in signal handler sigchld()Jan Klemkow1-1/+1
exit(3) is not async-signal-safe but, _exit(2) is. This change prevents st to crash and dump core.
2020-04-19Update XIM cursor position only if changedIvan Tham1-3/+6
Updating XIM cursor position is expensive, so only update it when cursor position changed.
2020-04-11just remove the EOF messageHiltjo Posthuma1-1/+0
2020-04-11Fix small typosHiltjo Posthuma1-4/+3
2020-04-11Launch scroll program with the default shellQuentin Rameau1-3/+6
2020-04-11Fix style issueRoberto E. Vargas Caballero1-1/+2