Replace st with st-flexipatch
This commit is contained in:
parent
68ffff9392
commit
c88995eb55
|
|
@ -1093,7 +1093,7 @@ static const Key keys[] = {
|
||||||
{ MODKEY, XK_o, winview, {0} },
|
{ MODKEY, XK_o, winview, {0} },
|
||||||
#endif // WINVIEW_PATCH
|
#endif // WINVIEW_PATCH
|
||||||
#if XRDB_PATCH && !BAR_VTCOLORS_PATCH
|
#if XRDB_PATCH && !BAR_VTCOLORS_PATCH
|
||||||
{ MODKEY|ShiftMask, XK_F5, xrdb, {.v = NULL } },
|
{ MODKEY, XK_F5, xrdb, {.v = NULL } },
|
||||||
#endif // XRDB_PATCH
|
#endif // XRDB_PATCH
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||||
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||||
|
|
|
||||||
|
|
@ -423,7 +423,7 @@
|
||||||
* Essentially this way the colors you use in your regular tty is "mirrored" to dwm.
|
* Essentially this way the colors you use in your regular tty is "mirrored" to dwm.
|
||||||
* https://dwm.suckless.org/patches/vtcolors/
|
* https://dwm.suckless.org/patches/vtcolors/
|
||||||
*/
|
*/
|
||||||
#define BAR_VTCOLORS_PATCH 0
|
#define BAR_VTCOLORS_PATCH 1
|
||||||
|
|
||||||
/* This patch allows client windows to be hidden. This code was originally part of awesomebar,
|
/* This patch allows client windows to be hidden. This code was originally part of awesomebar,
|
||||||
* but has been separated out so that other bar modules can take advantage of it.
|
* but has been separated out so that other bar modules can take advantage of it.
|
||||||
|
|
@ -667,7 +667,7 @@
|
||||||
* xdotool selectwindow -- set_window --urgency 1
|
* xdotool selectwindow -- set_window --urgency 1
|
||||||
* https://dwm.suckless.org/patches/focusurgent/
|
* https://dwm.suckless.org/patches/focusurgent/
|
||||||
*/
|
*/
|
||||||
#define FOCUSURGENT_PATCH 0
|
#define FOCUSURGENT_PATCH 1
|
||||||
|
|
||||||
/* By default, dwm responds to _NET_ACTIVE_WINDOW client messages by setting
|
/* By default, dwm responds to _NET_ACTIVE_WINDOW client messages by setting
|
||||||
* the urgency bit on the named window. This patch activates the window instead.
|
* the urgency bit on the named window. This patch activates the window instead.
|
||||||
|
|
|
||||||
3
st/.gitignore
vendored
3
st/.gitignore
vendored
|
|
@ -1,3 +0,0 @@
|
||||||
*.o
|
|
||||||
st
|
|
||||||
config.h
|
|
||||||
250
st/FAQ
250
st/FAQ
|
|
@ -1,250 +0,0 @@
|
||||||
## 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.
|
|
||||||
17
st/LEGACY
17
st/LEGACY
|
|
@ -1,17 +0,0 @@
|
||||||
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
|
|
||||||
|
|
||||||
34
st/LICENSE
34
st/LICENSE
|
|
@ -1,34 +0,0 @@
|
||||||
MIT/X Consortium License
|
|
||||||
|
|
||||||
© 2014-2022 Hiltjo Posthuma <hiltjo at codemadness dot org>
|
|
||||||
© 2018 Devin J. Pohly <djpohly at gmail dot com>
|
|
||||||
© 2014-2017 Quentin Rameau <quinq at fifth dot space>
|
|
||||||
© 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
|
|
||||||
© 2008-2017 Anselm R Garbe <garbeam at gmail dot com>
|
|
||||||
© 2012-2017 Roberto E. Vargas Caballero <k0ga at shike2 dot com>
|
|
||||||
© 2012-2016 Christoph Lohmann <20h at r-36 dot net>
|
|
||||||
© 2013 Eon S. Jeon <esjeon at hyunmu dot am>
|
|
||||||
© 2013 Alexander Sedov <alex0player at gmail dot com>
|
|
||||||
© 2013 Mark Edgar <medgar123 at gmail dot com>
|
|
||||||
© 2013-2014 Eric Pruitt <eric.pruitt at gmail dot com>
|
|
||||||
© 2013 Michael Forney <mforney at mforney dot org>
|
|
||||||
© 2013-2014 Markus Teich <markus dot teich at stusta dot mhn dot de>
|
|
||||||
© 2014-2015 Laslo Hunhold <dev at frign dot de>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
copy of this software and associated documentation files (the "Software"),
|
|
||||||
to deal in the Software without restriction, including without limitation
|
|
||||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
||||||
and/or sell copies of the Software, and to permit persons to whom the
|
|
||||||
Software is furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
DEALINGS IN THE SOFTWARE.
|
|
||||||
60
st/Makefile
60
st/Makefile
|
|
@ -1,60 +0,0 @@
|
||||||
# st - simple terminal
|
|
||||||
# See LICENSE file for copyright and license details.
|
|
||||||
.POSIX:
|
|
||||||
|
|
||||||
include config.mk
|
|
||||||
|
|
||||||
SRC = st.c x.c
|
|
||||||
OBJ = $(SRC:.c=.o)
|
|
||||||
|
|
||||||
all: options st
|
|
||||||
|
|
||||||
options:
|
|
||||||
@echo st build options:
|
|
||||||
@echo "CFLAGS = $(STCFLAGS)"
|
|
||||||
@echo "LDFLAGS = $(STLDFLAGS)"
|
|
||||||
@echo "CC = $(CC)"
|
|
||||||
|
|
||||||
config.h:
|
|
||||||
cp config.def.h config.h
|
|
||||||
|
|
||||||
.c.o:
|
|
||||||
$(CC) $(STCFLAGS) -c $<
|
|
||||||
|
|
||||||
st.o: config.h st.h win.h
|
|
||||||
x.o: arg.h config.h st.h win.h
|
|
||||||
|
|
||||||
$(OBJ): config.h config.mk
|
|
||||||
|
|
||||||
st: $(OBJ)
|
|
||||||
$(CC) -o $@ $(OBJ) $(STLDFLAGS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f st $(OBJ) st-$(VERSION).tar.gz
|
|
||||||
|
|
||||||
dist: clean
|
|
||||||
mkdir -p st-$(VERSION)
|
|
||||||
cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
|
|
||||||
config.def.h st.info st.1 arg.h st.h win.h $(SRC)\
|
|
||||||
st-$(VERSION)
|
|
||||||
tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
|
|
||||||
rm -rf st-$(VERSION)
|
|
||||||
|
|
||||||
install: st
|
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
||||||
cp -f st $(DESTDIR)$(PREFIX)/bin
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/st
|
|
||||||
cp -f st-autocomplete $(DESTDIR)$(PREFIX)/bin
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/st-autocomplete
|
|
||||||
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
|
||||||
sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
tic -sx st.info
|
|
||||||
@echo Please see the README file regarding the terminfo entry of st.
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/st
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/st-autocomplete
|
|
||||||
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
|
|
||||||
.PHONY: all options clean dist install uninstall
|
|
||||||
34
st/README
34
st/README
|
|
@ -1,34 +0,0 @@
|
||||||
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
st/TODO
28
st/TODO
|
|
@ -1,28 +0,0 @@
|
||||||
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
|
|
||||||
|
|
||||||
50
st/arg.h
50
st/arg.h
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
* Copy me if you can.
|
|
||||||
* by 20h
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef ARG_H__
|
|
||||||
#define ARG_H__
|
|
||||||
|
|
||||||
extern char *argv0;
|
|
||||||
|
|
||||||
/* use main(int argc, char *argv[]) */
|
|
||||||
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
|
|
||||||
argv[0] && argv[0][0] == '-'\
|
|
||||||
&& argv[0][1];\
|
|
||||||
argc--, argv++) {\
|
|
||||||
char argc_;\
|
|
||||||
char **argv_;\
|
|
||||||
int brk_;\
|
|
||||||
if (argv[0][1] == '-' && argv[0][2] == '\0') {\
|
|
||||||
argv++;\
|
|
||||||
argc--;\
|
|
||||||
break;\
|
|
||||||
}\
|
|
||||||
int i_;\
|
|
||||||
for (i_ = 1, brk_ = 0, argv_ = argv;\
|
|
||||||
argv[0][i_] && !brk_;\
|
|
||||||
i_++) {\
|
|
||||||
if (argv_ != argv)\
|
|
||||||
break;\
|
|
||||||
argc_ = argv[0][i_];\
|
|
||||||
switch (argc_)
|
|
||||||
|
|
||||||
#define ARGEND }\
|
|
||||||
}
|
|
||||||
|
|
||||||
#define ARGC() argc_
|
|
||||||
|
|
||||||
#define EARGF(x) ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
|
|
||||||
((x), abort(), (char *)0) :\
|
|
||||||
(brk_ = 1, (argv[0][i_+1] != '\0')?\
|
|
||||||
(&argv[0][i_+1]) :\
|
|
||||||
(argc--, argv++, argv[0])))
|
|
||||||
|
|
||||||
#define ARGF() ((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
|
|
||||||
(char *)0 :\
|
|
||||||
(brk_ = 1, (argv[0][i_+1] != '\0')?\
|
|
||||||
(&argv[0][i_+1]) :\
|
|
||||||
(argc--, argv++, argv[0])))
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
# ifndef __ST_AUTOCOMPLETE_H
|
|
||||||
# define __ST_AUTOCOMPLETE_H
|
|
||||||
|
|
||||||
enum {
|
|
||||||
ACMPL_DEACTIVATE,
|
|
||||||
ACMPL_WORD,
|
|
||||||
ACMPL_WWORD,
|
|
||||||
ACMPL_FUZZY_WORD,
|
|
||||||
ACMPL_FUZZY_WWORD,
|
|
||||||
ACMPL_FUZZY,
|
|
||||||
ACMPL_SUFFIX,
|
|
||||||
ACMPL_SURROUND,
|
|
||||||
ACMPL_UNDO,
|
|
||||||
};
|
|
||||||
|
|
||||||
# endif // __ST_AUTOCOMPLETE_H
|
|
||||||
494
st/config.def.h
494
st/config.def.h
|
|
@ -1,494 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* appearance
|
|
||||||
*
|
|
||||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
|
||||||
*/
|
|
||||||
static char *font = "Hack Nerd Font:pixelsize=14: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;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
|
||||||
* it
|
|
||||||
*/
|
|
||||||
static int bellvolume = 20;
|
|
||||||
|
|
||||||
/* default TERM value */
|
|
||||||
char *termname = "st";
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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;
|
|
||||||
|
|
||||||
/* bg opacity */
|
|
||||||
float alpha = 0.8;
|
|
||||||
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
|
||||||
static const char *colorname[] = {
|
|
||||||
/* 8 normal colors */
|
|
||||||
"black",
|
|
||||||
"#ed1515",
|
|
||||||
"#11d116",
|
|
||||||
"#f67400",
|
|
||||||
"#1d99f3",
|
|
||||||
"#9b59b6",
|
|
||||||
"#1abc9c",
|
|
||||||
"#63686d",
|
|
||||||
|
|
||||||
/* 8 bright colors */
|
|
||||||
"gray50",
|
|
||||||
"#c0392b",
|
|
||||||
"#1cdc9a",
|
|
||||||
"#fdbc4b",
|
|
||||||
"#1d99f3",
|
|
||||||
"#8e44ad",
|
|
||||||
"#16a085",
|
|
||||||
"white",
|
|
||||||
|
|
||||||
/* special colors */
|
|
||||||
[256] = "#232627", /* background */
|
|
||||||
[257] = "#fcfcfc", /* foreground */
|
|
||||||
[258] = "gray90",
|
|
||||||
[259] = "#ffffff",
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default colors (colorname index)
|
|
||||||
* foreground, background, cursor, reverse cursor
|
|
||||||
*/
|
|
||||||
unsigned int defaultfg = 257;
|
|
||||||
unsigned int defaultbg = 256;
|
|
||||||
unsigned int defaultcs = 257;
|
|
||||||
static unsigned int defaultrcs = 257;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default shape of cursor
|
|
||||||
* 2: Block ("█")
|
|
||||||
* 4: Underline ("_")
|
|
||||||
* 6: Bar ("|")
|
|
||||||
* 7: Snowman ("☃")
|
|
||||||
*/
|
|
||||||
static unsigned int cursorshape = 2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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;
|
|
||||||
|
|
||||||
# include "autocomplete.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Internal mouse shortcuts.
|
|
||||||
* Beware that overloading Button1 will disable the selection.
|
|
||||||
*/
|
|
||||||
const unsigned int mousescrollincrement = 1;
|
|
||||||
static MouseShortcut mshortcuts[] = {
|
|
||||||
/* mask button function argument release */
|
|
||||||
{ 0, Button4, kscrollup, {.i = mousescrollincrement} },
|
|
||||||
{ 0, Button5, kscrolldown, {.i = mousescrollincrement} },
|
|
||||||
{ 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} },
|
|
||||||
{ XK_NO_MOD, XK_F11, fullscreen, {.i = 0} },
|
|
||||||
{ MODKEY, XK_Return, fullscreen, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
|
|
||||||
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
|
|
||||||
{ TERMMOD, XK_Return, newterm, {.i = 0} },
|
|
||||||
{ ControlMask|Mod1Mask, XK_slash, autocomplete, { .i = ACMPL_WORD } },
|
|
||||||
{ ControlMask|Mod1Mask, XK_period, autocomplete, { .i = ACMPL_FUZZY_WORD } },
|
|
||||||
{ ControlMask|Mod1Mask, XK_comma, autocomplete, { .i = ACMPL_FUZZY } },
|
|
||||||
{ ControlMask|Mod1Mask, XK_apostrophe, autocomplete, { .i = ACMPL_SUFFIX } },
|
|
||||||
{ ControlMask|Mod1Mask, XK_semicolon, autocomplete, { .i = ACMPL_SURROUND } },
|
|
||||||
{ ControlMask|Mod1Mask, XK_bracketright,autocomplete, { .i = ACMPL_WWORD } },
|
|
||||||
{ ControlMask|Mod1Mask, XK_bracketleft, autocomplete, { .i = ACMPL_FUZZY_WWORD } },
|
|
||||||
{ ControlMask|Mod1Mask, XK_equal, autocomplete, { .i = ACMPL_UNDO } },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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[3~", -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[3~", -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{|}~";
|
|
||||||
35
st/config.mk
35
st/config.mk
|
|
@ -1,35 +0,0 @@
|
||||||
# st version
|
|
||||||
VERSION = 0.8.5
|
|
||||||
|
|
||||||
# Customize below to fit your system
|
|
||||||
|
|
||||||
# paths
|
|
||||||
PREFIX = /usr/local
|
|
||||||
MANPREFIX = $(PREFIX)/share/man
|
|
||||||
|
|
||||||
X11INC = /usr/X11R6/include
|
|
||||||
X11LIB = /usr/X11R6/lib
|
|
||||||
|
|
||||||
PKG_CONFIG = pkg-config
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I$(X11INC) \
|
|
||||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
|
||||||
`$(PKG_CONFIG) --cflags freetype2`
|
|
||||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
|
|
||||||
`$(PKG_CONFIG) --libs fontconfig` \
|
|
||||||
`$(PKG_CONFIG) --libs freetype2`
|
|
||||||
|
|
||||||
# flags
|
|
||||||
STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
|
|
||||||
STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
|
|
||||||
STLDFLAGS = $(LIBS) $(LDFLAGS)
|
|
||||||
|
|
||||||
# OpenBSD:
|
|
||||||
#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
|
|
||||||
#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
|
|
||||||
# `$(PKG_CONFIG) --libs fontconfig` \
|
|
||||||
# `$(PKG_CONFIG) --libs freetype2`
|
|
||||||
|
|
||||||
# compiler and linker
|
|
||||||
CC = gcc
|
|
||||||
|
|
@ -1,163 +0,0 @@
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 0e01717..e116631 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -82,6 +82,9 @@ char *termname = "st-256color";
|
|
||||||
*/
|
|
||||||
unsigned int tabspaces = 8;
|
|
||||||
|
|
||||||
+/* bg opacity */
|
|
||||||
+float alpha = 0.8;
|
|
||||||
+
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
|
||||||
static const char *colorname[] = {
|
|
||||||
/* 8 normal colors */
|
|
||||||
@@ -109,6 +112,7 @@ static const char *colorname[] = {
|
|
||||||
/* more colors can be added after 255 to use with DefaultXX */
|
|
||||||
"#cccccc",
|
|
||||||
"#555555",
|
|
||||||
+ "black",
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
@@ -117,7 +121,7 @@ static const char *colorname[] = {
|
|
||||||
* foreground, background, cursor, reverse cursor
|
|
||||||
*/
|
|
||||||
unsigned int defaultfg = 7;
|
|
||||||
-unsigned int defaultbg = 0;
|
|
||||||
+unsigned int defaultbg = 258;
|
|
||||||
static unsigned int defaultcs = 256;
|
|
||||||
static unsigned int defaultrcs = 257;
|
|
||||||
|
|
||||||
diff --git a/config.mk b/config.mk
|
|
||||||
index 0cbb002..1d2f0e2 100644
|
|
||||||
--- a/config.mk
|
|
||||||
+++ b/config.mk
|
|
||||||
@@ -16,7 +16,7 @@ PKG_CONFIG = pkg-config
|
|
||||||
INCS = -I$(X11INC) \
|
|
||||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
|
||||||
`$(PKG_CONFIG) --cflags freetype2`
|
|
||||||
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
|
||||||
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
|
|
||||||
`$(PKG_CONFIG) --libs fontconfig` \
|
|
||||||
`$(PKG_CONFIG) --libs freetype2`
|
|
||||||
|
|
||||||
diff --git a/st.h b/st.h
|
|
||||||
index 38c61c4..b7634ab 100644
|
|
||||||
--- a/st.h
|
|
||||||
+++ b/st.h
|
|
||||||
@@ -120,3 +120,4 @@ extern char *termname;
|
|
||||||
extern unsigned int tabspaces;
|
|
||||||
extern unsigned int defaultfg;
|
|
||||||
extern unsigned int defaultbg;
|
|
||||||
+extern float alpha;
|
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index 0422421..588dec3 100644
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -98,6 +98,7 @@ typedef struct {
|
|
||||||
XSetWindowAttributes attrs;
|
|
||||||
int scr;
|
|
||||||
int isfixed; /* is fixed geometry? */
|
|
||||||
+ int depth; /* bit depth */
|
|
||||||
int l, t; /* left and top offset */
|
|
||||||
int gm; /* geometry mask */
|
|
||||||
} XWindow;
|
|
||||||
@@ -229,6 +230,7 @@ static char *usedfont = NULL;
|
|
||||||
static double usedfontsize = 0;
|
|
||||||
static double defaultfontsize = 0;
|
|
||||||
|
|
||||||
+static char *opt_alpha = NULL;
|
|
||||||
static char *opt_class = NULL;
|
|
||||||
static char **opt_cmd = NULL;
|
|
||||||
static char *opt_embed = NULL;
|
|
||||||
@@ -688,7 +690,7 @@ xresize(int col, int row)
|
|
||||||
|
|
||||||
XFreePixmap(xw.dpy, xw.buf);
|
|
||||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
||||||
- DefaultDepth(xw.dpy, xw.scr));
|
|
||||||
+ xw.depth);
|
|
||||||
XftDrawChange(xw.draw, xw.buf);
|
|
||||||
xclear(0, 0, win.w, win.h);
|
|
||||||
|
|
||||||
@@ -748,6 +750,13 @@ xloadcols(void)
|
|
||||||
else
|
|
||||||
die("could not allocate color %d\n", i);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ /* set alpha value of bg color */
|
|
||||||
+ if (opt_alpha)
|
|
||||||
+ alpha = strtof(opt_alpha, NULL);
|
|
||||||
+ dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
|
|
||||||
+ dc.col[defaultbg].pixel &= 0x00FFFFFF;
|
|
||||||
+ dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
|
|
||||||
loaded = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1004,11 +1013,23 @@ xinit(int cols, int rows)
|
|
||||||
Window parent;
|
|
||||||
pid_t thispid = getpid();
|
|
||||||
XColor xmousefg, xmousebg;
|
|
||||||
+ XWindowAttributes attr;
|
|
||||||
+ XVisualInfo vis;
|
|
||||||
|
|
||||||
if (!(xw.dpy = XOpenDisplay(NULL)))
|
|
||||||
die("can't open display\n");
|
|
||||||
xw.scr = XDefaultScreen(xw.dpy);
|
|
||||||
- xw.vis = XDefaultVisual(xw.dpy, xw.scr);
|
|
||||||
+
|
|
||||||
+ if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
|
|
||||||
+ parent = XRootWindow(xw.dpy, xw.scr);
|
|
||||||
+ xw.depth = 32;
|
|
||||||
+ } else {
|
|
||||||
+ XGetWindowAttributes(xw.dpy, parent, &attr);
|
|
||||||
+ xw.depth = attr.depth;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
|
|
||||||
+ xw.vis = vis.visual;
|
|
||||||
|
|
||||||
/* font */
|
|
||||||
if (!FcInit())
|
|
||||||
@@ -1018,7 +1039,7 @@ xinit(int cols, int rows)
|
|
||||||
xloadfonts(usedfont, 0);
|
|
||||||
|
|
||||||
/* colors */
|
|
||||||
- xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
|
||||||
+ xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
|
|
||||||
xloadcols();
|
|
||||||
|
|
||||||
/* adjust fixed window geometry */
|
|
||||||
@@ -1038,19 +1059,15 @@ xinit(int cols, int rows)
|
|
||||||
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
|
||||||
xw.attrs.colormap = xw.cmap;
|
|
||||||
|
|
||||||
- if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
|
|
||||||
- parent = XRootWindow(xw.dpy, xw.scr);
|
|
||||||
xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
|
|
||||||
- win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
|
|
||||||
+ win.w, win.h, 0, xw.depth, InputOutput,
|
|
||||||
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
|
||||||
| CWEventMask | CWColormap, &xw.attrs);
|
|
||||||
|
|
||||||
memset(&gcvalues, 0, sizeof(gcvalues));
|
|
||||||
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 = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
|
|
||||||
+ dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
|
|
||||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
|
||||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
|
||||||
|
|
||||||
@@ -1894,6 +1911,9 @@ main(int argc, char *argv[])
|
|
||||||
case 'a':
|
|
||||||
allowaltscreen = 0;
|
|
||||||
break;
|
|
||||||
+ case 'A':
|
|
||||||
+ opt_alpha = EARGF(usage());
|
|
||||||
+ break;
|
|
||||||
case 'c':
|
|
||||||
opt_class = EARGF(usage());
|
|
||||||
break;
|
|
||||||
|
|
@ -1,152 +0,0 @@
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index 8bf998e..e2cda07 100644
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -81,6 +81,7 @@ typedef XftGlyphFontSpec GlyphFontSpec;
|
|
||||||
typedef struct {
|
|
||||||
int tw, th; /* tty width and height */
|
|
||||||
int w, h; /* window width and height */
|
|
||||||
+ int hborderpx, vborderpx;
|
|
||||||
int ch; /* char height */
|
|
||||||
int cw; /* char width */
|
|
||||||
int mode; /* window state/mode flags */
|
|
||||||
@@ -331,7 +332,7 @@ ttysend(const Arg *arg)
|
|
||||||
int
|
|
||||||
evcol(XEvent *e)
|
|
||||||
{
|
|
||||||
- int x = e->xbutton.x - borderpx;
|
|
||||||
+ int x = e->xbutton.x - win.hborderpx;
|
|
||||||
LIMIT(x, 0, win.tw - 1);
|
|
||||||
return x / win.cw;
|
|
||||||
}
|
|
||||||
@@ -339,7 +340,7 @@ evcol(XEvent *e)
|
|
||||||
int
|
|
||||||
evrow(XEvent *e)
|
|
||||||
{
|
|
||||||
- int y = e->xbutton.y - borderpx;
|
|
||||||
+ int y = e->xbutton.y - win.vborderpx;
|
|
||||||
LIMIT(y, 0, win.th - 1);
|
|
||||||
return y / win.ch;
|
|
||||||
}
|
|
||||||
@@ -723,6 +724,9 @@ cresize(int width, int height)
|
|
||||||
col = MAX(1, col);
|
|
||||||
row = MAX(1, row);
|
|
||||||
|
|
||||||
+ win.hborderpx = (win.w - col * win.cw) / 2;
|
|
||||||
+ win.vborderpx = (win.h - row * win.ch) / 2;
|
|
||||||
+
|
|
||||||
tresize(col, row);
|
|
||||||
xresize(col, row);
|
|
||||||
ttyresize(win.tw, win.th);
|
|
||||||
@@ -840,8 +844,8 @@ xhints(void)
|
|
||||||
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
|
||||||
sizeh->height = win.h;
|
|
||||||
sizeh->width = win.w;
|
|
||||||
- sizeh->height_inc = win.ch;
|
|
||||||
- sizeh->width_inc = win.cw;
|
|
||||||
+ sizeh->height_inc = 1;
|
|
||||||
+ sizeh->width_inc = 1;
|
|
||||||
sizeh->base_height = 2 * borderpx;
|
|
||||||
sizeh->base_width = 2 * borderpx;
|
|
||||||
sizeh->min_height = win.ch + 2 * borderpx;
|
|
||||||
@@ -1123,8 +1127,8 @@ xinit(int cols, int rows)
|
|
||||||
xloadcols();
|
|
||||||
|
|
||||||
/* adjust fixed window geometry */
|
|
||||||
- win.w = 2 * borderpx + cols * win.cw;
|
|
||||||
- win.h = 2 * borderpx + rows * win.ch;
|
|
||||||
+ win.w = 2 * win.hborderpx + 2 * borderpx + cols * win.cw;
|
|
||||||
+ win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
|
|
||||||
if (xw.gm & XNegative)
|
|
||||||
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
|
|
||||||
if (xw.gm & YNegative)
|
|
||||||
@@ -1213,7 +1217,7 @@ xinit(int cols, int rows)
|
|
||||||
int
|
|
||||||
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
|
|
||||||
{
|
|
||||||
- float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
|
|
||||||
+ float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
|
|
||||||
ushort mode, prevmode = USHRT_MAX;
|
|
||||||
Font *font = &dc.font;
|
|
||||||
int frcflags = FRC_NORMAL;
|
|
||||||
@@ -1346,7 +1350,7 @@ void
|
|
||||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
|
||||||
{
|
|
||||||
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
|
||||||
- int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
|
||||||
+ int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
|
|
||||||
width = charlen * win.cw;
|
|
||||||
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
|
||||||
XRenderColor colfg, colbg;
|
|
||||||
@@ -1436,17 +1440,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|
||||||
|
|
||||||
/* Intelligent cleaning up of the borders. */
|
|
||||||
if (x == 0) {
|
|
||||||
- xclear(0, (y == 0)? 0 : winy, borderpx,
|
|
||||||
+ xclear(0, (y == 0)? 0 : winy, win.vborderpx,
|
|
||||||
winy + win.ch +
|
|
||||||
- ((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
|
||||||
+ ((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
|
|
||||||
}
|
|
||||||
- if (winx + width >= borderpx + win.tw) {
|
|
||||||
+ if (winx + width >= win.hborderpx + win.tw) {
|
|
||||||
xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
|
||||||
- ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
|
|
||||||
+ ((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
|
|
||||||
}
|
|
||||||
if (y == 0)
|
|
||||||
- xclear(winx, 0, winx + width, borderpx);
|
|
||||||
- if (winy + win.ch >= borderpx + win.th)
|
|
||||||
+ xclear(winx, 0, winx + width, win.vborderpx);
|
|
||||||
+ if (winy + win.ch >= win.vborderpx + win.th)
|
|
||||||
xclear(winx, winy + win.ch, winx + width, win.h);
|
|
||||||
|
|
||||||
/* Clean up the region we want to draw to. */
|
|
||||||
@@ -1540,35 +1544,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
|
|
||||||
case 3: /* Blinking Underline */
|
|
||||||
case 4: /* Steady Underline */
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + (cy + 1) * win.ch - \
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + (cy + 1) * win.ch - \
|
|
||||||
cursorthickness,
|
|
||||||
win.cw, cursorthickness);
|
|
||||||
break;
|
|
||||||
case 5: /* Blinking bar */
|
|
||||||
case 6: /* Steady bar */
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + cy * win.ch,
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
cursorthickness, win.ch);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + cy * win.ch,
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
win.cw - 1, 1);
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + cy * win.ch,
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
1, win.ch - 1);
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + (cx + 1) * win.cw - 1,
|
|
||||||
- borderpx + cy * win.ch,
|
|
||||||
+ win.hborderpx + (cx + 1) * win.cw - 1,
|
|
||||||
+ win.vborderpx + cy * win.ch,
|
|
||||||
1, win.ch - 1);
|
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
|
||||||
- borderpx + cx * win.cw,
|
|
||||||
- borderpx + (cy + 1) * win.ch - 1,
|
|
||||||
+ win.hborderpx + cx * win.cw,
|
|
||||||
+ win.vborderpx + (cy + 1) * win.ch - 1,
|
|
||||||
win.cw, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,640 +0,0 @@
|
||||||
diff -uraN st-0.8.4/autocomplete.h st-autocomplete/autocomplete.h
|
|
||||||
--- st-0.8.4/autocomplete.h 1970-01-01 04:00:00.000000000 +0400
|
|
||||||
+++ st-autocomplete/autocomplete.h 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
@@ -0,0 +1,16 @@
|
|
||||||
+# ifndef __ST_AUTOCOMPLETE_H
|
|
||||||
+# define __ST_AUTOCOMPLETE_H
|
|
||||||
+
|
|
||||||
+enum {
|
|
||||||
+ ACMPL_DEACTIVATE,
|
|
||||||
+ ACMPL_WORD,
|
|
||||||
+ ACMPL_WWORD,
|
|
||||||
+ ACMPL_FUZZY_WORD,
|
|
||||||
+ ACMPL_FUZZY_WWORD,
|
|
||||||
+ ACMPL_FUZZY,
|
|
||||||
+ ACMPL_SUFFIX,
|
|
||||||
+ ACMPL_SURROUND,
|
|
||||||
+ ACMPL_UNDO,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+# endif // __ST_AUTOCOMPLETE_H
|
|
||||||
diff -uraN st-0.8.4/config.def.h st-autocomplete/config.def.h
|
|
||||||
--- st-0.8.4/config.def.h 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
+++ st-autocomplete/config.def.h 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
@@ -168,6 +168,8 @@
|
|
||||||
*/
|
|
||||||
static uint forcemousemod = ShiftMask;
|
|
||||||
|
|
||||||
+# include "autocomplete.h"
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Internal mouse shortcuts.
|
|
||||||
* Beware that overloading Button1 will disable the selection.
|
|
||||||
@@ -199,6 +201,14 @@
|
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_slash, autocomplete, { .i = ACMPL_WORD } },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_period, autocomplete, { .i = ACMPL_FUZZY_WORD } },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_comma, autocomplete, { .i = ACMPL_FUZZY } },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_apostrophe, autocomplete, { .i = ACMPL_SUFFIX } },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_semicolon, autocomplete, { .i = ACMPL_SURROUND } },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_bracketright,autocomplete, { .i = ACMPL_WWORD } },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_bracketleft, autocomplete, { .i = ACMPL_FUZZY_WWORD } },
|
|
||||||
+ { ControlMask|Mod1Mask, XK_equal, autocomplete, { .i = ACMPL_UNDO } },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff -uraN st-0.8.4/Makefile st-autocomplete/Makefile
|
|
||||||
--- st-0.8.4/Makefile 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
+++ st-autocomplete/Makefile 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
@@ -44,6 +44,8 @@
|
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
|
||||||
cp -f st $(DESTDIR)$(PREFIX)/bin
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/st
|
|
||||||
+ cp -f st-autocomplete $(DESTDIR)$(PREFIX)/bin
|
|
||||||
+ chmod 755 $(DESTDIR)$(PREFIX)/bin/st-autocomplete
|
|
||||||
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
|
||||||
sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
@@ -52,6 +54,7 @@
|
|
||||||
|
|
||||||
uninstall:
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/st
|
|
||||||
+ rm -f $(DESTDIR)$(PREFIX)/bin/st-autocomplete
|
|
||||||
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
|
||||||
|
|
||||||
.PHONY: all options clean dist install uninstall
|
|
||||||
diff -uraN st-0.8.4/st-autocomplete st-autocomplete/st-autocomplete
|
|
||||||
--- st-0.8.4/st-autocomplete 1970-01-01 04:00:00.000000000 +0400
|
|
||||||
+++ st-autocomplete/st-autocomplete 2021-12-18 12:42:16.841949553 +0400
|
|
||||||
@@ -0,0 +1,300 @@
|
|
||||||
+#!/usr/bin/perl
|
|
||||||
+#########################################################################
|
|
||||||
+# Copyright (C) 2012-2021 Wojciech Siewierski, Gaspar Vardanyan #
|
|
||||||
+# #
|
|
||||||
+# This program is free software: you can redistribute it and/or modify #
|
|
||||||
+# it under the terms of the GNU General Public License as published by #
|
|
||||||
+# the Free Software Foundation, either version 3 of the License, or #
|
|
||||||
+# (at your option) any later version. #
|
|
||||||
+# #
|
|
||||||
+# This program is distributed in the hope that it will be useful, #
|
|
||||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
|
||||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
|
||||||
+# GNU General Public License for more details. #
|
|
||||||
+# #
|
|
||||||
+# You should have received a copy of the GNU General Public License #
|
|
||||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
|
||||||
+#########################################################################
|
|
||||||
+
|
|
||||||
+my ($cmd, $cursor_row, $cursor_column) = @ARGV;
|
|
||||||
+
|
|
||||||
+# A reference to a function that transforms the completed word
|
|
||||||
+# into a regex matching the completions. Usually generated by
|
|
||||||
+# generate_matcher().
|
|
||||||
+#
|
|
||||||
+# For example
|
|
||||||
+# $fun = generate_matcher(".*");
|
|
||||||
+# $fun->("foo");
|
|
||||||
+# would return "f.*o.*o"
|
|
||||||
+#
|
|
||||||
+# In other words, indirectly decides which characters can
|
|
||||||
+# appear in the completion.
|
|
||||||
+my $matcher;
|
|
||||||
+
|
|
||||||
+# A regular expression matching a character before each match.
|
|
||||||
+# For example, it you want to match the text after a
|
|
||||||
+# whitespace, set it to "\s".
|
|
||||||
+my $char_class_before;
|
|
||||||
+
|
|
||||||
+# A regular expression matching every character in the entered
|
|
||||||
+# text that will be used to find matching completions. Usually
|
|
||||||
+# "\w" or similar.
|
|
||||||
+my $char_class_to_complete;
|
|
||||||
+
|
|
||||||
+# A regular expression matching every allowed last character
|
|
||||||
+# of the completion (uses greedy matching).
|
|
||||||
+my $char_class_at_end;
|
|
||||||
+
|
|
||||||
+if ($cmd eq 'word-complete') {
|
|
||||||
+ # Basic word completion. Completes the current word
|
|
||||||
+ # without any special matching.
|
|
||||||
+ $char_class_before = '[^-\w]';
|
|
||||||
+ $matcher = sub { quotemeta shift }; # identity
|
|
||||||
+ $char_class_at_end = '[-\w]';
|
|
||||||
+ $char_class_to_complete = '[-\w]';
|
|
||||||
+} elsif ($cmd eq 'WORD-complete') {
|
|
||||||
+ # The same as above but in the Vim meaning of a "WORD" --
|
|
||||||
+ # whitespace delimited.
|
|
||||||
+ $char_class_before = '\s';
|
|
||||||
+ $matcher = sub { quotemeta shift };
|
|
||||||
+ $char_class_at_end = '\S';
|
|
||||||
+ $char_class_to_complete = '\S';
|
|
||||||
+} elsif ($cmd eq 'fuzzy-word-complete' ||
|
|
||||||
+ $cmd eq 'skeleton-word-complete') {
|
|
||||||
+ # Fuzzy completion of the current word.
|
|
||||||
+ $char_class_before = '[^-\w]';
|
|
||||||
+ $matcher = generate_matcher('[-\w]*');
|
|
||||||
+ $char_class_at_end = '[-\w]';
|
|
||||||
+ $char_class_to_complete = '[-\w]';
|
|
||||||
+} elsif ($cmd eq 'fuzzy-WORD-complete') {
|
|
||||||
+ # Fuzzy completion of the current WORD.
|
|
||||||
+ $char_class_before = '\s';
|
|
||||||
+ $matcher = generate_matcher('\S*');
|
|
||||||
+ $char_class_at_end = '\S';
|
|
||||||
+ $char_class_to_complete = '\S';
|
|
||||||
+} elsif ($cmd eq 'fuzzy-complete' ||
|
|
||||||
+ $cmd eq 'skeleton-complete') {
|
|
||||||
+ # Fuzzy completion of an arbitrary text.
|
|
||||||
+ $char_class_before = '\W';
|
|
||||||
+ $matcher = generate_matcher('.*?');
|
|
||||||
+ $char_class_at_end = '\w';
|
|
||||||
+ $char_class_to_complete = '\S';
|
|
||||||
+} elsif ($cmd eq 'suffix-complete') {
|
|
||||||
+ # Fuzzy completion of an completing suffixes, like
|
|
||||||
+ # completing test=hello from /blah/hello.
|
|
||||||
+ $char_class_before = '\S';
|
|
||||||
+ $matcher = generate_matcher('\S*');
|
|
||||||
+ $char_class_at_end = '\S';
|
|
||||||
+ $char_class_to_complete = '\S';
|
|
||||||
+} elsif ($cmd eq 'surround-complete') {
|
|
||||||
+ # Completing contents of quotes and braces.
|
|
||||||
+
|
|
||||||
+ # Here we are using three named groups: s, b, p for quotes, braces
|
|
||||||
+ # and parenthesis.
|
|
||||||
+ $char_class_before = '((?<q>["\'`])|(?<b>\[)|(?<p>\())';
|
|
||||||
+
|
|
||||||
+ $matcher = generate_matcher('.*?');
|
|
||||||
+
|
|
||||||
+ # Here we match text till enclosing pair, using perl conditionals in
|
|
||||||
+ # regexps (?(condition)yes-expression|no-expression).
|
|
||||||
+ # \0 is used to hack concatenation with '*' later in the code.
|
|
||||||
+ $char_class_at_end = '.*?(.(?=(?(<b>)\]|((?(<p>)\)|\g{q})))))\0';
|
|
||||||
+ $char_class_to_complete = '\S';
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+my $lines = [];
|
|
||||||
+
|
|
||||||
+my $last_line = -1;
|
|
||||||
+my $lines_after_cursor = 0;
|
|
||||||
+
|
|
||||||
+while (<STDIN>)
|
|
||||||
+{
|
|
||||||
+ $last_line++;
|
|
||||||
+
|
|
||||||
+ if ($last_line <= $cursor_row)
|
|
||||||
+ {
|
|
||||||
+ push @{$lines}, $_;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ unshift @{$lines}, $_;
|
|
||||||
+ $lines_after_cursor++;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+$cursor_row = $last_line;
|
|
||||||
+
|
|
||||||
+# read the word behind the cursor
|
|
||||||
+$_ = substr(@{$lines} [$cursor_row], 0, $cursor_column); # get the current line up to the cursor...
|
|
||||||
+s/.*?($char_class_to_complete*)$/$1/; # ...and read the last word from it
|
|
||||||
+my $word_to_complete = quotemeta;
|
|
||||||
+
|
|
||||||
+# ignore the completed word itself
|
|
||||||
+$self->{already_completed}{$word_to_complete} = 1;
|
|
||||||
+
|
|
||||||
+print stdout "$word_to_complete\n";
|
|
||||||
+
|
|
||||||
+# search for matches
|
|
||||||
+while (my $completion = find_match($self,
|
|
||||||
+ $word_to_complete,
|
|
||||||
+ $self->{next_row} // $cursor_row,
|
|
||||||
+ $matcher->($word_to_complete),
|
|
||||||
+ $char_class_before,
|
|
||||||
+ $char_class_at_end)
|
|
||||||
+) {
|
|
||||||
+ calc_match_coords($self,
|
|
||||||
+ $self->{next_row}+1,
|
|
||||||
+ $completion);
|
|
||||||
+ print stdout "$completion @{$self->{highlight}}\n";
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+leave($self);
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+######################################################################
|
|
||||||
+
|
|
||||||
+# Finds the next matching completion in the row current row or above
|
|
||||||
+# while skipping duplicates using skip_duplicates().
|
|
||||||
+sub find_match {
|
|
||||||
+ my ($self, $word_to_match, $current_row, $regexp, $char_class_before, $char_class_at_end) = @_;
|
|
||||||
+ $self->{matches_in_row} //= [];
|
|
||||||
+
|
|
||||||
+ # cycle through all the matches in the current row if not starting a new search
|
|
||||||
+ if (@{$self->{matches_in_row}}) {
|
|
||||||
+ return skip_duplicates($self, $word_to_match, $current_row, $regexp, $char_class_before, $char_class_at_end);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ my $i;
|
|
||||||
+ # search through all the rows starting with current one or one above the last checked
|
|
||||||
+ for ($i = $current_row; $i >= 0; --$i) {
|
|
||||||
+ my $line = @{$lines} [$i]; # get the line of text from the row
|
|
||||||
+
|
|
||||||
+ if ($i == $cursor_row) {
|
|
||||||
+ $line = substr $line, 0, $cursor_column;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ $_ = $line;
|
|
||||||
+
|
|
||||||
+ # find all the matches in the current line
|
|
||||||
+ my $match;
|
|
||||||
+ push @{$self->{matches_in_row}}, $+{match} while ($_, $match) = /
|
|
||||||
+ (.*${char_class_before})
|
|
||||||
+ (?<match>
|
|
||||||
+ ${regexp}
|
|
||||||
+ ${char_class_at_end}*
|
|
||||||
+ )
|
|
||||||
+ /ix;
|
|
||||||
+ # corner case: match at the very beginning of line
|
|
||||||
+ push @{$self->{matches_in_row}}, $+{match} if $line =~ /^(${char_class_before}){0}(?<match>$regexp$char_class_at_end*)/i;
|
|
||||||
+
|
|
||||||
+ if (@{$self->{matches_in_row}}) {
|
|
||||||
+ # remember which row should be searched next
|
|
||||||
+ $self->{next_row} = --$i;
|
|
||||||
+
|
|
||||||
+ # arguments needed for find_match() mutual recursion
|
|
||||||
+ return skip_duplicates($self, $word_to_match, $i, $regexp, $char_class_before, $char_class_at_end);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ # no more possible completions, revert to the original word
|
|
||||||
+ $self->{next_row} = -1 if $i < 0;
|
|
||||||
+
|
|
||||||
+ return undef;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+######################################################################
|
|
||||||
+
|
|
||||||
+# Checks whether the completion found by find_match() was already
|
|
||||||
+# found and if it was, calls find_match() again to find the next
|
|
||||||
+# completion.
|
|
||||||
+#
|
|
||||||
+# Takes all the arguments that find_match() would take, to make a
|
|
||||||
+# mutually recursive call.
|
|
||||||
+sub skip_duplicates {
|
|
||||||
+ my $self = $_[0];
|
|
||||||
+ my $current_row = $_[2];
|
|
||||||
+ my $completion;
|
|
||||||
+ if ($current_row >= $lines_after_cursor)
|
|
||||||
+ {
|
|
||||||
+ $completion = shift @{$self->{matches_in_row}}; # get the rightmost one
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ $completion = pop @{$self->{matches_in_row}}; # get the rightmost one
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ # check for duplicates
|
|
||||||
+ if (exists $self->{already_completed}{$completion}) {
|
|
||||||
+ # skip this completion
|
|
||||||
+ return find_match(@_);
|
|
||||||
+ } else {
|
|
||||||
+ $self->{already_completed}{$completion} = 1;
|
|
||||||
+ return $completion;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+######################################################################
|
|
||||||
+
|
|
||||||
+# Returns a function that takes a string and returns that string with
|
|
||||||
+# this function's argument inserted between its every two characters.
|
|
||||||
+# The resulting string is used as a regular expression matching the
|
|
||||||
+# completion candidates.
|
|
||||||
+sub generate_matcher {
|
|
||||||
+ my $regex_between = shift;
|
|
||||||
+
|
|
||||||
+ sub {
|
|
||||||
+ $_ = shift;
|
|
||||||
+
|
|
||||||
+ # sorry for this lispy code, I couldn't resist ;)
|
|
||||||
+ (join "$regex_between",
|
|
||||||
+ (map quotemeta,
|
|
||||||
+ (split //)))
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+######################################################################
|
|
||||||
+
|
|
||||||
+sub calc_match_coords {
|
|
||||||
+ my ($self, $linenum, $completion) = @_;
|
|
||||||
+
|
|
||||||
+ my $line = @{$lines} [$linenum];
|
|
||||||
+ my $re = quotemeta $completion;
|
|
||||||
+
|
|
||||||
+ $line =~ /$re/;
|
|
||||||
+
|
|
||||||
+ #my ($beg_row, $beg_col) = $line->coord_of($-[0]);
|
|
||||||
+ #my ($end_row, $end_col) = $line->coord_of($+[0]);
|
|
||||||
+ my $beg = $-[0];
|
|
||||||
+ my $end = $+[0];
|
|
||||||
+
|
|
||||||
+ if (exists $self->{highlight}) {
|
|
||||||
+ delete $self->{highlight};
|
|
||||||
+ }
|
|
||||||
+ # () # TODO: what does () do in perl ????
|
|
||||||
+
|
|
||||||
+ if ($linenum >= $lines_after_cursor)
|
|
||||||
+ {
|
|
||||||
+ $linenum -= $lines_after_cursor;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ $linenum = $last_line - $linenum;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ # ACMPL_ISSUE: multi-line completions don't work
|
|
||||||
+ # $self->{highlight} = [$beg_row, $beg_col, $end_row, $end_col];
|
|
||||||
+ $self->{highlight} = [$linenum, $beg, $end];
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+######################################################################
|
|
||||||
+
|
|
||||||
+sub leave {
|
|
||||||
+ my ($self) = @_;
|
|
||||||
+
|
|
||||||
+ delete $self->{next_row};
|
|
||||||
+ delete $self->{matches_in_row};
|
|
||||||
+ delete $self->{already_completed};
|
|
||||||
+ delete $self->{highlight};
|
|
||||||
+}
|
|
||||||
diff -uraN st-0.8.4/st.c st-autocomplete/st.c
|
|
||||||
--- st-0.8.4/st.c 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
+++ st-autocomplete/st.c 2021-12-18 13:02:28.898642717 +0400
|
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <wchar.h>
|
|
||||||
|
|
||||||
+#include "autocomplete.h"
|
|
||||||
#include "st.h"
|
|
||||||
#include "win.h"
|
|
||||||
|
|
||||||
@@ -2476,6 +2477,9 @@
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if ( row < term.row || col < term.col )
|
|
||||||
+ autocomplete ((const Arg []) { ACMPL_DEACTIVATE });
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* slide screen to keep cursor where we expect it -
|
|
||||||
* tscrollup would work here, but we can optimize to
|
|
||||||
@@ -2595,3 +2599,216 @@
|
|
||||||
tfulldirt();
|
|
||||||
draw();
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+void autocomplete (const Arg * arg)
|
|
||||||
+{
|
|
||||||
+ static _Bool active = 0;
|
|
||||||
+
|
|
||||||
+ int acmpl_cmdindex = arg -> i;
|
|
||||||
+
|
|
||||||
+ static int acmpl_cmdindex_prev;
|
|
||||||
+
|
|
||||||
+ if (active == 0)
|
|
||||||
+ acmpl_cmdindex_prev = acmpl_cmdindex;
|
|
||||||
+
|
|
||||||
+ static const char * const (acmpl_cmd []) = {
|
|
||||||
+ [ACMPL_DEACTIVATE] = "__DEACTIVATE__",
|
|
||||||
+ [ACMPL_WORD] = "word-complete",
|
|
||||||
+ [ACMPL_WWORD] = "WORD-complete",
|
|
||||||
+ [ACMPL_FUZZY_WORD] = "fuzzy-word-complete",
|
|
||||||
+ [ACMPL_FUZZY_WWORD] = "fuzzy-WORD-complete",
|
|
||||||
+ [ACMPL_FUZZY] = "fuzzy-complete",
|
|
||||||
+ [ACMPL_SUFFIX] = "suffix-complete",
|
|
||||||
+ [ACMPL_SURROUND] = "surround-complete",
|
|
||||||
+ [ACMPL_UNDO] = "__UNDO__",
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ static char acmpl [1000]; // ACMPL_ISSUE: why 1000?
|
|
||||||
+
|
|
||||||
+ static FILE * acmpl_exec = NULL;
|
|
||||||
+ static int acmpl_status;
|
|
||||||
+
|
|
||||||
+ static const char * stbuffile;
|
|
||||||
+ static char target [1000]; // ACMPL_ISSUE: why 1000? dynamically allocate char array of size term.col
|
|
||||||
+ static size_t targetlen;
|
|
||||||
+
|
|
||||||
+ static char completion [1000] = {0}; // ACMPL_ISSUE: why 1000? dynamically allocate char array of size term.col
|
|
||||||
+ static size_t complen_prev = 0; // NOTE: always clear this variable after clearing completion
|
|
||||||
+
|
|
||||||
+ static int cx, cy;
|
|
||||||
+
|
|
||||||
+// Check for deactivation
|
|
||||||
+
|
|
||||||
+ if (acmpl_cmdindex == ACMPL_DEACTIVATE)
|
|
||||||
+ {
|
|
||||||
+
|
|
||||||
+// Deactivate autocomplete mode keeping current completion
|
|
||||||
+
|
|
||||||
+ if (active)
|
|
||||||
+ {
|
|
||||||
+ active = 0;
|
|
||||||
+ pclose (acmpl_exec);
|
|
||||||
+ remove (stbuffile);
|
|
||||||
+
|
|
||||||
+ if (complen_prev)
|
|
||||||
+ {
|
|
||||||
+ selclear ();
|
|
||||||
+ complen_prev = 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// Check for undo
|
|
||||||
+
|
|
||||||
+ if (acmpl_cmdindex == ACMPL_UNDO)
|
|
||||||
+ {
|
|
||||||
+
|
|
||||||
+// Deactivate autocomplete mode recovering target
|
|
||||||
+
|
|
||||||
+ if (active)
|
|
||||||
+ {
|
|
||||||
+ active = 0;
|
|
||||||
+ pclose (acmpl_exec);
|
|
||||||
+ remove (stbuffile);
|
|
||||||
+
|
|
||||||
+ if (complen_prev)
|
|
||||||
+ {
|
|
||||||
+ selclear ();
|
|
||||||
+ for (size_t i = 0; i < complen_prev; i++)
|
|
||||||
+ ttywrite ((char []) { '\b' }, 1, 1); // ACMPL_ISSUE: I'm not sure that this is the right way
|
|
||||||
+ complen_prev = 0;
|
|
||||||
+ ttywrite (target, targetlen, 0); // ACMPL_ISSUE: I'm not sure that this is a right solution
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// Check for command change
|
|
||||||
+
|
|
||||||
+ if (acmpl_cmdindex != acmpl_cmdindex_prev)
|
|
||||||
+ {
|
|
||||||
+
|
|
||||||
+// If command is changed, goto acmpl_begin avoiding rewriting st buffer
|
|
||||||
+
|
|
||||||
+ if (active)
|
|
||||||
+ {
|
|
||||||
+ acmpl_cmdindex_prev = acmpl_cmdindex;
|
|
||||||
+
|
|
||||||
+ goto acmpl_begin;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// If not active
|
|
||||||
+
|
|
||||||
+ if (active == 0)
|
|
||||||
+ {
|
|
||||||
+ acmpl_cmdindex_prev = acmpl_cmdindex;
|
|
||||||
+ cx = term.c.x;
|
|
||||||
+ cy = term.c.y;
|
|
||||||
+
|
|
||||||
+// Write st buffer to a temp file
|
|
||||||
+
|
|
||||||
+ stbuffile = tmpnam (NULL); // check for return value ...
|
|
||||||
+ // ACMPL_ISSUE: use coprocesses instead of temp files
|
|
||||||
+
|
|
||||||
+ FILE * stbuf = fopen (stbuffile, "w"); // check for opening error ...
|
|
||||||
+ char * stbufline = malloc (term.col + 2); // check for allocating error ...
|
|
||||||
+
|
|
||||||
+ for (size_t y = 0; y < term.row; y++)
|
|
||||||
+ {
|
|
||||||
+ size_t x = 0;
|
|
||||||
+ for (; x < term.col; x++)
|
|
||||||
+ utf8encode (term.line [y] [x].u, stbufline + x);
|
|
||||||
+ stbufline [x] = '\n';
|
|
||||||
+ stbufline [x + 1] = 0;
|
|
||||||
+ fputs (stbufline, stbuf);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ free (stbufline);
|
|
||||||
+ fclose (stbuf);
|
|
||||||
+
|
|
||||||
+acmpl_begin:
|
|
||||||
+
|
|
||||||
+// Run st-autocomplete
|
|
||||||
+
|
|
||||||
+ sprintf (
|
|
||||||
+ acmpl,
|
|
||||||
+ "cat %100s | st-autocomplete %500s %d %d", // ACMPL_ISSUE: why 100 and 500?
|
|
||||||
+ stbuffile,
|
|
||||||
+ acmpl_cmd [acmpl_cmdindex],
|
|
||||||
+ cy,
|
|
||||||
+ cx
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+ acmpl_exec = popen (acmpl, "r"); // ACMPL_ISSUE: popen isn't defined by The Standard. Does it work in BSDs for example?
|
|
||||||
+ // check for popen error ...
|
|
||||||
+
|
|
||||||
+// Read the target, targetlen
|
|
||||||
+
|
|
||||||
+ fscanf (acmpl_exec, "%500s\n", target); // check for scanning error ...
|
|
||||||
+ targetlen = strlen (target);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// Read a completion if exists (acmpl_status)
|
|
||||||
+
|
|
||||||
+ unsigned line, beg, end;
|
|
||||||
+
|
|
||||||
+ acmpl_status = fscanf (acmpl_exec, "%500s %u %u %u\n", completion, & line, & beg, & end);
|
|
||||||
+ // ACMPL_ISSUE: why 500? use term.col instead
|
|
||||||
+
|
|
||||||
+// Exit if no completions found
|
|
||||||
+
|
|
||||||
+ if (active == 0 && acmpl_status == EOF)
|
|
||||||
+ {
|
|
||||||
+
|
|
||||||
+// Close st-autocomplete and exit without activating the autocomplete mode
|
|
||||||
+
|
|
||||||
+ pclose (acmpl_exec);
|
|
||||||
+ remove (stbuffile);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// If completions found, enable autocomplete mode and autocomplete the target
|
|
||||||
+
|
|
||||||
+ active = 1;
|
|
||||||
+
|
|
||||||
+// Clear target before first completion
|
|
||||||
+
|
|
||||||
+ if (complen_prev == 0)
|
|
||||||
+ {
|
|
||||||
+ for (size_t i = 0; i < targetlen; i++)
|
|
||||||
+ ttywrite ((char []) { '\b' }, 1, 1); // ACMPL_ISSUE: I'm not sure that this is a right solution
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// Clear previuos completion if this is not the first
|
|
||||||
+
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ selclear ();
|
|
||||||
+ for (size_t i = 0; i < complen_prev; i++)
|
|
||||||
+ ttywrite ((char []) { '\b' }, 1, 1); // ACMPL_ISSUE: I'm not sure that this is a right solution
|
|
||||||
+ complen_prev = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// If no more completions found, reset and restart
|
|
||||||
+
|
|
||||||
+ if (acmpl_status == EOF)
|
|
||||||
+ {
|
|
||||||
+ active = 0;
|
|
||||||
+ pclose (acmpl_exec);
|
|
||||||
+ ttywrite (target, targetlen, 0);
|
|
||||||
+ goto acmpl_begin;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+// Read the new completion and autcomplete
|
|
||||||
+
|
|
||||||
+ selstart (beg, line, 0);
|
|
||||||
+ selextend (end - 1, line, 1, 0);
|
|
||||||
+ xsetsel (getsel ());
|
|
||||||
+
|
|
||||||
+ complen_prev = strlen (completion);
|
|
||||||
+ ttywrite (completion, complen_prev, 0);
|
|
||||||
+}
|
|
||||||
diff -uraN st-0.8.4/st.h st-autocomplete/st.h
|
|
||||||
--- st-0.8.4/st.h 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
+++ st-autocomplete/st.h 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
@@ -77,6 +77,8 @@
|
|
||||||
const char *s;
|
|
||||||
} Arg;
|
|
||||||
|
|
||||||
+void autocomplete (const Arg *);
|
|
||||||
+
|
|
||||||
void die(const char *, ...);
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
diff -uraN st-0.8.4/x.c st-autocomplete/x.c
|
|
||||||
--- st-0.8.4/x.c 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
+++ st-autocomplete/x.c 2021-12-18 10:56:10.545143280 +0400
|
|
||||||
@@ -1803,11 +1803,15 @@
|
|
||||||
/* 1. shortcuts */
|
|
||||||
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
|
||||||
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
|
||||||
+ if (bp -> func != autocomplete)
|
|
||||||
+ autocomplete ((const Arg []) { ACMPL_DEACTIVATE });
|
|
||||||
bp->func(&(bp->arg));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ autocomplete ((const Arg []) { ACMPL_DEACTIVATE });
|
|
||||||
+
|
|
||||||
/* 2. custom keys from config.h */
|
|
||||||
if ((customkey = kmap(ksym, e->state))) {
|
|
||||||
ttywrite(customkey, strlen(customkey), 1);
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index e5f1737..5cabd60 100644
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -673,6 +673,7 @@ setsel(char *str, Time t)
|
|
||||||
XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
|
|
||||||
if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
|
|
||||||
selclear();
|
|
||||||
+ clipcopy(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
--- config.def.h.orig 2020-11-12 20:23:48.867954750 +0100
|
|
||||||
+++ config.def.h 2020-11-12 20:21:15.055922720 +0100
|
|
||||||
@@ -276,7 +276,7 @@
|
|
||||||
{ 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_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},
|
|
||||||
@@ -344,7 +344,7 @@
|
|
||||||
{ 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_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
|
||||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
|
||||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
diff -r -u a/config.def.h b/config.def.h
|
|
||||||
--- a/config.def.h 2022-01-07 06:41:35.000000000 -0500
|
|
||||||
+++ b/config.def.h 2022-01-15 13:32:01.644320198 -0500
|
|
||||||
@@ -201,6 +201,8 @@
|
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
+ { XK_NO_MOD, XK_F11, fullscreen, {.i = 0} },
|
|
||||||
+ { MODKEY, XK_Return, fullscreen, {.i = 0} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff -r -u a/st.h b/st.h
|
|
||||||
--- a/st.h 2022-01-07 06:41:35.000000000 -0500
|
|
||||||
+++ b/st.h 2022-01-15 13:32:40.084320514 -0500
|
|
||||||
@@ -81,6 +81,7 @@
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
|
|
||||||
+void fullscreen(const Arg *);
|
|
||||||
void printscreen(const Arg *);
|
|
||||||
void printsel(const Arg *);
|
|
||||||
void sendbreak(const Arg *);
|
|
||||||
diff -r -u a/x.c b/x.c
|
|
||||||
--- a/x.c 2022-01-07 06:41:35.000000000 -0500
|
|
||||||
+++ b/x.c 2022-01-15 13:50:28.164329295 -0500
|
|
||||||
@@ -94,6 +94,7 @@
|
|
||||||
Drawable buf;
|
|
||||||
GlyphFontSpec *specbuf; /* font spec buffer used for rendering */
|
|
||||||
Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmpid;
|
|
||||||
+ Atom netwmstate, netwmfullscreen;
|
|
||||||
struct {
|
|
||||||
XIM xim;
|
|
||||||
XIC xic;
|
|
||||||
@@ -744,6 +745,24 @@
|
|
||||||
xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+fullscreen(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ XEvent ev;
|
|
||||||
+
|
|
||||||
+ memset(&ev, 0, sizeof(ev));
|
|
||||||
+
|
|
||||||
+ ev.xclient.type = ClientMessage;
|
|
||||||
+ ev.xclient.message_type = xw.netwmstate;
|
|
||||||
+ ev.xclient.display = xw.dpy;
|
|
||||||
+ ev.xclient.window = xw.win;
|
|
||||||
+ ev.xclient.format = 32;
|
|
||||||
+ ev.xclient.data.l[0] = 2; /* _NET_WM_STATE_TOGGLE */
|
|
||||||
+ ev.xclient.data.l[1] = xw.netwmfullscreen;
|
|
||||||
+
|
|
||||||
+ XSendEvent(xw.dpy, DefaultRootWindow(xw.dpy), False, SubstructureNotifyMask|SubstructureRedirectMask, &ev);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
ushort
|
|
||||||
sixd_to_16bit(int x)
|
|
||||||
{
|
|
||||||
@@ -1208,6 +1227,9 @@
|
|
||||||
XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
|
|
||||||
PropModeReplace, (uchar *)&thispid, 1);
|
|
||||||
|
|
||||||
+ xw.netwmstate = XInternAtom(xw.dpy, "_NET_WM_STATE", False);
|
|
||||||
+ xw.netwmfullscreen = XInternAtom(xw.dpy, "_NET_WM_STATE_FULLSCREEN", False);
|
|
||||||
+
|
|
||||||
win.mode = MODE_NUMLOCK;
|
|
||||||
resettitle();
|
|
||||||
xhints();
|
|
||||||
|
|
@ -1,108 +0,0 @@
|
||||||
From e6ac257f362f8b879b62225bedca9e8aafef4f3b Mon Sep 17 00:00:00 2001
|
|
||||||
From: bakkeby <bakkeby@gmail.com>
|
|
||||||
Date: Mon, 12 Jul 2021 09:35:04 +0200
|
|
||||||
Subject: [PATCH] Add shortcut to spawn new terminal in the current dir
|
|
||||||
|
|
||||||
Ctrl-Shift-Return now creates a new ST terminal, whose CWD is the same
|
|
||||||
as the parent st's CWD.
|
|
||||||
|
|
||||||
This version of the patch does a double fork, a technique commonly used
|
|
||||||
by daemons to spawn orphan processes.
|
|
||||||
|
|
||||||
This solution is specific to the swallow patch for dwm which traverses
|
|
||||||
the process tree to determine if the new window is a decendant of a
|
|
||||||
terminal window, in which case the new window should take the place of
|
|
||||||
the terminal window.
|
|
||||||
|
|
||||||
The way the original newterm patch worked the new st terminal would be
|
|
||||||
a direct decendant of the parent st terminal process, which could lead
|
|
||||||
to the wrong terminal window being swallowed.
|
|
||||||
|
|
||||||
The double fork method avoids this by leaving all new st terminals as
|
|
||||||
orphans, i.e. they will have no parent process.
|
|
||||||
---
|
|
||||||
config.def.h | 1 +
|
|
||||||
st.c | 32 ++++++++++++++++++++++++++++++++
|
|
||||||
st.h | 1 +
|
|
||||||
3 files changed, 34 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 6f05dce..9029e8d 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -199,6 +199,7 @@ static Shortcut shortcuts[] = {
|
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
+ { TERMMOD, XK_Return, newterm, {.i = 0} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
diff --git a/st.c b/st.c
|
|
||||||
index ebdf360..cb79bc0 100644
|
|
||||||
--- a/st.c
|
|
||||||
+++ b/st.c
|
|
||||||
@@ -153,6 +153,7 @@ typedef struct {
|
|
||||||
} STREscape;
|
|
||||||
|
|
||||||
static void execsh(char *, char **);
|
|
||||||
+static char *getcwd_by_pid(pid_t pid);
|
|
||||||
static void stty(char **);
|
|
||||||
static void sigchld(int);
|
|
||||||
static void ttywriteraw(const char *, size_t);
|
|
||||||
@@ -1060,6 +1061,37 @@ tswapscreen(void)
|
|
||||||
tfulldirt();
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+newterm(const Arg* a)
|
|
||||||
+{
|
|
||||||
+ int res;
|
|
||||||
+ switch (fork()) {
|
|
||||||
+ case -1:
|
|
||||||
+ die("fork failed: %s\n", strerror(errno));
|
|
||||||
+ break;
|
|
||||||
+ case 0:
|
|
||||||
+ switch (fork()) {
|
|
||||||
+ case -1:
|
|
||||||
+ die("fork failed: %s\n", strerror(errno));
|
|
||||||
+ break;
|
|
||||||
+ case 0:
|
|
||||||
+ res = chdir(getcwd_by_pid(pid));
|
|
||||||
+ execlp("st", "./st", NULL);
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ exit(0);
|
|
||||||
+ }
|
|
||||||
+ default:
|
|
||||||
+ wait(NULL);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static char *getcwd_by_pid(pid_t pid) {
|
|
||||||
+ char buf[32];
|
|
||||||
+ snprintf(buf, sizeof buf, "/proc/%d/cwd", pid);
|
|
||||||
+ return realpath(buf, NULL);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
tscrolldown(int orig, int n)
|
|
||||||
{
|
|
||||||
diff --git a/st.h b/st.h
|
|
||||||
index fa2eddf..b13399b 100644
|
|
||||||
--- a/st.h
|
|
||||||
+++ b/st.h
|
|
||||||
@@ -81,6 +81,7 @@ void die(const char *, ...);
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
|
|
||||||
+void newterm(const Arg *);
|
|
||||||
void printscreen(const Arg *);
|
|
||||||
void printsel(const Arg *);
|
|
||||||
void sendbreak(const Arg *);
|
|
||||||
--
|
|
||||||
2.32.0
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 4b3bf15..1986316 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -163,8 +163,8 @@ static uint forcemousemod = ShiftMask;
|
|
||||||
*/
|
|
||||||
static MouseShortcut mshortcuts[] = {
|
|
||||||
/* mask button function argument release */
|
|
||||||
- { ShiftMask, Button4, kscrollup, {.i = 1} },
|
|
||||||
- { ShiftMask, Button5, kscrolldown, {.i = 1} },
|
|
||||||
+ { XK_ANY_MOD, Button4, kscrollup, {.i = 1}, 0, /* !alt */ -1 },
|
|
||||||
+ { XK_ANY_MOD, Button5, kscrolldown, {.i = 1}, 0, /* !alt */ -1 },
|
|
||||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
|
||||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
|
||||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
|
||||||
diff --git a/st.c b/st.c
|
|
||||||
index f8b6f67..dd4cb31 100644
|
|
||||||
--- st.c
|
|
||||||
+++ st.c
|
|
||||||
@@ -1045,6 +1045,11 @@ tnew(int col, int row)
|
|
||||||
treset();
|
|
||||||
}
|
|
||||||
|
|
||||||
+int tisaltscr(void)
|
|
||||||
+{
|
|
||||||
+ return IS_SET(MODE_ALTSCREEN);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
tswapscreen(void)
|
|
||||||
{
|
|
||||||
diff --git a/st.h b/st.h
|
|
||||||
index 1332cf1..f9ad815 100644
|
|
||||||
--- st.h
|
|
||||||
+++ st.h
|
|
||||||
@@ -89,6 +89,7 @@ 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);
|
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index e5f1737..b8fbd7b 100644
|
|
||||||
--- x.c
|
|
||||||
+++ x.c
|
|
||||||
@@ -34,6 +34,7 @@ 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 {
|
|
||||||
@@ -446,6 +447,7 @@ 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));
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
From 63e717e51dcd2f59c7a3aa75b659926aa92e08f3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jacob Louis Prosser <geriatricjacob@cumallover.me>
|
|
||||||
Date: Mon, 5 Aug 2019 18:20:25 +1000
|
|
||||||
Subject: [st] [patch] Exposed variable to easily change mouse scroll increment.
|
|
||||||
|
|
||||||
---
|
|
||||||
config.def.h | 5 +++--
|
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index ad20c4c..47e4b66 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -154,6 +154,7 @@ static unsigned int defaultattr = 11;
|
|
||||||
* Internal mouse shortcuts.
|
|
||||||
* Beware that overloading Button1 will disable the selection.
|
|
||||||
*/
|
|
||||||
+const unsigned int mousescrollincrement = 1;
|
|
||||||
static MouseShortcut mshortcuts[] = {
|
|
||||||
/* button mask string */
|
|
||||||
{ Button4, XK_NO_MOD, "\031" },
|
|
||||||
@@ -162,8 +163,8 @@ static MouseShortcut mshortcuts[] = {
|
|
||||||
|
|
||||||
MouseKey mkeys[] = {
|
|
||||||
/* button mask function argument */
|
|
||||||
- { Button4, ShiftMask, kscrollup, {.i = 1} },
|
|
||||||
- { Button5, ShiftMask, kscrolldown, {.i = 1} },
|
|
||||||
+ { Button4, ShiftMask, kscrollup, {.i = mousescrollincrement} },
|
|
||||||
+ { Button5, ShiftMask, kscrolldown, {.i = mousescrollincrement} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Internal keyboard shortcuts. */
|
|
||||||
--
|
|
||||||
2.22.0
|
|
||||||
|
|
@ -1,351 +0,0 @@
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 6f05dce..93cbcc0 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -199,6 +199,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 ebdf360..817cc47 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;
|
|
||||||
|
|
||||||
@@ -850,6 +857,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);
|
|
||||||
@@ -1061,13 +1071,53 @@ 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);
|
|
||||||
|
|
||||||
@@ -1077,17 +1127,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);
|
|
||||||
|
|
||||||
@@ -1097,7 +1158,8 @@ tscrollup(int orig, int n)
|
|
||||||
term.line[i+n] = temp;
|
|
||||||
}
|
|
||||||
|
|
||||||
- selscroll(orig, -n);
|
|
||||||
+ if (term.scr == 0)
|
|
||||||
+ selscroll(orig, -n);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -1126,7 +1188,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++;
|
|
||||||
}
|
|
||||||
@@ -1291,14 +1353,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
|
|
||||||
@@ -1735,11 +1797,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);
|
|
||||||
@@ -2251,7 +2313,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);
|
|
||||||
}
|
|
||||||
@@ -2264,7 +2326,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);
|
|
||||||
}
|
|
||||||
@@ -2474,7 +2536,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;
|
|
||||||
@@ -2511,6 +2573,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));
|
|
||||||
@@ -2569,7 +2639,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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2590,8 +2660,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 fa2eddf..adda2db 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,13 +0,0 @@
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index ec1b576..4b3bf15 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -163,6 +163,8 @@ static uint forcemousemod = ShiftMask;
|
|
||||||
*/
|
|
||||||
static MouseShortcut mshortcuts[] = {
|
|
||||||
/* mask button function argument release */
|
|
||||||
+ { ShiftMask, Button4, kscrollup, {.i = 1} },
|
|
||||||
+ { ShiftMask, Button5, kscrolldown, {.i = 1} },
|
|
||||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
|
||||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
|
||||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
From 69cffc587b54b0a9cd81adb87abad8e526d5b25b Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
|
|
||||||
Date: Thu, 4 Jun 2020 17:35:08 +0300
|
|
||||||
Subject: [PATCH] support w3m images
|
|
||||||
|
|
||||||
w3m images are a hack which renders on top of the terminal's drawable,
|
|
||||||
which didn't work in st because when using double buffering, the front
|
|
||||||
buffer (on which w3m draws its images) is ignored, and st draws only
|
|
||||||
on the back buffer, which is then copied to the front buffer.
|
|
||||||
|
|
||||||
There's a patch to make it work at the FAQ already, but that patch
|
|
||||||
canceles double-buffering, which can have negative side effects on
|
|
||||||
some cases such as flickering.
|
|
||||||
|
|
||||||
This patch achieves the same goal but instead of canceling the double
|
|
||||||
buffer it first copies the front buffer to the back buffer.
|
|
||||||
|
|
||||||
This has the same issues as the FAQ patch in that the cursor line is
|
|
||||||
deleted at the image (because st renders always full lines), but
|
|
||||||
otherwise it's simpler and does keeps double buffering.
|
|
||||||
---
|
|
||||||
x.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/x.c b/x.c
|
|
||||||
index e5f1737..b6ae162 100644
|
|
||||||
--- a/x.c
|
|
||||||
+++ b/x.c
|
|
||||||
@@ -1594,6 +1594,8 @@ xsettitle(char *p)
|
|
||||||
int
|
|
||||||
xstartdraw(void)
|
|
||||||
{
|
|
||||||
+ if (IS_SET(MODE_VISIBLE))
|
|
||||||
+ XCopyArea(xw.dpy, xw.win, xw.buf, dc.gc, 0, 0, win.w, win.h, 0, 0);
|
|
||||||
return IS_SET(MODE_VISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
base-commit: 43a395ae91f7d67ce694e65edeaa7bbc720dd027
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
|
|
@ -1,300 +0,0 @@
|
||||||
#!/usr/bin/perl
|
|
||||||
#########################################################################
|
|
||||||
# Copyright (C) 2012-2021 Wojciech Siewierski, Gaspar Vardanyan #
|
|
||||||
# #
|
|
||||||
# This program is free software: you can redistribute it and/or modify #
|
|
||||||
# it under the terms of the GNU General Public License as published by #
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or #
|
|
||||||
# (at your option) any later version. #
|
|
||||||
# #
|
|
||||||
# This program is distributed in the hope that it will be useful, #
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
|
|
||||||
# GNU General Public License for more details. #
|
|
||||||
# #
|
|
||||||
# You should have received a copy of the GNU General Public License #
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
|
|
||||||
#########################################################################
|
|
||||||
|
|
||||||
my ($cmd, $cursor_row, $cursor_column) = @ARGV;
|
|
||||||
|
|
||||||
# A reference to a function that transforms the completed word
|
|
||||||
# into a regex matching the completions. Usually generated by
|
|
||||||
# generate_matcher().
|
|
||||||
#
|
|
||||||
# For example
|
|
||||||
# $fun = generate_matcher(".*");
|
|
||||||
# $fun->("foo");
|
|
||||||
# would return "f.*o.*o"
|
|
||||||
#
|
|
||||||
# In other words, indirectly decides which characters can
|
|
||||||
# appear in the completion.
|
|
||||||
my $matcher;
|
|
||||||
|
|
||||||
# A regular expression matching a character before each match.
|
|
||||||
# For example, it you want to match the text after a
|
|
||||||
# whitespace, set it to "\s".
|
|
||||||
my $char_class_before;
|
|
||||||
|
|
||||||
# A regular expression matching every character in the entered
|
|
||||||
# text that will be used to find matching completions. Usually
|
|
||||||
# "\w" or similar.
|
|
||||||
my $char_class_to_complete;
|
|
||||||
|
|
||||||
# A regular expression matching every allowed last character
|
|
||||||
# of the completion (uses greedy matching).
|
|
||||||
my $char_class_at_end;
|
|
||||||
|
|
||||||
if ($cmd eq 'word-complete') {
|
|
||||||
# Basic word completion. Completes the current word
|
|
||||||
# without any special matching.
|
|
||||||
$char_class_before = '[^-\w]';
|
|
||||||
$matcher = sub { quotemeta shift }; # identity
|
|
||||||
$char_class_at_end = '[-\w]';
|
|
||||||
$char_class_to_complete = '[-\w]';
|
|
||||||
} elsif ($cmd eq 'WORD-complete') {
|
|
||||||
# The same as above but in the Vim meaning of a "WORD" --
|
|
||||||
# whitespace delimited.
|
|
||||||
$char_class_before = '\s';
|
|
||||||
$matcher = sub { quotemeta shift };
|
|
||||||
$char_class_at_end = '\S';
|
|
||||||
$char_class_to_complete = '\S';
|
|
||||||
} elsif ($cmd eq 'fuzzy-word-complete' ||
|
|
||||||
$cmd eq 'skeleton-word-complete') {
|
|
||||||
# Fuzzy completion of the current word.
|
|
||||||
$char_class_before = '[^-\w]';
|
|
||||||
$matcher = generate_matcher('[-\w]*');
|
|
||||||
$char_class_at_end = '[-\w]';
|
|
||||||
$char_class_to_complete = '[-\w]';
|
|
||||||
} elsif ($cmd eq 'fuzzy-WORD-complete') {
|
|
||||||
# Fuzzy completion of the current WORD.
|
|
||||||
$char_class_before = '\s';
|
|
||||||
$matcher = generate_matcher('\S*');
|
|
||||||
$char_class_at_end = '\S';
|
|
||||||
$char_class_to_complete = '\S';
|
|
||||||
} elsif ($cmd eq 'fuzzy-complete' ||
|
|
||||||
$cmd eq 'skeleton-complete') {
|
|
||||||
# Fuzzy completion of an arbitrary text.
|
|
||||||
$char_class_before = '\W';
|
|
||||||
$matcher = generate_matcher('.*?');
|
|
||||||
$char_class_at_end = '\w';
|
|
||||||
$char_class_to_complete = '\S';
|
|
||||||
} elsif ($cmd eq 'suffix-complete') {
|
|
||||||
# Fuzzy completion of an completing suffixes, like
|
|
||||||
# completing test=hello from /blah/hello.
|
|
||||||
$char_class_before = '\S';
|
|
||||||
$matcher = generate_matcher('\S*');
|
|
||||||
$char_class_at_end = '\S';
|
|
||||||
$char_class_to_complete = '\S';
|
|
||||||
} elsif ($cmd eq 'surround-complete') {
|
|
||||||
# Completing contents of quotes and braces.
|
|
||||||
|
|
||||||
# Here we are using three named groups: s, b, p for quotes, braces
|
|
||||||
# and parenthesis.
|
|
||||||
$char_class_before = '((?<q>["\'`])|(?<b>\[)|(?<p>\())';
|
|
||||||
|
|
||||||
$matcher = generate_matcher('.*?');
|
|
||||||
|
|
||||||
# Here we match text till enclosing pair, using perl conditionals in
|
|
||||||
# regexps (?(condition)yes-expression|no-expression).
|
|
||||||
# \0 is used to hack concatenation with '*' later in the code.
|
|
||||||
$char_class_at_end = '.*?(.(?=(?(<b>)\]|((?(<p>)\)|\g{q})))))\0';
|
|
||||||
$char_class_to_complete = '\S';
|
|
||||||
}
|
|
||||||
|
|
||||||
my $lines = [];
|
|
||||||
|
|
||||||
my $last_line = -1;
|
|
||||||
my $lines_after_cursor = 0;
|
|
||||||
|
|
||||||
while (<STDIN>)
|
|
||||||
{
|
|
||||||
$last_line++;
|
|
||||||
|
|
||||||
if ($last_line <= $cursor_row)
|
|
||||||
{
|
|
||||||
push @{$lines}, $_;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unshift @{$lines}, $_;
|
|
||||||
$lines_after_cursor++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$cursor_row = $last_line;
|
|
||||||
|
|
||||||
# read the word behind the cursor
|
|
||||||
$_ = substr(@{$lines} [$cursor_row], 0, $cursor_column); # get the current line up to the cursor...
|
|
||||||
s/.*?($char_class_to_complete*)$/$1/; # ...and read the last word from it
|
|
||||||
my $word_to_complete = quotemeta;
|
|
||||||
|
|
||||||
# ignore the completed word itself
|
|
||||||
$self->{already_completed}{$word_to_complete} = 1;
|
|
||||||
|
|
||||||
print stdout "$word_to_complete\n";
|
|
||||||
|
|
||||||
# search for matches
|
|
||||||
while (my $completion = find_match($self,
|
|
||||||
$word_to_complete,
|
|
||||||
$self->{next_row} // $cursor_row,
|
|
||||||
$matcher->($word_to_complete),
|
|
||||||
$char_class_before,
|
|
||||||
$char_class_at_end)
|
|
||||||
) {
|
|
||||||
calc_match_coords($self,
|
|
||||||
$self->{next_row}+1,
|
|
||||||
$completion);
|
|
||||||
print stdout "$completion @{$self->{highlight}}\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
leave($self);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
######################################################################
|
|
||||||
|
|
||||||
# Finds the next matching completion in the row current row or above
|
|
||||||
# while skipping duplicates using skip_duplicates().
|
|
||||||
sub find_match {
|
|
||||||
my ($self, $word_to_match, $current_row, $regexp, $char_class_before, $char_class_at_end) = @_;
|
|
||||||
$self->{matches_in_row} //= [];
|
|
||||||
|
|
||||||
# cycle through all the matches in the current row if not starting a new search
|
|
||||||
if (@{$self->{matches_in_row}}) {
|
|
||||||
return skip_duplicates($self, $word_to_match, $current_row, $regexp, $char_class_before, $char_class_at_end);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
my $i;
|
|
||||||
# search through all the rows starting with current one or one above the last checked
|
|
||||||
for ($i = $current_row; $i >= 0; --$i) {
|
|
||||||
my $line = @{$lines} [$i]; # get the line of text from the row
|
|
||||||
|
|
||||||
if ($i == $cursor_row) {
|
|
||||||
$line = substr $line, 0, $cursor_column;
|
|
||||||
}
|
|
||||||
|
|
||||||
$_ = $line;
|
|
||||||
|
|
||||||
# find all the matches in the current line
|
|
||||||
my $match;
|
|
||||||
push @{$self->{matches_in_row}}, $+{match} while ($_, $match) = /
|
|
||||||
(.*${char_class_before})
|
|
||||||
(?<match>
|
|
||||||
${regexp}
|
|
||||||
${char_class_at_end}*
|
|
||||||
)
|
|
||||||
/ix;
|
|
||||||
# corner case: match at the very beginning of line
|
|
||||||
push @{$self->{matches_in_row}}, $+{match} if $line =~ /^(${char_class_before}){0}(?<match>$regexp$char_class_at_end*)/i;
|
|
||||||
|
|
||||||
if (@{$self->{matches_in_row}}) {
|
|
||||||
# remember which row should be searched next
|
|
||||||
$self->{next_row} = --$i;
|
|
||||||
|
|
||||||
# arguments needed for find_match() mutual recursion
|
|
||||||
return skip_duplicates($self, $word_to_match, $i, $regexp, $char_class_before, $char_class_at_end);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# no more possible completions, revert to the original word
|
|
||||||
$self->{next_row} = -1 if $i < 0;
|
|
||||||
|
|
||||||
return undef;
|
|
||||||
}
|
|
||||||
|
|
||||||
######################################################################
|
|
||||||
|
|
||||||
# Checks whether the completion found by find_match() was already
|
|
||||||
# found and if it was, calls find_match() again to find the next
|
|
||||||
# completion.
|
|
||||||
#
|
|
||||||
# Takes all the arguments that find_match() would take, to make a
|
|
||||||
# mutually recursive call.
|
|
||||||
sub skip_duplicates {
|
|
||||||
my $self = $_[0];
|
|
||||||
my $current_row = $_[2];
|
|
||||||
my $completion;
|
|
||||||
if ($current_row >= $lines_after_cursor)
|
|
||||||
{
|
|
||||||
$completion = shift @{$self->{matches_in_row}}; # get the rightmost one
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$completion = pop @{$self->{matches_in_row}}; # get the rightmost one
|
|
||||||
}
|
|
||||||
|
|
||||||
# check for duplicates
|
|
||||||
if (exists $self->{already_completed}{$completion}) {
|
|
||||||
# skip this completion
|
|
||||||
return find_match(@_);
|
|
||||||
} else {
|
|
||||||
$self->{already_completed}{$completion} = 1;
|
|
||||||
return $completion;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
######################################################################
|
|
||||||
|
|
||||||
# Returns a function that takes a string and returns that string with
|
|
||||||
# this function's argument inserted between its every two characters.
|
|
||||||
# The resulting string is used as a regular expression matching the
|
|
||||||
# completion candidates.
|
|
||||||
sub generate_matcher {
|
|
||||||
my $regex_between = shift;
|
|
||||||
|
|
||||||
sub {
|
|
||||||
$_ = shift;
|
|
||||||
|
|
||||||
# sorry for this lispy code, I couldn't resist ;)
|
|
||||||
(join "$regex_between",
|
|
||||||
(map quotemeta,
|
|
||||||
(split //)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
######################################################################
|
|
||||||
|
|
||||||
sub calc_match_coords {
|
|
||||||
my ($self, $linenum, $completion) = @_;
|
|
||||||
|
|
||||||
my $line = @{$lines} [$linenum];
|
|
||||||
my $re = quotemeta $completion;
|
|
||||||
|
|
||||||
$line =~ /$re/;
|
|
||||||
|
|
||||||
#my ($beg_row, $beg_col) = $line->coord_of($-[0]);
|
|
||||||
#my ($end_row, $end_col) = $line->coord_of($+[0]);
|
|
||||||
my $beg = $-[0];
|
|
||||||
my $end = $+[0];
|
|
||||||
|
|
||||||
if (exists $self->{highlight}) {
|
|
||||||
delete $self->{highlight};
|
|
||||||
}
|
|
||||||
# () # TODO: what does () do in perl ????
|
|
||||||
|
|
||||||
if ($linenum >= $lines_after_cursor)
|
|
||||||
{
|
|
||||||
$linenum -= $lines_after_cursor;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$linenum = $last_line - $linenum;
|
|
||||||
}
|
|
||||||
|
|
||||||
# ACMPL_ISSUE: multi-line completions don't work
|
|
||||||
# $self->{highlight} = [$beg_row, $beg_col, $end_row, $end_col];
|
|
||||||
$self->{highlight} = [$linenum, $beg, $end];
|
|
||||||
}
|
|
||||||
|
|
||||||
######################################################################
|
|
||||||
|
|
||||||
sub leave {
|
|
||||||
my ($self) = @_;
|
|
||||||
|
|
||||||
delete $self->{next_row};
|
|
||||||
delete $self->{matches_in_row};
|
|
||||||
delete $self->{already_completed};
|
|
||||||
delete $self->{highlight};
|
|
||||||
}
|
|
||||||
183
st/st.1
183
st/st.1
|
|
@ -1,183 +0,0 @@
|
||||||
.TH ST 1 st\-VERSION
|
|
||||||
.SH NAME
|
|
||||||
st \- simple terminal
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.B st
|
|
||||||
.RB [ \-aiv ]
|
|
||||||
.RB [ \-c
|
|
||||||
.IR class ]
|
|
||||||
.RB [ \-f
|
|
||||||
.IR font ]
|
|
||||||
.RB [ \-g
|
|
||||||
.IR geometry ]
|
|
||||||
.RB [ \-n
|
|
||||||
.IR name ]
|
|
||||||
.RB [ \-o
|
|
||||||
.IR iofile ]
|
|
||||||
.RB [ \-T
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-t
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-l
|
|
||||||
.IR line ]
|
|
||||||
.RB [ \-w
|
|
||||||
.IR windowid ]
|
|
||||||
.RB [[ \-e ]
|
|
||||||
.IR command
|
|
||||||
.RI [ arguments ...]]
|
|
||||||
.PP
|
|
||||||
.B st
|
|
||||||
.RB [ \-aiv ]
|
|
||||||
.RB [ \-c
|
|
||||||
.IR class ]
|
|
||||||
.RB [ \-f
|
|
||||||
.IR font ]
|
|
||||||
.RB [ \-g
|
|
||||||
.IR geometry ]
|
|
||||||
.RB [ \-n
|
|
||||||
.IR name ]
|
|
||||||
.RB [ \-o
|
|
||||||
.IR iofile ]
|
|
||||||
.RB [ \-T
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-t
|
|
||||||
.IR title ]
|
|
||||||
.RB [ \-w
|
|
||||||
.IR windowid ]
|
|
||||||
.RB \-l
|
|
||||||
.IR line
|
|
||||||
.RI [ stty_args ...]
|
|
||||||
.SH DESCRIPTION
|
|
||||||
.B st
|
|
||||||
is a simple terminal emulator.
|
|
||||||
.SH OPTIONS
|
|
||||||
.TP
|
|
||||||
.B \-a
|
|
||||||
disable alternate screens in terminal
|
|
||||||
.TP
|
|
||||||
.BI \-c " class"
|
|
||||||
defines the window class (default $TERM).
|
|
||||||
.TP
|
|
||||||
.BI \-f " font"
|
|
||||||
defines the
|
|
||||||
.I font
|
|
||||||
to use when st is run.
|
|
||||||
.TP
|
|
||||||
.BI \-g " geometry"
|
|
||||||
defines the X11 geometry string.
|
|
||||||
The form is [=][<cols>{xX}<rows>][{+-}<xoffset>{+-}<yoffset>]. See
|
|
||||||
.BR XParseGeometry (3)
|
|
||||||
for further details.
|
|
||||||
.TP
|
|
||||||
.B \-i
|
|
||||||
will fixate the position given with the -g option.
|
|
||||||
.TP
|
|
||||||
.BI \-n " name"
|
|
||||||
defines the window instance name (default $TERM).
|
|
||||||
.TP
|
|
||||||
.BI \-o " iofile"
|
|
||||||
writes all the I/O to
|
|
||||||
.I iofile.
|
|
||||||
This feature is useful when recording st sessions. A value of "-" means
|
|
||||||
standard output.
|
|
||||||
.TP
|
|
||||||
.BI \-T " title"
|
|
||||||
defines the window title (default 'st').
|
|
||||||
.TP
|
|
||||||
.BI \-t " title"
|
|
||||||
defines the window title (default 'st').
|
|
||||||
.TP
|
|
||||||
.BI \-w " windowid"
|
|
||||||
embeds st within the window identified by
|
|
||||||
.I windowid
|
|
||||||
.TP
|
|
||||||
.BI \-l " line"
|
|
||||||
use a tty
|
|
||||||
.I line
|
|
||||||
instead of a pseudo terminal.
|
|
||||||
.I line
|
|
||||||
should be a (pseudo-)serial device (e.g. /dev/ttyS0 on Linux for serial port
|
|
||||||
0).
|
|
||||||
When this flag is given
|
|
||||||
remaining arguments are used as flags for
|
|
||||||
.BR stty(1).
|
|
||||||
By default st initializes the serial line to 8 bits, no parity, 1 stop bit
|
|
||||||
and a 38400 baud rate. The speed is set by appending it as last argument
|
|
||||||
(e.g. 'st -l /dev/ttyS0 115200'). Arguments before the last one are
|
|
||||||
.BR stty(1)
|
|
||||||
flags. If you want to set odd parity on 115200 baud use for example 'st -l
|
|
||||||
/dev/ttyS0 parenb parodd 115200'. Set the number of bits by using for
|
|
||||||
example 'st -l /dev/ttyS0 cs7 115200'. See
|
|
||||||
.BR stty(1)
|
|
||||||
for more arguments and cases.
|
|
||||||
.TP
|
|
||||||
.B \-v
|
|
||||||
prints version information to stderr, then exits.
|
|
||||||
.TP
|
|
||||||
.BI \-e " command " [ " arguments " "... ]"
|
|
||||||
st executes
|
|
||||||
.I command
|
|
||||||
instead of the shell. If this is used it
|
|
||||||
.B must be the last option
|
|
||||||
on the command line, as in xterm / rxvt.
|
|
||||||
This option is only intended for compatibility,
|
|
||||||
and all the remaining arguments are used as a command
|
|
||||||
even without it.
|
|
||||||
.SH SHORTCUTS
|
|
||||||
.TP
|
|
||||||
.B Break
|
|
||||||
Send a break in the serial line.
|
|
||||||
Break key is obtained in PC keyboards
|
|
||||||
pressing at the same time control and pause.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Print Screen
|
|
||||||
Toggle if st should print to the
|
|
||||||
.I iofile.
|
|
||||||
.TP
|
|
||||||
.B Shift-Print Screen
|
|
||||||
Print the full screen to the
|
|
||||||
.I iofile.
|
|
||||||
.TP
|
|
||||||
.B Print Screen
|
|
||||||
Print the selection to the
|
|
||||||
.I iofile.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-Page Up
|
|
||||||
Increase font size.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-Page Down
|
|
||||||
Decrease font size.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-Home
|
|
||||||
Reset to default font size.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-y
|
|
||||||
Paste from primary selection (middle mouse button).
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-c
|
|
||||||
Copy the selected text to the clipboard selection.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-v
|
|
||||||
Paste from the clipboard selection.
|
|
||||||
.TP
|
|
||||||
.B Ctrl-Shift-Return
|
|
||||||
Launch a new session.
|
|
||||||
.TP
|
|
||||||
.B F11 or Alt+Return
|
|
||||||
Fullscreen mode.
|
|
||||||
.SH CUSTOMIZATION
|
|
||||||
.B st
|
|
||||||
can be customized by creating a custom config.h and (re)compiling the source
|
|
||||||
code. This keeps it fast, secure and simple.
|
|
||||||
.SH AUTHORS
|
|
||||||
See the LICENSE file for the authors.
|
|
||||||
.SH LICENSE
|
|
||||||
See the LICENSE file for the terms of redistribution.
|
|
||||||
.SH SEE ALSO
|
|
||||||
.BR tabbed (1),
|
|
||||||
.BR utmp (1),
|
|
||||||
.BR stty (1),
|
|
||||||
.BR scroll (1)
|
|
||||||
.SH BUGS
|
|
||||||
See the TODO file in the distribution.
|
|
||||||
|
|
||||||
136
st/st.h
136
st/st.h
|
|
@ -1,136 +0,0 @@
|
||||||
/* See LICENSE for license details. */
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
/* macros */
|
|
||||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
|
||||||
#define MAX(a, b) ((a) < (b) ? (b) : (a))
|
|
||||||
#define LEN(a) (sizeof(a) / sizeof(a)[0])
|
|
||||||
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
|
|
||||||
#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 || \
|
|
||||||
(a).bg != (b).bg)
|
|
||||||
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
|
||||||
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
|
||||||
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
|
|
||||||
|
|
||||||
#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
|
|
||||||
#define IS_TRUECOL(x) (1 << 24 & (x))
|
|
||||||
|
|
||||||
enum glyph_attribute {
|
|
||||||
ATTR_NULL = 0,
|
|
||||||
ATTR_BOLD = 1 << 0,
|
|
||||||
ATTR_FAINT = 1 << 1,
|
|
||||||
ATTR_ITALIC = 1 << 2,
|
|
||||||
ATTR_UNDERLINE = 1 << 3,
|
|
||||||
ATTR_BLINK = 1 << 4,
|
|
||||||
ATTR_REVERSE = 1 << 5,
|
|
||||||
ATTR_INVISIBLE = 1 << 6,
|
|
||||||
ATTR_STRUCK = 1 << 7,
|
|
||||||
ATTR_WRAP = 1 << 8,
|
|
||||||
ATTR_WIDE = 1 << 9,
|
|
||||||
ATTR_WDUMMY = 1 << 10,
|
|
||||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum selection_mode {
|
|
||||||
SEL_IDLE = 0,
|
|
||||||
SEL_EMPTY = 1,
|
|
||||||
SEL_READY = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
enum selection_type {
|
|
||||||
SEL_REGULAR = 1,
|
|
||||||
SEL_RECTANGULAR = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
enum selection_snap {
|
|
||||||
SNAP_WORD = 1,
|
|
||||||
SNAP_LINE = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef unsigned char uchar;
|
|
||||||
typedef unsigned int uint;
|
|
||||||
typedef unsigned long ulong;
|
|
||||||
typedef unsigned short ushort;
|
|
||||||
|
|
||||||
typedef uint_least32_t Rune;
|
|
||||||
|
|
||||||
#define Glyph Glyph_
|
|
||||||
typedef struct {
|
|
||||||
Rune u; /* character code */
|
|
||||||
ushort mode; /* attribute flags */
|
|
||||||
uint32_t fg; /* foreground */
|
|
||||||
uint32_t bg; /* background */
|
|
||||||
} Glyph;
|
|
||||||
|
|
||||||
typedef Glyph *Line;
|
|
||||||
|
|
||||||
typedef union {
|
|
||||||
int i;
|
|
||||||
uint ui;
|
|
||||||
float f;
|
|
||||||
const void *v;
|
|
||||||
const char *s;
|
|
||||||
} Arg;
|
|
||||||
|
|
||||||
void autocomplete (const Arg *);
|
|
||||||
|
|
||||||
void die(const char *, ...);
|
|
||||||
void redraw(void);
|
|
||||||
void draw(void);
|
|
||||||
|
|
||||||
void newterm(const Arg *);
|
|
||||||
void kscrolldown(const Arg *);
|
|
||||||
void kscrollup(const Arg *);
|
|
||||||
void fullscreen(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);
|
|
||||||
void ttyhangup(void);
|
|
||||||
int ttynew(const char *, char *, const char *, char **);
|
|
||||||
size_t ttyread(void);
|
|
||||||
void ttyresize(int, int);
|
|
||||||
void ttywrite(const char *, size_t, int);
|
|
||||||
|
|
||||||
void resettitle(void);
|
|
||||||
|
|
||||||
void selclear(void);
|
|
||||||
void selinit(void);
|
|
||||||
void selstart(int, int, int);
|
|
||||||
void selextend(int, int, int, int);
|
|
||||||
int selected(int, int);
|
|
||||||
char *getsel(void);
|
|
||||||
|
|
||||||
size_t utf8encode(Rune, char *);
|
|
||||||
|
|
||||||
void *xmalloc(size_t);
|
|
||||||
void *xrealloc(void *, size_t);
|
|
||||||
char *xstrdup(const char *);
|
|
||||||
|
|
||||||
int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b);
|
|
||||||
|
|
||||||
/* config.h globals */
|
|
||||||
extern char *utmp;
|
|
||||||
extern char *scroll;
|
|
||||||
extern char *stty_args;
|
|
||||||
extern char *vtiden;
|
|
||||||
extern wchar_t *worddelimiters;
|
|
||||||
extern int allowaltscreen;
|
|
||||||
extern int allowwindowops;
|
|
||||||
extern char *termname;
|
|
||||||
extern unsigned int tabspaces;
|
|
||||||
extern unsigned int defaultfg;
|
|
||||||
extern unsigned int defaultbg;
|
|
||||||
extern float alpha;
|
|
||||||
extern unsigned int defaultcs;
|
|
||||||
239
st/st.info
239
st/st.info
|
|
@ -1,239 +0,0 @@
|
||||||
st-mono| simpleterm monocolor,
|
|
||||||
acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
|
|
||||||
am,
|
|
||||||
bce,
|
|
||||||
bel=^G,
|
|
||||||
blink=\E[5m,
|
|
||||||
bold=\E[1m,
|
|
||||||
cbt=\E[Z,
|
|
||||||
cvvis=\E[?25h,
|
|
||||||
civis=\E[?25l,
|
|
||||||
clear=\E[H\E[2J,
|
|
||||||
cnorm=\E[?12l\E[?25h,
|
|
||||||
colors#2,
|
|
||||||
cols#80,
|
|
||||||
cr=^M,
|
|
||||||
csr=\E[%i%p1%d;%p2%dr,
|
|
||||||
cub=\E[%p1%dD,
|
|
||||||
cub1=^H,
|
|
||||||
cud1=^J,
|
|
||||||
cud=\E[%p1%dB,
|
|
||||||
cuf1=\E[C,
|
|
||||||
cuf=\E[%p1%dC,
|
|
||||||
cup=\E[%i%p1%d;%p2%dH,
|
|
||||||
cuu1=\E[A,
|
|
||||||
cuu=\E[%p1%dA,
|
|
||||||
dch=\E[%p1%dP,
|
|
||||||
dch1=\E[P,
|
|
||||||
dim=\E[2m,
|
|
||||||
dl=\E[%p1%dM,
|
|
||||||
dl1=\E[M,
|
|
||||||
ech=\E[%p1%dX,
|
|
||||||
ed=\E[J,
|
|
||||||
el=\E[K,
|
|
||||||
el1=\E[1K,
|
|
||||||
enacs=\E)0,
|
|
||||||
flash=\E[?5h$<80/>\E[?5l,
|
|
||||||
fsl=^G,
|
|
||||||
home=\E[H,
|
|
||||||
hpa=\E[%i%p1%dG,
|
|
||||||
hs,
|
|
||||||
ht=^I,
|
|
||||||
hts=\EH,
|
|
||||||
ich=\E[%p1%d@,
|
|
||||||
il1=\E[L,
|
|
||||||
il=\E[%p1%dL,
|
|
||||||
ind=^J,
|
|
||||||
indn=\E[%p1%dS,
|
|
||||||
invis=\E[8m,
|
|
||||||
is2=\E[4l\E>\E[?1034l,
|
|
||||||
it#8,
|
|
||||||
kel=\E[1;2F,
|
|
||||||
ked=\E[1;5F,
|
|
||||||
ka1=\E[1~,
|
|
||||||
ka3=\E[5~,
|
|
||||||
kc1=\E[4~,
|
|
||||||
kc3=\E[6~,
|
|
||||||
kbs=\177,
|
|
||||||
kcbt=\E[Z,
|
|
||||||
kb2=\EOu,
|
|
||||||
kcub1=\EOD,
|
|
||||||
kcud1=\EOB,
|
|
||||||
kcuf1=\EOC,
|
|
||||||
kcuu1=\EOA,
|
|
||||||
kDC=\E[3;2~,
|
|
||||||
kent=\EOM,
|
|
||||||
kEND=\E[1;2F,
|
|
||||||
kIC=\E[2;2~,
|
|
||||||
kNXT=\E[6;2~,
|
|
||||||
kPRV=\E[5;2~,
|
|
||||||
kHOM=\E[1;2H,
|
|
||||||
kLFT=\E[1;2D,
|
|
||||||
kRIT=\E[1;2C,
|
|
||||||
kind=\E[1;2B,
|
|
||||||
kri=\E[1;2A,
|
|
||||||
kclr=\E[3;5~,
|
|
||||||
kdl1=\E[3;2~,
|
|
||||||
kdch1=\E[3~,
|
|
||||||
kich1=\E[2~,
|
|
||||||
kend=\E[4~,
|
|
||||||
kf1=\EOP,
|
|
||||||
kf2=\EOQ,
|
|
||||||
kf3=\EOR,
|
|
||||||
kf4=\EOS,
|
|
||||||
kf5=\E[15~,
|
|
||||||
kf6=\E[17~,
|
|
||||||
kf7=\E[18~,
|
|
||||||
kf8=\E[19~,
|
|
||||||
kf9=\E[20~,
|
|
||||||
kf10=\E[21~,
|
|
||||||
kf11=\E[23~,
|
|
||||||
kf12=\E[24~,
|
|
||||||
kf13=\E[1;2P,
|
|
||||||
kf14=\E[1;2Q,
|
|
||||||
kf15=\E[1;2R,
|
|
||||||
kf16=\E[1;2S,
|
|
||||||
kf17=\E[15;2~,
|
|
||||||
kf18=\E[17;2~,
|
|
||||||
kf19=\E[18;2~,
|
|
||||||
kf20=\E[19;2~,
|
|
||||||
kf21=\E[20;2~,
|
|
||||||
kf22=\E[21;2~,
|
|
||||||
kf23=\E[23;2~,
|
|
||||||
kf24=\E[24;2~,
|
|
||||||
kf25=\E[1;5P,
|
|
||||||
kf26=\E[1;5Q,
|
|
||||||
kf27=\E[1;5R,
|
|
||||||
kf28=\E[1;5S,
|
|
||||||
kf29=\E[15;5~,
|
|
||||||
kf30=\E[17;5~,
|
|
||||||
kf31=\E[18;5~,
|
|
||||||
kf32=\E[19;5~,
|
|
||||||
kf33=\E[20;5~,
|
|
||||||
kf34=\E[21;5~,
|
|
||||||
kf35=\E[23;5~,
|
|
||||||
kf36=\E[24;5~,
|
|
||||||
kf37=\E[1;6P,
|
|
||||||
kf38=\E[1;6Q,
|
|
||||||
kf39=\E[1;6R,
|
|
||||||
kf40=\E[1;6S,
|
|
||||||
kf41=\E[15;6~,
|
|
||||||
kf42=\E[17;6~,
|
|
||||||
kf43=\E[18;6~,
|
|
||||||
kf44=\E[19;6~,
|
|
||||||
kf45=\E[20;6~,
|
|
||||||
kf46=\E[21;6~,
|
|
||||||
kf47=\E[23;6~,
|
|
||||||
kf48=\E[24;6~,
|
|
||||||
kf49=\E[1;3P,
|
|
||||||
kf50=\E[1;3Q,
|
|
||||||
kf51=\E[1;3R,
|
|
||||||
kf52=\E[1;3S,
|
|
||||||
kf53=\E[15;3~,
|
|
||||||
kf54=\E[17;3~,
|
|
||||||
kf55=\E[18;3~,
|
|
||||||
kf56=\E[19;3~,
|
|
||||||
kf57=\E[20;3~,
|
|
||||||
kf58=\E[21;3~,
|
|
||||||
kf59=\E[23;3~,
|
|
||||||
kf60=\E[24;3~,
|
|
||||||
kf61=\E[1;4P,
|
|
||||||
kf62=\E[1;4Q,
|
|
||||||
kf63=\E[1;4R,
|
|
||||||
khome=\E[1~,
|
|
||||||
kil1=\E[2;5~,
|
|
||||||
krmir=\E[2;2~,
|
|
||||||
knp=\E[6~,
|
|
||||||
kmous=\E[M,
|
|
||||||
kpp=\E[5~,
|
|
||||||
lines#24,
|
|
||||||
mir,
|
|
||||||
msgr,
|
|
||||||
npc,
|
|
||||||
op=\E[39;49m,
|
|
||||||
pairs#64,
|
|
||||||
mc0=\E[i,
|
|
||||||
mc4=\E[4i,
|
|
||||||
mc5=\E[5i,
|
|
||||||
rc=\E8,
|
|
||||||
rev=\E[7m,
|
|
||||||
ri=\EM,
|
|
||||||
rin=\E[%p1%dT,
|
|
||||||
ritm=\E[23m,
|
|
||||||
rmacs=\E(B,
|
|
||||||
rmcup=\E[?1049l,
|
|
||||||
rmir=\E[4l,
|
|
||||||
rmkx=\E[?1l\E>,
|
|
||||||
rmso=\E[27m,
|
|
||||||
rmul=\E[24m,
|
|
||||||
rs1=\Ec,
|
|
||||||
rs2=\E[4l\E>\E[?1034l,
|
|
||||||
sc=\E7,
|
|
||||||
sitm=\E[3m,
|
|
||||||
sgr0=\E[0m,
|
|
||||||
smacs=\E(0,
|
|
||||||
smcup=\E[?1049h,
|
|
||||||
smir=\E[4h,
|
|
||||||
smkx=\E[?1h\E=,
|
|
||||||
smso=\E[7m,
|
|
||||||
smul=\E[4m,
|
|
||||||
tbc=\E[3g,
|
|
||||||
tsl=\E]0;,
|
|
||||||
xenl,
|
|
||||||
vpa=\E[%i%p1%dd,
|
|
||||||
# XTerm extensions
|
|
||||||
rmxx=\E[29m,
|
|
||||||
smxx=\E[9m,
|
|
||||||
# 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)
|
|
||||||
Tc,
|
|
||||||
Ms=\E]52;%p1%s;%p2%s\007,
|
|
||||||
Se=\E[2 q,
|
|
||||||
Ss=\E[%p1%d q,
|
|
||||||
|
|
||||||
st| simpleterm,
|
|
||||||
use=st-mono,
|
|
||||||
colors#8,
|
|
||||||
setab=\E[4%p1%dm,
|
|
||||||
setaf=\E[3%p1%dm,
|
|
||||||
setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
|
|
||||||
setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
|
|
||||||
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
|
|
||||||
|
|
||||||
st-256color| simpleterm with 256 colors,
|
|
||||||
use=st,
|
|
||||||
ccc,
|
|
||||||
colors#256,
|
|
||||||
oc=\E]104\007,
|
|
||||||
pairs#32767,
|
|
||||||
# Nicked from xterm-256color
|
|
||||||
initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
|
|
||||||
setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
|
|
||||||
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
|
|
||||||
|
|
||||||
st-meta| simpleterm with meta key,
|
|
||||||
use=st,
|
|
||||||
km,
|
|
||||||
rmm=\E[?1034l,
|
|
||||||
smm=\E[?1034h,
|
|
||||||
rs2=\E[4l\E>\E[?1034h,
|
|
||||||
is2=\E[4l\E>\E[?1034h,
|
|
||||||
|
|
||||||
st-meta-256color| simpleterm with meta key and 256 colors,
|
|
||||||
use=st-256color,
|
|
||||||
km,
|
|
||||||
rmm=\E[?1034l,
|
|
||||||
smm=\E[?1034h,
|
|
||||||
rs2=\E[4l\E>\E[?1034h,
|
|
||||||
is2=\E[4l\E>\E[?1034h,
|
|
||||||
|
|
||||||
st-bs| simpleterm with backspace as backspace,
|
|
||||||
use=st,
|
|
||||||
kbs=\010,
|
|
||||||
kdch1=\177,
|
|
||||||
|
|
||||||
st-bs-256color| simpleterm with backspace as backspace and 256colors,
|
|
||||||
use=st-256color,
|
|
||||||
kbs=\010,
|
|
||||||
kdch1=\177,
|
|
||||||
40
st/win.h
40
st/win.h
|
|
@ -1,40 +0,0 @@
|
||||||
/* See LICENSE for license details. */
|
|
||||||
|
|
||||||
enum win_mode {
|
|
||||||
MODE_VISIBLE = 1 << 0,
|
|
||||||
MODE_FOCUSED = 1 << 1,
|
|
||||||
MODE_APPKEYPAD = 1 << 2,
|
|
||||||
MODE_MOUSEBTN = 1 << 3,
|
|
||||||
MODE_MOUSEMOTION = 1 << 4,
|
|
||||||
MODE_REVERSE = 1 << 5,
|
|
||||||
MODE_KBDLOCK = 1 << 6,
|
|
||||||
MODE_HIDE = 1 << 7,
|
|
||||||
MODE_APPCURSOR = 1 << 8,
|
|
||||||
MODE_MOUSESGR = 1 << 9,
|
|
||||||
MODE_8BIT = 1 << 10,
|
|
||||||
MODE_BLINK = 1 << 11,
|
|
||||||
MODE_FBLINK = 1 << 12,
|
|
||||||
MODE_FOCUS = 1 << 13,
|
|
||||||
MODE_MOUSEX10 = 1 << 14,
|
|
||||||
MODE_MOUSEMANY = 1 << 15,
|
|
||||||
MODE_BRCKTPASTE = 1 << 16,
|
|
||||||
MODE_NUMLOCK = 1 << 17,
|
|
||||||
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
|
||||||
|MODE_MOUSEMANY,
|
|
||||||
};
|
|
||||||
|
|
||||||
void xbell(void);
|
|
||||||
void xclipcopy(void);
|
|
||||||
void xdrawcursor(int, int, Glyph, int, int, Glyph);
|
|
||||||
void xdrawline(Line, int, int, int);
|
|
||||||
void xfinishdraw(void);
|
|
||||||
void xloadcols(void);
|
|
||||||
int xsetcolorname(int, const char *);
|
|
||||||
void xseticontitle(char *);
|
|
||||||
void xsettitle(char *);
|
|
||||||
int xsetcursor(int);
|
|
||||||
void xsetmode(int, unsigned int);
|
|
||||||
void xsetpointermotion(int);
|
|
||||||
void xsetsel(char *);
|
|
||||||
int xstartdraw(void);
|
|
||||||
void xximspot(int, int);
|
|
||||||
Loading…
Reference in a new issue