summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-01Makefile: add manual path for OpenBSDHiltjo Posthuma
2022-04-19code-golfing: cleanup osc color related codeNRK
* 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 sizeNRK
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()NRK
all the ctype.h functions' argument must be representable as an unsigned char or as EOF, otherwise the behavior is undefined.
2022-03-13make underlines and strikethroughs respect `chscale`Zacchary Dempsey-Plante
2022-02-18Delay redrawals on palette changesSanttu Lakkala
Build on auto-sync and only mark window dirty on palette changes and let the event handler do the actual draw.
2022-01-12X10/SGR mouse: use alt as meta key instead of super/windows keyHiltjo Posthuma
2022-01-10LICENSE: bump yearHiltjo Posthuma
2022-01-10Fix mousereportrobert
This patch replaces the previous one I sent. The following changes are made in this patch: - Fix tracking of pressed buttons. Previously, pressing two buttons and then releasing one would make st think no buttons are pressed, which in particular broke MODE_MOUSEMOTION. - Always send the lowest-numbered pressed button on motion events; when no button is pressed for a motion event in MODE_MOUSEMANY, then send a release. This matches the behaviour of xterm. (Previously, st sent the most recently pressed button in the motion report.) - Remove UB (?) access to potentially inactive struct member e->xbutton.button of XEvent union. - Fix (unlikely) possibility of overflow for large button numbers. The one discrepancy I found between st and xterm is that xterm sometimes encodes buttons with large numbers (>5) strangely. E.g., xterm reports presses of buttons 8 and 9 as releases, whereas st properly (?) encodes them as presses.
2022-01-07bump version to 0.8.5Hiltjo Posthuma
2022-01-02FAQ: fix a typo, patch -> pathHiltjo Posthuma
2021-12-30Fix overtyping wide characters.jamin
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 Sprickerhof
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 Posthuma
Otherwise the message "erresc: unknown str" is printed.
2021-12-26Add support for OSC color sequencesRaheman Vaiya
2021-08-24fix possible rare crash when Xutf8TextPropertyToTextList failsHiltjo Posthuma
from the XmbTextListToTextProperty(3) man page: "If insufficient memory is available for the new value string, the functions return XNoMemory. If the current locale is not supported, the functions return XLocaleNotSupported. In both of these error cases, the functions do not set text_prop_return." Reported by Steffen Nurpmeso <steffen@sdaoden.eu>, thanks!
2021-08-24fix a problem that the standard streams are unexpectedly closedKoichi Murase
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-07-18Add 14th bit to XK_SWITCH_MOD bitmaskPetar Kapriš
The bits of uint signal in an XKeyEvent which concern the key group (keyboard layout) are bits 13 and 14, as documented here: https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Groups_and_Shift_Levels In the older version, only bit 13 was marked as part of XK_SWITCH_MOD, this causes issues for users who have more than two keymaps. the 14th bit is not in ignoremod, key sequences are not caught by match(), if they switch to a third or fourth keyboard.
2021-05-06Mild const-correctness improvements.Markus F.X.J. Oberhumer
Only touch a few things, the main focus is to improve code readability.
2021-03-19fix: correctly encode mouse buttons >= 8 in X10 and SGR modeHiltjo Posthuma
These are typically mapped in X11 to the side-buttons (backward/forwards) on the mouse. A comparison of the button numbers in SGR mode (first field): st old: 0 1 2 64 65 66 67 68 69 70 st new (it is the same as xterm now): 0 1 2 64 65 66 67 128 129 130 A script to test and reproduce it, first argument is "h" (on) or "l" (off): #!/bin/sh printf '\x1b[?1000%s\x1b[?1006%s' "$1" "$1" for n in 1 2 3 4 5 6 7 8 9 10; do printf 'button %d\n' "$n" xdotool click "$n" printf '\n\n' done
2020-10-18remove unused variable from previous patchHiltjo Posthuma
2020-10-18ST: Add WM_ICON_NAME property supportJohn Collis
Also added _NET_WM_ICON_NAME.
2020-06-19bump version to 0.8.4Hiltjo Posthuma
2020-06-17config.mk: use PKG_CONFIG in commented OpenBSD sectionHiltjo Posthuma
2020-06-17LICENSE: bump yearsHiltjo Posthuma
2020-06-17remove sixel stub codeHiltjo Posthuma
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 Posthuma
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-06-01FAQ: fix single-buffer patchHiltjo Posthuma
rebase against master
2020-05-30config.def.h: add an option allowwindowops, by default off (secure)Hiltjo Posthuma
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-30FAQ: add some details about the w3m img hackHiltjo Posthuma
... and an example patch to switch from double-buffering to a single buffer.
2020-05-30tiny style fixHiltjo Posthuma
2020-05-30Partially add back in "support REP (repeat) escape sequence"Hiltjo Posthuma
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-24Call xsetcursor to set win.cursor in mainSteve Ward
In xsetcursor, remove "DEFAULT(cursor, 1)" because 0 is a valid value. Increase max allowed value of cursor from 6 to 7 (st extension).
2020-05-16Revert "support REP (repeat) escape sequence"Hiltjo Posthuma
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)
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-16Add rin terminfo capabilityRoberto E. Vargas
Tianlin Qu discovered that st is missing rin (scroll back #1 lines).
2020-05-16Make shift+wheel behaves as shift+Prev/Nextk0ga
St uses a very good hack where mouse wheel genereates ^Y and ^E, that are the same keys that less and vi uses for backward and fordward scrolling. Scroll, as many terminal emulators, use shift+Prev/Next for scrolling, but it is also using ^E and ^Y for scroling, characters that are reserved in the POSIX shell in emacs mode for end of line and yanking, making scroll unsable in st. This patch adds a new hack, making shift+wheel returning the same sequences than shift+Prev/Next, meaning that scroll or any other similar program will not be able to differentiate between them.
2020-05-12Fix selection: selscrollJakub Leszczak
2020-05-12Fix selection: ignore ATTR_WRAP when rectangular selection in getselJakub Leszczak
2020-05-12Fix selection: selclear in tputcJakub Leszczak
2020-05-09code-style: add fallthrough commentHiltjo Posthuma
Patch by Steve Ward, thanks.
2020-05-09optimize column width calculation and utf-8 encode for ASCIIHiltjo Posthuma
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 Posthuma
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 Posthuma
2020-05-09auto-sync: draw on idle to avoid flicker/tearingAvi Halachmi (:avih)
st could easily tear/flicker with animation or other unattended output. This commit eliminates most of the tear/flicker. Before this commit, the display timing had two "modes": - Interactively, st was waiting fixed `1000/xfps` ms after forwarding the kb/mouse event to the application and before drawing. - Unattended, and specifically with animations, the draw frequency was throttled to `actionfps`. Animation at a higher rate would throttle and likely tear, and at lower rates it was tearing big frames (specifically, when one `read` didn't get a full "frame"). The interactive behavior was decent, but it was impossible to get good unattended-draw behavior even with carefully chosen configuration. This commit changes the behavior such that it draws on idle instead of using fixed latency/frequency. This means that it tries to draw only when it's very likely that the application has completed its output (or after some duration without idle), so it mostly succeeds to avoid tear, flicker, and partial drawing. The config values minlatency/maxlatency replace xfps/actionfps and define the range which the algorithm is allowed to wait from the initial draw-trigger until the actual draw. The range enables the flexibility to choose when to draw - when least likely to flicker. It also unifies the interactive and unattended behavior and config values, which makes the code simpler as well - without sacrificing latency during interactive use, because typically interactively idle arrives very quickly, so the wait is typically minlatency. While it only slighly improves interactive behavior, for animations and other unattended-drawing it improves greatly, as it effectively adapts to any [animation] output rate without tearing, throttling, redundant drawing, or unnecessary delays (sounds impossible, but it works).
2020-04-30replace exit(3) by _exit(2) in signal handler sigchld()Jan Klemkow
exit(3) is not async-signal-safe but, _exit(2) is. This change prevents st to crash and dump core.
2020-04-27bump version to 0.8.3Hiltjo Posthuma
2020-04-19Update XIM cursor position only if changedIvan Tham
Updating XIM cursor position is expensive, so only update it when cursor position changed.
2020-04-11just remove the EOF messageHiltjo Posthuma
2020-04-11Add st-mono terminfo entryRoberto E. Vargas Caballero
This entry is intended for monocolor display and it is very helpful for color haters.