Compare commits
10 commits
5dbcca4926
...
bee2f5a700
| Author | SHA1 | Date | |
|---|---|---|---|
|
bee2f5a700 | ||
|
|
5808c71df9 | ||
|
|
09cbf6d8ad | ||
|
|
c652874917 | ||
|
|
90a7cdb744 | ||
|
|
4dbe68e9ec | ||
|
|
1a61e0c697 | ||
|
|
dd0b463434 | ||
|
|
73f6a950ad | ||
|
|
5042946b62 |
253
FAQ
253
FAQ
|
|
@ -1,253 +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.
|
|
||||||
|
|
||||||
As of 2022-09-05 this now seems to be finally fixed in libXft 2.3.5:
|
|
||||||
https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS
|
|
||||||
17
LEGACY
17
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
|
|
||||||
|
|
||||||
28
TODO
28
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
|
|
||||||
|
|
||||||
57
config.def.h
57
config.def.h
|
|
@ -5,8 +5,8 @@
|
||||||
*
|
*
|
||||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
*/
|
*/
|
||||||
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
static char *font = "Mononoki Nerd Font:pixelsize=20:antialias=true:autohint=true";
|
||||||
static int borderpx = 2;
|
static int borderpx = 16;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* What program is execed by st depends of these precedence rules:
|
* What program is execed by st depends of these precedence rules:
|
||||||
|
|
@ -93,35 +93,35 @@ char *termname = "st-256color";
|
||||||
*/
|
*/
|
||||||
unsigned int tabspaces = 8;
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
float alpha = 0.85;
|
||||||
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
static const char *colorname[] = {
|
static const char *colorname[] = {
|
||||||
/* 8 normal colors */
|
/* 8 normal colors */
|
||||||
"black",
|
"#222222",
|
||||||
"red3",
|
"#FF5555",
|
||||||
"green3",
|
"#5FD38D",
|
||||||
"yellow3",
|
"#FF9955",
|
||||||
"blue2",
|
"#3771C8",
|
||||||
"magenta3",
|
"#BC5FD3",
|
||||||
"cyan3",
|
"#5FD3BC",
|
||||||
"gray90",
|
"#999999",
|
||||||
|
|
||||||
/* 8 bright colors */
|
/* 8 bright colors */
|
||||||
"gray50",
|
"#666666",
|
||||||
"red",
|
"#FF8080",
|
||||||
"green",
|
"#87DEAA",
|
||||||
"yellow",
|
"#FFB380",
|
||||||
"#5c5cff",
|
"#5F8DD3",
|
||||||
"magenta",
|
"#CD87DE",
|
||||||
"cyan",
|
"#87DECD",
|
||||||
"white",
|
"#CCCCCC",
|
||||||
|
|
||||||
[255] = 0,
|
[255] = 0,
|
||||||
|
|
||||||
/* more colors can be added after 255 to use with DefaultXX */
|
/* more colors can be added after 255 to use with DefaultXX */
|
||||||
"#cccccc",
|
"#CCCCCC", /* nord4 (default foreground colour) */
|
||||||
"#555555",
|
"#222222", /* nord0 (default background colour) */
|
||||||
"gray90", /* default foreground colour */
|
|
||||||
"black", /* default background colour */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -129,8 +129,8 @@ static const char *colorname[] = {
|
||||||
* Default colors (colorname index)
|
* Default colors (colorname index)
|
||||||
* foreground, background, cursor, reverse cursor
|
* foreground, background, cursor, reverse cursor
|
||||||
*/
|
*/
|
||||||
unsigned int defaultfg = 258;
|
unsigned int defaultfg = 256;
|
||||||
unsigned int defaultbg = 259;
|
unsigned int defaultbg = 257;
|
||||||
unsigned int defaultcs = 256;
|
unsigned int defaultcs = 256;
|
||||||
static unsigned int defaultrcs = 257;
|
static unsigned int defaultrcs = 257;
|
||||||
|
|
||||||
|
|
@ -178,9 +178,9 @@ static MouseShortcut mshortcuts[] = {
|
||||||
/* mask button function argument release */
|
/* mask button function argument release */
|
||||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||||
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
||||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
{ XK_ANY_MOD, Button4, kscrollup, {.i = 3}, 0 },
|
||||||
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
||||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
{ XK_ANY_MOD, Button5, kscrolldown, {.i = 3}, 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Internal keyboard shortcuts. */
|
/* Internal keyboard shortcuts. */
|
||||||
|
|
@ -199,8 +199,9 @@ static Shortcut shortcuts[] = {
|
||||||
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
||||||
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
||||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
{ TERMMOD, XK_Escape, keyboard_select,{ 0 } },
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -346,7 +347,7 @@ static Key key[] = {
|
||||||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
{ XK_Delete, ShiftMask, "\033[3;2~", +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_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
||||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
||||||
|
|
|
||||||
475
config.h
Normal file
475
config.h
Normal file
|
|
@ -0,0 +1,475 @@
|
||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* appearance
|
||||||
|
*
|
||||||
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
|
*/
|
||||||
|
static char *font = "Mononoki Nerd Font:pixelsize=20:antialias=true:autohint=true";
|
||||||
|
static int borderpx = 16;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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 = 2;
|
||||||
|
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 = 0;
|
||||||
|
|
||||||
|
/* default TERM value */
|
||||||
|
char *termname = "st-256color";
|
||||||
|
|
||||||
|
/*
|
||||||
|
* spaces per tab
|
||||||
|
*
|
||||||
|
* When you are changing this value, don't forget to adapt the »it« value in
|
||||||
|
* the st.info and appropriately install the st.info in the environment where
|
||||||
|
* you use this st version.
|
||||||
|
*
|
||||||
|
* it#$tabspaces,
|
||||||
|
*
|
||||||
|
* Secondly make sure your kernel is not expanding tabs. When running `stty
|
||||||
|
* -a` »tab0« should appear. You can tell the terminal to not expand tabs by
|
||||||
|
* running following command:
|
||||||
|
*
|
||||||
|
* stty tabs
|
||||||
|
*/
|
||||||
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
float alpha = 0.85;
|
||||||
|
|
||||||
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
|
static const char *colorname[] = {
|
||||||
|
/* 8 normal colors */
|
||||||
|
"#222222",
|
||||||
|
"#FF5555",
|
||||||
|
"#5FD38D",
|
||||||
|
"#FF9955",
|
||||||
|
"#3771C8",
|
||||||
|
"#BC5FD3",
|
||||||
|
"#5FD3BC",
|
||||||
|
"#999999",
|
||||||
|
|
||||||
|
/* 8 bright colors */
|
||||||
|
"#666666",
|
||||||
|
"#FF8080",
|
||||||
|
"#87DEAA",
|
||||||
|
"#FFB380",
|
||||||
|
"#5F8DD3",
|
||||||
|
"#CD87DE",
|
||||||
|
"#87DECD",
|
||||||
|
"#CCCCCC",
|
||||||
|
|
||||||
|
[255] = 0,
|
||||||
|
|
||||||
|
/* more colors can be added after 255 to use with DefaultXX */
|
||||||
|
"#CCCCCC", /* nord4 (default foreground colour) */
|
||||||
|
"#222222", /* nord0 (default background colour) */
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default colors (colorname index)
|
||||||
|
* foreground, background, cursor, reverse cursor
|
||||||
|
*/
|
||||||
|
unsigned int defaultfg = 256;
|
||||||
|
unsigned int defaultbg = 257;
|
||||||
|
unsigned int defaultcs = 256;
|
||||||
|
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;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Internal mouse shortcuts.
|
||||||
|
* Beware that overloading Button1 will disable the selection.
|
||||||
|
*/
|
||||||
|
static MouseShortcut mshortcuts[] = {
|
||||||
|
/* mask button function argument release */
|
||||||
|
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||||
|
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
||||||
|
{ XK_ANY_MOD, Button4, kscrollup, {.i = 3}, 0 },
|
||||||
|
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
||||||
|
{ XK_ANY_MOD, Button5, kscrolldown, {.i = 3}, 0 },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* 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} },
|
||||||
|
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
{ ShiftMask, XK_Escape, keyboard_select,{ 0 } },
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Special keys (change & recompile st.info accordingly)
|
||||||
|
*
|
||||||
|
* Mask value:
|
||||||
|
* * Use XK_ANY_MOD to match the key no matter modifiers state
|
||||||
|
* * Use XK_NO_MOD to match the key alone (no modifiers)
|
||||||
|
* appkey value:
|
||||||
|
* * 0: no value
|
||||||
|
* * > 0: keypad application mode enabled
|
||||||
|
* * = 2: term.numlock = 1
|
||||||
|
* * < 0: keypad application mode disabled
|
||||||
|
* appcursor value:
|
||||||
|
* * 0: no value
|
||||||
|
* * > 0: cursor application mode enabled
|
||||||
|
* * < 0: cursor application mode disabled
|
||||||
|
*
|
||||||
|
* Be careful with the order of the definitions because st searches in
|
||||||
|
* this table sequentially, so any XK_ANY_MOD must be in the last
|
||||||
|
* position for a key.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
|
||||||
|
* to be mapped below, add them to this array.
|
||||||
|
*/
|
||||||
|
static KeySym mappedkeys[] = { -1 };
|
||||||
|
|
||||||
|
/*
|
||||||
|
* State bits to ignore when matching key or button events. By default,
|
||||||
|
* numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
|
||||||
|
*/
|
||||||
|
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is the huge key array which defines all compatibility to the Linux
|
||||||
|
* world. Please decide about changes wisely.
|
||||||
|
*/
|
||||||
|
static Key key[] = {
|
||||||
|
/* keysym mask string appkey appcursor */
|
||||||
|
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
|
||||||
|
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||||
|
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||||
|
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
|
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||||
|
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||||
|
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
|
||||||
|
{ XK_KP_End, ControlMask, "\033[J", -1, 0},
|
||||||
|
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
|
||||||
|
{ XK_KP_End, ShiftMask, "\033[K", -1, 0},
|
||||||
|
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||||
|
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||||
|
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||||
|
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||||
|
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
|
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
|
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
|
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
|
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
|
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
|
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
|
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||||
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
|
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
|
||||||
|
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
|
||||||
|
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
|
||||||
|
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
|
||||||
|
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
|
||||||
|
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
|
||||||
|
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
|
||||||
|
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
|
||||||
|
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
|
||||||
|
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
|
||||||
|
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
|
||||||
|
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
|
||||||
|
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
|
||||||
|
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
|
||||||
|
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
|
||||||
|
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
|
||||||
|
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
|
||||||
|
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0},
|
||||||
|
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
|
||||||
|
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
|
||||||
|
{ XK_Up, ControlMask, "\033[1;5A", 0, 0},
|
||||||
|
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
|
||||||
|
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
|
||||||
|
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
|
||||||
|
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
|
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
|
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0},
|
||||||
|
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
|
||||||
|
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
|
||||||
|
{ XK_Down, ControlMask, "\033[1;5B", 0, 0},
|
||||||
|
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
|
||||||
|
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
|
||||||
|
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
|
||||||
|
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
|
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
|
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0},
|
||||||
|
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
|
||||||
|
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
|
||||||
|
{ XK_Left, ControlMask, "\033[1;5D", 0, 0},
|
||||||
|
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
|
||||||
|
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
|
||||||
|
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
|
||||||
|
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
|
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
|
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0},
|
||||||
|
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
|
||||||
|
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
|
||||||
|
{ XK_Right, ControlMask, "\033[1;5C", 0, 0},
|
||||||
|
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
|
||||||
|
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
|
||||||
|
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
|
||||||
|
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
|
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
|
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
|
||||||
|
{ XK_Return, Mod1Mask, "\033\r", 0, 0},
|
||||||
|
{ XK_Return, XK_ANY_MOD, "\r", 0, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
|
{ XK_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
|
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
|
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
|
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
|
{ XK_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
|
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
|
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
|
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
|
{ XK_Delete, XK_ANY_MOD, "\033[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{|}~";
|
||||||
13
shell.nix
Normal file
13
shell.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = [
|
||||||
|
pkgs.gnumake
|
||||||
|
pkgs.gcc
|
||||||
|
pkgs.pkg-config
|
||||||
|
pkgs.xorg.libX11
|
||||||
|
pkgs.xorg.libXft
|
||||||
|
pkgs.fontconfig
|
||||||
|
pkgs.freetype
|
||||||
|
];
|
||||||
|
}
|
||||||
336
st-keyboard_select-0.8.2.diff
Normal file
336
st-keyboard_select-0.8.2.diff
Normal file
|
|
@ -0,0 +1,336 @@
|
||||||
|
From 45cadc1ce5d8d9dd3493c2e9979e8958d87e8bc5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Bartosz Sosna <brtsos@gmail.com>
|
||||||
|
Date: Sat, 4 May 2019 00:28:24 +0200
|
||||||
|
Subject: [PATCH] Adjust patch to version st-0.8.2
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 1 +
|
||||||
|
st.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
st.h | 1 +
|
||||||
|
win.h | 3 +
|
||||||
|
x.c | 15 ++++
|
||||||
|
5 files changed, 242 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 482901e..c1e9cce 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -178,6 +178,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_Escape, keyboard_select,{ 0 } },
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
diff --git a/st.c b/st.c
|
||||||
|
index ede7ae6..c2116b2 100644
|
||||||
|
--- a/st.c
|
||||||
|
+++ b/st.c
|
||||||
|
@@ -16,6 +16,8 @@
|
||||||
|
#include <termios.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <wchar.h>
|
||||||
|
+#include <X11/keysym.h>
|
||||||
|
+#include <X11/X.h>
|
||||||
|
|
||||||
|
#include "st.h"
|
||||||
|
#include "win.h"
|
||||||
|
@@ -2464,6 +2466,9 @@ tresize(int col, int row)
|
||||||
|
int *bp;
|
||||||
|
TCursor c;
|
||||||
|
|
||||||
|
+ if ( row < term.row || col < term.col )
|
||||||
|
+ toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0));
|
||||||
|
+
|
||||||
|
if (col < 1 || row < 1) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"tresize: error resizing to %dx%d\n", col, row);
|
||||||
|
@@ -2586,3 +2591,220 @@ redraw(void)
|
||||||
|
tfulldirt();
|
||||||
|
draw();
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+void set_notifmode(int type, KeySym ksym) {
|
||||||
|
+ static char *lib[] = { " MOVE ", " SEL "};
|
||||||
|
+ static Glyph *g, *deb, *fin;
|
||||||
|
+ static int col, bot;
|
||||||
|
+
|
||||||
|
+ if ( ksym == -1 ) {
|
||||||
|
+ free(g);
|
||||||
|
+ col = term.col, bot = term.bot;
|
||||||
|
+ g = xmalloc(col * sizeof(Glyph));
|
||||||
|
+ memcpy(g, term.line[bot], col * sizeof(Glyph));
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == -2 )
|
||||||
|
+ memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
+
|
||||||
|
+ if ( type < 2 ) {
|
||||||
|
+ char *z = lib[type];
|
||||||
|
+ for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
|
||||||
|
+ deb->mode = ATTR_REVERSE,
|
||||||
|
+ deb->u = *z,
|
||||||
|
+ deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
+ }
|
||||||
|
+ else if ( type < 5 )
|
||||||
|
+ memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
+ else {
|
||||||
|
+ for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++)
|
||||||
|
+ deb->mode = ATTR_REVERSE,
|
||||||
|
+ deb->u = ' ',
|
||||||
|
+ deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
+ term.line[bot][0].u = ksym;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ term.dirty[bot] = 1;
|
||||||
|
+ drawregion(0, bot, col, bot + 1);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void select_or_drawcursor(int selectsearch_mode, int type) {
|
||||||
|
+ int done = 0;
|
||||||
|
+
|
||||||
|
+ if ( selectsearch_mode & 1 ) {
|
||||||
|
+ selextend(term.c.x, term.c.y, type, done);
|
||||||
|
+ xsetsel(getsel());
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
|
||||||
|
+ term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu) {
|
||||||
|
+ Rune *r;
|
||||||
|
+ int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr;
|
||||||
|
+
|
||||||
|
+ for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) {
|
||||||
|
+ for (r = target; r - target < ptarget; r++) {
|
||||||
|
+ if ( *r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u ) {
|
||||||
|
+ if ( r - target == ptarget - 1 ) break;
|
||||||
|
+ } else {
|
||||||
|
+ r = NULL;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if ( r != NULL ) break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ( i != bound ) {
|
||||||
|
+ term.c.y = i / term.col, term.c.x = i % term.col;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int trt_kbdselect(KeySym ksym, char *buf, int len) {
|
||||||
|
+ static TCursor cu;
|
||||||
|
+ static Rune target[64];
|
||||||
|
+ static int type = 1, ptarget, in_use;
|
||||||
|
+ static int sens, quant;
|
||||||
|
+ static char selectsearch_mode;
|
||||||
|
+ int i, bound, *xy;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ if ( selectsearch_mode & 2 ) {
|
||||||
|
+ if ( ksym == XK_Return ) {
|
||||||
|
+ selectsearch_mode ^= 2;
|
||||||
|
+ set_notifmode(selectsearch_mode, -2);
|
||||||
|
+ if ( ksym == XK_Escape ) ptarget = 0;
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == XK_BackSpace ) {
|
||||||
|
+ if ( !ptarget ) return 0;
|
||||||
|
+ term.line[term.bot][ptarget--].u = ' ';
|
||||||
|
+ }
|
||||||
|
+ else if ( len < 1 ) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ptarget == term.col || ksym == XK_Escape ) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ utf8decode(buf, &target[ptarget++], len);
|
||||||
|
+ term.line[term.bot][ptarget].u = target[ptarget - 1];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ( ksym != XK_BackSpace )
|
||||||
|
+ search(selectsearch_mode, &target[0], ptarget, sens, type, &cu);
|
||||||
|
+
|
||||||
|
+ term.dirty[term.bot] = 1;
|
||||||
|
+ drawregion(0, term.bot, term.col, term.bot + 1);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ switch ( ksym ) {
|
||||||
|
+ case -1 :
|
||||||
|
+ in_use = 1;
|
||||||
|
+ cu.x = term.c.x, cu.y = term.c.y;
|
||||||
|
+ set_notifmode(0, ksym);
|
||||||
|
+ return MODE_KBDSELECT;
|
||||||
|
+ case XK_s :
|
||||||
|
+ if ( selectsearch_mode & 1 )
|
||||||
|
+ selclear();
|
||||||
|
+ else
|
||||||
|
+ selstart(term.c.x, term.c.y, 0);
|
||||||
|
+ set_notifmode(selectsearch_mode ^= 1, ksym);
|
||||||
|
+ break;
|
||||||
|
+ case XK_t :
|
||||||
|
+ selextend(term.c.x, term.c.y, type ^= 3, i = 0); /* 2 fois */
|
||||||
|
+ selextend(term.c.x, term.c.y, type, i = 0);
|
||||||
|
+ break;
|
||||||
|
+ case XK_slash :
|
||||||
|
+ case XK_KP_Divide :
|
||||||
|
+ case XK_question :
|
||||||
|
+ ksym &= XK_question; /* Divide to slash */
|
||||||
|
+ sens = (ksym == XK_slash) ? -1 : 1;
|
||||||
|
+ ptarget = 0;
|
||||||
|
+ set_notifmode(15, ksym);
|
||||||
|
+ selectsearch_mode ^= 2;
|
||||||
|
+ break;
|
||||||
|
+ case XK_Escape :
|
||||||
|
+ if ( !in_use ) break;
|
||||||
|
+ selclear();
|
||||||
|
+ case XK_Return :
|
||||||
|
+ set_notifmode(4, ksym);
|
||||||
|
+ term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode = 0, type);
|
||||||
|
+ in_use = quant = 0;
|
||||||
|
+ return MODE_KBDSELECT;
|
||||||
|
+ case XK_n :
|
||||||
|
+ case XK_N :
|
||||||
|
+ if ( ptarget )
|
||||||
|
+ search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu);
|
||||||
|
+ break;
|
||||||
|
+ case XK_BackSpace :
|
||||||
|
+ term.c.x = 0;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_dollar :
|
||||||
|
+ term.c.x = term.col - 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_Home :
|
||||||
|
+ term.c.x = 0, term.c.y = 0;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_End :
|
||||||
|
+ term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_Page_Up :
|
||||||
|
+ case XK_Page_Down :
|
||||||
|
+ term.c.y = (ksym == XK_Prior ) ? 0 : cu.y;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_exclam :
|
||||||
|
+ term.c.x = term.col >> 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ case XK_asterisk :
|
||||||
|
+ case XK_KP_Multiply :
|
||||||
|
+ term.c.x = term.col >> 1;
|
||||||
|
+ case XK_underscore :
|
||||||
|
+ term.c.y = cu.y >> 1;
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ break;
|
||||||
|
+ default :
|
||||||
|
+ if ( ksym >= XK_0 && ksym <= XK_9 ) { /* 0-9 keyboard */
|
||||||
|
+ quant = (quant * 10) + (ksym ^ XK_0);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym >= XK_KP_0 && ksym <= XK_KP_9 ) { /* 0-9 numpad */
|
||||||
|
+ quant = (quant * 10) + (ksym ^ XK_KP_0);
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ else if ( ksym == XK_k || ksym == XK_h )
|
||||||
|
+ i = ksym & 1;
|
||||||
|
+ else if ( ksym == XK_l || ksym == XK_j )
|
||||||
|
+ i = ((ksym & 6) | 4) >> 1;
|
||||||
|
+ else if ( (XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3 )
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ xy = (i & 1) ? &term.c.y : &term.c.x;
|
||||||
|
+ sens = (i & 2) ? 1 : -1;
|
||||||
|
+ bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot;
|
||||||
|
+
|
||||||
|
+ if ( quant == 0 )
|
||||||
|
+ quant++;
|
||||||
|
+
|
||||||
|
+ if ( *xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0)) )
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ *xy += quant * sens;
|
||||||
|
+ if ( *xy < 0 || ( bound > 0 && *xy > bound) )
|
||||||
|
+ *xy = bound;
|
||||||
|
+
|
||||||
|
+ select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
+ }
|
||||||
|
+ quant = 0;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
diff --git a/st.h b/st.h
|
||||||
|
index 4da3051..22125e4 100644
|
||||||
|
--- a/st.h
|
||||||
|
+++ b/st.h
|
||||||
|
@@ -109,6 +109,7 @@ size_t utf8encode(Rune, char *);
|
||||||
|
void *xmalloc(size_t);
|
||||||
|
void *xrealloc(void *, size_t);
|
||||||
|
char *xstrdup(char *);
|
||||||
|
+int trt_kbdselect(KeySym, char *, int);
|
||||||
|
|
||||||
|
/* config.h globals */
|
||||||
|
extern char *utmp;
|
||||||
|
diff --git a/win.h b/win.h
|
||||||
|
index a6ef1b9..a240783 100644
|
||||||
|
--- a/win.h
|
||||||
|
+++ b/win.h
|
||||||
|
@@ -21,6 +21,7 @@ enum win_mode {
|
||||||
|
MODE_NUMLOCK = 1 << 17,
|
||||||
|
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
||||||
|
|MODE_MOUSEMANY,
|
||||||
|
+ MODE_KBDSELECT = 1 << 18,
|
||||||
|
};
|
||||||
|
|
||||||
|
void xbell(void);
|
||||||
|
@@ -36,4 +37,6 @@ void xsetmode(int, unsigned int);
|
||||||
|
void xsetpointermotion(int);
|
||||||
|
void xsetsel(char *);
|
||||||
|
int xstartdraw(void);
|
||||||
|
+void toggle_winmode(int);
|
||||||
|
+void keyboard_select(const Arg *);
|
||||||
|
void xximspot(int, int);
|
||||||
|
diff --git a/x.c b/x.c
|
||||||
|
index 5828a3b..5221641 100644
|
||||||
|
--- a/x.c
|
||||||
|
+++ b/x.c
|
||||||
|
@@ -1731,6 +1731,13 @@ kpress(XEvent *ev)
|
||||||
|
return;
|
||||||
|
|
||||||
|
len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
|
||||||
|
+ if ( IS_SET(MODE_KBDSELECT) ) {
|
||||||
|
+ if ( match(XK_NO_MOD, e->state) ||
|
||||||
|
+ (XK_Shift_L | XK_Shift_R) & e->state )
|
||||||
|
+ win.mode ^= trt_kbdselect(ksym, buf, len);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* 1. shortcuts */
|
||||||
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
||||||
|
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
||||||
|
@@ -1914,6 +1921,14 @@ usage(void)
|
||||||
|
" [stty_args ...]\n", argv0, argv0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void toggle_winmode(int flag) {
|
||||||
|
+ win.mode ^= flag;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void keyboard_select(const Arg *dummy) {
|
||||||
|
+ win.mode ^= trt_kbdselect(-1, NULL, 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
||||||
339
st.c
339
st.c
|
|
@ -16,6 +16,8 @@
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
|
#include <X11/keysym.h>
|
||||||
|
#include <X11/X.h>
|
||||||
|
|
||||||
#include "st.h"
|
#include "st.h"
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
@ -35,6 +37,7 @@
|
||||||
#define ESC_ARG_SIZ 16
|
#define ESC_ARG_SIZ 16
|
||||||
#define STR_BUF_SIZ ESC_BUF_SIZ
|
#define STR_BUF_SIZ ESC_BUF_SIZ
|
||||||
#define STR_ARG_SIZ ESC_ARG_SIZ
|
#define STR_ARG_SIZ ESC_ARG_SIZ
|
||||||
|
#define HISTSIZE 2000
|
||||||
|
|
||||||
/* macros */
|
/* macros */
|
||||||
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
#define IS_SET(flag) ((term.mode & (flag)) != 0)
|
||||||
|
|
@ -42,6 +45,9 @@
|
||||||
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
|
||||||
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
|
||||||
#define ISDELIM(u) (u && wcschr(worddelimiters, u))
|
#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 {
|
enum term_mode {
|
||||||
MODE_WRAP = 1 << 0,
|
MODE_WRAP = 1 << 0,
|
||||||
|
|
@ -115,6 +121,9 @@ typedef struct {
|
||||||
int col; /* nb col */
|
int col; /* nb col */
|
||||||
Line *line; /* screen */
|
Line *line; /* screen */
|
||||||
Line *alt; /* alternate screen */
|
Line *alt; /* alternate screen */
|
||||||
|
Line hist[HISTSIZE]; /* history buffer */
|
||||||
|
int histi; /* history index */
|
||||||
|
int scr; /* scroll back */
|
||||||
int *dirty; /* dirtyness of lines */
|
int *dirty; /* dirtyness of lines */
|
||||||
TCursor c; /* cursor */
|
TCursor c; /* cursor */
|
||||||
int ocx; /* old cursor col */
|
int ocx; /* old cursor col */
|
||||||
|
|
@ -185,8 +194,8 @@ static void tnewline(int);
|
||||||
static void tputtab(int);
|
static void tputtab(int);
|
||||||
static void tputc(Rune);
|
static void tputc(Rune);
|
||||||
static void treset(void);
|
static void treset(void);
|
||||||
static void tscrollup(int, int);
|
static void tscrollup(int, int, int);
|
||||||
static void tscrolldown(int, int);
|
static void tscrolldown(int, int, int);
|
||||||
static void tsetattr(const int *, int);
|
static void tsetattr(const int *, int);
|
||||||
static void tsetchar(Rune, const Glyph *, int, int);
|
static void tsetchar(Rune, const Glyph *, int, int);
|
||||||
static void tsetdirt(int, int);
|
static void tsetdirt(int, int);
|
||||||
|
|
@ -409,10 +418,10 @@ tlinelen(int y)
|
||||||
{
|
{
|
||||||
int i = term.col;
|
int i = term.col;
|
||||||
|
|
||||||
if (term.line[y][i - 1].mode & ATTR_WRAP)
|
if (TLINE(y)[i - 1].mode & ATTR_WRAP)
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
while (i > 0 && term.line[y][i - 1].u == ' ')
|
while (i > 0 && TLINE(y)[i - 1].u == ' ')
|
||||||
--i;
|
--i;
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
|
|
@ -521,7 +530,7 @@ selsnap(int *x, int *y, int direction)
|
||||||
* Snap around if the word wraps around at the end or
|
* Snap around if the word wraps around at the end or
|
||||||
* beginning of a line.
|
* beginning of a line.
|
||||||
*/
|
*/
|
||||||
prevgp = &term.line[*y][*x];
|
prevgp = &TLINE(*y)[*x];
|
||||||
prevdelim = ISDELIM(prevgp->u);
|
prevdelim = ISDELIM(prevgp->u);
|
||||||
for (;;) {
|
for (;;) {
|
||||||
newx = *x + direction;
|
newx = *x + direction;
|
||||||
|
|
@ -536,14 +545,14 @@ selsnap(int *x, int *y, int direction)
|
||||||
yt = *y, xt = *x;
|
yt = *y, xt = *x;
|
||||||
else
|
else
|
||||||
yt = newy, xt = newx;
|
yt = newy, xt = newx;
|
||||||
if (!(term.line[yt][xt].mode & ATTR_WRAP))
|
if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newx >= tlinelen(newy))
|
if (newx >= tlinelen(newy))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
gp = &term.line[newy][newx];
|
gp = &TLINE(newy)[newx];
|
||||||
delim = ISDELIM(gp->u);
|
delim = ISDELIM(gp->u);
|
||||||
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
|
||||||
|| (delim && gp->u != prevgp->u)))
|
|| (delim && gp->u != prevgp->u)))
|
||||||
|
|
@ -564,14 +573,14 @@ selsnap(int *x, int *y, int direction)
|
||||||
*x = (direction < 0) ? 0 : term.col - 1;
|
*x = (direction < 0) ? 0 : term.col - 1;
|
||||||
if (direction < 0) {
|
if (direction < 0) {
|
||||||
for (; *y > 0; *y += direction) {
|
for (; *y > 0; *y += direction) {
|
||||||
if (!(term.line[*y-1][term.col-1].mode
|
if (!(TLINE(*y-1)[term.col-1].mode
|
||||||
& ATTR_WRAP)) {
|
& ATTR_WRAP)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (direction > 0) {
|
} else if (direction > 0) {
|
||||||
for (; *y < term.row-1; *y += direction) {
|
for (; *y < term.row-1; *y += direction) {
|
||||||
if (!(term.line[*y][term.col-1].mode
|
if (!(TLINE(*y)[term.col-1].mode
|
||||||
& ATTR_WRAP)) {
|
& ATTR_WRAP)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -602,13 +611,13 @@ getsel(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sel.type == SEL_RECTANGULAR) {
|
if (sel.type == SEL_RECTANGULAR) {
|
||||||
gp = &term.line[y][sel.nb.x];
|
gp = &TLINE(y)[sel.nb.x];
|
||||||
lastx = sel.ne.x;
|
lastx = sel.ne.x;
|
||||||
} else {
|
} 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;
|
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 == ' ')
|
while (last >= gp && last->u == ' ')
|
||||||
--last;
|
--last;
|
||||||
|
|
||||||
|
|
@ -844,6 +853,9 @@ void
|
||||||
ttywrite(const char *s, size_t n, int may_echo)
|
ttywrite(const char *s, size_t n, int may_echo)
|
||||||
{
|
{
|
||||||
const char *next;
|
const char *next;
|
||||||
|
Arg arg = (Arg) { .i = term.scr };
|
||||||
|
|
||||||
|
kscrolldown(&arg);
|
||||||
|
|
||||||
if (may_echo && IS_SET(MODE_ECHO))
|
if (may_echo && IS_SET(MODE_ECHO))
|
||||||
twrite(s, n, 1);
|
twrite(s, n, 1);
|
||||||
|
|
@ -1055,13 +1067,53 @@ tswapscreen(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
int i;
|
||||||
Line temp;
|
Line temp;
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
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);
|
tsetdirt(orig, term.bot-n);
|
||||||
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
tclearregion(0, term.bot-n+1, term.col-1, term.bot);
|
||||||
|
|
||||||
|
|
@ -1071,17 +1123,28 @@ tscrolldown(int orig, int n)
|
||||||
term.line[i-n] = temp;
|
term.line[i-n] = temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (term.scr == 0)
|
||||||
selscroll(orig, n);
|
selscroll(orig, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tscrollup(int orig, int n)
|
tscrollup(int orig, int n, int copyhist)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
Line temp;
|
Line temp;
|
||||||
|
|
||||||
LIMIT(n, 0, term.bot-orig+1);
|
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);
|
tclearregion(0, orig, term.col-1, orig+n-1);
|
||||||
tsetdirt(orig+n, term.bot);
|
tsetdirt(orig+n, term.bot);
|
||||||
|
|
||||||
|
|
@ -1091,6 +1154,7 @@ tscrollup(int orig, int n)
|
||||||
term.line[i+n] = temp;
|
term.line[i+n] = temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (term.scr == 0)
|
||||||
selscroll(orig, -n);
|
selscroll(orig, -n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1120,7 +1184,7 @@ tnewline(int first_col)
|
||||||
int y = term.c.y;
|
int y = term.c.y;
|
||||||
|
|
||||||
if (y == term.bot) {
|
if (y == term.bot) {
|
||||||
tscrollup(term.top, 1);
|
tscrollup(term.top, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
y++;
|
y++;
|
||||||
}
|
}
|
||||||
|
|
@ -1288,14 +1352,14 @@ void
|
||||||
tinsertblankline(int n)
|
tinsertblankline(int n)
|
||||||
{
|
{
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||||
tscrolldown(term.c.y, n);
|
tscrolldown(term.c.y, n, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tdeleteline(int n)
|
tdeleteline(int n)
|
||||||
{
|
{
|
||||||
if (BETWEEN(term.c.y, term.top, term.bot))
|
if (BETWEEN(term.c.y, term.top, term.bot))
|
||||||
tscrollup(term.c.y, n);
|
tscrollup(term.c.y, n, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t
|
int32_t
|
||||||
|
|
@ -1733,11 +1797,11 @@ csihandle(void)
|
||||||
case 'S': /* SU -- Scroll <n> line up */
|
case 'S': /* SU -- Scroll <n> line up */
|
||||||
if (csiescseq.priv) break;
|
if (csiescseq.priv) break;
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
DEFAULT(csiescseq.arg[0], 1);
|
||||||
tscrollup(term.top, csiescseq.arg[0]);
|
tscrollup(term.top, csiescseq.arg[0], 0);
|
||||||
break;
|
break;
|
||||||
case 'T': /* SD -- Scroll <n> line down */
|
case 'T': /* SD -- Scroll <n> line down */
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
DEFAULT(csiescseq.arg[0], 1);
|
||||||
tscrolldown(term.top, csiescseq.arg[0]);
|
tscrolldown(term.top, csiescseq.arg[0], 0);
|
||||||
break;
|
break;
|
||||||
case 'L': /* IL -- Insert <n> blank lines */
|
case 'L': /* IL -- Insert <n> blank lines */
|
||||||
DEFAULT(csiescseq.arg[0], 1);
|
DEFAULT(csiescseq.arg[0], 1);
|
||||||
|
|
@ -2309,7 +2373,7 @@ eschandle(uchar ascii)
|
||||||
return 0;
|
return 0;
|
||||||
case 'D': /* IND -- Linefeed */
|
case 'D': /* IND -- Linefeed */
|
||||||
if (term.c.y == term.bot) {
|
if (term.c.y == term.bot) {
|
||||||
tscrollup(term.top, 1);
|
tscrollup(term.top, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
tmoveto(term.c.x, term.c.y+1);
|
tmoveto(term.c.x, term.c.y+1);
|
||||||
}
|
}
|
||||||
|
|
@ -2322,7 +2386,7 @@ eschandle(uchar ascii)
|
||||||
break;
|
break;
|
||||||
case 'M': /* RI -- Reverse index */
|
case 'M': /* RI -- Reverse index */
|
||||||
if (term.c.y == term.top) {
|
if (term.c.y == term.top) {
|
||||||
tscrolldown(term.top, 1);
|
tscrolldown(term.top, 1, 1);
|
||||||
} else {
|
} else {
|
||||||
tmoveto(term.c.x, term.c.y-1);
|
tmoveto(term.c.x, term.c.y-1);
|
||||||
}
|
}
|
||||||
|
|
@ -2545,12 +2609,15 @@ twrite(const char *buf, int buflen, int show_ctrl)
|
||||||
void
|
void
|
||||||
tresize(int col, int row)
|
tresize(int col, int row)
|
||||||
{
|
{
|
||||||
int i;
|
int i, j;
|
||||||
int minrow = MIN(row, term.row);
|
int minrow = MIN(row, term.row);
|
||||||
int mincol = MIN(col, term.col);
|
int mincol = MIN(col, term.col);
|
||||||
int *bp;
|
int *bp;
|
||||||
TCursor c;
|
TCursor c;
|
||||||
|
|
||||||
|
if ( row < term.row || col < term.col )
|
||||||
|
toggle_winmode(trt_kbdselect(XK_Escape, NULL, 0));
|
||||||
|
|
||||||
if (col < 1 || row < 1) {
|
if (col < 1 || row < 1) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"tresize: error resizing to %dx%d\n", col, row);
|
"tresize: error resizing to %dx%d\n", col, row);
|
||||||
|
|
@ -2582,6 +2649,14 @@ tresize(int col, int row)
|
||||||
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
|
||||||
term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
|
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 */
|
/* resize each row to new width, zero-pad if needed */
|
||||||
for (i = 0; i < minrow; i++) {
|
for (i = 0; i < minrow; i++) {
|
||||||
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
|
||||||
|
|
@ -2640,7 +2715,7 @@ drawregion(int x1, int y1, int x2, int y2)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
term.dirty[y] = 0;
|
term.dirty[y] = 0;
|
||||||
xdrawline(term.line[y], x1, y, x2);
|
xdrawline(TLINE(y), x1, y, x2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2661,6 +2736,7 @@ draw(void)
|
||||||
cx--;
|
cx--;
|
||||||
|
|
||||||
drawregion(0, 0, term.col, term.row);
|
drawregion(0, 0, term.col, term.row);
|
||||||
|
if (term.scr == 0)
|
||||||
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
|
||||||
term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||||
term.ocx = cx;
|
term.ocx = cx;
|
||||||
|
|
@ -2676,3 +2752,220 @@ redraw(void)
|
||||||
tfulldirt();
|
tfulldirt();
|
||||||
draw();
|
draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void set_notifmode(int type, KeySym ksym) {
|
||||||
|
static char *lib[] = { " MOVE ", " SEL "};
|
||||||
|
static Glyph *g, *deb, *fin;
|
||||||
|
static int col, bot;
|
||||||
|
|
||||||
|
if ( ksym == -1 ) {
|
||||||
|
free(g);
|
||||||
|
col = term.col, bot = term.bot;
|
||||||
|
g = xmalloc(col * sizeof(Glyph));
|
||||||
|
memcpy(g, term.line[bot], col * sizeof(Glyph));
|
||||||
|
|
||||||
|
}
|
||||||
|
else if ( ksym == -2 )
|
||||||
|
memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
|
||||||
|
if ( type < 2 ) {
|
||||||
|
char *z = lib[type];
|
||||||
|
for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
|
||||||
|
deb->mode = ATTR_REVERSE,
|
||||||
|
deb->u = *z,
|
||||||
|
deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
}
|
||||||
|
else if ( type < 5 )
|
||||||
|
memcpy(term.line[bot], g, col * sizeof(Glyph));
|
||||||
|
else {
|
||||||
|
for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++)
|
||||||
|
deb->mode = ATTR_REVERSE,
|
||||||
|
deb->u = ' ',
|
||||||
|
deb->fg = defaultfg, deb->bg = defaultbg;
|
||||||
|
term.line[bot][0].u = ksym;
|
||||||
|
}
|
||||||
|
|
||||||
|
term.dirty[bot] = 1;
|
||||||
|
drawregion(0, bot, col, bot + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void select_or_drawcursor(int selectsearch_mode, int type) {
|
||||||
|
int done = 0;
|
||||||
|
|
||||||
|
if ( selectsearch_mode & 1 ) {
|
||||||
|
selextend(term.c.x, term.c.y, type, done);
|
||||||
|
xsetsel(getsel());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
|
||||||
|
term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
|
||||||
|
}
|
||||||
|
|
||||||
|
void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu) {
|
||||||
|
Rune *r;
|
||||||
|
int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr;
|
||||||
|
|
||||||
|
for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) {
|
||||||
|
for (r = target; r - target < ptarget; r++) {
|
||||||
|
if ( *r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u ) {
|
||||||
|
if ( r - target == ptarget - 1 ) break;
|
||||||
|
} else {
|
||||||
|
r = NULL;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ( r != NULL ) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( i != bound ) {
|
||||||
|
term.c.y = i / term.col, term.c.x = i % term.col;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int trt_kbdselect(KeySym ksym, char *buf, int len) {
|
||||||
|
static TCursor cu;
|
||||||
|
static Rune target[64];
|
||||||
|
static int type = 1, ptarget, in_use;
|
||||||
|
static int sens, quant;
|
||||||
|
static char selectsearch_mode;
|
||||||
|
int i, bound, *xy;
|
||||||
|
|
||||||
|
|
||||||
|
if ( selectsearch_mode & 2 ) {
|
||||||
|
if ( ksym == XK_Return ) {
|
||||||
|
selectsearch_mode ^= 2;
|
||||||
|
set_notifmode(selectsearch_mode, -2);
|
||||||
|
if ( ksym == XK_Escape ) ptarget = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ksym == XK_BackSpace ) {
|
||||||
|
if ( !ptarget ) return 0;
|
||||||
|
term.line[term.bot][ptarget--].u = ' ';
|
||||||
|
}
|
||||||
|
else if ( len < 1 ) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ptarget == term.col || ksym == XK_Escape ) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
utf8decode(buf, &target[ptarget++], len);
|
||||||
|
term.line[term.bot][ptarget].u = target[ptarget - 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( ksym != XK_BackSpace )
|
||||||
|
search(selectsearch_mode, &target[0], ptarget, sens, type, &cu);
|
||||||
|
|
||||||
|
term.dirty[term.bot] = 1;
|
||||||
|
drawregion(0, term.bot, term.col, term.bot + 1);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch ( ksym ) {
|
||||||
|
case -1 :
|
||||||
|
in_use = 1;
|
||||||
|
cu.x = term.c.x, cu.y = term.c.y;
|
||||||
|
set_notifmode(0, ksym);
|
||||||
|
return MODE_KBDSELECT;
|
||||||
|
case XK_s :
|
||||||
|
if ( selectsearch_mode & 1 )
|
||||||
|
selclear();
|
||||||
|
else
|
||||||
|
selstart(term.c.x, term.c.y, 0);
|
||||||
|
set_notifmode(selectsearch_mode ^= 1, ksym);
|
||||||
|
break;
|
||||||
|
case XK_t :
|
||||||
|
selextend(term.c.x, term.c.y, type ^= 3, i = 0); /* 2 fois */
|
||||||
|
selextend(term.c.x, term.c.y, type, i = 0);
|
||||||
|
break;
|
||||||
|
case XK_slash :
|
||||||
|
case XK_KP_Divide :
|
||||||
|
case XK_question :
|
||||||
|
ksym &= XK_question; /* Divide to slash */
|
||||||
|
sens = (ksym == XK_slash) ? -1 : 1;
|
||||||
|
ptarget = 0;
|
||||||
|
set_notifmode(15, ksym);
|
||||||
|
selectsearch_mode ^= 2;
|
||||||
|
break;
|
||||||
|
case XK_Escape :
|
||||||
|
if ( !in_use ) break;
|
||||||
|
selclear();
|
||||||
|
case XK_Return :
|
||||||
|
set_notifmode(4, ksym);
|
||||||
|
term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
select_or_drawcursor(selectsearch_mode = 0, type);
|
||||||
|
in_use = quant = 0;
|
||||||
|
return MODE_KBDSELECT;
|
||||||
|
case XK_n :
|
||||||
|
case XK_N :
|
||||||
|
if ( ptarget )
|
||||||
|
search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu);
|
||||||
|
break;
|
||||||
|
case XK_BackSpace :
|
||||||
|
term.c.x = 0;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_dollar :
|
||||||
|
term.c.x = term.col - 1;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_Home :
|
||||||
|
term.c.x = 0, term.c.y = 0;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_End :
|
||||||
|
term.c.x = cu.x, term.c.y = cu.y;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_Page_Up :
|
||||||
|
case XK_Page_Down :
|
||||||
|
term.c.y = (ksym == XK_Prior ) ? 0 : cu.y;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_exclam :
|
||||||
|
term.c.x = term.col >> 1;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
case XK_asterisk :
|
||||||
|
case XK_KP_Multiply :
|
||||||
|
term.c.x = term.col >> 1;
|
||||||
|
case XK_underscore :
|
||||||
|
term.c.y = cu.y >> 1;
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
break;
|
||||||
|
default :
|
||||||
|
if ( ksym >= XK_0 && ksym <= XK_9 ) { /* 0-9 keyboard */
|
||||||
|
quant = (quant * 10) + (ksym ^ XK_0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ksym >= XK_KP_0 && ksym <= XK_KP_9 ) { /* 0-9 numpad */
|
||||||
|
quant = (quant * 10) + (ksym ^ XK_KP_0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if ( ksym == XK_k || ksym == XK_h )
|
||||||
|
i = ksym & 1;
|
||||||
|
else if ( ksym == XK_l || ksym == XK_j )
|
||||||
|
i = ((ksym & 6) | 4) >> 1;
|
||||||
|
else if ( (XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3 )
|
||||||
|
break;
|
||||||
|
|
||||||
|
xy = (i & 1) ? &term.c.y : &term.c.x;
|
||||||
|
sens = (i & 2) ? 1 : -1;
|
||||||
|
bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot;
|
||||||
|
|
||||||
|
if ( quant == 0 )
|
||||||
|
quant++;
|
||||||
|
|
||||||
|
if ( *xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0)) )
|
||||||
|
break;
|
||||||
|
|
||||||
|
*xy += quant * sens;
|
||||||
|
if ( *xy < 0 || ( bound > 0 && *xy > bound) )
|
||||||
|
*xy = bound;
|
||||||
|
|
||||||
|
select_or_drawcursor(selectsearch_mode, type);
|
||||||
|
}
|
||||||
|
quant = 0;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
|
||||||
3
st.h
3
st.h
|
|
@ -81,6 +81,8 @@ void die(const char *, ...);
|
||||||
void redraw(void);
|
void redraw(void);
|
||||||
void draw(void);
|
void draw(void);
|
||||||
|
|
||||||
|
void kscrolldown(const Arg *);
|
||||||
|
void kscrollup(const Arg *);
|
||||||
void printscreen(const Arg *);
|
void printscreen(const Arg *);
|
||||||
void printsel(const Arg *);
|
void printsel(const Arg *);
|
||||||
void sendbreak(const Arg *);
|
void sendbreak(const Arg *);
|
||||||
|
|
@ -110,6 +112,7 @@ size_t utf8encode(Rune, char *);
|
||||||
void *xmalloc(size_t);
|
void *xmalloc(size_t);
|
||||||
void *xrealloc(void *, size_t);
|
void *xrealloc(void *, size_t);
|
||||||
char *xstrdup(const char *);
|
char *xstrdup(const char *);
|
||||||
|
int trt_kbdselect(KeySym, char *, int);
|
||||||
|
|
||||||
/* config.h globals */
|
/* config.h globals */
|
||||||
extern char *utmp;
|
extern char *utmp;
|
||||||
|
|
|
||||||
3
win.h
3
win.h
|
|
@ -21,6 +21,7 @@ enum win_mode {
|
||||||
MODE_NUMLOCK = 1 << 17,
|
MODE_NUMLOCK = 1 << 17,
|
||||||
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
|
||||||
|MODE_MOUSEMANY,
|
|MODE_MOUSEMANY,
|
||||||
|
MODE_KBDSELECT = 1 << 18,
|
||||||
};
|
};
|
||||||
|
|
||||||
void xbell(void);
|
void xbell(void);
|
||||||
|
|
@ -38,4 +39,6 @@ void xsetmode(int, unsigned int);
|
||||||
void xsetpointermotion(int);
|
void xsetpointermotion(int);
|
||||||
void xsetsel(char *);
|
void xsetsel(char *);
|
||||||
int xstartdraw(void);
|
int xstartdraw(void);
|
||||||
|
void toggle_winmode(int);
|
||||||
|
void keyboard_select(const Arg *);
|
||||||
void xximspot(int, int);
|
void xximspot(int, int);
|
||||||
|
|
|
||||||
60
x.c
60
x.c
|
|
@ -105,6 +105,7 @@ typedef struct {
|
||||||
XSetWindowAttributes attrs;
|
XSetWindowAttributes attrs;
|
||||||
int scr;
|
int scr;
|
||||||
int isfixed; /* is fixed geometry? */
|
int isfixed; /* is fixed geometry? */
|
||||||
|
int depth; /* bit depth */
|
||||||
int l, t; /* left and top offset */
|
int l, t; /* left and top offset */
|
||||||
int gm; /* geometry mask */
|
int gm; /* geometry mask */
|
||||||
} XWindow;
|
} XWindow;
|
||||||
|
|
@ -273,6 +274,7 @@ void
|
||||||
clippaste(const Arg *dummy)
|
clippaste(const Arg *dummy)
|
||||||
{
|
{
|
||||||
Atom clipboard;
|
Atom clipboard;
|
||||||
|
printf("test");
|
||||||
|
|
||||||
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
|
clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
|
||||||
XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
|
XConvertSelection(xw.dpy, clipboard, xsel.xtarget, clipboard,
|
||||||
|
|
@ -752,7 +754,7 @@ xresize(int col, int row)
|
||||||
|
|
||||||
XFreePixmap(xw.dpy, xw.buf);
|
XFreePixmap(xw.dpy, xw.buf);
|
||||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||||
DefaultDepth(xw.dpy, xw.scr));
|
xw.depth);
|
||||||
XftDrawChange(xw.draw, xw.buf);
|
XftDrawChange(xw.draw, xw.buf);
|
||||||
xclear(0, 0, win.w, win.h);
|
xclear(0, 0, win.w, win.h);
|
||||||
|
|
||||||
|
|
@ -812,6 +814,10 @@ xloadcols(void)
|
||||||
else
|
else
|
||||||
die("could not allocate color %d\n", i);
|
die("could not allocate color %d\n", i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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;
|
loaded = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -842,6 +848,12 @@ xsetcolorname(int x, const char *name)
|
||||||
XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
|
XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
|
||||||
dc.col[x] = ncolor;
|
dc.col[x] = ncolor;
|
||||||
|
|
||||||
|
if (x == defaultbg) {
|
||||||
|
dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
|
||||||
|
dc.col[defaultbg].pixel &= 0x00FFFFFF;
|
||||||
|
dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1134,11 +1146,23 @@ xinit(int cols, int rows)
|
||||||
Window parent;
|
Window parent;
|
||||||
pid_t thispid = getpid();
|
pid_t thispid = getpid();
|
||||||
XColor xmousefg, xmousebg;
|
XColor xmousefg, xmousebg;
|
||||||
|
XWindowAttributes attr;
|
||||||
|
XVisualInfo vis;
|
||||||
|
|
||||||
if (!(xw.dpy = XOpenDisplay(NULL)))
|
if (!(xw.dpy = XOpenDisplay(NULL)))
|
||||||
die("can't open display\n");
|
die("can't open display\n");
|
||||||
xw.scr = XDefaultScreen(xw.dpy);
|
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 */
|
/* font */
|
||||||
if (!FcInit())
|
if (!FcInit())
|
||||||
|
|
@ -1148,7 +1172,7 @@ xinit(int cols, int rows)
|
||||||
xloadfonts(usedfont, 0);
|
xloadfonts(usedfont, 0);
|
||||||
|
|
||||||
/* colors */
|
/* colors */
|
||||||
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
|
||||||
xloadcols();
|
xloadcols();
|
||||||
|
|
||||||
/* adjust fixed window geometry */
|
/* adjust fixed window geometry */
|
||||||
|
|
@ -1168,19 +1192,15 @@ xinit(int cols, int rows)
|
||||||
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
||||||
xw.attrs.colormap = xw.cmap;
|
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,
|
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
|
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
||||||
| CWEventMask | CWColormap, &xw.attrs);
|
| CWEventMask | CWColormap, &xw.attrs);
|
||||||
|
|
||||||
memset(&gcvalues, 0, sizeof(gcvalues));
|
memset(&gcvalues, 0, sizeof(gcvalues));
|
||||||
gcvalues.graphics_exposures = False;
|
gcvalues.graphics_exposures = False;
|
||||||
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
|
||||||
&gcvalues);
|
dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
|
||||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
|
||||||
DefaultDepth(xw.dpy, xw.scr));
|
|
||||||
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
|
||||||
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
|
||||||
|
|
||||||
|
|
@ -1856,6 +1876,14 @@ kpress(XEvent *ev)
|
||||||
} else {
|
} else {
|
||||||
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
|
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( IS_SET(MODE_KBDSELECT) ) {
|
||||||
|
if ( match(XK_NO_MOD, e->state) ||
|
||||||
|
(XK_Shift_L | XK_Shift_R) & e->state )
|
||||||
|
win.mode ^= trt_kbdselect(ksym, buf, len);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* 1. shortcuts */
|
/* 1. shortcuts */
|
||||||
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
||||||
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
||||||
|
|
@ -2033,6 +2061,14 @@ usage(void)
|
||||||
" [stty_args ...]\n", argv0, argv0);
|
" [stty_args ...]\n", argv0, argv0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void toggle_winmode(int flag) {
|
||||||
|
win.mode ^= flag;
|
||||||
|
}
|
||||||
|
|
||||||
|
void keyboard_select(const Arg *dummy) {
|
||||||
|
win.mode ^= trt_kbdselect(-1, NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
|
@ -2044,6 +2080,10 @@ main(int argc, char *argv[])
|
||||||
case 'a':
|
case 'a':
|
||||||
allowaltscreen = 0;
|
allowaltscreen = 0;
|
||||||
break;
|
break;
|
||||||
|
case 'A':
|
||||||
|
alpha = strtof(EARGF(usage()), NULL);
|
||||||
|
LIMIT(alpha, 0.0, 1.0);
|
||||||
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
opt_class = EARGF(usage());
|
opt_class = EARGF(usage());
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue