Commit Graph

271 Commits

Author SHA1 Message Date
Bakkeby
1da419eb35 ligatures + wide glyphs + vertcenter: compatibility fixes ref. #118 2024-03-10 22:18:05 +01:00
Bakkeby
f87d3de2cf wide glyphs: fixing compilation error following code refactoring 2024-03-10 10:05:54 +01:00
Bakkeby
3564593563 Revert "Fix cursor move with wide glyphs" ref. #118
This reverts commit 400aa4492f.
2024-03-08 19:52:11 +01:00
Bakkeby
cd37481bde sixel: moving osc_table out of sixel patch due to global dependency ref. #118 2024-03-08 19:52:00 +01:00
Bakkeby
9ddc13c0e0 drawcol = dc.col[g.bg]; 2024-03-07 23:40:50 +01:00
Bakkeby
b43957b061 Optimise utf8decode() 2024-03-07 23:26:34 +01:00
Bakkeby
d78d582eaa Streamline validation in utf8decode()
https://lists.suckless.org/hackers/2207/18407.html
2024-03-07 23:22:02 +01:00
Bakkeby
6d5c2b3ddb code-golfing: cleanup osc color related code
* 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.

ref.
https://git.suckless.org/st/commit/8629d9a1da72cc18568a8f146307b0e939b77ebf.html
2024-03-07 23:16:00 +01:00
Bakkeby
e88f2bf20c Removing the VIM browse patch.
The general reasoning is that the vim browse patch is very invasive,
has a high level of complexity, and is incompatible with a significant
number of other patches and it complicates further maintenance.

Additionally the patch has its own scrollback mechanism which seemingly
did not work properly - and nobody seems to have complained about this
since the patch was added back in May 2021.

If you want to try out the vim browse patch then I would recommend having
a play around with the patch author's own build that has this patch
integrated:
   - https://github.com/juliusHuelsmann/st-history-vim
   - https://github.com/juliusHuelsmann/st

Alternatively a tag has been added to this repository that refers to the
last commit that still has the vim browse patch:
   - https://github.com/bakkeby/st-flexipatch/tree/VIM_BROWSE_PATCH
2024-03-07 22:35:11 +01:00
Bakkeby
340caa5d0a xmakeglyphfontspecs: fix for when not using ligatures 2024-03-07 21:59:15 +01:00
Bakkeby
b7add20215 Set upper limit for REP escape sequence argument
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.

ref.
https://git.suckless.org/st/commit/95f22c53059ccd60ee701ccf2659dacd95e4e89a.html
2024-03-07 21:44:39 +01:00
Bakkeby
400aa4492f Fix cursor move with wide glyphs
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.

ref.
https://git.suckless.org/st/commit/7473a8d1a57e5f9aba41b953f4e498c35e1c9dc5.html
2024-03-07 21:43:24 +01:00
Bakkeby
c089485aa4 hidecursor: add config option to disable hidecursor functionality 2024-03-07 21:43:18 +01:00
Bakkeby
f79ac733f3 sixel + anysize patch compatibility fix ref. #117 2024-03-07 21:24:31 +01:00
Bakkeby
0f50ef072c ligatures: upgrading 2024-03-07 15:34:21 +01:00
Stein Gunnar Bakkeby
677c2da0be
Reworking sixel implementation based on veltza's implementation (#117)
* sixel: remove black bars from sixel images

When the images don't fully cover the text cells, black bars are added
to them. This fix removes those bars, but if you need the old behavior,
you can restore it by setting 'sixelremovebars' to zero in config.h

* sixel: fix a potential memory leak

* sixel: improve behavior with text reflow

* sixel: prevent animated gifs from choking the terminal

Animated gifs constantly spawn new images that eventually choke the
terminal because the old animation frames are kept in the image buffer.
This fix removes overlapping images from the image buffer and prevents
them from piling up.

* sixel: add zooming and clipping

* sixel: copying bulk of changes

* sixel: move sixel_parser_parse() and add missing sequences and blocks (#113)

- Move sixel_parser_parse() from tputc() to twrite()
- Add missing 8452, DECSDM, XTSMGRAPHICS and XTWINOPS sequences
- Add more conditional blocks for the scrollback and sync patches
- Remove unused reflow_y from ImageList. It is only used for the
  scrollback-reflow patch in st-sx.

* sixel: update vtiden to VT200 family

* sixel: fix scrolling issues inside tmux (#114)

tmux is using the scrolling region and sequence to clear the screen
below the shell prompt. This peculiar behavior caused the tscrollup()
function to be called, which always scrolled the images regardless of
whether they were inside the region or not. So the images moved out of
place whenever the bottom of the screen was cleared. This fix checks
that the images are inside the region before scrolling them.

* sixel: prevent images from being deleted when resizing (#115)

This fixes resizing issues outside of tmux not inside.

* Rewriting tresize logic based on veltza's proposed implementation in PR #115

* tresize: correction for tscrollup call when scrollback patch is used

---------

Co-authored-by: veltza <106755522+veltza@users.noreply.github.com>
2024-03-07 09:22:44 +01:00
Jordan Callicoat
2e0e84d56a
Add selectioncolors patch (#110)
https://st.suckless.org/patches/selectioncolors/

Closes #91
2024-02-28 14:34:06 +01:00
Bakkeby
74f19eafe9 csi: check for private marker in 'S' case
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.

ref.
https://git.suckless.org/st/commit/a3f7420310be0fd778ef9fe2abf20edc2d8dc81a.html
2024-02-19 09:09:08 +01:00
veltza
76cb5801f6
sixel: fix resizing issues (#109)
Fixes #108
2023-12-12 21:29:26 +01:00
Bakkeby
3fcf0e3db7 [st][patch][ligatures] Fix ATTR_WRAP attribute handling in layout logic.
Ref. https://git.suckless.org/sites/commit/20d453defdb6ae7bb37f644a2e2831cf2097cdbb.html
2023-11-23 22:21:31 +01:00
veltza
003ab067da
Remove black bars from sixel images and add... (#107)
...support for transparency. Technically, the sixels do not have transparency,
but empty pixels are now rendered with the current background color instead
of black to make the them appear transparent. Same goes for the black bars.
The current background color makes them disappear.

There is one technical limitation with the alpha focus highlight patch.
The alpha value and background color is taken from the current background color,
so when the window is unfocused, images may have the wrong alpha and/or
background color. This can't be fixed easily.
2023-11-23 21:45:20 +01:00
Bakkeby
1af2184c87 Add terminfo entries for bracketed paste mode
Helps Vim (and hopefully others) to discover that this feature exists
without further user configuration.

ref.
https://git.suckless.org/st/commit/9846a56bd7fdc86bf788db04bbbcbde7b7eb9952.html
2023-10-08 20:24:52 +02:00
Bakkeby
1df649dfbd 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).

ref.
https://git.suckless.org/st/commit/559fdc278681c98470749adb59f01cd071720458.html
2023-10-08 20:22:22 +02:00
Bakkeby
3cbaecfa31 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.

ref.
https://git.suckless.org/st/commit/8abe4bcb41aa7fda0ae00823f6a20271124150db.html
2023-10-08 20:21:13 +02:00
Bakkeby
6ade70c726 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".

ref.
https://git.suckless.org/st/commit/2fc7e532b23e2f820c6b73d352ec7c41fefa45b5.html
2023-10-08 20:19:56 +02:00
Bakkeby
859906235e 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\\'

ref.
https://git.suckless.org/st/commit/a6bbc0c96b0a1db804061b0db79101c6b26aec57.html
2023-10-08 20:18:30 +02:00
Bakkeby
4a1d981d54 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.

ref.
https://git.suckless.org/st/commit/eb3b894f4076f2b25afc644a1f444b5cbd96aae8.html
2023-09-22 18:16:08 +02:00
Bakkeby
1c03f10db9 sixel: only clear sixel images on RM (Reset Mode) if we are in alt screen ref. #102 2023-09-12 16:11:08 +02:00
Bakkeby
c1ef3ce0d8 scrollback: clear history on reset ref. #102 2023-09-12 16:02:19 +02:00
Bakkeby
41e6f9dce6 sixel: remove images on escape code 'l' - Reset Mode (RM) ref. #102 2023-09-12 00:16:10 +02:00
Sajay
f097dbd079
Check for already exisiting desktop entry (#100)
When st desktop entry already exists it throws error when running make
2023-07-05 11:15:27 +02:00
Bakkeby
b82057eb85 Fix for wide character being incorrectly cleared on MODE_INSERT
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'

Ref.
https://git.suckless.org/st/commit/3a6d6d740110e6ee1b092d05ad746244eedabe4b.html
2023-06-25 14:19:27 +02:00
veltza
677f854c05
Fix sixel issues and add a clearing sequence (#99)
This patch fixes the following sixel issues:

- The current sixel implementation cleared all cells from the left side
  of the image when the image was drawn. The fix only clears the cells
  where the image will be drawn.
- The deletion routine didn't work correctly. In certain situations,
  it left the image or images undrawn. For example, if the first image
  was marked for deletion, it didn't draw the second one.
- The drawing routine caused a high cpu usage, because XCopyArea()
  triggered the X server to send the NoExpose event, which caused sixels
  to be redrawn and the X server to send another NoExpose event and so
  on. This loop caused constant redraw of sixels and high cpu usage.
  The fix prevents the X server from sending GraphicsExpose and NoExpose
  events.

The patch also adds a control sequence for removing sixels:

Because the sixels are implemented as overlay images, they cannot be
removed by clearing the underlaying cells. Therefore, we need a control
sequence to remove them. I opted to choose ESC[6J as the control
sequence because it is not used and the number refers to sixels. So when
the lf file manager supports sixels [1], you can use the following
minimal scripts to preview images in lf:

previewer:
  #!/bin/sh
  case "$(readlink -f "$1")" in
      *.bmp|*.gif|*.jpg|*.jpeg|*.png|*.webp|*.six|*.svg|*.xpm)
          chafa -s "$(($2-3))x$3" -f sixels "$1"
          exit 1 ;;
      *)
          bat "$1" ;;
  esac

cleaner:
  #!/bin/sh
  printf "\033[6J" >/dev/tty

[1] https://github.com/gokcehan/lf/pull/1211
2023-06-12 16:02:19 +02:00
Bakkeby
1343b29ee5 Bump to 211964d.
ignore C1 control characters in UTF-8 mode

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

Ref.
https://git.suckless.org/st/commit/211964d56ee00a7d46e251cbc150afb79138ae37.html
2023-04-07 14:31:41 +02:00
Bakkeby
18e7dc5545 Bump to f17abd2.
Add support for DSR response "OK" escape sequence

"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,

Ref.
https://git.suckless.org/st/commit/f17abd25b376c292f783062ecf821453eaa9cc4c.html
2023-04-07 14:28:19 +02:00
Bakkeby
da9835bdf0 Bump to 7e8050c.
Fixed OSC color reset without parameter->resets all colors

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'

Ref.
https://git.suckless.org/st/commit/7e8050cc621f27002eaf1be8114dee2497beff91.html
2023-04-07 14:25:12 +02:00
Bakkeby
a8e2af0d92 ligatures: adding 0 initialiser for features array ref. #93 2023-01-09 10:08:19 +01:00
Bakkeby
bd370228a4 ligatures: upgrading patch 2022-12-19 10:14:14 +01:00
Bakkeby
e6a2fb489c Bump to e5e9598.
fix buffer overflow when handling long composed input

To reproduce the issue:

"
If you already have the multi-key enabled on your system, then add this line
to your ~/.XCompose file:

[...]
<question> <T> <E> <S> <T> <question> :
"1234567890123456789012345678901234567890123456789012345678901234567890"
"

Reported by and an initial patch by Andy Gozas <andy@gozas.me>, thanks!

Adapted the patch, for now st (like dmenu) handles a fixed amount of composed
characters, or otherwise ignores it. This is done for simplicity sake.

Ref.
https://git.suckless.org/st/commit/e5e959835b195c023d1f685ef4dbbcfc3b5120b2.html
2022-10-25 17:22:33 +02:00
Bakkeby
d8529b66a4 Adding fullscreen patch ref. #88 2022-10-24 11:27:51 +02:00
Bakkeby
4dfb6683cd Adding the COLORTERM environment variable 2022-10-24 11:26:36 +02:00
badarg1
6ce9ec69ad
Fixed a glitch when using using the keyboardselect and scrollback patches. (#48)
Scrolling back and then entering keyboardselect's copy mode causes
glitched text to appear when moving the cursor. This is because the
keyboardselect patch is not aware of the scrollback history (term.hist),
so it takes the text from the last displayed screen (term.line).

Co-authored-by: Àlex Ramírez <aramirez@verbio.com>
2022-10-17 13:39:34 +02:00
step
d58abd5638
dedup XK_Z in fixkeyboardinput.c (#87)
Closes #85.
2022-10-15 15:40:39 +02:00
Bakkeby
13f2b133eb Bump to 68d1ad9.
FAQ: document the color emojis crash issue which affected some systems is fixed

It is fixed in libXft 2.3.6:

https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS

bump version to 1.5

Ref.
https://git.suckless.org/st/commit/00085199039ee63acc7b1ecb7e3774a9c3552b2a.html
https://git.suckless.org/st/commit/68d1ad9b54e952e3079356aeab8ab37e44c56c2c.html
2022-10-06 15:33:26 +02:00
Bakkeby
35b7da0919 alpha focus highlight: upgrade patch to latest (20200731-43a395a) 2022-10-06 13:20:27 +02:00
Bakkeby
f899d0552a alpha: remove debug print statements from changealpha 2022-10-01 08:37:17 +02:00
Utkarsh Verma
2d74e49c4f Add function for changing alpha (#47)
Co-authored-by: Stein Gunnar Bakkeby <bakkeby@gmail.com>
2022-09-24 11:04:38 +02:00
step
499b7fbc19
XRESOURCES_RELOAD_PATCH reload fonts + re-render (#84)
This patch 1) improves reloading X resources - by considering fonts in
a way nearly identical to function `zoomabs`' - and 2) re-renders st so
that changed colors and fonts can be seen.
2022-09-24 10:40:33 +02:00
Bakkeby
34cd955f14 Adding key and mouse binding option to control whether they apply to primary screen, alt screen or both ref. #81 2022-09-01 22:01:20 +02:00
Bakkeby
89ced627cd font2: adding use XftFontMatch patch compatibility
Also adding support for using size in addition to
pixelsize when configuring fonts.

Ref. https://github.com/bakkeby/dwm-flexipatch/issues/294
2022-08-29 09:50:47 +02:00