Add terminfo entries for bracketed paste mode

Helps Vim (and hopefully others) to discover that this feature exists without further user configuration.
Unhide cursor on RIS (\033c)
2023-10-07 12:16:59 +02:00 · 2023-10-07 12:16:59 +02:00 · 2023-10-07 12:16:59 +02:00 · 2023-10-07 12:16:59 +02:00 · 2023-10-07 12:16:59 +02:00 · 2023-09-22 15:16:52 +02:00
4 changed files with 14 additions and 12 deletions
--- a/10
+++ b/10
@ -7,13 +7,7 @@ include config.mk
 SRC = st.c x.c
 OBJ = $(SRC:.c=.o)
-all: options st
+all: st
 options:
 	@echo st build options:
 	@echo "CFLAGS  = $(STCFLAGS)"
 	@echo "LDFLAGS = $(STLDFLAGS)"
 	@echo "CC      = $(CC)"
 config.h:
 	cp config.def.h config.h
@ -54,4 +48,4 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/st
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
-.PHONY: all options clean dist install uninstall
+.PHONY: all clean dist install uninstall
--- a/st.c
+++ b/st.c
@ -1097,7 +1097,7 @@ tscrollup(int orig, int n)
 void
 selscroll(int orig, int n)
 {
-	if (sel.ob.x == -1)
+	if (sel.ob.x == -1 || sel.alt != IS_SET(MODE_ALTSCREEN))
 		return;
 	if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
@ -2330,6 +2330,7 @@ eschandle(uchar ascii)
 		treset();
 		resettitle();
 		xloadcols();
 		xsetmode(0, MODE_HIDE);
 		break;
 	case '=': /* DECPAM -- Application keypad */
 		xsetmode(1, MODE_APPKEYPAD);
@ -2477,7 +2478,10 @@ check_control_code:
 	}
 	if (term.c.x+width > term.col) {
-		tnewline(1);
+		if (IS_SET(MODE_WRAP))
 			tnewline(1);
 		else
 			tmoveto(term.col - width, term.c.y);
 		gp = &term.line[term.c.y][term.c.x];
 	}
--- a/st.info
+++ b/st.info
@ -184,6 +184,10 @@ st-mono| simpleterm monocolor,
 # XTerm extensions
 	rmxx=\E[29m,
 	smxx=\E[9m,
 	BE=\E[?2004h,
 	BD=\E[?2004l,
 	PS=\E[200~,
 	PE=\E[201~,
 # disabled rep for now: causes some issues with older ncurses versions.
 #	rep=%p1%c\E[%p2%{1}%-%db,
 # tmux extensions, see TERMINFO EXTENSIONS in tmux(1)
--- a/x.c
+++ b/x.c
@ -818,7 +818,7 @@ xloadcols(void)
 int
 xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b)
 {
-	if (!BETWEEN(x, 0, dc.collen))
+	if (!BETWEEN(x, 0, dc.collen - 1))
 		return 1;
 	*r = dc.col[x].color.red >> 8;
@ -833,7 +833,7 @@ xsetcolorname(int x, const char *name)
 {
 	Color ncolor;
-	if (!BETWEEN(x, 0, dc.collen))
+	if (!BETWEEN(x, 0, dc.collen - 1))
 		return 1;
 	if (!xloadcolor(x, name, &ncolor))
Author	SHA1	Message	Date
Peter Hofmann	9846a56bd7	Add terminfo entries for bracketed paste mode Helps Vim (and hopefully others) to discover that this feature exists without further user configuration.	2023-10-07 12:16:59 +02:00
Peter Hofmann	559fdc2786	Unhide cursor on RIS (\033c) 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-07 12:16:59 +02:00
Peter Hofmann	8abe4bcb41	Fix wide glyphs breaking "nowrap" mode 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-07 12:16:59 +02:00
Peter Hofmann	2fc7e532b2	Don't scroll selection on the other screen 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-10-07 12:16:59 +02:00
Peter Hofmann	a6bbc0c96b	Fix bounds checks of dc.col dc.collen is the length of dc.col, not the maximum index, hence if x is equal to dc.collen, then it's an error. With config.def.h, the last valid index is 259, so this correctly reports "black": $ printf '\033]4;259;?\e\\' 260 is an invalid index and this reports garbage instead of printing an error: $ printf '\033]4;260;?\e\\'	2023-10-07 12:16:59 +02:00
Hiltjo Posthuma	eb3b894f40	Makefile: remove the options target The Makefile used to suppress output (by using @), so this target made sense at the time. But the Makefile should be simple and make debugging with less abstractions or fancy printing. The Makefile was made verbose and doesn't hide the build output, so remove this target. Prompted by a question on the mailing list about the options target.	2023-09-22 15:16:52 +02:00