commit
82cf724fd8
17 changed files with 1050 additions and 1176 deletions
253
FAQ
Normal file
253
FAQ
Normal file
|
|
@ -0,0 +1,253 @@
|
|||
## Why does st not handle utmp entries?
|
||||
|
||||
Use the excellent tool of [utmp](https://git.suckless.org/utmp/) for this task.
|
||||
|
||||
|
||||
## Some _random program_ complains that st is unknown/not recognised/unsupported/whatever!
|
||||
|
||||
It means that st doesn’t have any terminfo entry on your system. Chances are
|
||||
you did not `make install`. If you just want to test it without installing it,
|
||||
you can manually run `tic -sx st.info`.
|
||||
|
||||
|
||||
## Nothing works, and nothing is said about an unknown terminal!
|
||||
|
||||
* Some programs just assume they’re running in xterm i.e. they don’t rely on
|
||||
terminfo. What you see is the current state of the “xterm compliance”.
|
||||
* Some programs don’t complain about the lacking st description and default to
|
||||
another terminal. In that case see the question about terminfo.
|
||||
|
||||
|
||||
## How do I scroll back up?
|
||||
|
||||
* Using a terminal multiplexer.
|
||||
* `st -e tmux` using C-b [
|
||||
* `st -e screen` using C-a ESC
|
||||
* Using the excellent tool of [scroll](https://git.suckless.org/scroll/).
|
||||
* Using the scrollback [patch](https://st.suckless.org/patches/scrollback/).
|
||||
|
||||
|
||||
## I would like to have utmp and/or scroll functionality by default
|
||||
|
||||
You can add the absolute path of both programs in your config.h file. You only
|
||||
have to modify the value of utmp and scroll variables.
|
||||
|
||||
|
||||
## Why doesn't the Del key work in some programs?
|
||||
|
||||
Taken from the terminfo manpage:
|
||||
|
||||
If the terminal has a keypad that transmits codes when the keys
|
||||
are pressed, this information can be given. Note that it is not
|
||||
possible to handle terminals where the keypad only works in
|
||||
local (this applies, for example, to the unshifted HP 2621 keys).
|
||||
If the keypad can be set to transmit or not transmit, give these
|
||||
codes as smkx and rmkx. Otherwise the keypad is assumed to
|
||||
always transmit.
|
||||
|
||||
In the st case smkx=E[?1hE= and rmkx=E[?1lE>, so it is mandatory that
|
||||
applications which want to test against keypad keys send these
|
||||
sequences.
|
||||
|
||||
But buggy applications (like bash and irssi, for example) don't do this. A fast
|
||||
solution for them is to use the following command:
|
||||
|
||||
$ printf '\033[?1h\033=' >/dev/tty
|
||||
|
||||
or
|
||||
$ tput smkx
|
||||
|
||||
In the case of bash, readline is used. Readline has a different note in its
|
||||
manpage about this issue:
|
||||
|
||||
enable-keypad (Off)
|
||||
When set to On, readline will try to enable the
|
||||
application keypad when it is called. Some systems
|
||||
need this to enable arrow keys.
|
||||
|
||||
Adding this option to your .inputrc will fix the keypad problem for all
|
||||
applications using readline.
|
||||
|
||||
If you are using zsh, then read the zsh FAQ
|
||||
<http://zsh.sourceforge.net/FAQ/zshfaq03.html#l25>:
|
||||
|
||||
It should be noted that the O / [ confusion can occur with other keys
|
||||
such as Home and End. Some systems let you query the key sequences
|
||||
sent by these keys from the system's terminal database, terminfo.
|
||||
Unfortunately, the key sequences given there typically apply to the
|
||||
mode that is not the one zsh uses by default (it's the "application"
|
||||
mode rather than the "raw" mode). Explaining the use of terminfo is
|
||||
outside of the scope of this FAQ, but if you wish to use the key
|
||||
sequences given there you can tell the line editor to turn on
|
||||
"application" mode when it starts and turn it off when it stops:
|
||||
|
||||
function zle-line-init () { echoti smkx }
|
||||
function zle-line-finish () { echoti rmkx }
|
||||
zle -N zle-line-init
|
||||
zle -N zle-line-finish
|
||||
|
||||
Putting these lines into your .zshrc will fix the problems.
|
||||
|
||||
|
||||
## How can I use meta in 8bit mode?
|
||||
|
||||
St supports meta in 8bit mode, but the default terminfo entry doesn't
|
||||
use this capability. If you want it, you have to use the 'st-meta' value
|
||||
in TERM.
|
||||
|
||||
|
||||
## I cannot compile st in OpenBSD
|
||||
|
||||
OpenBSD lacks librt, despite it being mandatory in POSIX
|
||||
<http://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html#tag_20_11_13>.
|
||||
If you want to compile st for OpenBSD you have to remove -lrt from config.mk, and
|
||||
st will compile without any loss of functionality, because all the functions are
|
||||
included in libc on this platform.
|
||||
|
||||
|
||||
## The Backspace Case
|
||||
|
||||
St is emulating the Linux way of handling backspace being delete and delete being
|
||||
backspace.
|
||||
|
||||
This is an issue that was discussed in suckless mailing list
|
||||
<https://lists.suckless.org/dev/1404/20697.html>. Here is why some old grumpy
|
||||
terminal users wants its backspace to be how he feels it:
|
||||
|
||||
Well, I am going to comment why I want to change the behaviour
|
||||
of this key. When ASCII was defined in 1968, communication
|
||||
with computers was done using punched cards, or hardcopy
|
||||
terminals (basically a typewriter machine connected with the
|
||||
computer using a serial port). ASCII defines DELETE as 7F,
|
||||
because, in punched-card terms, it means all the holes of the
|
||||
card punched; it is thus a kind of 'physical delete'. In the
|
||||
same way, the BACKSPACE key was a non-destructive backspace,
|
||||
as on a typewriter. So, if you wanted to delete a character,
|
||||
you had to BACKSPACE and then DELETE. Another use of BACKSPACE
|
||||
was to type accented characters, for example 'a BACKSPACE `'.
|
||||
The VT100 had no BACKSPACE key; it was generated using the
|
||||
CONTROL key as another control character (CONTROL key sets to
|
||||
0 b7 b6 b5, so it converts H (code 0x48) into BACKSPACE (code
|
||||
0x08)), but it had a DELETE key in a similar position where
|
||||
the BACKSPACE key is located today on common PC keyboards.
|
||||
All the terminal emulators emulated the difference between
|
||||
these keys correctly: the backspace key generated a BACKSPACE
|
||||
(^H) and delete key generated a DELETE (^?).
|
||||
|
||||
But a problem arose when Linus Torvalds wrote Linux. Unlike
|
||||
earlier terminals, the Linux virtual terminal (the terminal
|
||||
emulator integrated in the kernel) returned a DELETE when
|
||||
backspace was pressed, due to the VT100 having a DELETE key in
|
||||
the same position. This created a lot of problems (see [1]
|
||||
and [2]). Since Linux has become the king, a lot of terminal
|
||||
emulators today generate a DELETE when the backspace key is
|
||||
pressed in order to avoid problems with Linux. The result is
|
||||
that the only way of generating a BACKSPACE on these systems
|
||||
is by using CONTROL + H. (I also think that emacs had an
|
||||
important point here because the CONTROL + H prefix is used
|
||||
in emacs in some commands (help commands).)
|
||||
|
||||
From point of view of the kernel, you can change the key
|
||||
for deleting a previous character with stty erase. When you
|
||||
connect a real terminal into a machine you describe the type
|
||||
of terminal, so getty configures the correct value of stty
|
||||
erase for this terminal. In the case of terminal emulators,
|
||||
however, you don't have any getty that can set the correct
|
||||
value of stty erase, so you always get the default value.
|
||||
For this reason, it is necessary to add 'stty erase ^H' to your
|
||||
profile if you have changed the value of the backspace key.
|
||||
Of course, another solution is for st itself to modify the
|
||||
value of stty erase. I usually have the inverse problem:
|
||||
when I connect to non-Unix machines, I have to press CONTROL +
|
||||
h to get a BACKSPACE. The inverse problem occurs when a user
|
||||
connects to my Unix machines from a different system with a
|
||||
correct backspace key.
|
||||
|
||||
[1] http://www.ibb.net/~anne/keyboard.html
|
||||
[2] http://www.tldp.org/HOWTO/Keyboard-and-Console-HOWTO-5.html
|
||||
|
||||
|
||||
## But I really want the old grumpy behaviour of my terminal
|
||||
|
||||
Apply [1].
|
||||
|
||||
[1] https://st.suckless.org/patches/delkey
|
||||
|
||||
|
||||
## Why do images not work in st using the w3m image hack?
|
||||
|
||||
w3mimg uses a hack that draws an image on top of the terminal emulator Drawable
|
||||
window. The hack relies on the terminal to use a single buffer to draw its
|
||||
contents directly.
|
||||
|
||||
st uses double-buffered drawing so the image is quickly replaced and may show a
|
||||
short flicker effect.
|
||||
|
||||
Below is a patch example to change st double-buffering to a single Drawable
|
||||
buffer.
|
||||
|
||||
diff --git a/x.c b/x.c
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -732,10 +732,6 @@ xresize(int col, int row)
|
||||
win.tw = col * win.cw;
|
||||
win.th = row * win.ch;
|
||||
|
||||
- XFreePixmap(xw.dpy, xw.buf);
|
||||
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||
- DefaultDepth(xw.dpy, xw.scr));
|
||||
- XftDrawChange(xw.draw, xw.buf);
|
||||
xclear(0, 0, win.w, win.h);
|
||||
|
||||
/* resize to new width */
|
||||
@@ -1148,8 +1144,7 @@ xinit(int cols, int rows)
|
||||
gcvalues.graphics_exposures = False;
|
||||
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
||||
&gcvalues);
|
||||
- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||
- DefaultDepth(xw.dpy, xw.scr));
|
||||
+ xw.buf = xw.win;
|
||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
||||
|
||||
@@ -1632,8 +1627,6 @@ xdrawline(Line line, int x1, int y1, int x2)
|
||||
void
|
||||
xfinishdraw(void)
|
||||
{
|
||||
- XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
|
||||
- win.h, 0, 0);
|
||||
XSetForeground(xw.dpy, dc.gc,
|
||||
dc.col[IS_SET(MODE_REVERSE)?
|
||||
defaultfg : defaultbg].pixel);
|
||||
|
||||
|
||||
## BadLength X error in Xft when trying to render emoji
|
||||
|
||||
Xft makes st crash when rendering color emojis with the following error:
|
||||
|
||||
"X Error of failed request: BadLength (poly request too large or internal Xlib length error)"
|
||||
Major opcode of failed request: 139 (RENDER)
|
||||
Minor opcode of failed request: 20 (RenderAddGlyphs)
|
||||
Serial number of failed request: 1595
|
||||
Current serial number in output stream: 1818"
|
||||
|
||||
This is a known bug in Xft (not st) which happens on some platforms and
|
||||
combination of particular fonts and fontconfig settings.
|
||||
|
||||
See also:
|
||||
https://gitlab.freedesktop.org/xorg/lib/libxft/issues/6
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=107534
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1498269
|
||||
|
||||
The solution is to remove color emoji fonts or disable this in the fontconfig
|
||||
XML configuration. As an ugly workaround (which may work only on newer
|
||||
fontconfig versions (FC_COLOR)), the following code can be used to mask color
|
||||
fonts:
|
||||
|
||||
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
|
||||
|
||||
Please don't bother reporting this bug to st, but notify the upstream Xft
|
||||
developers about fixing this bug.
|
||||
|
||||
As of 2022-09-05 this now seems to be finally fixed in libXft 2.3.5:
|
||||
https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS
|
||||
17
LEGACY
Normal file
17
LEGACY
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
A STATEMENT ON LEGACY SUPPORT
|
||||
|
||||
In the terminal world there is much cruft that comes from old and unsup‐
|
||||
ported terminals that inherit incompatible modes and escape sequences
|
||||
which noone is able to know, except when he/she comes from that time and
|
||||
developed a graphical vt100 emulator at that time.
|
||||
|
||||
One goal of st is to only support what is really needed. When you en‐
|
||||
counter a sequence which you really need, implement it. But while you
|
||||
are at it, do not add the other cruft you might encounter while sneek‐
|
||||
ing at other terminal emulators. History has bloated them and there is
|
||||
no real evidence that most of the sequences are used today.
|
||||
|
||||
|
||||
Christoph Lohmann <20h@r-36.net>
|
||||
2012-09-13T07:00:36.081271045+02:00
|
||||
|
||||
10
Makefile
10
Makefile
|
|
@ -7,13 +7,7 @@ include config.mk
|
|||
SRC = st.c x.c boxdraw.c hb.c
|
||||
OBJ = $(SRC:.c=.o)
|
||||
|
||||
all: options st
|
||||
|
||||
options:
|
||||
@echo st build options:
|
||||
@echo "CFLAGS = $(STCFLAGS)"
|
||||
@echo "LDFLAGS = $(STLDFLAGS)"
|
||||
@echo "CC = $(CC)"
|
||||
all: st
|
||||
|
||||
config.h:
|
||||
cp config.def.h config.h
|
||||
|
|
@ -56,4 +50,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
|
||||
|
|
|
|||
34
README
Normal file
34
README
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
st - simple terminal
|
||||
--------------------
|
||||
st is a simple terminal emulator for X which sucks less.
|
||||
|
||||
|
||||
Requirements
|
||||
------------
|
||||
In order to build st you need the Xlib header files.
|
||||
|
||||
|
||||
Installation
|
||||
------------
|
||||
Edit config.mk to match your local setup (st is installed into
|
||||
the /usr/local namespace by default).
|
||||
|
||||
Afterwards enter the following command to build and install st (if
|
||||
necessary as root):
|
||||
|
||||
make clean install
|
||||
|
||||
|
||||
Running st
|
||||
----------
|
||||
If you did not install st with make clean install, you must compile
|
||||
the st terminfo entry with the following command:
|
||||
|
||||
tic -sx st.info
|
||||
|
||||
See the man page for additional details.
|
||||
|
||||
Credits
|
||||
-------
|
||||
Based on Aurélien APTEL <aurelien dot aptel at gmail dot com> bt source code.
|
||||
|
||||
28
TODO
Normal file
28
TODO
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
vt emulation
|
||||
------------
|
||||
|
||||
* double-height support
|
||||
|
||||
code & interface
|
||||
----------------
|
||||
|
||||
* add a simple way to do multiplexing
|
||||
|
||||
drawing
|
||||
-------
|
||||
* add diacritics support to xdraws()
|
||||
* switch to a suckless font drawing library
|
||||
* make the font cache simpler
|
||||
* add better support for brightening of the upper colors
|
||||
|
||||
bugs
|
||||
----
|
||||
|
||||
* fix shift up/down (shift selection in emacs)
|
||||
* remove DEC test sequence when appropriate
|
||||
|
||||
misc
|
||||
----
|
||||
|
||||
$ grep -nE 'XXX|TODO' st.c
|
||||
|
||||
523
config.def.h
Normal file
523
config.def.h
Normal file
|
|
@ -0,0 +1,523 @@
|
|||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
/*
|
||||
* appearance
|
||||
*
|
||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||
*/
|
||||
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
||||
static int borderpx = 2;
|
||||
|
||||
/*
|
||||
* What program is execed by st depends of these precedence rules:
|
||||
* 1: program passed with -e
|
||||
* 2: scroll and/or utmp
|
||||
* 3: SHELL environment variable
|
||||
* 4: value of shell in /etc/passwd
|
||||
* 5: value of shell in config.h
|
||||
*/
|
||||
static char *shell = "/bin/sh";
|
||||
char *utmp = NULL;
|
||||
/* scroll program: to enable use a string like "scroll" */
|
||||
char *scroll = NULL;
|
||||
char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
|
||||
|
||||
/* identification sequence returned in DA and DECID */
|
||||
char *vtiden = "\033[?6c";
|
||||
|
||||
/* Kerning / character bounding-box multipliers */
|
||||
static float cwscale = 1.0;
|
||||
static float chscale = 1.0;
|
||||
|
||||
/*
|
||||
* word delimiter string
|
||||
*
|
||||
* More advanced example: L" `'\"()[]{}"
|
||||
*/
|
||||
wchar_t *worddelimiters = L" ";
|
||||
|
||||
/* selection timeouts (in milliseconds) */
|
||||
static unsigned int doubleclicktimeout = 300;
|
||||
static unsigned int tripleclicktimeout = 600;
|
||||
|
||||
/* alt screens */
|
||||
int allowaltscreen = 1;
|
||||
|
||||
/* allow certain non-interactive (insecure) window operations such as:
|
||||
setting the clipboard text */
|
||||
int allowwindowops = 0;
|
||||
|
||||
/*
|
||||
* draw latency range in ms - from new content/keypress/etc until drawing.
|
||||
* within this range, st draws when content stops arriving (idle). mostly it's
|
||||
* near minlatency, but it waits longer for slow updates to avoid partial draw.
|
||||
* low minlatency will tear/flicker more, as it can "detect" idle too early.
|
||||
*/
|
||||
static double minlatency = 8;
|
||||
static double maxlatency = 33;
|
||||
|
||||
/*
|
||||
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
|
||||
* attribute.
|
||||
*/
|
||||
static unsigned int blinktimeout = 800;
|
||||
|
||||
/*
|
||||
* thickness of underline and bar cursors
|
||||
*/
|
||||
static unsigned int cursorthickness = 2;
|
||||
|
||||
/*
|
||||
* 1: render most of the lines/blocks characters without using the font for
|
||||
* perfect alignment between cells (U2500 - U259F except dashes/diagonals).
|
||||
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
||||
* 0: disable (render all U25XX glyphs normally from the font).
|
||||
*/
|
||||
const int boxdraw = 0;
|
||||
const int boxdraw_bold = 0;
|
||||
|
||||
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||
const int boxdraw_braille = 0;
|
||||
|
||||
/*
|
||||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
||||
* it
|
||||
*/
|
||||
static int bellvolume = 0;
|
||||
|
||||
/* default TERM value */
|
||||
char *termname = "st-256color";
|
||||
|
||||
/*
|
||||
* spaces per tab
|
||||
*
|
||||
* When you are changing this value, don't forget to adapt the »it« value in
|
||||
* the st.info and appropriately install the st.info in the environment where
|
||||
* you use this st version.
|
||||
*
|
||||
* it#$tabspaces,
|
||||
*
|
||||
* Secondly make sure your kernel is not expanding tabs. When running `stty
|
||||
* -a` »tab0« should appear. You can tell the terminal to not expand tabs by
|
||||
* running following command:
|
||||
*
|
||||
* stty tabs
|
||||
*/
|
||||
unsigned int tabspaces = 8;
|
||||
|
||||
/* Terminal colors (16 first used in escape sequence) */
|
||||
static const char *colorname[] = {
|
||||
/* 8 normal colors */
|
||||
"black",
|
||||
"red3",
|
||||
"green3",
|
||||
"yellow3",
|
||||
"blue2",
|
||||
"magenta3",
|
||||
"cyan3",
|
||||
"gray90",
|
||||
|
||||
/* 8 bright colors */
|
||||
"gray50",
|
||||
"red",
|
||||
"green",
|
||||
"yellow",
|
||||
"#5c5cff",
|
||||
"magenta",
|
||||
"cyan",
|
||||
"white",
|
||||
|
||||
[255] = 0,
|
||||
|
||||
/* more colors can be added after 255 to use with DefaultXX */
|
||||
"#cccccc",
|
||||
"#555555",
|
||||
"gray90", /* default foreground colour */
|
||||
"black", /* default background colour */
|
||||
"#2e3440",
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Default colors (colorname index)
|
||||
* foreground, background, cursor, reverse cursor
|
||||
*/
|
||||
unsigned int defaultfg = 258;
|
||||
unsigned int defaultbg = 259;
|
||||
unsigned int defaultcs = 256;
|
||||
static unsigned int defaultrcs = 257;
|
||||
unsigned int selectionbg = 260;
|
||||
unsigned int selectionfg = 7;
|
||||
/* If 0 use selectionfg as foreground in order to have a uniform foreground-color */
|
||||
/* Else if 1 keep original foreground-color of each cell => more colors :) */
|
||||
static int ignoreselfg = 1;
|
||||
|
||||
/*
|
||||
* https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81
|
||||
* Default style of cursor
|
||||
* 0: blinking block
|
||||
* 1: blinking block (default)
|
||||
* 2: steady block ("█")
|
||||
* 3: blinking underline
|
||||
* 4: steady underline ("_")
|
||||
* 5: blinking bar
|
||||
* 6: steady bar ("|")
|
||||
* 7: blinking st cursor
|
||||
* 8: steady st cursor
|
||||
*/
|
||||
static unsigned int cursorstyle = 1;
|
||||
static Rune stcursor = 0x2603; /* snowman ("☃") */
|
||||
|
||||
/*
|
||||
* Default columns and rows numbers
|
||||
*/
|
||||
|
||||
static unsigned int cols = 80;
|
||||
static unsigned int rows = 24;
|
||||
|
||||
/*
|
||||
* Default colour and shape of the mouse cursor
|
||||
*/
|
||||
static unsigned int mouseshape = XC_xterm;
|
||||
static unsigned int mousefg = 7;
|
||||
static unsigned int mousebg = 0;
|
||||
|
||||
/*
|
||||
* Color used to display font attributes when fontconfig selected a font which
|
||||
* doesn't match the ones requested.
|
||||
*/
|
||||
static unsigned int defaultattr = 11;
|
||||
|
||||
/*
|
||||
* Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
|
||||
* Note that if you want to use ShiftMask with selmasks, set this to an other
|
||||
* modifier, set to 0 to not use it.
|
||||
*/
|
||||
static uint forcemousemod = ShiftMask;
|
||||
|
||||
/*
|
||||
* Internal mouse shortcuts.
|
||||
* Beware that overloading Button1 will disable the selection.
|
||||
*/
|
||||
static MouseShortcut mshortcuts[] = {
|
||||
/* mask button function argument release */
|
||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
||||
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
||||
};
|
||||
|
||||
/* Internal keyboard shortcuts. */
|
||||
#define MODKEY Mod1Mask
|
||||
#define TERMMOD (ControlMask|ShiftMask)
|
||||
|
||||
static Shortcut shortcuts[] = {
|
||||
/* mask keysym function argument */
|
||||
{ XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
|
||||
{ ControlMask, XK_Print, toggleprinter, {.i = 0} },
|
||||
{ ShiftMask, XK_Print, printscreen, {.i = 0} },
|
||||
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
|
||||
{ TERMMOD, XK_Prior, zoom, {.f = +1} },
|
||||
{ TERMMOD, XK_Next, zoom, {.f = -1} },
|
||||
{ TERMMOD, XK_Home, zoomreset, {.f = 0} },
|
||||
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
||||
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||
};
|
||||
|
||||
/*
|
||||
* Special keys (change & recompile st.info accordingly)
|
||||
*
|
||||
* Mask value:
|
||||
* * Use XK_ANY_MOD to match the key no matter modifiers state
|
||||
* * Use XK_NO_MOD to match the key alone (no modifiers)
|
||||
* appkey value:
|
||||
* * 0: no value
|
||||
* * > 0: keypad application mode enabled
|
||||
* * = 2: term.numlock = 1
|
||||
* * < 0: keypad application mode disabled
|
||||
* appcursor value:
|
||||
* * 0: no value
|
||||
* * > 0: cursor application mode enabled
|
||||
* * < 0: cursor application mode disabled
|
||||
*
|
||||
* Be careful with the order of the definitions because st searches in
|
||||
* this table sequentially, so any XK_ANY_MOD must be in the last
|
||||
* position for a key.
|
||||
*/
|
||||
|
||||
/*
|
||||
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
|
||||
* to be mapped below, add them to this array.
|
||||
*/
|
||||
static KeySym mappedkeys[] = { -1 };
|
||||
|
||||
/*
|
||||
* State bits to ignore when matching key or button events. By default,
|
||||
* numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
|
||||
*/
|
||||
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
|
||||
|
||||
/*
|
||||
* This is the huge key array which defines all compatibility to the Linux
|
||||
* world. Please decide about changes wisely.
|
||||
*/
|
||||
static Key key[] = {
|
||||
/* keysym mask string appkey appcursor */
|
||||
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
|
||||
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
|
||||
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
|
||||
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
|
||||
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
|
||||
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
|
||||
{ XK_KP_End, ControlMask, "\033[J", -1, 0},
|
||||
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
|
||||
{ XK_KP_End, ShiftMask, "\033[K", -1, 0},
|
||||
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0},
|
||||
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0},
|
||||
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
|
||||
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
|
||||
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
|
||||
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
|
||||
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
|
||||
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
|
||||
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
|
||||
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
|
||||
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
|
||||
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
|
||||
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
|
||||
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
|
||||
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
|
||||
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
|
||||
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
|
||||
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
|
||||
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
|
||||
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0},
|
||||
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
|
||||
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
|
||||
{ XK_Up, ControlMask, "\033[1;5A", 0, 0},
|
||||
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
|
||||
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
|
||||
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
|
||||
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0},
|
||||
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
|
||||
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
|
||||
{ XK_Down, ControlMask, "\033[1;5B", 0, 0},
|
||||
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
|
||||
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
|
||||
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
|
||||
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0},
|
||||
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
|
||||
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
|
||||
{ XK_Left, ControlMask, "\033[1;5D", 0, 0},
|
||||
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
|
||||
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
|
||||
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
|
||||
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0},
|
||||
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
|
||||
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
|
||||
{ XK_Right, ControlMask, "\033[1;5C", 0, 0},
|
||||
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
|
||||
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
|
||||
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
|
||||
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
|
||||
{ XK_Return, Mod1Mask, "\033\r", 0, 0},
|
||||
{ XK_Return, XK_ANY_MOD, "\r", 0, 0},
|
||||
{ XK_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||
{ XK_Insert, ControlMask, "\033[L", -1, 0},
|
||||
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||
{ XK_Delete, ControlMask, "\033[M", -1, 0},
|
||||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
||||
{ XK_Home, ShiftMask, "\033[2J", 0, -1},
|
||||
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||
{ XK_End, ControlMask, "\033[J", -1, 0},
|
||||
{ XK_End, ControlMask, "\033[1;5F", +1, 0},
|
||||
{ XK_End, ShiftMask, "\033[K", -1, 0},
|
||||
{ XK_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0},
|
||||
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||
{ XK_Next, ControlMask, "\033[6;5~", 0, 0},
|
||||
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0},
|
||||
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
|
||||
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
|
||||
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
|
||||
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
|
||||
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
|
||||
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0},
|
||||
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
|
||||
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
|
||||
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
|
||||
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
|
||||
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
|
||||
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0},
|
||||
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
|
||||
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
|
||||
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
|
||||
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
|
||||
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
|
||||
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0},
|
||||
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
|
||||
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
|
||||
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
|
||||
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
|
||||
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
|
||||
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
|
||||
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
|
||||
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
|
||||
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
|
||||
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
|
||||
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
|
||||
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
|
||||
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
|
||||
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
|
||||
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
|
||||
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
|
||||
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
|
||||
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
|
||||
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
|
||||
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
|
||||
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
|
||||
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
|
||||
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
|
||||
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
|
||||
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
|
||||
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
|
||||
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
|
||||
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
|
||||
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
|
||||
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
|
||||
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
|
||||
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
|
||||
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
|
||||
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
|
||||
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
|
||||
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
|
||||
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
|
||||
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
|
||||
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
|
||||
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
|
||||
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
|
||||
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
|
||||
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
|
||||
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
|
||||
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
|
||||
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
|
||||
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
|
||||
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
|
||||
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
|
||||
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
|
||||
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
|
||||
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
|
||||
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
|
||||
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
|
||||
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
|
||||
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
|
||||
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
|
||||
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
|
||||
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
|
||||
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
|
||||
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
|
||||
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
|
||||
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
|
||||
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
|
||||
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
|
||||
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
|
||||
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
|
||||
};
|
||||
|
||||
/*
|
||||
* Selection types' masks.
|
||||
* Use the same masks as usual.
|
||||
* Button1Mask is always unset, to make masks match between ButtonPress.
|
||||
* ButtonRelease and MotionNotify.
|
||||
* If no match is found, regular selection is used.
|
||||
*/
|
||||
static uint selmasks[] = {
|
||||
[SEL_RECTANGULAR] = Mod1Mask,
|
||||
};
|
||||
|
||||
/*
|
||||
* Printable characters in ASCII, used to estimate the advance width
|
||||
* of single wide characters.
|
||||
*/
|
||||
static char ascii_printable[] =
|
||||
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||
|
||||
/**
|
||||
* Undercurl style. Set UNDERCURL_STYLE to one of the available styles.
|
||||
*
|
||||
* Curly: Dunno how to draw it *shrug*
|
||||
* _ _ _ _
|
||||
* ( ) ( ) ( ) ( )
|
||||
* (_) (_) (_) (_)
|
||||
*
|
||||
* Spiky:
|
||||
* /\ /\ /\ /\
|
||||
* \/ \/ \/
|
||||
*
|
||||
* Capped:
|
||||
* _ _ _
|
||||
* / \ / \ / \
|
||||
* \_/ \_/
|
||||
*/
|
||||
// Available styles
|
||||
#define UNDERCURL_CURLY 0
|
||||
#define UNDERCURL_SPIKY 1
|
||||
#define UNDERCURL_CAPPED 2
|
||||
// Active style
|
||||
#define UNDERCURL_STYLE UNDERCURL_SPIKY
|
||||
13
config.h
13
config.h
|
|
@ -1,3 +1,4 @@
|
|||
// vim:set ft=c:
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
static char *font = "FiraCode Nerd Font Mono:pixelsize=14";
|
||||
|
|
@ -62,7 +63,7 @@ static double maxlatency = 25;
|
|||
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
|
||||
* attribute.
|
||||
*/
|
||||
static unsigned int blinktimeout = 600;
|
||||
static unsigned int blinktimeout = 800;
|
||||
|
||||
/*
|
||||
* thickness of underline and bar cursors
|
||||
|
|
@ -199,9 +200,11 @@ static uint forcemousemod = ShiftMask;
|
|||
*/
|
||||
static MouseShortcut mshortcuts[] = {
|
||||
/* mask button function argument release */
|
||||
// { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||
{ ShiftMask, Button4, kscrollup, {.i = 3} }, /* You can increase .i to increase scroll speed*/
|
||||
{ ShiftMask, Button5, kscrolldown, {.i = 3} },
|
||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
||||
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
||||
};
|
||||
|
||||
/* Internal keyboard shortcuts. */
|
||||
|
|
@ -222,8 +225,6 @@ static Shortcut shortcuts[] = {
|
|||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
|
||||
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,18 +1,8 @@
|
|||
From a3cdd0753bf578cd4e6db7c6507481f3b5c38aea Mon Sep 17 00:00:00 2001
|
||||
From: Steve Ward <planet36@gmail.com>
|
||||
Date: Tue, 16 Nov 2021 14:15:06 -0500
|
||||
Subject: [PATCH] Allow blinking cursor
|
||||
|
||||
---
|
||||
config.def.h | 19 +++++++++++++------
|
||||
x.c | 47 +++++++++++++++++++++++++++++++++++------------
|
||||
2 files changed, 48 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 6f05dce..1a5fed0 100644
|
||||
index 91ab8ca..b33a2ac 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -133,13 +133,20 @@ static unsigned int defaultcs = 256;
|
||||
@@ -135,13 +135,20 @@ unsigned int defaultcs = 256;
|
||||
static unsigned int defaultrcs = 257;
|
||||
|
||||
/*
|
||||
|
|
@ -40,18 +30,18 @@ index 6f05dce..1a5fed0 100644
|
|||
/*
|
||||
* Default columns and rows numbers
|
||||
diff --git a/x.c b/x.c
|
||||
index 89786b8..7d2447d 100644
|
||||
index b36fb8c..a7eb96a 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -253,6 +253,7 @@ static char *opt_name = NULL;
|
||||
static char *opt_title = NULL;
|
||||
|
||||
static int oldbutton = 3; /* button event on startup: 3 = release */
|
||||
static uint buttons; /* bit field of pressed buttons */
|
||||
+static int cursorblinks = 0;
|
||||
|
||||
void
|
||||
clipcopy(const Arg *dummy)
|
||||
@@ -1529,29 +1530,44 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
@@ -1558,29 +1559,44 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
/* draw the new one */
|
||||
if (IS_SET(MODE_FOCUSED)) {
|
||||
switch (win.cursor) {
|
||||
|
|
@ -105,7 +95,7 @@ index 89786b8..7d2447d 100644
|
|||
}
|
||||
} else {
|
||||
XftDrawRect(xw.draw, &drawcol,
|
||||
@@ -1708,9 +1724,12 @@ xsetmode(int set, unsigned int flags)
|
||||
@@ -1737,9 +1753,12 @@ xsetmode(int set, unsigned int flags)
|
||||
int
|
||||
xsetcursor(int cursor)
|
||||
{
|
||||
|
|
@ -119,7 +109,7 @@ index 89786b8..7d2447d 100644
|
|||
return 0;
|
||||
}
|
||||
|
||||
@@ -1954,6 +1973,10 @@ run(void)
|
||||
@@ -1986,6 +2005,10 @@ run(void)
|
||||
if (FD_ISSET(ttyfd, &rfd) || xev) {
|
||||
if (!drawing) {
|
||||
trigger = now;
|
||||
|
|
@ -130,7 +120,7 @@ index 89786b8..7d2447d 100644
|
|||
drawing = 1;
|
||||
}
|
||||
timeout = (maxlatency - TIMEDIFF(now, trigger)) \
|
||||
@@ -1964,7 +1987,7 @@ run(void)
|
||||
@@ -1996,7 +2019,7 @@ run(void)
|
||||
|
||||
/* idle detected or maxlatency exhausted -> draw */
|
||||
timeout = -1;
|
||||
|
|
@ -139,7 +129,7 @@ index 89786b8..7d2447d 100644
|
|||
timeout = blinktimeout - TIMEDIFF(now, lastblink);
|
||||
if (timeout <= 0) {
|
||||
if (-timeout > blinktimeout) /* start visible */
|
||||
@@ -2000,7 +2023,7 @@ main(int argc, char *argv[])
|
||||
@@ -2032,7 +2055,7 @@ main(int argc, char *argv[])
|
||||
{
|
||||
xw.l = xw.t = 0;
|
||||
xw.isfixed = False;
|
||||
|
|
@ -148,6 +138,4 @@ index 89786b8..7d2447d 100644
|
|||
|
||||
ARGBEGIN {
|
||||
case 'a':
|
||||
--
|
||||
2.34.0
|
||||
|
||||
|
|
@ -1,624 +0,0 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index 6dfa212..adfa07a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
include config.mk
|
||||
|
||||
-SRC = st.c x.c boxdraw.c
|
||||
+SRC = st.c x.c boxdraw.c hb.c
|
||||
OBJ = $(SRC:.c=.o)
|
||||
|
||||
all: options st
|
||||
@@ -22,8 +22,9 @@ config.h:
|
||||
$(CC) $(STCFLAGS) -c $<
|
||||
|
||||
st.o: config.h st.h win.h
|
||||
-x.o: arg.h config.h st.h win.h
|
||||
+x.o: arg.h config.h st.h win.h hb.h
|
||||
boxdraw.o: config.h st.h boxdraw_data.h
|
||||
+hb.o: st.h
|
||||
|
||||
$(OBJ): config.h config.mk
|
||||
|
||||
diff --git a/config.mk b/config.mk
|
||||
index 1e306f8..3e13e53 100644
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
|
||||
# includes and libs
|
||||
INCS = -I$(X11INC) \
|
||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||
- `$(PKG_CONFIG) --cflags freetype2`
|
||||
+ `$(PKG_CONFIG) --cflags freetype2` \
|
||||
+ `$(PKG_CONFIG) --cflags harfbuzz`
|
||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
||||
`$(PKG_CONFIG) --libs fontconfig` \
|
||||
- `$(PKG_CONFIG) --libs freetype2`
|
||||
+ `$(PKG_CONFIG) --libs freetype2` \
|
||||
+ `$(PKG_CONFIG) --libs harfbuzz`
|
||||
|
||||
# flags
|
||||
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
||||
diff --git a/hb.c b/hb.c
|
||||
new file mode 100644
|
||||
index 0000000..528c040
|
||||
--- /dev/null
|
||||
+++ b/hb.c
|
||||
@@ -0,0 +1,124 @@
|
||||
+#include <stdlib.h>
|
||||
+#include <stdio.h>
|
||||
+#include <math.h>
|
||||
+#include <X11/Xft/Xft.h>
|
||||
+#include <X11/cursorfont.h>
|
||||
+#include <hb.h>
|
||||
+#include <hb-ft.h>
|
||||
+
|
||||
+#include "st.h"
|
||||
+#include "hb.h"
|
||||
+
|
||||
+#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END }
|
||||
+#define BUFFER_STEP 256
|
||||
+
|
||||
+hb_font_t *hbfindfont(XftFont *match);
|
||||
+
|
||||
+typedef struct {
|
||||
+ XftFont *match;
|
||||
+ hb_font_t *font;
|
||||
+} HbFontMatch;
|
||||
+
|
||||
+typedef struct {
|
||||
+ size_t capacity;
|
||||
+ HbFontMatch *fonts;
|
||||
+} HbFontCache;
|
||||
+
|
||||
+static HbFontCache hbfontcache = { 0, NULL };
|
||||
+
|
||||
+typedef struct {
|
||||
+ size_t capacity;
|
||||
+ Rune *runes;
|
||||
+} RuneBuffer;
|
||||
+
|
||||
+static RuneBuffer hbrunebuffer = { 0, NULL };
|
||||
+
|
||||
+/*
|
||||
+ * Poplulate the array with a list of font features, wrapped in FEATURE macro,
|
||||
+ * e. g.
|
||||
+ * FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g')
|
||||
+ */
|
||||
+hb_feature_t features[] = { };
|
||||
+
|
||||
+void
|
||||
+hbunloadfonts()
|
||||
+{
|
||||
+ for (int i = 0; i < hbfontcache.capacity; i++) {
|
||||
+ hb_font_destroy(hbfontcache.fonts[i].font);
|
||||
+ XftUnlockFace(hbfontcache.fonts[i].match);
|
||||
+ }
|
||||
+
|
||||
+ if (hbfontcache.fonts != NULL) {
|
||||
+ free(hbfontcache.fonts);
|
||||
+ hbfontcache.fonts = NULL;
|
||||
+ }
|
||||
+ hbfontcache.capacity = 0;
|
||||
+}
|
||||
+
|
||||
+hb_font_t *
|
||||
+hbfindfont(XftFont *match)
|
||||
+{
|
||||
+ for (int i = 0; i < hbfontcache.capacity; i++) {
|
||||
+ if (hbfontcache.fonts[i].match == match)
|
||||
+ return hbfontcache.fonts[i].font;
|
||||
+ }
|
||||
+
|
||||
+ /* Font not found in cache, caching it now. */
|
||||
+ hbfontcache.fonts = realloc(hbfontcache.fonts, sizeof(HbFontMatch) * (hbfontcache.capacity + 1));
|
||||
+ FT_Face face = XftLockFace(match);
|
||||
+ hb_font_t *font = hb_ft_font_create(face, NULL);
|
||||
+ if (font == NULL)
|
||||
+ die("Failed to load Harfbuzz font.");
|
||||
+
|
||||
+ hbfontcache.fonts[hbfontcache.capacity].match = match;
|
||||
+ hbfontcache.fonts[hbfontcache.capacity].font = font;
|
||||
+ hbfontcache.capacity += 1;
|
||||
+
|
||||
+ return font;
|
||||
+}
|
||||
+
|
||||
+void hbtransform(HbTransformData *data, XftFont *xfont, const Glyph *glyphs, int start, int length) {
|
||||
+ ushort mode = USHRT_MAX;
|
||||
+ unsigned int glyph_count;
|
||||
+ int rune_idx, glyph_idx, end = start + length;
|
||||
+
|
||||
+ hb_font_t *font = hbfindfont(xfont);
|
||||
+ if (font == NULL)
|
||||
+ return;
|
||||
+
|
||||
+ hb_buffer_t *buffer = hb_buffer_create();
|
||||
+ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
|
||||
+
|
||||
+ /* Resize the buffer if required length is larger. */
|
||||
+ if (hbrunebuffer.capacity < length) {
|
||||
+ hbrunebuffer.capacity = (length / BUFFER_STEP + 1) * BUFFER_STEP;
|
||||
+ hbrunebuffer.runes = realloc(hbrunebuffer.runes, hbrunebuffer.capacity * sizeof(Rune));
|
||||
+ }
|
||||
+
|
||||
+ /* Fill buffer with codepoints. */
|
||||
+ for (rune_idx = 0, glyph_idx = start; glyph_idx < end; glyph_idx++, rune_idx++) {
|
||||
+ hbrunebuffer.runes[rune_idx] = glyphs[glyph_idx].u;
|
||||
+ mode = glyphs[glyph_idx].mode;
|
||||
+ if (mode & ATTR_WDUMMY)
|
||||
+ hbrunebuffer.runes[rune_idx] = 0x0020;
|
||||
+ }
|
||||
+ hb_buffer_add_codepoints(buffer, hbrunebuffer.runes, length, 0, length);
|
||||
+
|
||||
+ /* Shape the segment. */
|
||||
+ hb_shape(font, buffer, features, sizeof(features)/sizeof(hb_feature_t));
|
||||
+
|
||||
+ /* Get new glyph info. */
|
||||
+ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count);
|
||||
+ hb_glyph_position_t *pos = hb_buffer_get_glyph_positions(buffer, &glyph_count);
|
||||
+
|
||||
+ /* Fill the output. */
|
||||
+ data->buffer = buffer;
|
||||
+ data->glyphs = info;
|
||||
+ data->positions = pos;
|
||||
+ data->count = glyph_count;
|
||||
+}
|
||||
+
|
||||
+void hbcleanup(HbTransformData *data) {
|
||||
+ hb_buffer_destroy(data->buffer);
|
||||
+ memset(data, 0, sizeof(HbTransformData));
|
||||
+}
|
||||
diff --git a/hb.h b/hb.h
|
||||
new file mode 100644
|
||||
index 0000000..88de9bd
|
||||
--- /dev/null
|
||||
+++ b/hb.h
|
||||
@@ -0,0 +1,14 @@
|
||||
+#include <X11/Xft/Xft.h>
|
||||
+#include <hb.h>
|
||||
+#include <hb-ft.h>
|
||||
+
|
||||
+typedef struct {
|
||||
+ hb_buffer_t *buffer;
|
||||
+ hb_glyph_info_t *glyphs;
|
||||
+ hb_glyph_position_t *positions;
|
||||
+ unsigned int count;
|
||||
+} HbTransformData;
|
||||
+
|
||||
+void hbunloadfonts();
|
||||
+void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int);
|
||||
+void hbcleanup(HbTransformData *);
|
||||
diff --git a/st.c b/st.c
|
||||
index 41d5ace..1c2edd6 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -2643,7 +2643,8 @@ draw(void)
|
||||
|
||||
drawregion(0, 0, term.col, term.row);
|
||||
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx],
|
||||
+ term.line[term.ocy], term.col);
|
||||
term.ocx = cx;
|
||||
term.ocy = term.c.y;
|
||||
xfinishdraw();
|
||||
diff --git a/st.h b/st.h
|
||||
index 808f5f7..ae41368 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -11,7 +11,8 @@
|
||||
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
||||
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
|
||||
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
||||
-#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
|
||||
+#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP)) != ((b).mode & (~ATTR_WRAP)) || \
|
||||
+ (a).fg != (b).fg || \
|
||||
(a).bg != (b).bg)
|
||||
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
||||
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
||||
diff --git a/win.h b/win.h
|
||||
index 6de960d..94679e4 100644
|
||||
--- a/win.h
|
||||
+++ b/win.h
|
||||
@@ -25,7 +25,7 @@ enum win_mode {
|
||||
|
||||
void xbell(void);
|
||||
void xclipcopy(void);
|
||||
-void xdrawcursor(int, int, Glyph, int, int, Glyph);
|
||||
+void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
|
||||
void xdrawline(Line, int, int, int);
|
||||
void xfinishdraw(void);
|
||||
void xloadcols(void);
|
||||
diff --git a/x.c b/x.c
|
||||
index bf6bbf9..929a59a 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -19,6 +19,7 @@ char *argv0;
|
||||
#include "arg.h"
|
||||
#include "st.h"
|
||||
#include "win.h"
|
||||
+#include "hb.h"
|
||||
|
||||
/* types used in config.h */
|
||||
typedef struct {
|
||||
@@ -141,6 +142,7 @@ typedef struct {
|
||||
} DC;
|
||||
|
||||
static inline ushort sixd_to_16bit(int);
|
||||
+static void xresetfontsettings(ushort mode, Font **font, int *frcflags);
|
||||
static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
|
||||
static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
|
||||
static void xdrawglyph(Glyph, int, int);
|
||||
@@ -757,7 +759,7 @@ xresize(int col, int row)
|
||||
xclear(0, 0, win.w, win.h);
|
||||
|
||||
/* resize to new width */
|
||||
- xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
|
||||
+ xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec) * 4);
|
||||
}
|
||||
|
||||
ushort
|
||||
@@ -1062,6 +1064,9 @@ xunloadfont(Font *f)
|
||||
void
|
||||
xunloadfonts(void)
|
||||
{
|
||||
+ /* Clear Harfbuzz font cache. */
|
||||
+ hbunloadfonts();
|
||||
+
|
||||
/* Free the loaded fonts in the font cache. */
|
||||
while (frclen > 0)
|
||||
XftFontClose(xw.dpy, frc[--frclen].font);
|
||||
@@ -1185,7 +1190,7 @@ xinit(int cols, int rows)
|
||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
||||
|
||||
/* font spec buffer */
|
||||
- xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
|
||||
+ xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec) * 4);
|
||||
|
||||
/* Xft rendering context */
|
||||
xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
|
||||
@@ -1241,6 +1246,22 @@ xinit(int cols, int rows)
|
||||
boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
|
||||
}
|
||||
|
||||
+void
|
||||
+xresetfontsettings(ushort mode, Font **font, int *frcflags)
|
||||
+{
|
||||
+ *font = &dc.font;
|
||||
+ if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
|
||||
+ *font = &dc.ibfont;
|
||||
+ *frcflags = FRC_ITALICBOLD;
|
||||
+ } else if (mode & ATTR_ITALIC) {
|
||||
+ *font = &dc.ifont;
|
||||
+ *frcflags = FRC_ITALIC;
|
||||
+ } else if (mode & ATTR_BOLD) {
|
||||
+ *font = &dc.bfont;
|
||||
+ *frcflags = FRC_BOLD;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
int
|
||||
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
|
||||
{
|
||||
@@ -1255,126 +1276,158 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
FcPattern *fcpattern, *fontpattern;
|
||||
FcFontSet *fcsets[] = { NULL };
|
||||
FcCharSet *fccharset;
|
||||
- int i, f, numspecs = 0;
|
||||
+ int i, f, length = 0, start = 0, numspecs = 0;
|
||||
+ float cluster_xp = xp, cluster_yp = yp;
|
||||
+ HbTransformData shaped = { 0 };
|
||||
+
|
||||
+ /* Initial values. */
|
||||
+ mode = prevmode = glyphs[0].mode;
|
||||
+ xresetfontsettings(mode, &font, &frcflags);
|
||||
|
||||
for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
|
||||
- /* Fetch rune and mode for current glyph. */
|
||||
- rune = glyphs[i].u;
|
||||
mode = glyphs[i].mode;
|
||||
|
||||
/* Skip dummy wide-character spacing. */
|
||||
- if (mode == ATTR_WDUMMY)
|
||||
+ if (mode & ATTR_WDUMMY && i < (len - 1))
|
||||
continue;
|
||||
|
||||
- /* Determine font for glyph if different from previous glyph. */
|
||||
- if (prevmode != mode) {
|
||||
- prevmode = mode;
|
||||
- font = &dc.font;
|
||||
- frcflags = FRC_NORMAL;
|
||||
- runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
|
||||
- if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
|
||||
- font = &dc.ibfont;
|
||||
- frcflags = FRC_ITALICBOLD;
|
||||
- } else if (mode & ATTR_ITALIC) {
|
||||
- font = &dc.ifont;
|
||||
- frcflags = FRC_ITALIC;
|
||||
- } else if (mode & ATTR_BOLD) {
|
||||
- font = &dc.bfont;
|
||||
- frcflags = FRC_BOLD;
|
||||
+ if (
|
||||
+ prevmode != mode
|
||||
+ || ATTRCMP(glyphs[start], glyphs[i])
|
||||
+ || selected(x + i, y) != selected(x + start, y)
|
||||
+ || i == (len - 1)
|
||||
+ ) {
|
||||
+ /* Handle 1-character wide segments and end of line */
|
||||
+ length = i - start;
|
||||
+ if (i == start) {
|
||||
+ length = 1;
|
||||
+ } else if (i == (len - 1)) {
|
||||
+ length = (i - start + 1);
|
||||
}
|
||||
- yp = winy + font->ascent;
|
||||
- }
|
||||
|
||||
- if (mode & ATTR_BOXDRAW) {
|
||||
- /* minor shoehorning: boxdraw uses only this ushort */
|
||||
- glyphidx = boxdrawindex(&glyphs[i]);
|
||||
- } else {
|
||||
- /* Lookup character index with default font. */
|
||||
- glyphidx = XftCharIndex(xw.dpy, font->match, rune);
|
||||
- }
|
||||
- if (glyphidx) {
|
||||
- specs[numspecs].font = font->match;
|
||||
- specs[numspecs].glyph = glyphidx;
|
||||
- specs[numspecs].x = (short)xp;
|
||||
- specs[numspecs].y = (short)yp;
|
||||
- xp += runewidth;
|
||||
- numspecs++;
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- /* Fallback on font cache, search the font cache for match. */
|
||||
- for (f = 0; f < frclen; f++) {
|
||||
- glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
|
||||
- /* Everything correct. */
|
||||
- if (glyphidx && frc[f].flags == frcflags)
|
||||
- break;
|
||||
- /* We got a default font for a not found glyph. */
|
||||
- if (!glyphidx && frc[f].flags == frcflags
|
||||
- && frc[f].unicodep == rune) {
|
||||
- break;
|
||||
+ /* Shape the segment. */
|
||||
+ hbtransform(&shaped, font->match, glyphs, start, length);
|
||||
+ runewidth = win.cw * ((glyphs[start].mode & ATTR_WIDE) ? 2.0f : 1.0f);
|
||||
+ cluster_xp = xp; cluster_yp = yp;
|
||||
+ for (int code_idx = 0; code_idx < shaped.count; code_idx++) {
|
||||
+ int idx = shaped.glyphs[code_idx].cluster;
|
||||
+
|
||||
+ if (glyphs[start + idx].mode & ATTR_WDUMMY)
|
||||
+ continue;
|
||||
+
|
||||
+ /* Advance the drawing cursor if we've moved to a new cluster */
|
||||
+ if (code_idx > 0 && idx != shaped.glyphs[code_idx - 1].cluster) {
|
||||
+ xp += runewidth;
|
||||
+ cluster_xp = xp;
|
||||
+ cluster_yp = yp;
|
||||
+ runewidth = win.cw * ((glyphs[start + idx].mode & ATTR_WIDE) ? 2.0f : 1.0f);
|
||||
+ }
|
||||
+
|
||||
+ if (glyphs[start + code_idx].mode & ATTR_BOXDRAW) {
|
||||
+ /* minor shoehorning: boxdraw uses only this ushort */
|
||||
+ specs[numspecs].font = font->match;
|
||||
+ specs[numspecs].glyph = boxdrawindex(&glyphs[start + code_idx]);
|
||||
+ specs[numspecs].x = xp;
|
||||
+ specs[numspecs].y = yp;
|
||||
+ numspecs++;
|
||||
+ } else if (shaped.glyphs[code_idx].codepoint != 0) {
|
||||
+ /* If symbol is found, put it into the specs. */
|
||||
+ specs[numspecs].font = font->match;
|
||||
+ specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint;
|
||||
+ specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.);
|
||||
+ specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.);
|
||||
+ cluster_xp += shaped.positions[code_idx].x_advance / 64.;
|
||||
+ cluster_yp += shaped.positions[code_idx].y_advance / 64.;
|
||||
+ numspecs++;
|
||||
+ } else {
|
||||
+ /* If it's not found, try to fetch it through the font cache. */
|
||||
+ rune = glyphs[start + idx].u;
|
||||
+ for (f = 0; f < frclen; f++) {
|
||||
+ glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
|
||||
+ /* Everything correct. */
|
||||
+ if (glyphidx && frc[f].flags == frcflags)
|
||||
+ break;
|
||||
+ /* We got a default font for a not found glyph. */
|
||||
+ if (!glyphidx && frc[f].flags == frcflags
|
||||
+ && frc[f].unicodep == rune) {
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Nothing was found. Use fontconfig to find matching font. */
|
||||
+ if (f >= frclen) {
|
||||
+ if (!font->set)
|
||||
+ font->set = FcFontSort(0, font->pattern,
|
||||
+ 1, 0, &fcres);
|
||||
+ fcsets[0] = font->set;
|
||||
+
|
||||
+ /*
|
||||
+ * Nothing was found in the cache. Now use
|
||||
+ * some dozen of Fontconfig calls to get the
|
||||
+ * font for one single character.
|
||||
+ *
|
||||
+ * Xft and fontconfig are design failures.
|
||||
+ */
|
||||
+ fcpattern = FcPatternDuplicate(font->pattern);
|
||||
+ fccharset = FcCharSetCreate();
|
||||
+
|
||||
+ FcCharSetAddChar(fccharset, rune);
|
||||
+ FcPatternAddCharSet(fcpattern, FC_CHARSET,
|
||||
+ fccharset);
|
||||
+ FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
|
||||
+
|
||||
+ FcConfigSubstitute(0, fcpattern,
|
||||
+ FcMatchPattern);
|
||||
+ FcDefaultSubstitute(fcpattern);
|
||||
+
|
||||
+ fontpattern = FcFontSetMatch(0, fcsets, 1,
|
||||
+ fcpattern, &fcres);
|
||||
+
|
||||
+ /* Allocate memory for the new cache entry. */
|
||||
+ if (frclen >= frccap) {
|
||||
+ frccap += 16;
|
||||
+ frc = xrealloc(frc, frccap * sizeof(Fontcache));
|
||||
+ }
|
||||
+
|
||||
+ frc[frclen].font = XftFontOpenPattern(xw.dpy,
|
||||
+ fontpattern);
|
||||
+ if (!frc[frclen].font)
|
||||
+ die("XftFontOpenPattern failed seeking fallback font: %s\n",
|
||||
+ strerror(errno));
|
||||
+ frc[frclen].flags = frcflags;
|
||||
+ frc[frclen].unicodep = rune;
|
||||
+
|
||||
+ glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
|
||||
+
|
||||
+ f = frclen;
|
||||
+ frclen++;
|
||||
+
|
||||
+ FcPatternDestroy(fcpattern);
|
||||
+ FcCharSetDestroy(fccharset);
|
||||
+ }
|
||||
+
|
||||
+ specs[numspecs].font = frc[f].font;
|
||||
+ specs[numspecs].glyph = glyphidx;
|
||||
+ specs[numspecs].x = (short)xp;
|
||||
+ specs[numspecs].y = (short)yp;
|
||||
+ numspecs++;
|
||||
+ }
|
||||
}
|
||||
- }
|
||||
|
||||
- /* Nothing was found. Use fontconfig to find matching font. */
|
||||
- if (f >= frclen) {
|
||||
- if (!font->set)
|
||||
- font->set = FcFontSort(0, font->pattern,
|
||||
- 1, 0, &fcres);
|
||||
- fcsets[0] = font->set;
|
||||
+ /* Cleanup and get ready for next segment. */
|
||||
+ hbcleanup(&shaped);
|
||||
+ start = i;
|
||||
|
||||
- /*
|
||||
- * Nothing was found in the cache. Now use
|
||||
- * some dozen of Fontconfig calls to get the
|
||||
- * font for one single character.
|
||||
- *
|
||||
- * Xft and fontconfig are design failures.
|
||||
- */
|
||||
- fcpattern = FcPatternDuplicate(font->pattern);
|
||||
- fccharset = FcCharSetCreate();
|
||||
-
|
||||
- FcCharSetAddChar(fccharset, rune);
|
||||
- FcPatternAddCharSet(fcpattern, FC_CHARSET,
|
||||
- fccharset);
|
||||
- FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
|
||||
-
|
||||
- FcConfigSubstitute(0, fcpattern,
|
||||
- FcMatchPattern);
|
||||
- FcDefaultSubstitute(fcpattern);
|
||||
-
|
||||
- fontpattern = FcFontSetMatch(0, fcsets, 1,
|
||||
- fcpattern, &fcres);
|
||||
-
|
||||
- /* Allocate memory for the new cache entry. */
|
||||
- if (frclen >= frccap) {
|
||||
- frccap += 16;
|
||||
- frc = xrealloc(frc, frccap * sizeof(Fontcache));
|
||||
+ /* Determine font for glyph if different from previous glyph. */
|
||||
+ if (prevmode != mode) {
|
||||
+ prevmode = mode;
|
||||
+ xresetfontsettings(mode, &font, &frcflags);
|
||||
+ yp = winy + font->ascent;
|
||||
}
|
||||
-
|
||||
- frc[frclen].font = XftFontOpenPattern(xw.dpy,
|
||||
- fontpattern);
|
||||
- if (!frc[frclen].font)
|
||||
- die("XftFontOpenPattern failed seeking fallback font: %s\n",
|
||||
- strerror(errno));
|
||||
- frc[frclen].flags = frcflags;
|
||||
- frc[frclen].unicodep = rune;
|
||||
-
|
||||
- glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
|
||||
-
|
||||
- f = frclen;
|
||||
- frclen++;
|
||||
-
|
||||
- FcPatternDestroy(fcpattern);
|
||||
- FcCharSetDestroy(fccharset);
|
||||
}
|
||||
-
|
||||
- specs[numspecs].font = frc[f].font;
|
||||
- specs[numspecs].glyph = glyphidx;
|
||||
- specs[numspecs].x = (short)xp;
|
||||
- specs[numspecs].y = (short)yp;
|
||||
- xp += runewidth;
|
||||
- numspecs++;
|
||||
}
|
||||
|
||||
+ hbcleanup(&shaped);
|
||||
return numspecs;
|
||||
}
|
||||
|
||||
@@ -1528,14 +1581,17 @@ xdrawglyph(Glyph g, int x, int y)
|
||||
}
|
||||
|
||||
void
|
||||
-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
+xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
|
||||
{
|
||||
Color drawcol;
|
||||
|
||||
/* remove the old cursor */
|
||||
if (selected(ox, oy))
|
||||
og.mode ^= ATTR_REVERSE;
|
||||
- xdrawglyph(og, ox, oy);
|
||||
+
|
||||
+ /* Redraw the line where cursor was previously.
|
||||
+ * It will restore the ligatures broken by the cursor. */
|
||||
+ xdrawline(line, 0, oy, len);
|
||||
|
||||
if (IS_SET(MODE_HIDE))
|
||||
return;
|
||||
@@ -1663,18 +1719,16 @@ xdrawline(Line line, int x1, int y1, int x2)
|
||||
Glyph base, new;
|
||||
XftGlyphFontSpec *specs = xw.specbuf;
|
||||
|
||||
- numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
|
||||
i = ox = 0;
|
||||
- for (x = x1; x < x2 && i < numspecs; x++) {
|
||||
+ for (x = x1; x < x2; x++) {
|
||||
new = line[x];
|
||||
if (new.mode == ATTR_WDUMMY)
|
||||
continue;
|
||||
if (selected(x, y1))
|
||||
new.mode ^= ATTR_REVERSE;
|
||||
- if (i > 0 && ATTRCMP(base, new)) {
|
||||
- xdrawglyphfontspecs(specs, base, i, ox, y1);
|
||||
- specs += i;
|
||||
- numspecs -= i;
|
||||
+ if ((i > 0) && ATTRCMP(base, new)) {
|
||||
+ numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1);
|
||||
+ xdrawglyphfontspecs(specs, base, numspecs, ox, y1);
|
||||
i = 0;
|
||||
}
|
||||
if (i == 0) {
|
||||
@@ -1683,8 +1737,10 @@ xdrawline(Line line, int x1, int y1, int x2)
|
||||
}
|
||||
i++;
|
||||
}
|
||||
- if (i > 0)
|
||||
- xdrawglyphfontspecs(specs, base, i, ox, y1);
|
||||
+ if (i > 0) {
|
||||
+ numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1);
|
||||
+ xdrawglyphfontspecs(specs, base, numspecs, ox, y1);
|
||||
+ }
|
||||
}
|
||||
|
||||
void
|
||||
101
patches/st-ligatures-boxdraw-20231213-9846a56.diff
Normal file
101
patches/st-ligatures-boxdraw-20231213-9846a56.diff
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 91ab8ca..47b7915 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -127,12 +127,17 @@ static const char *colorname[] = {
|
||||
|
||||
/*
|
||||
* Default colors (colorname index)
|
||||
- * foreground, background, cursor, reverse cursor
|
||||
+ * foreground, background, cursor, reverse cursor, selection
|
||||
*/
|
||||
unsigned int defaultfg = 258;
|
||||
unsigned int defaultbg = 259;
|
||||
unsigned int defaultcs = 256;
|
||||
-static unsigned int defaultrcs = 257;
|
||||
+static unsigned int defaultrcs = 256;
|
||||
+unsigned int selectionbg = 257;
|
||||
+unsigned int selectionfg = 7;
|
||||
+/* If 0 use selectionfg as foreground in order to have a uniform foreground-color */
|
||||
+/* Else if 1 keep original foreground-color of each cell => more colors :) */
|
||||
+static int ignoreselfg = 1;
|
||||
|
||||
/*
|
||||
* Default shape of cursor
|
||||
diff --git a/st.h b/st.h
|
||||
index fd3b0d8..1d56e54 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -33,6 +33,7 @@ enum glyph_attribute {
|
||||
ATTR_WRAP = 1 << 8,
|
||||
ATTR_WIDE = 1 << 9,
|
||||
ATTR_WDUMMY = 1 << 10,
|
||||
+ ATTR_SELECTED = 1 << 11,
|
||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||
};
|
||||
|
||||
diff --git a/x.c b/x.c
|
||||
index b36fb8c..bba8be5 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -1457,6 +1457,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
bg = temp;
|
||||
}
|
||||
|
||||
+ if (base.mode & ATTR_SELECTED) {
|
||||
+ bg = &dc.col[selectionbg];
|
||||
+ if (!ignoreselfg)
|
||||
+ fg = &dc.col[selectionfg];
|
||||
+ }
|
||||
+
|
||||
if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
|
||||
fg = bg;
|
||||
|
||||
@@ -1523,7 +1529,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
|
||||
/* remove the old cursor */
|
||||
if (selected(ox, oy))
|
||||
- og.mode ^= ATTR_REVERSE;
|
||||
+ og.mode |= ATTR_SELECTED;
|
||||
xdrawglyph(og, ox, oy);
|
||||
|
||||
if (IS_SET(MODE_HIDE))
|
||||
@@ -1536,23 +1542,13 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
|
||||
if (IS_SET(MODE_REVERSE)) {
|
||||
g.mode |= ATTR_REVERSE;
|
||||
+ g.fg = defaultcs;
|
||||
g.bg = defaultfg;
|
||||
- if (selected(cx, cy)) {
|
||||
- drawcol = dc.col[defaultcs];
|
||||
- g.fg = defaultrcs;
|
||||
- } else {
|
||||
- drawcol = dc.col[defaultrcs];
|
||||
- g.fg = defaultcs;
|
||||
- }
|
||||
+ drawcol = dc.col[defaultrcs];
|
||||
} else {
|
||||
- if (selected(cx, cy)) {
|
||||
- g.fg = defaultfg;
|
||||
- g.bg = defaultrcs;
|
||||
- } else {
|
||||
- g.fg = defaultbg;
|
||||
- g.bg = defaultcs;
|
||||
- }
|
||||
- drawcol = dc.col[g.bg];
|
||||
+ g.fg = defaultbg;
|
||||
+ g.bg = defaultcs;
|
||||
+ drawcol = dc.col[defaultcs];
|
||||
}
|
||||
|
||||
/* draw the new one */
|
||||
@@ -1659,7 +1655,7 @@ xdrawline(Line line, int x1, int y1, int x2)
|
||||
if (new.mode == ATTR_WDUMMY)
|
||||
continue;
|
||||
if (selected(x, y1))
|
||||
- new.mode ^= ATTR_REVERSE;
|
||||
+ new.mode |= ATTR_SELECTED;
|
||||
if (i > 0 && ATTRCMP(base, new)) {
|
||||
xdrawglyphfontspecs(specs, base, i, ox, y1);
|
||||
specs += i;
|
||||
|
||||
|
|
@ -1,350 +0,0 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 91ab8ca..e3b469b 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -201,6 +201,8 @@ static Shortcut shortcuts[] = {
|
||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||
+ { ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
|
||||
+ { ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
|
||||
};
|
||||
|
||||
/*
|
||||
diff --git a/st.c b/st.c
|
||||
index 51049ba..cd750f2 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -35,6 +35,7 @@
|
||||
#define ESC_ARG_SIZ 16
|
||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||
+#define HISTSIZE 2000
|
||||
|
||||
/* macros */
|
||||
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
||||
@@ -42,6 +43,9 @@
|
||||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
||||
+#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
||||
+ term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
||||
+ term.line[(y) - term.scr])
|
||||
|
||||
enum term_mode {
|
||||
MODE_WRAP = 1 << 0,
|
||||
@@ -115,6 +119,9 @@ typedef struct {
|
||||
int col; /* nb col */
|
||||
Line *line; /* screen */
|
||||
Line *alt; /* alternate screen */
|
||||
+ Line hist[HISTSIZE]; /* history buffer */
|
||||
+ int histi; /* history index */
|
||||
+ int scr; /* scroll back */
|
||||
int *dirty; /* dirtyness of lines */
|
||||
TCursor c; /* cursor */
|
||||
int ocx; /* old cursor col */
|
||||
@@ -184,8 +191,8 @@ static void tnewline(int);
|
||||
static void tputtab(int);
|
||||
static void tputc(Rune);
|
||||
static void treset(void);
|
||||
-static void tscrollup(int, int);
|
||||
-static void tscrolldown(int, int);
|
||||
+static void tscrollup(int, int, int);
|
||||
+static void tscrolldown(int, int, int);
|
||||
static void tsetattr(const int *, int);
|
||||
static void tsetchar(Rune, const Glyph *, int, int);
|
||||
static void tsetdirt(int, int);
|
||||
@@ -416,10 +423,10 @@ tlinelen(int y)
|
||||
{
|
||||
int i = term.col;
|
||||
|
||||
- if (term.line[y][i - 1].mode & ATTR_WRAP)
|
||||
+ if (TLINE(y)[i - 1].mode & ATTR_WRAP)
|
||||
return i;
|
||||
|
||||
- while (i > 0 && term.line[y][i - 1].u == ' ')
|
||||
+ while (i > 0 && TLINE(y)[i - 1].u == ' ')
|
||||
--i;
|
||||
|
||||
return i;
|
||||
@@ -528,7 +535,7 @@ selsnap(int *x, int *y, int direction)
|
||||
* Snap around if the word wraps around at the end or
|
||||
* beginning of a line.
|
||||
*/
|
||||
- prevgp = &term.line[*y][*x];
|
||||
+ prevgp = &TLINE(*y)[*x];
|
||||
prevdelim = ISDELIM(prevgp->u);
|
||||
for (;;) {
|
||||
newx = *x + direction;
|
||||
@@ -543,14 +550,14 @@ selsnap(int *x, int *y, int direction)
|
||||
yt = *y, xt = *x;
|
||||
else
|
||||
yt = newy, xt = newx;
|
||||
- if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
||||
+ if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
|
||||
break;
|
||||
}
|
||||
|
||||
if (newx >= tlinelen(newy))
|
||||
break;
|
||||
|
||||
- gp = &term.line[newy][newx];
|
||||
+ gp = &TLINE(newy)[newx];
|
||||
delim = ISDELIM(gp->u);
|
||||
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
||||
|| (delim && gp->u != prevgp->u)))
|
||||
@@ -571,14 +578,14 @@ selsnap(int *x, int *y, int direction)
|
||||
*x = (direction < 0) ? 0 : term.col - 1;
|
||||
if (direction < 0) {
|
||||
for (; *y > 0; *y += direction) {
|
||||
- if (!(term.line[*y-1][term.col-1].mode
|
||||
+ if (!(TLINE(*y-1)[term.col-1].mode
|
||||
& ATTR_WRAP)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (direction > 0) {
|
||||
for (; *y < term.row-1; *y += direction) {
|
||||
- if (!(term.line[*y][term.col-1].mode
|
||||
+ if (!(TLINE(*y)[term.col-1].mode
|
||||
& ATTR_WRAP)) {
|
||||
break;
|
||||
}
|
||||
@@ -609,13 +616,13 @@ getsel(void)
|
||||
}
|
||||
|
||||
if (sel.type == SEL_RECTANGULAR) {
|
||||
- gp = &term.line[y][sel.nb.x];
|
||||
+ gp = &TLINE(y)[sel.nb.x];
|
||||
lastx = sel.ne.x;
|
||||
} else {
|
||||
- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
|
||||
+ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
|
||||
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
|
||||
}
|
||||
- last = &term.line[y][MIN(lastx, linelen-1)];
|
||||
+ last = &TLINE(y)[MIN(lastx, linelen-1)];
|
||||
while (last >= gp && last->u == ' ')
|
||||
--last;
|
||||
|
||||
@@ -851,6 +858,9 @@ void
|
||||
ttywrite(const char *s, size_t n, int may_echo)
|
||||
{
|
||||
const char *next;
|
||||
+ Arg arg = (Arg) { .i = term.scr };
|
||||
+
|
||||
+ kscrolldown(&arg);
|
||||
|
||||
if (may_echo && IS_SET(MODE_ECHO))
|
||||
twrite(s, n, 1);
|
||||
@@ -1062,12 +1072,52 @@ tswapscreen(void)
|
||||
}
|
||||
|
||||
void
|
||||
-tscrolldown(int orig, int n)
|
||||
+kscrolldown(const Arg* a)
|
||||
+{
|
||||
+ int n = a->i;
|
||||
+
|
||||
+ if (n < 0)
|
||||
+ n = term.row + n;
|
||||
+
|
||||
+ if (n > term.scr)
|
||||
+ n = term.scr;
|
||||
+
|
||||
+ if (term.scr > 0) {
|
||||
+ term.scr -= n;
|
||||
+ selscroll(0, -n);
|
||||
+ tfulldirt();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+kscrollup(const Arg* a)
|
||||
+{
|
||||
+ int n = a->i;
|
||||
+
|
||||
+ if (n < 0)
|
||||
+ n = term.row + n;
|
||||
+
|
||||
+ if (term.scr <= HISTSIZE-n) {
|
||||
+ term.scr += n;
|
||||
+ selscroll(0, n);
|
||||
+ tfulldirt();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+tscrolldown(int orig, int n, int copyhist)
|
||||
{
|
||||
int i;
|
||||
Line temp;
|
||||
|
||||
LIMIT(n, 0, term.bot-orig+1);
|
||||
+ if (copyhist) {
|
||||
+ term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
|
||||
+ temp = term.hist[term.histi];
|
||||
+ term.hist[term.histi] = term.line[term.bot];
|
||||
+ term.line[term.bot] = temp;
|
||||
+ }
|
||||
+
|
||||
|
||||
tsetdirt(orig, term.bot-n);
|
||||
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
||||
@@ -1078,17 +1128,28 @@ tscrolldown(int orig, int n)
|
||||
term.line[i-n] = temp;
|
||||
}
|
||||
|
||||
- selscroll(orig, n);
|
||||
+ if (term.scr == 0)
|
||||
+ selscroll(orig, n);
|
||||
}
|
||||
|
||||
void
|
||||
-tscrollup(int orig, int n)
|
||||
+tscrollup(int orig, int n, int copyhist)
|
||||
{
|
||||
int i;
|
||||
Line temp;
|
||||
|
||||
LIMIT(n, 0, term.bot-orig+1);
|
||||
|
||||
+ if (copyhist) {
|
||||
+ term.histi = (term.histi + 1) % HISTSIZE;
|
||||
+ temp = term.hist[term.histi];
|
||||
+ term.hist[term.histi] = term.line[orig];
|
||||
+ term.line[orig] = temp;
|
||||
+ }
|
||||
+
|
||||
+ if (term.scr > 0 && term.scr < HISTSIZE)
|
||||
+ term.scr = MIN(term.scr + n, HISTSIZE-1);
|
||||
+
|
||||
tclearregion(0, orig, term.col-1, orig+n-1);
|
||||
tsetdirt(orig+n, term.bot);
|
||||
|
||||
@@ -1098,7 +1159,8 @@ tscrollup(int orig, int n)
|
||||
term.line[i+n] = temp;
|
||||
}
|
||||
|
||||
- selscroll(orig, -n);
|
||||
+ if (term.scr == 0)
|
||||
+ selscroll(orig, -n);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -1127,7 +1189,7 @@ tnewline(int first_col)
|
||||
int y = term.c.y;
|
||||
|
||||
if (y == term.bot) {
|
||||
- tscrollup(term.top, 1);
|
||||
+ tscrollup(term.top, 1, 1);
|
||||
} else {
|
||||
y++;
|
||||
}
|
||||
@@ -1292,14 +1354,14 @@ void
|
||||
tinsertblankline(int n)
|
||||
{
|
||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||
- tscrolldown(term.c.y, n);
|
||||
+ tscrolldown(term.c.y, n, 0);
|
||||
}
|
||||
|
||||
void
|
||||
tdeleteline(int n)
|
||||
{
|
||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||
- tscrollup(term.c.y, n);
|
||||
+ tscrollup(term.c.y, n, 0);
|
||||
}
|
||||
|
||||
int32_t
|
||||
@@ -1736,11 +1798,11 @@ csihandle(void)
|
||||
break;
|
||||
case 'S': /* SU -- Scroll <n> line up */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
- tscrollup(term.top, csiescseq.arg[0]);
|
||||
+ tscrollup(term.top, csiescseq.arg[0], 0);
|
||||
break;
|
||||
case 'T': /* SD -- Scroll <n> line down */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
- tscrolldown(term.top, csiescseq.arg[0]);
|
||||
+ tscrolldown(term.top, csiescseq.arg[0], 0);
|
||||
break;
|
||||
case 'L': /* IL -- Insert <n> blank lines */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
@@ -2330,7 +2392,7 @@ eschandle(uchar ascii)
|
||||
return 0;
|
||||
case 'D': /* IND -- Linefeed */
|
||||
if (term.c.y == term.bot) {
|
||||
- tscrollup(term.top, 1);
|
||||
+ tscrollup(term.top, 1, 1);
|
||||
} else {
|
||||
tmoveto(term.c.x, term.c.y+1);
|
||||
}
|
||||
@@ -2343,7 +2405,7 @@ eschandle(uchar ascii)
|
||||
break;
|
||||
case 'M': /* RI -- Reverse index */
|
||||
if (term.c.y == term.top) {
|
||||
- tscrolldown(term.top, 1);
|
||||
+ tscrolldown(term.top, 1, 1);
|
||||
} else {
|
||||
tmoveto(term.c.x, term.c.y-1);
|
||||
}
|
||||
@@ -2557,7 +2619,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
|
||||
void
|
||||
tresize(int col, int row)
|
||||
{
|
||||
- int i;
|
||||
+ int i, j;
|
||||
int minrow = MIN(row, term.row);
|
||||
int mincol = MIN(col, term.col);
|
||||
int *bp;
|
||||
@@ -2594,6 +2656,14 @@ tresize(int col, int row)
|
||||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
||||
|
||||
+ for (i = 0; i < HISTSIZE; i++) {
|
||||
+ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
|
||||
+ for (j = mincol; j < col; j++) {
|
||||
+ term.hist[i][j] = term.c.attr;
|
||||
+ term.hist[i][j].u = ' ';
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/* resize each row to new width, zero-pad if needed */
|
||||
for (i = 0; i < minrow; i++) {
|
||||
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
||||
@@ -2652,7 +2722,7 @@ drawregion(int x1, int y1, int x2, int y2)
|
||||
continue;
|
||||
|
||||
term.dirty[y] = 0;
|
||||
- xdrawline(term.line[y], x1, y, x2);
|
||||
+ xdrawline(TLINE(y), x1, y, x2);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2673,8 +2743,9 @@ draw(void)
|
||||
cx--;
|
||||
|
||||
drawregion(0, 0, term.col, term.row);
|
||||
- xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||
- term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||
+ if (term.scr == 0)
|
||||
+ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||
term.ocx = cx;
|
||||
term.ocy = term.c.y;
|
||||
xfinishdraw();
|
||||
diff --git a/st.h b/st.h
|
||||
index 519b9bd..da36b34 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -81,6 +81,8 @@ void die(const char *, ...);
|
||||
void redraw(void);
|
||||
void draw(void);
|
||||
|
||||
+void kscrolldown(const Arg *);
|
||||
+void kscrollup(const Arg *);
|
||||
void printscreen(const Arg *);
|
||||
void printsel(const Arg *);
|
||||
void sendbreak(const Arg *);
|
||||
|
|
@ -1,44 +1,26 @@
|
|||
From 0750c0b8c91579ec871c70c8990527bebc86a56e Mon Sep 17 00:00:00 2001
|
||||
From: Ashish Kumar Yadav <ashishkumar.yadav@students.iiserpune.ac.in>
|
||||
Date: Sat, 31 Jul 2021 22:21:11 +0530
|
||||
Subject: [PATCH] Add settings for selection-colors
|
||||
|
||||
This patch adds the two color-settings *selectionfg* and *selectionbg* to
|
||||
config.def.h. Those define the fore- and background colors which are used when
|
||||
text on the screen is selected with the mouse. This removes the default
|
||||
behaviour which would simply reverse the colors.
|
||||
|
||||
Additionally, a third setting *ingnoreselfg* exists. If true then the setting
|
||||
*selectionfg* is ignored and the original foreground-colors of each cell are
|
||||
not changed during selection. Basically only the background-color would change.
|
||||
This might be more visually appealing to some folks.
|
||||
---
|
||||
config.def.h | 11 ++++++++---
|
||||
st.h | 1 +
|
||||
x.c | 30 +++++++++++++-----------------
|
||||
3 files changed, 22 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/config.def.h b/config.def.h
|
||||
index 6f05dce..3679af8 100644
|
||||
index 91ab8ca..a382605 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -119,18 +119,23 @@ static const char *colorname[] = {
|
||||
@@ -119,7 +119,7 @@ static const char *colorname[] = {
|
||||
|
||||
/* more colors can be added after 255 to use with DefaultXX */
|
||||
"#cccccc",
|
||||
- "#555555",
|
||||
+ "#2e3440",
|
||||
"gray90", /* default foreground colour */
|
||||
"black", /* default background colour */
|
||||
};
|
||||
|
||||
@@ -127,12 +127,17 @@ static const char *colorname[] = {
|
||||
|
||||
/*
|
||||
* Default colors (colorname index)
|
||||
- * foreground, background, cursor, reverse cursor
|
||||
+ * foreground, background, cursor, reverse cursor, selection
|
||||
*/
|
||||
unsigned int defaultfg = 7;
|
||||
unsigned int defaultbg = 0;
|
||||
static unsigned int defaultcs = 256;
|
||||
unsigned int defaultfg = 258;
|
||||
unsigned int defaultbg = 259;
|
||||
unsigned int defaultcs = 256;
|
||||
-static unsigned int defaultrcs = 257;
|
||||
+static unsigned int defaultrcs = 256;
|
||||
+unsigned int selectionbg = 257;
|
||||
|
|
@ -50,7 +32,7 @@ index 6f05dce..3679af8 100644
|
|||
/*
|
||||
* Default shape of cursor
|
||||
diff --git a/st.h b/st.h
|
||||
index 3d351b6..e1a28c3 100644
|
||||
index fd3b0d8..1d56e54 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -33,6 +33,7 @@ enum glyph_attribute {
|
||||
|
|
@ -62,10 +44,10 @@ index 3d351b6..e1a28c3 100644
|
|||
};
|
||||
|
||||
diff --git a/x.c b/x.c
|
||||
index 210f184..7a6c70e 100644
|
||||
index b36fb8c..bba8be5 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -1425,6 +1425,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
@@ -1457,6 +1457,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
bg = temp;
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +60,7 @@ index 210f184..7a6c70e 100644
|
|||
if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
|
||||
fg = bg;
|
||||
|
||||
@@ -1491,7 +1497,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
@@ -1523,7 +1529,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
|
||||
/* remove the old cursor */
|
||||
if (selected(ox, oy))
|
||||
|
|
@ -87,7 +69,7 @@ index 210f184..7a6c70e 100644
|
|||
xdrawglyph(og, ox, oy);
|
||||
|
||||
if (IS_SET(MODE_HIDE))
|
||||
@@ -1504,23 +1510,13 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
@@ -1536,23 +1542,13 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
||||
|
||||
if (IS_SET(MODE_REVERSE)) {
|
||||
g.mode |= ATTR_REVERSE;
|
||||
|
|
@ -116,7 +98,7 @@ index 210f184..7a6c70e 100644
|
|||
}
|
||||
|
||||
/* draw the new one */
|
||||
@@ -1612,7 +1608,7 @@ xdrawline(Line line, int x1, int y1, int x2)
|
||||
@@ -1659,7 +1655,7 @@ xdrawline(Line line, int x1, int y1, int x2)
|
||||
if (new.mode == ATTR_WDUMMY)
|
||||
continue;
|
||||
if (selected(x, y1))
|
||||
|
|
@ -125,6 +107,4 @@ index 210f184..7a6c70e 100644
|
|||
if (i > 0 && ATTRCMP(base, new)) {
|
||||
xdrawglyphfontspecs(specs, base, i, ox, y1);
|
||||
specs += i;
|
||||
--
|
||||
2.32.0
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 6f05dce..7ae1b92 100644
|
||||
index 91ab8ca..b959ad6 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -470,3 +470,27 @@ static char ascii_printable[] =
|
||||
@@ -472,3 +472,27 @@ static char ascii_printable[] =
|
||||
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||
|
|
@ -31,7 +31,7 @@ index 6f05dce..7ae1b92 100644
|
|||
+// Active style
|
||||
+#define UNDERCURL_STYLE UNDERCURL_SPIKY
|
||||
diff --git a/st.c b/st.c
|
||||
index 76b7e0d..542ab3a 100644
|
||||
index d6478f5..aedf938 100644
|
||||
--- a/st.c
|
||||
+++ b/st.c
|
||||
@@ -33,6 +33,7 @@
|
||||
|
|
@ -57,8 +57,8 @@ index 76b7e0d..542ab3a 100644
|
|||
+static void readcolonargs(char **, int, int[][CAR_PER_ARG]);
|
||||
static void csiparse(void);
|
||||
static void csireset(void);
|
||||
static int eschandle(uchar);
|
||||
@@ -1131,6 +1134,28 @@ tnewline(int first_col)
|
||||
static void osc_color_response(int, int, int);
|
||||
@@ -1127,6 +1130,28 @@ tnewline(int first_col)
|
||||
tmoveto(first_col ? 0 : term.c.x, y);
|
||||
}
|
||||
|
||||
|
|
@ -87,7 +87,7 @@ index 76b7e0d..542ab3a 100644
|
|||
void
|
||||
csiparse(void)
|
||||
{
|
||||
@@ -1153,6 +1178,7 @@ csiparse(void)
|
||||
@@ -1149,6 +1174,7 @@ csiparse(void)
|
||||
v = -1;
|
||||
csiescseq.arg[csiescseq.narg++] = v;
|
||||
p = np;
|
||||
|
|
@ -95,7 +95,7 @@ index 76b7e0d..542ab3a 100644
|
|||
if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
|
||||
break;
|
||||
p++;
|
||||
@@ -1369,6 +1395,10 @@ tsetattr(int *attr, int l)
|
||||
@@ -1365,6 +1391,10 @@ tsetattr(const int *attr, int l)
|
||||
ATTR_STRUCK );
|
||||
term.c.attr.fg = defaultfg;
|
||||
term.c.attr.bg = defaultbg;
|
||||
|
|
@ -106,7 +106,7 @@ index 76b7e0d..542ab3a 100644
|
|||
break;
|
||||
case 1:
|
||||
term.c.attr.mode |= ATTR_BOLD;
|
||||
@@ -1380,7 +1410,14 @@ tsetattr(int *attr, int l)
|
||||
@@ -1376,7 +1406,14 @@ tsetattr(const int *attr, int l)
|
||||
term.c.attr.mode |= ATTR_ITALIC;
|
||||
break;
|
||||
case 4:
|
||||
|
|
@ -122,7 +122,7 @@ index 76b7e0d..542ab3a 100644
|
|||
break;
|
||||
case 5: /* slow blink */
|
||||
/* FALLTHROUGH */
|
||||
@@ -1431,6 +1468,18 @@ tsetattr(int *attr, int l)
|
||||
@@ -1427,6 +1464,18 @@ tsetattr(const int *attr, int l)
|
||||
case 49:
|
||||
term.c.attr.bg = defaultbg;
|
||||
break;
|
||||
|
|
@ -142,7 +142,7 @@ index 76b7e0d..542ab3a 100644
|
|||
if (BETWEEN(attr[i], 30, 37)) {
|
||||
term.c.attr.fg = attr[i] - 30;
|
||||
diff --git a/st.h b/st.h
|
||||
index 3d351b6..95bdcbd 100644
|
||||
index fd3b0d8..5d398b5 100644
|
||||
--- a/st.h
|
||||
+++ b/st.h
|
||||
@@ -34,6 +34,7 @@ enum glyph_attribute {
|
||||
|
|
@ -163,7 +163,7 @@ index 3d351b6..95bdcbd 100644
|
|||
|
||||
typedef Glyph *Line;
|
||||
diff --git a/st.info b/st.info
|
||||
index 8201ad6..659878c 100644
|
||||
index efab2cf..23b1875 100644
|
||||
--- a/st.info
|
||||
+++ b/st.info
|
||||
@@ -1,4 +1,5 @@
|
||||
|
|
@ -173,7 +173,7 @@ index 8201ad6..659878c 100644
|
|||
am,
|
||||
bce,
|
||||
diff --git a/x.c b/x.c
|
||||
index 210f184..3a0e79e 100644
|
||||
index b36fb8c..2f036d1 100644
|
||||
--- a/x.c
|
||||
+++ b/x.c
|
||||
@@ -45,6 +45,14 @@ typedef struct {
|
||||
|
|
@ -191,7 +191,7 @@ index 210f184..3a0e79e 100644
|
|||
/* X modifiers */
|
||||
#define XK_ANY_MOD UINT_MAX
|
||||
#define XK_NO_MOD 0
|
||||
@@ -1339,6 +1347,51 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
@@ -1371,6 +1379,51 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
|
||||
return numspecs;
|
||||
}
|
||||
|
||||
|
|
@ -243,11 +243,11 @@ index 210f184..3a0e79e 100644
|
|||
void
|
||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
||||
{
|
||||
@@ -1461,8 +1514,357 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
@@ -1493,8 +1546,357 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
|
||||
/* Render underline and strikethrough. */
|
||||
if (base.mode & ATTR_UNDERLINE) {
|
||||
- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
|
||||
- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
|
||||
- width, 1);
|
||||
+ // Underline Color
|
||||
+ const int widthThreshold = 28; // +1 width every widthThreshold px of font
|
||||
|
|
@ -603,3 +603,4 @@ index 210f184..3a0e79e 100644
|
|||
}
|
||||
|
||||
if (base.mode & ATTR_STRUCK) {
|
||||
|
||||
145
st.c
145
st.c
|
|
@ -36,7 +36,6 @@
|
|||
#define CAR_PER_ARG 4
|
||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||
#define HISTSIZE 5000
|
||||
|
||||
/* macros */
|
||||
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
||||
|
|
@ -44,9 +43,6 @@
|
|||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
||||
#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
||||
term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
||||
term.line[(y) - term.scr])
|
||||
|
||||
enum term_mode {
|
||||
MODE_WRAP = 1 << 0,
|
||||
|
|
@ -120,9 +116,6 @@ typedef struct {
|
|||
int col; /* nb col */
|
||||
Line *line; /* screen */
|
||||
Line *alt; /* alternate screen */
|
||||
Line hist[HISTSIZE]; /* history buffer */
|
||||
int histi; /* history index */
|
||||
int scr; /* scroll back */
|
||||
int *dirty; /* dirtyness of lines */
|
||||
TCursor c; /* cursor */
|
||||
int ocx; /* old cursor col */
|
||||
|
|
@ -195,8 +188,8 @@ static void tnewline(int);
|
|||
static void tputtab(int);
|
||||
static void tputc(Rune);
|
||||
static void treset(void);
|
||||
static void tscrollup(int, int, int);
|
||||
static void tscrolldown(int, int, int);
|
||||
static void tscrollup(int, int);
|
||||
static void tscrolldown(int, int);
|
||||
static void tsetattr(const int *, int);
|
||||
static void tsetchar(Rune, const Glyph *, int, int);
|
||||
static void tsetdirt(int, int);
|
||||
|
|
@ -419,10 +412,10 @@ tlinelen(int y)
|
|||
{
|
||||
int i = term.col;
|
||||
|
||||
if (TLINE(y)[i - 1].mode & ATTR_WRAP)
|
||||
if (term.line[y][i - 1].mode & ATTR_WRAP)
|
||||
return i;
|
||||
|
||||
while (i > 0 && TLINE(y)[i - 1].u == ' ')
|
||||
while (i > 0 && term.line[y][i - 1].u == ' ')
|
||||
--i;
|
||||
|
||||
return i;
|
||||
|
|
@ -531,7 +524,7 @@ selsnap(int *x, int *y, int direction)
|
|||
* Snap around if the word wraps around at the end or
|
||||
* beginning of a line.
|
||||
*/
|
||||
prevgp = &TLINE(*y)[*x];
|
||||
prevgp = &term.line[*y][*x];
|
||||
prevdelim = ISDELIM(prevgp->u);
|
||||
for (;;) {
|
||||
newx = *x + direction;
|
||||
|
|
@ -546,14 +539,14 @@ selsnap(int *x, int *y, int direction)
|
|||
yt = *y, xt = *x;
|
||||
else
|
||||
yt = newy, xt = newx;
|
||||
if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
|
||||
if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
||||
break;
|
||||
}
|
||||
|
||||
if (newx >= tlinelen(newy))
|
||||
break;
|
||||
|
||||
gp = &TLINE(newy)[newx];
|
||||
gp = &term.line[newy][newx];
|
||||
delim = ISDELIM(gp->u);
|
||||
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
||||
|| (delim && gp->u != prevgp->u)))
|
||||
|
|
@ -574,14 +567,14 @@ selsnap(int *x, int *y, int direction)
|
|||
*x = (direction < 0) ? 0 : term.col - 1;
|
||||
if (direction < 0) {
|
||||
for (; *y > 0; *y += direction) {
|
||||
if (!(TLINE(*y-1)[term.col-1].mode
|
||||
if (!(term.line[*y-1][term.col-1].mode
|
||||
& ATTR_WRAP)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else if (direction > 0) {
|
||||
for (; *y < term.row-1; *y += direction) {
|
||||
if (!(TLINE(*y)[term.col-1].mode
|
||||
if (!(term.line[*y][term.col-1].mode
|
||||
& ATTR_WRAP)) {
|
||||
break;
|
||||
}
|
||||
|
|
@ -612,13 +605,13 @@ getsel(void)
|
|||
}
|
||||
|
||||
if (sel.type == SEL_RECTANGULAR) {
|
||||
gp = &TLINE(y)[sel.nb.x];
|
||||
gp = &term.line[y][sel.nb.x];
|
||||
lastx = sel.ne.x;
|
||||
} else {
|
||||
gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
|
||||
gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
|
||||
lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
|
||||
}
|
||||
last = &TLINE(y)[MIN(lastx, linelen-1)];
|
||||
last = &term.line[y][MIN(lastx, linelen-1)];
|
||||
while (last >= gp && last->u == ' ')
|
||||
--last;
|
||||
|
||||
|
|
@ -854,9 +847,6 @@ void
|
|||
ttywrite(const char *s, size_t n, int may_echo)
|
||||
{
|
||||
const char *next;
|
||||
Arg arg = (Arg) { .i = term.scr };
|
||||
|
||||
kscrolldown(&arg);
|
||||
|
||||
if (may_echo && IS_SET(MODE_ECHO))
|
||||
twrite(s, n, 1);
|
||||
|
|
@ -1056,12 +1046,6 @@ tnew(int col, int row)
|
|||
treset();
|
||||
}
|
||||
|
||||
int
|
||||
tisaltscr(void)
|
||||
{
|
||||
return IS_SET(MODE_ALTSCREEN);
|
||||
}
|
||||
|
||||
void
|
||||
tswapscreen(void)
|
||||
{
|
||||
|
|
@ -1074,52 +1058,12 @@ tswapscreen(void)
|
|||
}
|
||||
|
||||
void
|
||||
kscrolldown(const Arg* a)
|
||||
{
|
||||
int n = a->i;
|
||||
|
||||
if (n < 0)
|
||||
n = term.row + n;
|
||||
|
||||
if (n > term.scr)
|
||||
n = term.scr;
|
||||
|
||||
if (term.scr > 0) {
|
||||
term.scr -= n;
|
||||
selscroll(0, -n);
|
||||
tfulldirt();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
kscrollup(const Arg* a)
|
||||
{
|
||||
int n = a->i;
|
||||
|
||||
if (n < 0)
|
||||
n = term.row + n;
|
||||
|
||||
if (term.scr <= HISTSIZE-n) {
|
||||
term.scr += n;
|
||||
selscroll(0, n);
|
||||
tfulldirt();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
tscrolldown(int orig, int n, int copyhist)
|
||||
tscrolldown(int orig, int n)
|
||||
{
|
||||
int i;
|
||||
Line temp;
|
||||
|
||||
LIMIT(n, 0, term.bot-orig+1);
|
||||
if (copyhist) {
|
||||
term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
|
||||
temp = term.hist[term.histi];
|
||||
term.hist[term.histi] = term.line[term.bot];
|
||||
term.line[term.bot] = temp;
|
||||
}
|
||||
|
||||
|
||||
tsetdirt(orig, term.bot-n);
|
||||
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
||||
|
|
@ -1130,28 +1074,17 @@ tscrolldown(int orig, int n, int copyhist)
|
|||
term.line[i-n] = temp;
|
||||
}
|
||||
|
||||
if (term.scr == 0)
|
||||
selscroll(orig, n);
|
||||
selscroll(orig, n);
|
||||
}
|
||||
|
||||
void
|
||||
tscrollup(int orig, int n, int copyhist)
|
||||
tscrollup(int orig, int n)
|
||||
{
|
||||
int i;
|
||||
Line temp;
|
||||
|
||||
LIMIT(n, 0, term.bot-orig+1);
|
||||
|
||||
if (copyhist) {
|
||||
term.histi = (term.histi + 1) % HISTSIZE;
|
||||
temp = term.hist[term.histi];
|
||||
term.hist[term.histi] = term.line[orig];
|
||||
term.line[orig] = temp;
|
||||
}
|
||||
|
||||
if (term.scr > 0 && term.scr < HISTSIZE)
|
||||
term.scr = MIN(term.scr + n, HISTSIZE-1);
|
||||
|
||||
tclearregion(0, orig, term.col-1, orig+n-1);
|
||||
tsetdirt(orig+n, term.bot);
|
||||
|
||||
|
|
@ -1161,14 +1094,13 @@ tscrollup(int orig, int n, int copyhist)
|
|||
term.line[i+n] = temp;
|
||||
}
|
||||
|
||||
if (term.scr == 0)
|
||||
selscroll(orig, -n);
|
||||
selscroll(orig, -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)) {
|
||||
|
|
@ -1191,7 +1123,7 @@ tnewline(int first_col)
|
|||
int y = term.c.y;
|
||||
|
||||
if (y == term.bot) {
|
||||
tscrollup(term.top, 1, 1);
|
||||
tscrollup(term.top, 1);
|
||||
} else {
|
||||
y++;
|
||||
}
|
||||
|
|
@ -1382,14 +1314,14 @@ void
|
|||
tinsertblankline(int n)
|
||||
{
|
||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||
tscrolldown(term.c.y, n, 0);
|
||||
tscrolldown(term.c.y, n);
|
||||
}
|
||||
|
||||
void
|
||||
tdeleteline(int n)
|
||||
{
|
||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||
tscrollup(term.c.y, n, 0);
|
||||
tscrollup(term.c.y, n);
|
||||
}
|
||||
|
||||
int32_t
|
||||
|
|
@ -1849,11 +1781,11 @@ csihandle(void)
|
|||
break;
|
||||
case 'S': /* SU -- Scroll <n> line up */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
tscrollup(term.top, csiescseq.arg[0], 0);
|
||||
tscrollup(term.top, csiescseq.arg[0]);
|
||||
break;
|
||||
case 'T': /* SD -- Scroll <n> line down */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
tscrolldown(term.top, csiescseq.arg[0], 0);
|
||||
tscrolldown(term.top, csiescseq.arg[0]);
|
||||
break;
|
||||
case 'L': /* IL -- Insert <n> blank lines */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
|
|
@ -2452,7 +2384,7 @@ eschandle(uchar ascii)
|
|||
return 0;
|
||||
case 'D': /* IND -- Linefeed */
|
||||
if (term.c.y == term.bot) {
|
||||
tscrollup(term.top, 1, 1);
|
||||
tscrollup(term.top, 1);
|
||||
} else {
|
||||
tmoveto(term.c.x, term.c.y+1);
|
||||
}
|
||||
|
|
@ -2465,7 +2397,7 @@ eschandle(uchar ascii)
|
|||
break;
|
||||
case 'M': /* RI -- Reverse index */
|
||||
if (term.c.y == term.top) {
|
||||
tscrolldown(term.top, 1, 1);
|
||||
tscrolldown(term.top, 1);
|
||||
} else {
|
||||
tmoveto(term.c.x, term.c.y-1);
|
||||
}
|
||||
|
|
@ -2478,6 +2410,7 @@ eschandle(uchar ascii)
|
|||
xfreetitlestack();
|
||||
resettitle();
|
||||
xloadcols();
|
||||
xsetmode(0, MODE_HIDE);
|
||||
break;
|
||||
case '=': /* DECPAM -- Application keypad */
|
||||
xsetmode(1, MODE_APPKEYPAD);
|
||||
|
|
@ -2619,11 +2552,16 @@ check_control_code:
|
|||
gp = &term.line[term.c.y][term.c.x];
|
||||
}
|
||||
|
||||
if (IS_SET(MODE_INSERT) && term.c.x+width < term.col)
|
||||
if (IS_SET(MODE_INSERT) && term.c.x+width < term.col) {
|
||||
memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
|
||||
gp->mode &= ~ATTR_WIDE;
|
||||
}
|
||||
|
||||
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];
|
||||
}
|
||||
|
||||
|
|
@ -2683,7 +2621,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
|
|||
void
|
||||
tresize(int col, int row)
|
||||
{
|
||||
int i, j;
|
||||
int i;
|
||||
int minrow = MIN(row, term.row);
|
||||
int mincol = MIN(col, term.col);
|
||||
int *bp;
|
||||
|
|
@ -2720,14 +2658,6 @@ tresize(int col, int row)
|
|||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
||||
|
||||
for (i = 0; i < HISTSIZE; i++) {
|
||||
term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
|
||||
for (j = mincol; j < col; j++) {
|
||||
term.hist[i][j] = term.c.attr;
|
||||
term.hist[i][j].u = ' ';
|
||||
}
|
||||
}
|
||||
|
||||
/* resize each row to new width, zero-pad if needed */
|
||||
for (i = 0; i < minrow; i++) {
|
||||
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
||||
|
|
@ -2786,7 +2716,7 @@ drawregion(int x1, int y1, int x2, int y2)
|
|||
continue;
|
||||
|
||||
term.dirty[y] = 0;
|
||||
xdrawline(TLINE(y), x1, y, x2);
|
||||
xdrawline(term.line[y], x1, y, x2);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2807,10 +2737,9 @@ draw(void)
|
|||
cx--;
|
||||
|
||||
drawregion(0, 0, term.col, term.row);
|
||||
if (term.scr == 0)
|
||||
xdrawcursor(cx, term.c.y, TLINE(term.c.y)[cx],
|
||||
term.ocx, term.ocy, TLINE(term.ocy)[term.ocx],
|
||||
TLINE(term.ocy), term.col);
|
||||
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||
term.ocx, term.ocy, term.line[term.ocy][term.ocx],
|
||||
term.line[term.ocy], term.col);
|
||||
term.ocx = cx;
|
||||
term.ocy = term.c.y;
|
||||
xfinishdraw();
|
||||
|
|
|
|||
3
st.h
3
st.h
|
|
@ -87,15 +87,12 @@ void die(const char *, ...);
|
|||
void redraw(void);
|
||||
void draw(void);
|
||||
|
||||
void kscrolldown(const Arg *);
|
||||
void kscrollup(const Arg *);
|
||||
void printscreen(const Arg *);
|
||||
void printsel(const Arg *);
|
||||
void sendbreak(const Arg *);
|
||||
void toggleprinter(const Arg *);
|
||||
|
||||
int tattrset(int);
|
||||
int tisaltscr(void);
|
||||
void tnew(int, int);
|
||||
void tresize(int, int);
|
||||
void tsetdirtattr(int);
|
||||
|
|
|
|||
4
st.info
4
st.info
|
|
@ -185,6 +185,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)
|
||||
|
|
|
|||
12
x.c
12
x.c
|
|
@ -35,7 +35,6 @@ typedef struct {
|
|||
void (*func)(const Arg *);
|
||||
const Arg arg;
|
||||
uint release;
|
||||
int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */
|
||||
} MouseShortcut;
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -474,7 +473,6 @@ mouseaction(XEvent *e, uint release)
|
|||
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
|
||||
if (ms->release == release &&
|
||||
ms->button == e->xbutton.button &&
|
||||
(!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) &&
|
||||
(match(ms->mod, state) || /* exact or forced */
|
||||
match(ms->mod, state & ~forcemousemod))) {
|
||||
ms->func(&(ms->arg));
|
||||
|
|
@ -841,7 +839,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;
|
||||
|
|
@ -856,7 +854,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))
|
||||
|
|
@ -1666,9 +1664,9 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|||
|
||||
// Underline Style
|
||||
if (base.ustyle != 3) {
|
||||
//XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1, width, 1);
|
||||
//XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1);
|
||||
XFillRectangle(xw.dpy, XftDrawDrawable(xw.draw), ugc, winx,
|
||||
winy + dc.font.ascent * chscale + 1, width, wlw);
|
||||
winy + dc.font.ascent + 1, width, wlw);
|
||||
} else if (base.ustyle == 3) {
|
||||
int ww = win.cw;//width;
|
||||
int wh = dc.font.descent - wlw/2 - 1;//r.height/7;
|
||||
|
|
@ -1976,7 +1974,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|||
}
|
||||
|
||||
XFreeGC(xw.dpy, ugc);
|
||||
}
|
||||
}
|
||||
|
||||
if (base.mode & ATTR_STRUCK) {
|
||||
XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue