aboutsummaryrefslogtreecommitdiffstats
path: root/st.c
Commit message (Collapse)AuthorAgeFilesLines
* base64_digits: reduce scope, implicit zero, +1 sizeNRK2024-05-121-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.
* avoid potential UB when using isprint()NRK2024-05-121-1/+1
| | | | | all the ctype.h functions' argument must be representable as an unsigned char or as EOF, otherwise the behavior is undefined.
* Delay redrawals on palette changesSanttu Lakkala2024-05-121-4/+4
| | | | | Build on auto-sync and only mark window dirty on palette changes and let the event handler do the actual draw.
* Fix overtyping wide characters.jamin2024-05-121-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
* Fix null pointer access in strhandleJochen Sprickerhof2024-05-121-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.
* follow-up fix for OSC color sequences, returnHiltjo Posthuma2024-05-121-3/+3
| | | | Otherwise the message "erresc: unknown str" is printed.
* Add support for OSC color sequencesRaheman Vaiya2024-05-121-1/+79
|
* fix a problem that the standard streams are unexpectedly closedKoichi Murase2021-08-241-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.
* Mild const-correctness improvements.Markus F.X.J. Oberhumer2021-05-061-21/+23
| | | | | Only touch a few things, the main focus is to improve code readability.
* remove unused variable from previous patchHiltjo Posthuma2020-10-181-1/+0
|
* ST: Add WM_ICON_NAME property supportJohn Collis2020-10-181-0/+9
| | | | Also added _NET_WM_ICON_NAME.
* remove sixel stub codeHiltjo Posthuma2020-06-171-21/+5
| | | | | Remove stub code that was used for an experiment of adding sixel code to st from the commit f7398434.
* fix unicode glitch in DCS strings, patch by Tim AllenHiltjo Posthuma2020-06-171-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. "
* config.def.h: add an option allowwindowops, by default off (secure)Hiltjo Posthuma2020-05-301-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'
* tiny style fixHiltjo Posthuma2020-05-301-2/+1
|
* Partially add back in "support REP (repeat) escape sequence"Hiltjo Posthuma2020-05-301-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.
* Revert "support REP (repeat) escape sequence"Hiltjo Posthuma2020-05-161-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).
* support REP (repeat) escape sequenceAvi Halachmi (:avih)2020-05-161-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.
* Fix selection: selscrollJakub Leszczak2020-05-121-18/+8
|
* Fix selection: ignore ATTR_WRAP when rectangular selection in getselJakub Leszczak2020-05-121-1/+2
|
* Fix selection: selclear in tputcJakub Leszczak2020-05-121-1/+1
|
* code-style: add fallthrough commentHiltjo Posthuma2020-05-091-0/+1
| | | | Patch by Steve Ward, thanks.
* optimize column width calculation and utf-8 encode for ASCIIHiltjo Posthuma2020-05-091-1/+1
| | | | | In particular on OpenBSD and on glibc wcwidth() is quite expensive. On musl there is little difference.
* fix for incorrect (partial) written sequences when libc wcwidth() == -1Hiltjo Posthuma2020-05-091-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.
* tiny code-style and typo-fix in commentHiltjo Posthuma2020-05-091-3/+3
|
* replace exit(3) by _exit(2) in signal handler sigchld()Jan Klemkow2020-04-301-1/+1
| | | | | exit(3) is not async-signal-safe but, _exit(2) is. This change prevents st to crash and dump core.
* Update XIM cursor position only if changedIvan Tham2020-04-191-3/+6
| | | | | Updating XIM cursor position is expensive, so only update it when cursor position changed.
* just remove the EOF messageHiltjo Posthuma2020-04-111-1/+0
|
* Fix small typosHiltjo Posthuma2020-04-111-4/+3
|
* Launch scroll program with the default shellQuentin Rameau2020-04-111-3/+6
|
* Fix style issueRoberto E. Vargas Caballero2020-04-111-1/+2
|
* ttyread: test for EOF while reading ttyRoberto E. Vargas Caballero2020-04-111-9/+16
| | | | | | When a read operation returns 0 then it means that we arrived to the end of the file, and new reads will return 0 unless you do some other operation such as lseek(). This case happens with USB-232 adapters when they are unplugged.
* Add support for scroll(1)Roberto E. Vargas Caballero2020-04-111-6/+10
| | | | | | | | | Scroll is a program that stores all the lines of its child and be used in st as a way of implementing scrollback. This solution is much better than implementing the scrollback in st itself because having a different program allows to use it in any other program without doing modifications to those programs.
* OSC 52 - copy to clipboard: don't limit to 382 bytesAvi Halachmi (:avih)2019-11-101-4/+11
| | | | | | | | | | | | | | | | | | Strings which an application sends to the terminal in OSC, DCS, etc are typically small (title, colors, etc) but one exception is OSC 52 which copies text to the clipboard, and is used for instance by tmux. Previously st cropped these strings at 512 bytes, which for OSC 52 limited the copied text to 382 bytes (remaining buffer space before base64). This made it less useful than it can be. Now it's a dynamic growing buffer. It remains allocated after use, resets to 512 when a new string starts, or leaked on exit. Resetting/deallocating the buffer right after use (at strhandle) is possible with some more code, however, it doesn't always end up used, and to cover those cases too will require even more code, so resetting only on new string is good enough for now.
* CSIEscape, STREscape: use size_t for buffer lengthHiltjo Posthuma2019-11-101-4/+4
|
* STREscape: don't trim prematurelyAvi Halachmi (:avih)2019-11-101-1/+1
| | | | | | | | | | | STRescape holds strings in escape sequences such as OSC and DCS, and its buffer is 512 bytes. If the input is too big then trailing chars are ignored, but the test was off-by-1 such that it took 510 chars instead of 511 (before a terminating NULL is added). Now the full size can be utilized.
* base64dec: don't read out of boundsAvi Halachmi (:avih)2019-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, base64dec checked terminating input '\0' every 4 calls to base64dec_getc, where the latter progressed one or more chars on each call, and could read past '\0' in the way it was used. The input to base64dec currently comes only from OSC 52 escape seq (copy to clipboard), and reading past '\0' or even past the buffer boundary was easy to trigger. Also, even if we could trust external input to be valid base64, there are different base64 standards, and not all of them require padding to 4 bytes blocks (using trailing '=' chars). It didn't affect short OSC 52 strings because the buffer is initialized to 0's, so typically it did stop within the buffer, but if the string was trimmed to fit (the buffer is 512 bytes) then it did also read past the end of the buffer, and the decoded suffix ended up arbitrary. This patch makes base64dec_getc not progress past '\0', and instead produce fake trailing padding of '='. Additionally, at base64dec, if padding is detected at the first or second byte of a quartet, then we identify it as invalid and abort (a valid quartet has at least two leading non-padding bytes).
* selection: fix view to match actual selection on first cellAvi Halachmi (:avih)2019-04-141-1/+1
|
* revert part of commit add0211522737b79dad990ccd65c8af63b5cc1ddHiltjo Posthuma2019-03-151-2/+1
| | | | | | | | | | "use iswspace()/iswpunct() to find word delimiters this inverts the configuration logic: you no longer provide a list of delimiters -- all space and punctuation characters are considered delimiters, unless listed in extrawordchars." Feedback from IRC and personal preference.
* dont print color warning on color reset OSC 104 without parameterHiltjo Posthuma2019-03-151-1/+4
| | | | | | also print explicitly "(null)" when printf "%s" p=NULL. noticed when exiting mutt: printf '\x1b]104\x07'
* minor code-style, initialize var at the top of functionHiltjo Posthuma2019-03-151-3/+1
|
* use iswspace()/iswpunct() to find word delimitersLauri Tirkkonen2019-03-151-1/+2
| | | | | | this inverts the configuration logic: you no longer provide a list of delimiters -- all space and punctuation characters are considered delimiters, unless listed in extrawordchars.
* replace utf8strchr with wcschrLauri Tirkkonen2019-03-151-19/+1
|
* be silent about explicitly unhandled mouse modesLauri Tirkkonen2019-03-131-0/+1
|
* style: remove double empty newlinesHiltjo Posthuma2019-03-031-1/+0
|
* better Input Method Editor (IME) supportIvan Tham2019-02-121-0/+1
| | | | | | | | | | | | Features: - Allow input methods swap with hotkey (E.g. left ctrl + left shift). - Over-the-spot pre-editing style, pre-edit data placed over insertion point. - Restart IME without segmentation fault. TODO: - Automatically pickup IME if st started before IME
* output child WEXITSTATUS/WTERMSIG on abnormal terminationLauri Tirkkonen2018-12-111-2/+4
|
* st: small typofix in commentHiltjo Posthuma2018-11-041-1/+1
|
* small code-style fixHiltjo Posthuma2018-09-111-1/+2
|
* Remove the ISO 14755 featureQuentin Rameau2018-09-111-26/+0
| | | | | | And move it to the patches section. Keeping it would force to add an exec pledge on OpenBSD, and some people think it's bloated, so bye!
remember that computers suck.