Add files via upload
This commit is contained in:
Madeleine
GitHub
parent
9e721252b4
commit
254af1b3e0
17
LEGACY
Normal file
17
LEGACY
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
A STATEMENT ON LEGACY SUPPORT
|
||||||
|
|
||||||
|
In the terminal world there is much cruft that comes from old and unsup‐
|
||||||
|
ported terminals that inherit incompatible modes and escape sequences
|
||||||
|
which noone is able to know, except when he/she comes from that time and
|
||||||
|
developed a graphical vt100 emulator at that time.
|
||||||
|
|
||||||
|
One goal of st is to only support what is really needed. When you en‐
|
||||||
|
counter a sequence which you really need, implement it. But while you
|
||||||
|
are at it, do not add the other cruft you might encounter while sneek‐
|
||||||
|
ing at other terminal emulators. History has bloated them and there is
|
||||||
|
no real evidence that most of the sequences are used today.
|
||||||
|
|
||||||
|
|
||||||
|
Christoph Lohmann <20h@r-36.net>
|
||||||
|
2012-09-13T07:00:36.081271045+02:00
|
||||||
|
|
||||||
2
LICENSE
2
LICENSE
@ -1,6 +1,6 @@
|
|||||||
MIT/X Consortium License
|
MIT/X Consortium License
|
||||||
|
|
||||||
© 2014-2020 Hiltjo Posthuma <hiltjo at codemadness dot org>
|
© 2014-2022 Hiltjo Posthuma <hiltjo at codemadness dot org>
|
||||||
© 2018 Devin J. Pohly <djpohly at gmail dot com>
|
© 2018 Devin J. Pohly <djpohly at gmail dot com>
|
||||||
© 2014-2017 Quentin Rameau <quinq at fifth dot space>
|
© 2014-2017 Quentin Rameau <quinq at fifth dot space>
|
||||||
© 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
|
© 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
|
||||||
|
|||||||
15
Makefile
15
Makefile
@ -15,6 +15,9 @@ options:
|
|||||||
@echo "LDFLAGS = $(STLDFLAGS)"
|
@echo "LDFLAGS = $(STLDFLAGS)"
|
||||||
@echo "CC = $(CC)"
|
@echo "CC = $(CC)"
|
||||||
|
|
||||||
|
config.h:
|
||||||
|
cp config.def.h config.h
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) $(STCFLAGS) -c $<
|
$(CC) $(STCFLAGS) -c $<
|
||||||
|
|
||||||
@ -29,26 +32,20 @@ st: $(OBJ)
|
|||||||
$(CC) -o $@ $(OBJ) $(STLDFLAGS)
|
$(CC) -o $@ $(OBJ) $(STLDFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f st $(OBJ) st-$(VERSION).tar.gz *.rej *.orig *.o
|
rm -f st $(OBJ) st-$(VERSION).tar.gz
|
||||||
|
|
||||||
dist: clean
|
dist: clean
|
||||||
mkdir -p st-$(VERSION)
|
mkdir -p st-$(VERSION)
|
||||||
cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
|
cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
|
||||||
config.h st.info st.1 arg.h st.h win.h $(SRC)\
|
config.def.h st.info st.1 arg.h st.h win.h $(SRC)\
|
||||||
st-$(VERSION)
|
st-$(VERSION)
|
||||||
tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
|
tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
|
||||||
rm -rf st-$(VERSION)
|
rm -rf st-$(VERSION)
|
||||||
|
|
||||||
install: st
|
install: st
|
||||||
git submodule init
|
|
||||||
git submodule update
|
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
mkdir -p $(DESTDIR)$(PREFIX)/bin
|
||||||
cp -f st $(DESTDIR)$(PREFIX)/bin
|
cp -f st $(DESTDIR)$(PREFIX)/bin
|
||||||
cp -f st-copyout $(DESTDIR)$(PREFIX)/bin
|
|
||||||
cp -f st-urlhandler $(DESTDIR)$(PREFIX)/bin
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/st
|
chmod 755 $(DESTDIR)$(PREFIX)/bin/st
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/st-copyout
|
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/st-urlhandler
|
|
||||||
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
||||||
sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
|
sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
|
||||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
|
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
|
||||||
@ -57,8 +54,6 @@ install: st
|
|||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/st
|
rm -f $(DESTDIR)$(PREFIX)/bin/st
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/st-copyout
|
|
||||||
rm -f $(DESTDIR)$(PREFIX)/bin/st-urlhandler
|
|
||||||
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
||||||
|
|
||||||
.PHONY: all options clean dist install uninstall
|
.PHONY: all options clean dist install uninstall
|
||||||
|
|||||||
34
README
Normal file
34
README
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
st - simple terminal
|
||||||
|
--------------------
|
||||||
|
st is a simple terminal emulator for X which sucks less.
|
||||||
|
|
||||||
|
|
||||||
|
Requirements
|
||||||
|
------------
|
||||||
|
In order to build st you need the Xlib header files.
|
||||||
|
|
||||||
|
|
||||||
|
Installation
|
||||||
|
------------
|
||||||
|
Edit config.mk to match your local setup (st is installed into
|
||||||
|
the /usr/local namespace by default).
|
||||||
|
|
||||||
|
Afterwards enter the following command to build and install st (if
|
||||||
|
necessary as root):
|
||||||
|
|
||||||
|
make clean install
|
||||||
|
|
||||||
|
|
||||||
|
Running st
|
||||||
|
----------
|
||||||
|
If you did not install st with make clean install, you must compile
|
||||||
|
the st terminfo entry with the following command:
|
||||||
|
|
||||||
|
tic -sx st.info
|
||||||
|
|
||||||
|
See the man page for additional details.
|
||||||
|
|
||||||
|
Credits
|
||||||
|
-------
|
||||||
|
Based on Aurélien APTEL <aurelien dot aptel at gmail dot com> bt source code.
|
||||||
|
|
||||||
496
config.def.h
Normal file
496
config.def.h
Normal file
@ -0,0 +1,496 @@
|
|||||||
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* appearance
|
||||||
|
*
|
||||||
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
|
*/
|
||||||
|
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
||||||
|
/* Spare fonts */
|
||||||
|
static char *font2[] = {
|
||||||
|
/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
|
||||||
|
/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
|
||||||
|
};
|
||||||
|
|
||||||
|
static int borderpx = 2;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* What program is execed by st depends of these precedence rules:
|
||||||
|
* 1: program passed with -e
|
||||||
|
* 2: scroll and/or utmp
|
||||||
|
* 3: SHELL environment variable
|
||||||
|
* 4: value of shell in /etc/passwd
|
||||||
|
* 5: value of shell in config.h
|
||||||
|
*/
|
||||||
|
static char *shell = "/bin/sh";
|
||||||
|
char *utmp = NULL;
|
||||||
|
/* scroll program: to enable use a string like "scroll" */
|
||||||
|
char *scroll = NULL;
|
||||||
|
char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
|
||||||
|
|
||||||
|
/* identification sequence returned in DA and DECID */
|
||||||
|
char *vtiden = "\033[?6c";
|
||||||
|
|
||||||
|
/* Kerning / character bounding-box multipliers */
|
||||||
|
static float cwscale = 1.0;
|
||||||
|
static float chscale = 1.0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* word delimiter string
|
||||||
|
*
|
||||||
|
* More advanced example: L" `'\"()[]{}"
|
||||||
|
*/
|
||||||
|
wchar_t *worddelimiters = L" ";
|
||||||
|
|
||||||
|
/* selection timeouts (in milliseconds) */
|
||||||
|
static unsigned int doubleclicktimeout = 300;
|
||||||
|
static unsigned int tripleclicktimeout = 600;
|
||||||
|
|
||||||
|
/* alt screens */
|
||||||
|
int allowaltscreen = 1;
|
||||||
|
|
||||||
|
/* allow certain non-interactive (insecure) window operations such as:
|
||||||
|
setting the clipboard text */
|
||||||
|
int allowwindowops = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* draw latency range in ms - from new content/keypress/etc until drawing.
|
||||||
|
* within this range, st draws when content stops arriving (idle). mostly it's
|
||||||
|
* near minlatency, but it waits longer for slow updates to avoid partial draw.
|
||||||
|
* low minlatency will tear/flicker more, as it can "detect" idle too early.
|
||||||
|
*/
|
||||||
|
static double minlatency = 8;
|
||||||
|
static double maxlatency = 33;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
|
||||||
|
* attribute.
|
||||||
|
*/
|
||||||
|
static unsigned int blinktimeout = 800;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* thickness of underline and bar cursors
|
||||||
|
*/
|
||||||
|
static unsigned int cursorthickness = 2;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 1: render most of the lines/blocks characters without using the font for
|
||||||
|
* perfect alignment between cells (U2500 - U259F except dashes/diagonals).
|
||||||
|
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
||||||
|
* 0: disable (render all U25XX glyphs normally from the font).
|
||||||
|
*/
|
||||||
|
const int boxdraw = 0;
|
||||||
|
const int boxdraw_bold = 0;
|
||||||
|
|
||||||
|
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||||
|
const int boxdraw_braille = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
||||||
|
* it
|
||||||
|
*/
|
||||||
|
static int bellvolume = 0;
|
||||||
|
|
||||||
|
/* default TERM value */
|
||||||
|
char *termname = "st-256color";
|
||||||
|
|
||||||
|
/*
|
||||||
|
* spaces per tab
|
||||||
|
*
|
||||||
|
* When you are changing this value, don't forget to adapt the »it« value in
|
||||||
|
* the st.info and appropriately install the st.info in the environment where
|
||||||
|
* you use this st version.
|
||||||
|
*
|
||||||
|
* it#$tabspaces,
|
||||||
|
*
|
||||||
|
* Secondly make sure your kernel is not expanding tabs. When running `stty
|
||||||
|
* -a` »tab0« should appear. You can tell the terminal to not expand tabs by
|
||||||
|
* running following command:
|
||||||
|
*
|
||||||
|
* stty tabs
|
||||||
|
*/
|
||||||
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
|
static const char *colorname[] = {
|
||||||
|
/* 8 normal colors */
|
||||||
|
"black",
|
||||||
|
"red3",
|
||||||
|
"green3",
|
||||||
|
"yellow3",
|
||||||
|
"blue2",
|
||||||
|
"magenta3",
|
||||||
|
"cyan3",
|
||||||
|
"gray90",
|
||||||
|
|
||||||
|
/* 8 bright colors */
|
||||||
|
"gray50",
|
||||||
|
"red",
|
||||||
|
"green",
|
||||||
|
"yellow",
|
||||||
|
"#5c5cff",
|
||||||
|
"magenta",
|
||||||
|
"cyan",
|
||||||
|
"white",
|
||||||
|
|
||||||
|
[255] = 0,
|
||||||
|
|
||||||
|
/* more colors can be added after 255 to use with DefaultXX */
|
||||||
|
"#cccccc",
|
||||||
|
"#555555",
|
||||||
|
"gray90", /* default foreground colour */
|
||||||
|
"black", /* default background colour */
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default colors (colorname index)
|
||||||
|
* foreground, background, cursor, reverse cursor
|
||||||
|
*/
|
||||||
|
unsigned int defaultfg = 258;
|
||||||
|
unsigned int defaultbg = 259;
|
||||||
|
unsigned int defaultcs = 256;
|
||||||
|
static unsigned int defaultrcs = 257;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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 */
|
||||||
|
{ ShiftMask, Button4, kscrollup, {.i = 1} },
|
||||||
|
{ ShiftMask, Button5, kscrolldown, {.i = 1} },
|
||||||
|
{ 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} },
|
||||||
|
{ ShiftMask, XK_Page_Up, kscrollup, {.i = -1} },
|
||||||
|
{ ShiftMask, XK_Page_Down, kscrolldown, {.i = -1} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Special keys (change & recompile st.info accordingly)
|
||||||
|
*
|
||||||
|
* Mask value:
|
||||||
|
* * Use XK_ANY_MOD to match the key no matter modifiers state
|
||||||
|
* * Use XK_NO_MOD to match the key alone (no modifiers)
|
||||||
|
* appkey value:
|
||||||
|
* * 0: no value
|
||||||
|
* * > 0: keypad application mode enabled
|
||||||
|
* * = 2: term.numlock = 1
|
||||||
|
* * < 0: keypad application mode disabled
|
||||||
|
* appcursor value:
|
||||||
|
* * 0: no value
|
||||||
|
* * > 0: cursor application mode enabled
|
||||||
|
* * < 0: cursor application mode disabled
|
||||||
|
*
|
||||||
|
* Be careful with the order of the definitions because st searches in
|
||||||
|
* this table sequentially, so any XK_ANY_MOD must be in the last
|
||||||
|
* position for a key.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
|
||||||
|
* to be mapped below, add them to this array.
|
||||||
|
*/
|
||||||
|
static KeySym mappedkeys[] = { -1 };
|
||||||
|
|
||||||
|
/*
|
||||||
|
* State bits to ignore when matching key or button events. By default,
|
||||||
|
* numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
|
||||||
|
*/
|
||||||
|
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is the huge key array which defines all compatibility to the Linux
|
||||||
|
* world. Please decide about changes wisely.
|
||||||
|
*/
|
||||||
|
static Key key[] = {
|
||||||
|
/* keysym mask string appkey appcursor */
|
||||||
|
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
|
||||||
|
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||||
|
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||||
|
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
|
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
|
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
|
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
|
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
|
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||||
|
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||||
|
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
|
||||||
|
{ XK_KP_End, ControlMask, "\033[J", -1, 0},
|
||||||
|
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
|
||||||
|
{ XK_KP_End, ShiftMask, "\033[K", -1, 0},
|
||||||
|
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||||
|
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||||
|
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||||
|
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||||
|
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
|
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
|
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
|
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
|
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
|
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
|
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
|
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
|
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||||
|
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
|
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
|
||||||
|
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
|
||||||
|
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
|
||||||
|
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
|
||||||
|
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
|
||||||
|
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
|
||||||
|
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
|
||||||
|
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
|
||||||
|
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
|
||||||
|
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
|
||||||
|
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
|
||||||
|
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
|
||||||
|
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
|
||||||
|
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
|
||||||
|
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
|
||||||
|
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
|
||||||
|
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
|
||||||
|
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0},
|
||||||
|
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
|
||||||
|
{ XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0},
|
||||||
|
{ XK_Up, ControlMask, "\033[1;5A", 0, 0},
|
||||||
|
{ XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0},
|
||||||
|
{ XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0},
|
||||||
|
{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0},
|
||||||
|
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
|
||||||
|
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
|
||||||
|
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0},
|
||||||
|
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
|
||||||
|
{ XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0},
|
||||||
|
{ XK_Down, ControlMask, "\033[1;5B", 0, 0},
|
||||||
|
{ XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0},
|
||||||
|
{ XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0},
|
||||||
|
{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0},
|
||||||
|
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
|
||||||
|
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
|
||||||
|
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0},
|
||||||
|
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
|
||||||
|
{ XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0},
|
||||||
|
{ XK_Left, ControlMask, "\033[1;5D", 0, 0},
|
||||||
|
{ XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0},
|
||||||
|
{ XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0},
|
||||||
|
{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0},
|
||||||
|
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
|
||||||
|
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
|
||||||
|
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0},
|
||||||
|
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
|
||||||
|
{ XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0},
|
||||||
|
{ XK_Right, ControlMask, "\033[1;5C", 0, 0},
|
||||||
|
{ XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0},
|
||||||
|
{ XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0},
|
||||||
|
{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0},
|
||||||
|
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
|
||||||
|
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
|
||||||
|
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
|
||||||
|
{ XK_Return, Mod1Mask, "\033\r", 0, 0},
|
||||||
|
{ XK_Return, XK_ANY_MOD, "\r", 0, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[4l", -1, 0},
|
||||||
|
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
|
||||||
|
{ XK_Insert, ControlMask, "\033[L", -1, 0},
|
||||||
|
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0},
|
||||||
|
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
|
||||||
|
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
|
||||||
|
{ XK_Delete, ControlMask, "\033[M", -1, 0},
|
||||||
|
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0},
|
||||||
|
{ XK_Delete, ShiftMask, "\033[2K", -1, 0},
|
||||||
|
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
|
||||||
|
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
|
||||||
|
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
|
||||||
|
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
|
||||||
|
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
|
||||||
|
{ XK_Home, ShiftMask, "\033[2J", 0, -1},
|
||||||
|
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1},
|
||||||
|
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
|
||||||
|
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
|
||||||
|
{ XK_End, ControlMask, "\033[J", -1, 0},
|
||||||
|
{ XK_End, ControlMask, "\033[1;5F", +1, 0},
|
||||||
|
{ XK_End, ShiftMask, "\033[K", -1, 0},
|
||||||
|
{ XK_End, ShiftMask, "\033[1;2F", +1, 0},
|
||||||
|
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
|
||||||
|
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0},
|
||||||
|
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
|
||||||
|
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
|
||||||
|
{ XK_Next, ControlMask, "\033[6;5~", 0, 0},
|
||||||
|
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0},
|
||||||
|
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
|
||||||
|
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0},
|
||||||
|
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
|
||||||
|
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
|
||||||
|
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
|
||||||
|
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
|
||||||
|
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
|
||||||
|
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0},
|
||||||
|
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
|
||||||
|
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
|
||||||
|
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
|
||||||
|
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
|
||||||
|
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
|
||||||
|
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0},
|
||||||
|
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
|
||||||
|
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
|
||||||
|
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
|
||||||
|
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
|
||||||
|
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
|
||||||
|
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0},
|
||||||
|
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
|
||||||
|
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
|
||||||
|
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
|
||||||
|
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
|
||||||
|
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
|
||||||
|
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
|
||||||
|
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
|
||||||
|
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
|
||||||
|
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
|
||||||
|
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
|
||||||
|
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
|
||||||
|
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
|
||||||
|
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
|
||||||
|
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
|
||||||
|
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
|
||||||
|
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
|
||||||
|
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
|
||||||
|
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
|
||||||
|
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
|
||||||
|
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
|
||||||
|
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
|
||||||
|
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
|
||||||
|
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
|
||||||
|
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
|
||||||
|
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
|
||||||
|
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
|
||||||
|
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
|
||||||
|
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
|
||||||
|
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
|
||||||
|
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
|
||||||
|
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
|
||||||
|
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
|
||||||
|
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
|
||||||
|
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
|
||||||
|
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
|
||||||
|
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
|
||||||
|
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
|
||||||
|
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
|
||||||
|
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
|
||||||
|
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
|
||||||
|
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
|
||||||
|
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
|
||||||
|
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
|
||||||
|
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
|
||||||
|
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
|
||||||
|
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
|
||||||
|
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
|
||||||
|
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
|
||||||
|
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
|
||||||
|
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
|
||||||
|
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
|
||||||
|
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
|
||||||
|
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
|
||||||
|
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
|
||||||
|
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
|
||||||
|
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
|
||||||
|
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
|
||||||
|
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
|
||||||
|
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
|
||||||
|
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
|
||||||
|
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
|
||||||
|
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
|
||||||
|
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
|
||||||
|
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
|
||||||
|
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
|
||||||
|
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
|
||||||
|
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Selection types' masks.
|
||||||
|
* Use the same masks as usual.
|
||||||
|
* Button1Mask is always unset, to make masks match between ButtonPress.
|
||||||
|
* ButtonRelease and MotionNotify.
|
||||||
|
* If no match is found, regular selection is used.
|
||||||
|
*/
|
||||||
|
static uint selmasks[] = {
|
||||||
|
[SEL_RECTANGULAR] = Mod1Mask,
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Printable characters in ASCII, used to estimate the advance width
|
||||||
|
* of single wide characters.
|
||||||
|
*/
|
||||||
|
static char ascii_printable[] =
|
||||||
|
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||||
|
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||||
|
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||||
106
config.h
106
config.h
@ -6,8 +6,12 @@
|
|||||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
*/
|
*/
|
||||||
static char *font = "Iosevka:pixelsize=16:antialias=true:autohint=true";
|
static char *font = "Iosevka:pixelsize=16:antialias=true:autohint=true";
|
||||||
static char *font2[] = { "Iosevka:pixelsize=16:antialias=true:autohint=true" };
|
static char *font2[] = {
|
||||||
static int borderpx = 5;
|
"JoyPixels:pixelsize=16:antialias=true:autohint=true",
|
||||||
|
"Font Awesome 6 Free Solid:pixelsize=16:antialias=true:autohint=true",
|
||||||
|
"Font Awesome 6 Brands:pixelsize=16:antialias=true:autohint=true",
|
||||||
|
};
|
||||||
|
static int borderpx = 2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* What program is execed by st depends of these precedence rules:
|
* What program is execed by st depends of these precedence rules:
|
||||||
@ -17,7 +21,7 @@ static int borderpx = 5;
|
|||||||
* 4: value of shell in /etc/passwd
|
* 4: value of shell in /etc/passwd
|
||||||
* 5: value of shell in config.h
|
* 5: value of shell in config.h
|
||||||
*/
|
*/
|
||||||
static char *shell = "/bin/zsh";
|
static char *shell = "/bin/sh";
|
||||||
char *utmp = NULL;
|
char *utmp = NULL;
|
||||||
/* scroll program: to enable use a string like "scroll" */
|
/* scroll program: to enable use a string like "scroll" */
|
||||||
char *scroll = NULL;
|
char *scroll = NULL;
|
||||||
@ -74,7 +78,7 @@ static unsigned int cursorthickness = 2;
|
|||||||
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
* Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
|
||||||
* 0: disable (render all U25XX glyphs normally from the font).
|
* 0: disable (render all U25XX glyphs normally from the font).
|
||||||
*/
|
*/
|
||||||
const int boxdraw = 1;
|
const int boxdraw = 0;
|
||||||
const int boxdraw_bold = 0;
|
const int boxdraw_bold = 0;
|
||||||
|
|
||||||
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
/* braille (U28XX): 1: render as adjacent "pixels", 0: use font */
|
||||||
@ -106,49 +110,8 @@ char *termname = "st-256color";
|
|||||||
*/
|
*/
|
||||||
unsigned int tabspaces = 8;
|
unsigned int tabspaces = 8;
|
||||||
|
|
||||||
/* bg opacity */
|
|
||||||
float alpha = 1;
|
|
||||||
float alphaOffset = 0.0;
|
|
||||||
float alphaUnfocus;
|
|
||||||
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
static const char *colorname[] = {
|
#include "/home/spy/cols/st.h"
|
||||||
|
|
||||||
/* 8 normal colors */
|
|
||||||
[0] = "#1e2127", /* black */
|
|
||||||
[1] = "#e06c75", /* red */
|
|
||||||
[2] = "#98c379", /* green */
|
|
||||||
[3] = "#d19a66", /* yellow */
|
|
||||||
[4] = "#61afef", /* blue */
|
|
||||||
[5] = "#c678dd", /* magenta */
|
|
||||||
[6] = "#56b6c2", /* cyan */
|
|
||||||
[7] = "#abb2bf", /* white */
|
|
||||||
|
|
||||||
/* 8 bright colors */
|
|
||||||
[8] = "#5c6370", /* black */
|
|
||||||
[9] = "#e06c75", /* red */
|
|
||||||
[10] = "#98c379", /* green */
|
|
||||||
[11] = "#d19a66", /* yellow */
|
|
||||||
[12] = "#61afef", /* blue */
|
|
||||||
[13] = "#c678dd", /* magenta */
|
|
||||||
[14] = "#56b6c2", /* cyan */
|
|
||||||
[15] = "#ffffff", /* white */
|
|
||||||
|
|
||||||
/* special colors */
|
|
||||||
[256] = "#1e2127", /* background */
|
|
||||||
[257] = "#abb2bf", /* foreground */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default colors (colorname index)
|
|
||||||
* foreground, background, cursor
|
|
||||||
*/
|
|
||||||
unsigned int defaultfg = 257;
|
|
||||||
unsigned int defaultbg = 256;
|
|
||||||
unsigned int defaultcs = 257;
|
|
||||||
unsigned int defaultrcs = 257;
|
|
||||||
unsigned int background = 256;
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Default shape of cursor
|
* Default shape of cursor
|
||||||
@ -157,7 +120,7 @@ unsigned int background = 256;
|
|||||||
* 6: Bar ("|")
|
* 6: Bar ("|")
|
||||||
* 7: Snowman ("☃")
|
* 7: Snowman ("☃")
|
||||||
*/
|
*/
|
||||||
static unsigned int cursorshape = 6;
|
static unsigned int cursorshape = 2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Default columns and rows numbers
|
* Default columns and rows numbers
|
||||||
@ -186,45 +149,6 @@ static unsigned int defaultattr = 11;
|
|||||||
*/
|
*/
|
||||||
static uint forcemousemod = ShiftMask;
|
static uint forcemousemod = ShiftMask;
|
||||||
|
|
||||||
/*
|
|
||||||
* Xresources preferences to load at startup
|
|
||||||
*/
|
|
||||||
ResourcePref resources[] = {
|
|
||||||
{ "font", STRING, &font },
|
|
||||||
{ "fontalt0", STRING, &font2[0] },
|
|
||||||
{ "color0", STRING, &colorname[0] },
|
|
||||||
{ "color1", STRING, &colorname[1] },
|
|
||||||
{ "color2", STRING, &colorname[2] },
|
|
||||||
{ "color3", STRING, &colorname[3] },
|
|
||||||
{ "color4", STRING, &colorname[4] },
|
|
||||||
{ "color5", STRING, &colorname[5] },
|
|
||||||
{ "color6", STRING, &colorname[6] },
|
|
||||||
{ "color7", STRING, &colorname[7] },
|
|
||||||
{ "color8", STRING, &colorname[8] },
|
|
||||||
{ "color9", STRING, &colorname[9] },
|
|
||||||
{ "color10", STRING, &colorname[10] },
|
|
||||||
{ "color11", STRING, &colorname[11] },
|
|
||||||
{ "color12", STRING, &colorname[12] },
|
|
||||||
{ "color13", STRING, &colorname[13] },
|
|
||||||
{ "color14", STRING, &colorname[14] },
|
|
||||||
{ "color15", STRING, &colorname[15] },
|
|
||||||
{ "background", STRING, &colorname[258] },
|
|
||||||
{ "foreground", STRING, &colorname[259] },
|
|
||||||
{ "cursorColor", STRING, &colorname[256] },
|
|
||||||
{ "termname", STRING, &termname },
|
|
||||||
{ "shell", STRING, &shell },
|
|
||||||
{ "minlatency", INTEGER, &minlatency },
|
|
||||||
{ "maxlatency", INTEGER, &maxlatency },
|
|
||||||
{ "blinktimeout", INTEGER, &blinktimeout },
|
|
||||||
{ "bellvolume", INTEGER, &bellvolume },
|
|
||||||
{ "tabspaces", INTEGER, &tabspaces },
|
|
||||||
{ "borderpx", INTEGER, &borderpx },
|
|
||||||
{ "cwscale", FLOAT, &cwscale },
|
|
||||||
{ "chscale", FLOAT, &chscale },
|
|
||||||
{ "alpha", FLOAT, &alpha },
|
|
||||||
{ "alphaOffset", FLOAT, &alphaOffset },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Internal mouse shortcuts.
|
* Internal mouse shortcuts.
|
||||||
* Beware that overloading Button1 will disable the selection.
|
* Beware that overloading Button1 will disable the selection.
|
||||||
@ -244,11 +168,6 @@ static MouseShortcut mshortcuts[] = {
|
|||||||
#define MODKEY Mod1Mask
|
#define MODKEY Mod1Mask
|
||||||
#define TERMMOD (Mod1Mask|ShiftMask)
|
#define TERMMOD (Mod1Mask|ShiftMask)
|
||||||
|
|
||||||
static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL };
|
|
||||||
static char *copyurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -c", "externalpipe", NULL };
|
|
||||||
static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL };
|
|
||||||
|
|
||||||
|
|
||||||
static Shortcut shortcuts[] = {
|
static Shortcut shortcuts[] = {
|
||||||
/* mask keysym function argument */
|
/* mask keysym function argument */
|
||||||
{ XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
|
{ XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} },
|
||||||
@ -275,17 +194,12 @@ static Shortcut shortcuts[] = {
|
|||||||
{ MODKEY, XK_Down, kscrolldown, {.i = 1} },
|
{ MODKEY, XK_Down, kscrolldown, {.i = 1} },
|
||||||
{ MODKEY, XK_u, kscrollup, {.i = -1} },
|
{ MODKEY, XK_u, kscrollup, {.i = -1} },
|
||||||
{ MODKEY, XK_d, kscrolldown, {.i = -1} },
|
{ MODKEY, XK_d, kscrolldown, {.i = -1} },
|
||||||
{ MODKEY, XK_s, changealpha, {.f = -0.05} },
|
|
||||||
{ MODKEY, XK_a, changealpha, {.f = +0.05} },
|
|
||||||
{ TERMMOD, XK_Up, zoom, {.f = +1} },
|
{ TERMMOD, XK_Up, zoom, {.f = +1} },
|
||||||
{ TERMMOD, XK_Down, zoom, {.f = -1} },
|
{ TERMMOD, XK_Down, zoom, {.f = -1} },
|
||||||
{ TERMMOD, XK_K, zoom, {.f = +1} },
|
{ TERMMOD, XK_K, zoom, {.f = +1} },
|
||||||
{ TERMMOD, XK_J, zoom, {.f = -1} },
|
{ TERMMOD, XK_J, zoom, {.f = -1} },
|
||||||
{ TERMMOD, XK_U, zoom, {.f = +2} },
|
{ TERMMOD, XK_U, zoom, {.f = +2} },
|
||||||
{ TERMMOD, XK_D, zoom, {.f = -2} },
|
{ TERMMOD, XK_D, zoom, {.f = -2} },
|
||||||
{ MODKEY, XK_l, externalpipe, {.v = openurlcmd } },
|
|
||||||
{ MODKEY, XK_y, externalpipe, {.v = copyurlcmd } },
|
|
||||||
{ MODKEY, XK_o, externalpipe, {.v = copyoutput } },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# st version
|
# st version
|
||||||
VERSION = 0.8.4
|
VERSION = 0.8.5
|
||||||
|
|
||||||
# Customize below to fit your system
|
# Customize below to fit your system
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ INCS = -I$(X11INC) \
|
|||||||
`$(PKG_CONFIG) --cflags fontconfig` \
|
`$(PKG_CONFIG) --cflags fontconfig` \
|
||||||
`$(PKG_CONFIG) --cflags freetype2` \
|
`$(PKG_CONFIG) --cflags freetype2` \
|
||||||
`$(PKG_CONFIG) --cflags harfbuzz`
|
`$(PKG_CONFIG) --cflags harfbuzz`
|
||||||
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
|
LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
|
||||||
`$(PKG_CONFIG) --libs fontconfig` \
|
`$(PKG_CONFIG) --libs fontconfig` \
|
||||||
`$(PKG_CONFIG) --libs freetype2` \
|
`$(PKG_CONFIG) --libs freetype2` \
|
||||||
`$(PKG_CONFIG) --libs harfbuzz`
|
`$(PKG_CONFIG) --libs harfbuzz`
|
||||||
|
|||||||
12
hb.c
12
hb.c
@ -7,6 +7,8 @@
|
|||||||
|
|
||||||
#include "st.h"
|
#include "st.h"
|
||||||
|
|
||||||
|
#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END }
|
||||||
|
|
||||||
void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
|
void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
|
||||||
hb_font_t *hbfindfont(XftFont *match);
|
hb_font_t *hbfindfont(XftFont *match);
|
||||||
|
|
||||||
@ -18,6 +20,12 @@ typedef struct {
|
|||||||
static int hbfontslen = 0;
|
static int hbfontslen = 0;
|
||||||
static HbFontMatch *hbfontcache = NULL;
|
static HbFontMatch *hbfontcache = NULL;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Replace 0 with a list of font features, wrapped in FEATURE macro, e.g.
|
||||||
|
* FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g')
|
||||||
|
*/
|
||||||
|
hb_feature_t features[] = { 0 };
|
||||||
|
|
||||||
void
|
void
|
||||||
hbunloadfonts()
|
hbunloadfonts()
|
||||||
{
|
{
|
||||||
@ -59,7 +67,7 @@ void
|
|||||||
hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
|
hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
|
||||||
{
|
{
|
||||||
int start = 0, length = 1, gstart = 0;
|
int start = 0, length = 1, gstart = 0;
|
||||||
hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
|
hb_codepoint_t *codepoints = calloc((unsigned int)len, sizeof(hb_codepoint_t));
|
||||||
|
|
||||||
for (int idx = 1, specidx = 1; idx < len; idx++) {
|
for (int idx = 1, specidx = 1; idx < len; idx++) {
|
||||||
if (glyphs[idx].mode & ATTR_WDUMMY) {
|
if (glyphs[idx].mode & ATTR_WDUMMY) {
|
||||||
@ -124,7 +132,7 @@ hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoin
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Shape the segment. */
|
/* Shape the segment. */
|
||||||
hb_shape(font, buffer, NULL, 0);
|
hb_shape(font, buffer, features, sizeof(features));
|
||||||
|
|
||||||
/* Get new glyph info. */
|
/* Get new glyph info. */
|
||||||
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
|
hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
|
||||||
|
|||||||
1
hb.h
1
hb.h
@ -4,4 +4,3 @@
|
|||||||
|
|
||||||
void hbunloadfonts();
|
void hbunloadfonts();
|
||||||
void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
|
void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
|
||||||
|
|
||||||
|
|||||||
177
st.1
Normal file
177
st.1
Normal file
@ -0,0 +1,177 @@
|
|||||||
|
.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.
|
||||||
|
.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.
|
||||||
|
|
||||||
234
st.c
234
st.c
@ -46,7 +46,6 @@
|
|||||||
#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
|
||||||
term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
term.scr + HISTSIZE + 1) % HISTSIZE] : \
|
||||||
term.line[(y) - term.scr])
|
term.line[(y) - term.scr])
|
||||||
#define TLINE_HIST(y) ((y) <= HISTSIZE-term.row+2 ? term.hist[(y)] : term.line[(y-HISTSIZE+term.row-3)])
|
|
||||||
|
|
||||||
enum term_mode {
|
enum term_mode {
|
||||||
MODE_WRAP = 1 << 0,
|
MODE_WRAP = 1 << 0,
|
||||||
@ -118,7 +117,6 @@ typedef struct {
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
int row; /* nb row */
|
int row; /* nb row */
|
||||||
int col; /* nb col */
|
int col; /* nb col */
|
||||||
int maxcol;
|
|
||||||
Line *line; /* screen */
|
Line *line; /* screen */
|
||||||
Line *alt; /* alternate screen */
|
Line *alt; /* alternate screen */
|
||||||
Line hist[HISTSIZE]; /* history buffer */
|
Line hist[HISTSIZE]; /* history buffer */
|
||||||
@ -195,17 +193,18 @@ static void tputc(Rune);
|
|||||||
static void treset(void);
|
static void treset(void);
|
||||||
static void tscrollup(int, int, int);
|
static void tscrollup(int, int, int);
|
||||||
static void tscrolldown(int, int, int);
|
static void tscrolldown(int, int, int);
|
||||||
static void tsetattr(int *, int);
|
static void tsetattr(const int *, int);
|
||||||
static void tsetchar(Rune, Glyph *, int, int);
|
static void tsetchar(Rune, const Glyph *, int, int);
|
||||||
static void tsetdirt(int, int);
|
static void tsetdirt(int, int);
|
||||||
static void tsetscroll(int, int);
|
static void tsetscroll(int, int);
|
||||||
static void tswapscreen(void);
|
static void tswapscreen(void);
|
||||||
static void tsetmode(int, int, int *, int);
|
static void tsetmode(int, int, const int *, int);
|
||||||
static int twrite(const char *, int, int);
|
static int twrite(const char *, int, int);
|
||||||
|
static void tfulldirt(void);
|
||||||
static void tcontrolcode(uchar );
|
static void tcontrolcode(uchar );
|
||||||
static void tdectest(char );
|
static void tdectest(char );
|
||||||
static void tdefutf8(char);
|
static void tdefutf8(char);
|
||||||
static int32_t tdefcolor(int *, int *, int);
|
static int32_t tdefcolor(const int *, int *, int);
|
||||||
static void tdeftran(char);
|
static void tdeftran(char);
|
||||||
static void tstrsequence(uchar);
|
static void tstrsequence(uchar);
|
||||||
|
|
||||||
@ -234,10 +233,10 @@ static int iofd = 1;
|
|||||||
static int cmdfd;
|
static int cmdfd;
|
||||||
static pid_t pid;
|
static pid_t pid;
|
||||||
|
|
||||||
static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
static const uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
||||||
static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
||||||
static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
static const Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
||||||
static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
||||||
|
|
||||||
ssize_t
|
ssize_t
|
||||||
xwrite(int fd, const char *s, size_t len)
|
xwrite(int fd, const char *s, size_t len)
|
||||||
@ -277,12 +276,14 @@ xrealloc(void *p, size_t len)
|
|||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
xstrdup(char *s)
|
xstrdup(const char *s)
|
||||||
{
|
{
|
||||||
if ((s = strdup(s)) == NULL)
|
char *p;
|
||||||
|
|
||||||
|
if ((p = strdup(s)) == NULL)
|
||||||
die("strdup: %s\n", strerror(errno));
|
die("strdup: %s\n", strerror(errno));
|
||||||
|
|
||||||
return s;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
@ -431,20 +432,6 @@ tlinelen(int y)
|
|||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
tlinehistlen(int y)
|
|
||||||
{
|
|
||||||
int i = term.col;
|
|
||||||
|
|
||||||
if (TLINE_HIST(y)[i - 1].mode & ATTR_WRAP)
|
|
||||||
return i;
|
|
||||||
|
|
||||||
while (i > 0 && TLINE_HIST(y)[i - 1].u == ' ')
|
|
||||||
--i;
|
|
||||||
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
selstart(int col, int row, int snap)
|
selstart(int col, int row, int snap)
|
||||||
{
|
{
|
||||||
@ -540,7 +527,7 @@ selsnap(int *x, int *y, int direction)
|
|||||||
{
|
{
|
||||||
int newx, newy, xt, yt;
|
int newx, newy, xt, yt;
|
||||||
int delim, prevdelim;
|
int delim, prevdelim;
|
||||||
Glyph *gp, *prevgp;
|
const Glyph *gp, *prevgp;
|
||||||
|
|
||||||
switch (sel.snap) {
|
switch (sel.snap) {
|
||||||
case SNAP_WORD:
|
case SNAP_WORD:
|
||||||
@ -613,7 +600,7 @@ getsel(void)
|
|||||||
{
|
{
|
||||||
char *str, *ptr;
|
char *str, *ptr;
|
||||||
int y, bufsize, lastx, linelen;
|
int y, bufsize, lastx, linelen;
|
||||||
Glyph *gp, *last;
|
const Glyph *gp, *last;
|
||||||
|
|
||||||
if (sel.ob.x == -1)
|
if (sel.ob.x == -1)
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -780,7 +767,7 @@ stty(char **args)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
ttynew(char *line, char *cmd, char *out, char **args)
|
ttynew(const char *line, char *cmd, const char *out, char **args)
|
||||||
{
|
{
|
||||||
int m, s;
|
int m, s;
|
||||||
|
|
||||||
@ -813,14 +800,15 @@ ttynew(char *line, char *cmd, char *out, char **args)
|
|||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
close(iofd);
|
close(iofd);
|
||||||
|
close(m);
|
||||||
setsid(); /* create a new process group */
|
setsid(); /* create a new process group */
|
||||||
dup2(s, 0);
|
dup2(s, 0);
|
||||||
dup2(s, 1);
|
dup2(s, 1);
|
||||||
dup2(s, 2);
|
dup2(s, 2);
|
||||||
if (ioctl(s, TIOCSCTTY, NULL) < 0)
|
if (ioctl(s, TIOCSCTTY, NULL) < 0)
|
||||||
die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
|
die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
|
||||||
close(s);
|
if (s > 2)
|
||||||
close(m);
|
close(s);
|
||||||
#ifdef __OpenBSD__
|
#ifdef __OpenBSD__
|
||||||
if (pledge("stdio getpw proc exec", NULL) == -1)
|
if (pledge("stdio getpw proc exec", NULL) == -1)
|
||||||
die("pledge\n");
|
die("pledge\n");
|
||||||
@ -1263,9 +1251,9 @@ tmoveto(int x, int y)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tsetchar(Rune u, Glyph *attr, int x, int y)
|
tsetchar(Rune u, const Glyph *attr, int x, int y)
|
||||||
{
|
{
|
||||||
static char *vt100_0[62] = { /* 0x41 - 0x7e */
|
static const char *vt100_0[62] = { /* 0x41 - 0x7e */
|
||||||
"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
|
"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
|
0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
|
||||||
0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
|
0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
|
||||||
@ -1312,8 +1300,8 @@ tclearregion(int x1, int y1, int x2, int y2)
|
|||||||
if (y1 > y2)
|
if (y1 > y2)
|
||||||
temp = y1, y1 = y2, y2 = temp;
|
temp = y1, y1 = y2, y2 = temp;
|
||||||
|
|
||||||
LIMIT(x1, 0, term.maxcol-1);
|
LIMIT(x1, 0, term.col-1);
|
||||||
LIMIT(x2, 0, term.maxcol-1);
|
LIMIT(x2, 0, term.col-1);
|
||||||
LIMIT(y1, 0, term.row-1);
|
LIMIT(y1, 0, term.row-1);
|
||||||
LIMIT(y2, 0, term.row-1);
|
LIMIT(y2, 0, term.row-1);
|
||||||
|
|
||||||
@ -1380,7 +1368,7 @@ tdeleteline(int n)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int32_t
|
int32_t
|
||||||
tdefcolor(int *attr, int *npar, int l)
|
tdefcolor(const int *attr, int *npar, int l)
|
||||||
{
|
{
|
||||||
int32_t idx = -1;
|
int32_t idx = -1;
|
||||||
uint r, g, b;
|
uint r, g, b;
|
||||||
@ -1430,7 +1418,7 @@ tdefcolor(int *attr, int *npar, int l)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tsetattr(int *attr, int l)
|
tsetattr(const int *attr, int l)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int32_t idx;
|
int32_t idx;
|
||||||
@ -1548,9 +1536,9 @@ tsetscroll(int t, int b)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
tsetmode(int priv, int set, int *args, int narg)
|
tsetmode(int priv, int set, const int *args, int narg)
|
||||||
{
|
{
|
||||||
int alt, *lim;
|
int alt; const int *lim;
|
||||||
|
|
||||||
for (lim = args + narg; args < lim; ++args) {
|
for (lim = args + narg; args < lim; ++args) {
|
||||||
if (priv) {
|
if (priv) {
|
||||||
@ -1919,6 +1907,42 @@ csireset(void)
|
|||||||
memset(&csiescseq, 0, sizeof(csiescseq));
|
memset(&csiescseq, 0, sizeof(csiescseq));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
osc4_color_response(int num)
|
||||||
|
{
|
||||||
|
int n;
|
||||||
|
char buf[32];
|
||||||
|
unsigned char r, g, b;
|
||||||
|
|
||||||
|
if (xgetcolor(num, &r, &g, &b)) {
|
||||||
|
fprintf(stderr, "erresc: failed to fetch osc4 color %d\n", num);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
n = snprintf(buf, sizeof buf, "\033]4;%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
|
||||||
|
num, r, r, g, g, b, b);
|
||||||
|
|
||||||
|
ttywrite(buf, n, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
osc_color_response(int index, int num)
|
||||||
|
{
|
||||||
|
int n;
|
||||||
|
char buf[32];
|
||||||
|
unsigned char r, g, b;
|
||||||
|
|
||||||
|
if (xgetcolor(index, &r, &g, &b)) {
|
||||||
|
fprintf(stderr, "erresc: failed to fetch osc color %d\n", index);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
n = snprintf(buf, sizeof buf, "\033]%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
|
||||||
|
num, r, r, g, g, b, b);
|
||||||
|
|
||||||
|
ttywrite(buf, n, 1);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
strhandle(void)
|
strhandle(void)
|
||||||
{
|
{
|
||||||
@ -1957,14 +1981,56 @@ strhandle(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
case 10:
|
||||||
|
if (narg < 2)
|
||||||
|
break;
|
||||||
|
|
||||||
|
p = strescseq.args[1];
|
||||||
|
|
||||||
|
if (!strcmp(p, "?"))
|
||||||
|
osc_color_response(defaultfg, 10);
|
||||||
|
else if (xsetcolorname(defaultfg, p))
|
||||||
|
fprintf(stderr, "erresc: invalid foreground color: %s\n", p);
|
||||||
|
else
|
||||||
|
redraw();
|
||||||
|
return;
|
||||||
|
case 11:
|
||||||
|
if (narg < 2)
|
||||||
|
break;
|
||||||
|
|
||||||
|
p = strescseq.args[1];
|
||||||
|
|
||||||
|
if (!strcmp(p, "?"))
|
||||||
|
osc_color_response(defaultbg, 11);
|
||||||
|
else if (xsetcolorname(defaultbg, p))
|
||||||
|
fprintf(stderr, "erresc: invalid background color: %s\n", p);
|
||||||
|
else
|
||||||
|
redraw();
|
||||||
|
return;
|
||||||
|
case 12:
|
||||||
|
if (narg < 2)
|
||||||
|
break;
|
||||||
|
|
||||||
|
p = strescseq.args[1];
|
||||||
|
|
||||||
|
if (!strcmp(p, "?"))
|
||||||
|
osc_color_response(defaultcs, 12);
|
||||||
|
else if (xsetcolorname(defaultcs, p))
|
||||||
|
fprintf(stderr, "erresc: invalid cursor color: %s\n", p);
|
||||||
|
else
|
||||||
|
redraw();
|
||||||
|
return;
|
||||||
case 4: /* color set */
|
case 4: /* color set */
|
||||||
if (narg < 3)
|
if (narg < 3)
|
||||||
break;
|
break;
|
||||||
p = strescseq.args[2];
|
p = strescseq.args[2];
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
case 104: /* color reset, here p = NULL */
|
case 104: /* color reset */
|
||||||
j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
|
j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
|
||||||
if (xsetcolorname(j, p)) {
|
|
||||||
|
if (p && !strcmp(p, "?"))
|
||||||
|
osc4_color_response(j);
|
||||||
|
else if (xsetcolorname(j, p)) {
|
||||||
if (par == 104 && narg <= 1)
|
if (par == 104 && narg <= 1)
|
||||||
return; /* color reset without parameter */
|
return; /* color reset without parameter */
|
||||||
fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
|
fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
|
||||||
@ -2014,61 +2080,6 @@ strparse(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
externalpipe(const Arg *arg)
|
|
||||||
{
|
|
||||||
int to[2];
|
|
||||||
char buf[UTF_SIZ];
|
|
||||||
void (*oldsigpipe)(int);
|
|
||||||
Glyph *bp, *end;
|
|
||||||
int lastpos, n, newline;
|
|
||||||
|
|
||||||
if (pipe(to) == -1)
|
|
||||||
return;
|
|
||||||
|
|
||||||
switch (fork()) {
|
|
||||||
case -1:
|
|
||||||
close(to[0]);
|
|
||||||
close(to[1]);
|
|
||||||
return;
|
|
||||||
case 0:
|
|
||||||
dup2(to[0], STDIN_FILENO);
|
|
||||||
close(to[0]);
|
|
||||||
close(to[1]);
|
|
||||||
execvp(((char **)arg->v)[0], (char **)arg->v);
|
|
||||||
fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]);
|
|
||||||
perror("failed");
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
close(to[0]);
|
|
||||||
/* ignore sigpipe for now, in case child exists early */
|
|
||||||
oldsigpipe = signal(SIGPIPE, SIG_IGN);
|
|
||||||
newline = 0;
|
|
||||||
for (n = 0; n <= HISTSIZE + 2; n++) {
|
|
||||||
bp = TLINE_HIST(n);
|
|
||||||
lastpos = MIN(tlinehistlen(n) + 1, term.col) - 1;
|
|
||||||
if (lastpos < 0)
|
|
||||||
break;
|
|
||||||
if (lastpos == 0)
|
|
||||||
continue;
|
|
||||||
end = &bp[lastpos + 1];
|
|
||||||
for (; bp < end; ++bp)
|
|
||||||
if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
|
|
||||||
break;
|
|
||||||
if ((newline = TLINE_HIST(n)[lastpos].mode & ATTR_WRAP))
|
|
||||||
continue;
|
|
||||||
if (xwrite(to[1], "\n", 1) < 0)
|
|
||||||
break;
|
|
||||||
newline = 0;
|
|
||||||
}
|
|
||||||
if (newline)
|
|
||||||
(void)xwrite(to[1], "\n", 1);
|
|
||||||
close(to[1]);
|
|
||||||
/* restore */
|
|
||||||
signal(SIGPIPE, oldsigpipe);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
strdump(void)
|
strdump(void)
|
||||||
{
|
{
|
||||||
@ -2155,7 +2166,7 @@ void
|
|||||||
tdumpline(int n)
|
tdumpline(int n)
|
||||||
{
|
{
|
||||||
char buf[UTF_SIZ];
|
char buf[UTF_SIZ];
|
||||||
Glyph *bp, *end;
|
const Glyph *bp, *end;
|
||||||
|
|
||||||
bp = &term.line[n][0];
|
bp = &term.line[n][0];
|
||||||
end = &bp[MIN(tlinelen(n), term.col) - 1];
|
end = &bp[MIN(tlinelen(n), term.col) - 1];
|
||||||
@ -2561,6 +2572,10 @@ check_control_code:
|
|||||||
if (width == 2) {
|
if (width == 2) {
|
||||||
gp->mode |= ATTR_WIDE;
|
gp->mode |= ATTR_WIDE;
|
||||||
if (term.c.x+1 < term.col) {
|
if (term.c.x+1 < term.col) {
|
||||||
|
if (gp[1].mode == ATTR_WIDE && term.c.x+2 < term.col) {
|
||||||
|
gp[2].u = ' ';
|
||||||
|
gp[2].mode &= ~ATTR_WDUMMY;
|
||||||
|
}
|
||||||
gp[1].u = '\0';
|
gp[1].u = '\0';
|
||||||
gp[1].mode = ATTR_WDUMMY;
|
gp[1].mode = ATTR_WDUMMY;
|
||||||
}
|
}
|
||||||
@ -2608,18 +2623,11 @@ void
|
|||||||
tresize(int col, int row)
|
tresize(int col, int row)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
int tmp;
|
int minrow = MIN(row, term.row);
|
||||||
int minrow, mincol;
|
int mincol = MIN(col, term.col);
|
||||||
int *bp;
|
int *bp;
|
||||||
TCursor c;
|
TCursor c;
|
||||||
|
|
||||||
tmp = col;
|
|
||||||
if (!term.maxcol)
|
|
||||||
term.maxcol = term.col;
|
|
||||||
col = MAX(col, term.maxcol);
|
|
||||||
minrow = MIN(row, term.row);
|
|
||||||
mincol = MIN(col, term.maxcol);
|
|
||||||
|
|
||||||
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);
|
||||||
@ -2670,18 +2678,17 @@ tresize(int col, int row)
|
|||||||
term.line[i] = xmalloc(col * sizeof(Glyph));
|
term.line[i] = xmalloc(col * sizeof(Glyph));
|
||||||
term.alt[i] = xmalloc(col * sizeof(Glyph));
|
term.alt[i] = xmalloc(col * sizeof(Glyph));
|
||||||
}
|
}
|
||||||
if (col > term.maxcol) {
|
if (col > term.col) {
|
||||||
bp = term.tabs + term.maxcol;
|
bp = term.tabs + term.col;
|
||||||
|
|
||||||
memset(bp, 0, sizeof(*term.tabs) * (col - term.maxcol));
|
memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
|
||||||
while (--bp > term.tabs && !*bp)
|
while (--bp > term.tabs && !*bp)
|
||||||
/* nothing */ ;
|
/* nothing */ ;
|
||||||
for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
|
for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
|
||||||
*bp = 1;
|
*bp = 1;
|
||||||
}
|
}
|
||||||
/* update terminal size */
|
/* update terminal size */
|
||||||
term.col = tmp;
|
term.col = col;
|
||||||
term.maxcol = col;
|
|
||||||
term.row = row;
|
term.row = row;
|
||||||
/* reset scrolling region */
|
/* reset scrolling region */
|
||||||
tsetscroll(0, row-1);
|
tsetscroll(0, row-1);
|
||||||
@ -2743,9 +2750,6 @@ draw(void)
|
|||||||
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.line[term.ocy], term.col);
|
term.line[term.ocy], term.col);
|
||||||
/* xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], */
|
|
||||||
/* term.ocx, term.ocy, term.line[term.ocy][term.ocx], */
|
|
||||||
/* term.line[term.ocy], term.col); */
|
|
||||||
term.ocx = cx;
|
term.ocx = cx;
|
||||||
term.ocy = term.c.y;
|
term.ocy = term.c.y;
|
||||||
xfinishdraw();
|
xfinishdraw();
|
||||||
|
|||||||
11
st.h
11
st.h
@ -82,10 +82,8 @@ typedef union {
|
|||||||
|
|
||||||
void die(const char *, ...);
|
void die(const char *, ...);
|
||||||
void redraw(void);
|
void redraw(void);
|
||||||
void tfulldirt(void);
|
|
||||||
void draw(void);
|
void draw(void);
|
||||||
|
|
||||||
void externalpipe(const Arg *);
|
|
||||||
void kscrolldown(const Arg *);
|
void kscrolldown(const Arg *);
|
||||||
void kscrollup(const Arg *);
|
void kscrollup(const Arg *);
|
||||||
void printscreen(const Arg *);
|
void printscreen(const Arg *);
|
||||||
@ -98,7 +96,7 @@ void tnew(int, int);
|
|||||||
void tresize(int, int);
|
void tresize(int, int);
|
||||||
void tsetdirtattr(int);
|
void tsetdirtattr(int);
|
||||||
void ttyhangup(void);
|
void ttyhangup(void);
|
||||||
int ttynew(char *, char *, char *, char **);
|
int ttynew(const char *, char *, const char *, char **);
|
||||||
size_t ttyread(void);
|
size_t ttyread(void);
|
||||||
void ttyresize(int, int);
|
void ttyresize(int, int);
|
||||||
void ttywrite(const char *, size_t, int);
|
void ttywrite(const char *, size_t, int);
|
||||||
@ -116,7 +114,9 @@ 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(char *);
|
char *xstrdup(const char *);
|
||||||
|
|
||||||
|
int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b);
|
||||||
|
|
||||||
int isboxdraw(Rune);
|
int isboxdraw(Rune);
|
||||||
ushort boxdrawindex(const Glyph *);
|
ushort boxdrawindex(const Glyph *);
|
||||||
@ -138,6 +138,5 @@ extern char *termname;
|
|||||||
extern unsigned int tabspaces;
|
extern unsigned int tabspaces;
|
||||||
extern unsigned int defaultfg;
|
extern unsigned int defaultfg;
|
||||||
extern unsigned int defaultbg;
|
extern unsigned int defaultbg;
|
||||||
extern float alpha;
|
extern unsigned int defaultcs;
|
||||||
extern float alphaUnfocus;
|
|
||||||
extern const int boxdraw, boxdraw_bold, boxdraw_braille;
|
extern const int boxdraw, boxdraw_bold, boxdraw_braille;
|
||||||
|
|||||||
239
st.info
Normal file
239
st.info
Normal file
@ -0,0 +1,239 @@
|
|||||||
|
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,
|
||||||
367
x.c
367
x.c
@ -14,7 +14,6 @@
|
|||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
#include <X11/Xft/Xft.h>
|
#include <X11/Xft/Xft.h>
|
||||||
#include <X11/XKBlib.h>
|
#include <X11/XKBlib.h>
|
||||||
#include <X11/Xresource.h>
|
|
||||||
|
|
||||||
char *argv0;
|
char *argv0;
|
||||||
#include "arg.h"
|
#include "arg.h"
|
||||||
@ -47,30 +46,16 @@ typedef struct {
|
|||||||
signed char appcursor; /* application cursor */
|
signed char appcursor; /* application cursor */
|
||||||
} Key;
|
} Key;
|
||||||
|
|
||||||
/* Xresources preferences */
|
|
||||||
enum resource_type {
|
|
||||||
STRING = 0,
|
|
||||||
INTEGER = 1,
|
|
||||||
FLOAT = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
char *name;
|
|
||||||
enum resource_type type;
|
|
||||||
void *dst;
|
|
||||||
} ResourcePref;
|
|
||||||
|
|
||||||
/* X modifiers */
|
/* X modifiers */
|
||||||
#define XK_ANY_MOD UINT_MAX
|
#define XK_ANY_MOD UINT_MAX
|
||||||
#define XK_NO_MOD 0
|
#define XK_NO_MOD 0
|
||||||
#define XK_SWITCH_MOD (1<<13)
|
#define XK_SWITCH_MOD (1<<13|1<<14)
|
||||||
|
|
||||||
/* function definitions used in config.h */
|
/* function definitions used in config.h */
|
||||||
static void clipcopy(const Arg *);
|
static void clipcopy(const Arg *);
|
||||||
static void clippaste(const Arg *);
|
static void clippaste(const Arg *);
|
||||||
static void numlock(const Arg *);
|
static void numlock(const Arg *);
|
||||||
static void selpaste(const Arg *);
|
static void selpaste(const Arg *);
|
||||||
static void changealpha(const Arg *);
|
|
||||||
static void zoom(const Arg *);
|
static void zoom(const Arg *);
|
||||||
static void zoomabs(const Arg *);
|
static void zoomabs(const Arg *);
|
||||||
static void zoomreset(const Arg *);
|
static void zoomreset(const Arg *);
|
||||||
@ -97,7 +82,6 @@ typedef XftGlyphFontSpec GlyphFontSpec;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
int tw, th; /* tty width and height */
|
int tw, th; /* tty width and height */
|
||||||
int w, h; /* window width and height */
|
int w, h; /* window width and height */
|
||||||
int hborderpx, vborderpx;
|
|
||||||
int ch; /* char height */
|
int ch; /* char height */
|
||||||
int cw; /* char width */
|
int cw; /* char width */
|
||||||
int mode; /* window state/mode flags */
|
int mode; /* window state/mode flags */
|
||||||
@ -122,7 +106,6 @@ 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;
|
||||||
@ -174,7 +157,7 @@ static void xresize(int, int);
|
|||||||
static void xhints(void);
|
static void xhints(void);
|
||||||
static int xloadcolor(int, const char *, Color *);
|
static int xloadcolor(int, const char *, Color *);
|
||||||
static int xloadfont(Font *, FcPattern *);
|
static int xloadfont(Font *, FcPattern *);
|
||||||
static void xloadfonts(char *, double);
|
static void xloadfonts(const char *, double);
|
||||||
static int xloadsparefont(FcPattern *, int);
|
static int xloadsparefont(FcPattern *, int);
|
||||||
static void xloadsparefonts(void);
|
static void xloadsparefonts(void);
|
||||||
static void xunloadfont(Font *);
|
static void xunloadfont(Font *);
|
||||||
@ -183,7 +166,6 @@ static void xsetenv(void);
|
|||||||
static void xseturgency(int);
|
static void xseturgency(int);
|
||||||
static int evcol(XEvent *);
|
static int evcol(XEvent *);
|
||||||
static int evrow(XEvent *);
|
static int evrow(XEvent *);
|
||||||
static float clamp(float, float, float);
|
|
||||||
|
|
||||||
static void expose(XEvent *);
|
static void expose(XEvent *);
|
||||||
static void visibility(XEvent *);
|
static void visibility(XEvent *);
|
||||||
@ -264,7 +246,6 @@ static char *usedfont = NULL;
|
|||||||
static double usedfontsize = 0;
|
static double usedfontsize = 0;
|
||||||
static double defaultfontsize = 0;
|
static double defaultfontsize = 0;
|
||||||
|
|
||||||
static char *opt_alpha = NULL;
|
|
||||||
static char *opt_class = NULL;
|
static char *opt_class = NULL;
|
||||||
static char **opt_cmd = NULL;
|
static char **opt_cmd = NULL;
|
||||||
static char *opt_embed = NULL;
|
static char *opt_embed = NULL;
|
||||||
@ -274,9 +255,7 @@ static char *opt_line = NULL;
|
|||||||
static char *opt_name = NULL;
|
static char *opt_name = NULL;
|
||||||
static char *opt_title = NULL;
|
static char *opt_title = NULL;
|
||||||
|
|
||||||
static int focused = 0;
|
static uint buttons; /* bit field of pressed buttons */
|
||||||
|
|
||||||
static int oldbutton = 3; /* button event on startup: 3 = release */
|
|
||||||
|
|
||||||
void
|
void
|
||||||
clipcopy(const Arg *dummy)
|
clipcopy(const Arg *dummy)
|
||||||
@ -316,18 +295,6 @@ numlock(const Arg *dummy)
|
|||||||
win.mode ^= MODE_NUMLOCK;
|
win.mode ^= MODE_NUMLOCK;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
changealpha(const Arg *arg)
|
|
||||||
{
|
|
||||||
if((alpha > 0 && arg->f < 0) || (alpha < 1 && arg->f > 0))
|
|
||||||
alpha += arg->f;
|
|
||||||
alpha = clamp(alpha, 0.0, 1.0);
|
|
||||||
alphaUnfocus = clamp(alpha-alphaOffset, 0.0, 1.0);
|
|
||||||
|
|
||||||
xloadcols();
|
|
||||||
redraw();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
zoom(const Arg *arg)
|
zoom(const Arg *arg)
|
||||||
{
|
{
|
||||||
@ -368,7 +335,7 @@ ttysend(const Arg *arg)
|
|||||||
int
|
int
|
||||||
evcol(XEvent *e)
|
evcol(XEvent *e)
|
||||||
{
|
{
|
||||||
int x = e->xbutton.x - win.hborderpx;
|
int x = e->xbutton.x - borderpx;
|
||||||
LIMIT(x, 0, win.tw - 1);
|
LIMIT(x, 0, win.tw - 1);
|
||||||
return x / win.cw;
|
return x / win.cw;
|
||||||
}
|
}
|
||||||
@ -376,20 +343,11 @@ evcol(XEvent *e)
|
|||||||
int
|
int
|
||||||
evrow(XEvent *e)
|
evrow(XEvent *e)
|
||||||
{
|
{
|
||||||
int y = e->xbutton.y - win.vborderpx;
|
int y = e->xbutton.y - borderpx;
|
||||||
LIMIT(y, 0, win.th - 1);
|
LIMIT(y, 0, win.th - 1);
|
||||||
return y / win.ch;
|
return y / win.ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
float
|
|
||||||
clamp(float value, float lower, float upper) {
|
|
||||||
if(value < lower)
|
|
||||||
return lower;
|
|
||||||
if(value > upper)
|
|
||||||
return upper;
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
mousesel(XEvent *e, int done)
|
mousesel(XEvent *e, int done)
|
||||||
{
|
{
|
||||||
@ -410,59 +368,68 @@ mousesel(XEvent *e, int done)
|
|||||||
void
|
void
|
||||||
mousereport(XEvent *e)
|
mousereport(XEvent *e)
|
||||||
{
|
{
|
||||||
int len, x = evcol(e), y = evrow(e),
|
int len, btn, code;
|
||||||
button = e->xbutton.button, state = e->xbutton.state;
|
int x = evcol(e), y = evrow(e);
|
||||||
|
int state = e->xbutton.state;
|
||||||
char buf[40];
|
char buf[40];
|
||||||
static int ox, oy;
|
static int ox, oy;
|
||||||
|
|
||||||
/* from urxvt */
|
if (e->type == MotionNotify) {
|
||||||
if (e->xbutton.type == MotionNotify) {
|
|
||||||
if (x == ox && y == oy)
|
if (x == ox && y == oy)
|
||||||
return;
|
return;
|
||||||
if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
|
if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
|
||||||
return;
|
return;
|
||||||
/* MOUSE_MOTION: no reporting if no button is pressed */
|
/* MODE_MOUSEMOTION: no reporting if no button is pressed */
|
||||||
if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
|
if (IS_SET(MODE_MOUSEMOTION) && buttons == 0)
|
||||||
return;
|
return;
|
||||||
|
/* Set btn to lowest-numbered pressed button, or 12 if no
|
||||||
button = oldbutton + 32;
|
* buttons are pressed. */
|
||||||
ox = x;
|
for (btn = 1; btn <= 11 && !(buttons & (1<<(btn-1))); btn++)
|
||||||
oy = y;
|
;
|
||||||
|
code = 32;
|
||||||
} else {
|
} else {
|
||||||
if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
|
btn = e->xbutton.button;
|
||||||
button = 3;
|
/* Only buttons 1 through 11 can be encoded */
|
||||||
} else {
|
if (btn < 1 || btn > 11)
|
||||||
button -= Button1;
|
return;
|
||||||
if (button >= 3)
|
if (e->type == ButtonRelease) {
|
||||||
button += 64 - 3;
|
|
||||||
}
|
|
||||||
if (e->xbutton.type == ButtonPress) {
|
|
||||||
oldbutton = button;
|
|
||||||
ox = x;
|
|
||||||
oy = y;
|
|
||||||
} else if (e->xbutton.type == ButtonRelease) {
|
|
||||||
oldbutton = 3;
|
|
||||||
/* MODE_MOUSEX10: no button release reporting */
|
/* MODE_MOUSEX10: no button release reporting */
|
||||||
if (IS_SET(MODE_MOUSEX10))
|
if (IS_SET(MODE_MOUSEX10))
|
||||||
return;
|
return;
|
||||||
if (button == 64 || button == 65)
|
/* Don't send release events for the scroll wheel */
|
||||||
|
if (btn == 4 || btn == 5)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
code = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ox = x;
|
||||||
|
oy = y;
|
||||||
|
|
||||||
|
/* Encode btn into code. If no button is pressed for a motion event in
|
||||||
|
* MODE_MOUSEMANY, then encode it as a release. */
|
||||||
|
if ((!IS_SET(MODE_MOUSESGR) && e->type == ButtonRelease) || btn == 12)
|
||||||
|
code += 3;
|
||||||
|
else if (btn >= 8)
|
||||||
|
code += 128 + btn - 8;
|
||||||
|
else if (btn >= 4)
|
||||||
|
code += 64 + btn - 4;
|
||||||
|
else
|
||||||
|
code += btn - 1;
|
||||||
|
|
||||||
if (!IS_SET(MODE_MOUSEX10)) {
|
if (!IS_SET(MODE_MOUSEX10)) {
|
||||||
button += ((state & ShiftMask ) ? 4 : 0)
|
code += ((state & ShiftMask ) ? 4 : 0)
|
||||||
+ ((state & Mod4Mask ) ? 8 : 0)
|
+ ((state & Mod1Mask ) ? 8 : 0) /* meta key: alt */
|
||||||
+ ((state & ControlMask) ? 16 : 0);
|
+ ((state & ControlMask) ? 16 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_SET(MODE_MOUSESGR)) {
|
if (IS_SET(MODE_MOUSESGR)) {
|
||||||
len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
|
len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
|
||||||
button, x+1, y+1,
|
code, x+1, y+1,
|
||||||
e->xbutton.type == ButtonRelease ? 'm' : 'M');
|
e->type == ButtonRelease ? 'm' : 'M');
|
||||||
} else if (x < 223 && y < 223) {
|
} else if (x < 223 && y < 223) {
|
||||||
len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
|
len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
|
||||||
32+button, 32+x+1, 32+y+1);
|
32+code, 32+x+1, 32+y+1);
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -505,9 +472,13 @@ mouseaction(XEvent *e, uint release)
|
|||||||
void
|
void
|
||||||
bpress(XEvent *e)
|
bpress(XEvent *e)
|
||||||
{
|
{
|
||||||
|
int btn = e->xbutton.button;
|
||||||
struct timespec now;
|
struct timespec now;
|
||||||
int snap;
|
int snap;
|
||||||
|
|
||||||
|
if (1 <= btn && btn <= 11)
|
||||||
|
buttons |= 1 << (btn-1);
|
||||||
|
|
||||||
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
|
||||||
mousereport(e);
|
mousereport(e);
|
||||||
return;
|
return;
|
||||||
@ -516,7 +487,7 @@ bpress(XEvent *e)
|
|||||||
if (mouseaction(e, 0))
|
if (mouseaction(e, 0))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (e->xbutton.button == Button1) {
|
if (btn == Button1) {
|
||||||
/*
|
/*
|
||||||
* If the user clicks below predefined timeouts specific
|
* If the user clicks below predefined timeouts specific
|
||||||
* snapping behaviour is exposed.
|
* snapping behaviour is exposed.
|
||||||
@ -730,6 +701,11 @@ xsetsel(char *str)
|
|||||||
void
|
void
|
||||||
brelease(XEvent *e)
|
brelease(XEvent *e)
|
||||||
{
|
{
|
||||||
|
int btn = e->xbutton.button;
|
||||||
|
|
||||||
|
if (1 <= btn && btn <= 11)
|
||||||
|
buttons &= ~(1 << (btn-1));
|
||||||
|
|
||||||
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
|
if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
|
||||||
mousereport(e);
|
mousereport(e);
|
||||||
return;
|
return;
|
||||||
@ -737,7 +713,7 @@ brelease(XEvent *e)
|
|||||||
|
|
||||||
if (mouseaction(e, 1))
|
if (mouseaction(e, 1))
|
||||||
return;
|
return;
|
||||||
if (e->xbutton.button == Button1)
|
if (btn == Button1)
|
||||||
mousesel(e, 1);
|
mousesel(e, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -767,9 +743,6 @@ cresize(int width, int height)
|
|||||||
col = MAX(1, col);
|
col = MAX(1, col);
|
||||||
row = MAX(1, row);
|
row = MAX(1, row);
|
||||||
|
|
||||||
win.hborderpx = (win.w - col * win.cw) / 2;
|
|
||||||
win.vborderpx = (win.h - row * win.ch) / 2;
|
|
||||||
|
|
||||||
tresize(col, row);
|
tresize(col, row);
|
||||||
xresize(col, row);
|
xresize(col, row);
|
||||||
ttyresize(win.tw, win.th);
|
ttyresize(win.tw, win.th);
|
||||||
@ -783,7 +756,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,
|
||||||
xw.depth);
|
DefaultDepth(xw.dpy, xw.scr));
|
||||||
XftDrawChange(xw.draw, xw.buf);
|
XftDrawChange(xw.draw, xw.buf);
|
||||||
xclear(0, 0, win.w, win.h);
|
xclear(0, 0, win.w, win.h);
|
||||||
|
|
||||||
@ -821,16 +794,6 @@ xloadcolor(int i, const char *name, Color *ncolor)
|
|||||||
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
|
return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
xloadalpha(void)
|
|
||||||
{
|
|
||||||
float const usedAlpha = focused ? alpha : alphaUnfocus;
|
|
||||||
if (opt_alpha) alpha = strtof(opt_alpha, NULL);
|
|
||||||
dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * usedAlpha);
|
|
||||||
dc.col[defaultbg].pixel &= 0x00FFFFFF;
|
|
||||||
dc.col[defaultbg].pixel |= (unsigned char)(0xff * usedAlpha) << 24;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
xloadcols(void)
|
xloadcols(void)
|
||||||
{
|
{
|
||||||
@ -838,26 +801,37 @@ xloadcols(void)
|
|||||||
static int loaded;
|
static int loaded;
|
||||||
Color *cp;
|
Color *cp;
|
||||||
|
|
||||||
if (!loaded) {
|
if (loaded) {
|
||||||
dc.collen = 1 + (defaultbg = MAX(LEN(colorname), 256));
|
for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
|
||||||
|
XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
|
||||||
|
} else {
|
||||||
|
dc.collen = MAX(LEN(colorname), 256);
|
||||||
dc.col = xmalloc(dc.collen * sizeof(Color));
|
dc.col = xmalloc(dc.collen * sizeof(Color));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i+1 < dc.collen; i++)
|
for (i = 0; i < dc.collen; i++)
|
||||||
if (!xloadcolor(i, NULL, &dc.col[i])) {
|
if (!xloadcolor(i, NULL, &dc.col[i])) {
|
||||||
if (colorname[i])
|
if (colorname[i])
|
||||||
die("could not allocate color '%s'\n", colorname[i]);
|
die("could not allocate color '%s'\n", colorname[i]);
|
||||||
else
|
else
|
||||||
die("could not allocate color %d\n", i);
|
die("could not allocate color %d\n", i);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dc.collen) // cannot die, as the color is already loaded.
|
|
||||||
xloadcolor(background, NULL, &dc.col[defaultbg]);
|
|
||||||
|
|
||||||
xloadalpha();
|
|
||||||
loaded = 1;
|
loaded = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b)
|
||||||
|
{
|
||||||
|
if (!BETWEEN(x, 0, dc.collen))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
*r = dc.col[x].color.red >> 8;
|
||||||
|
*g = dc.col[x].color.green >> 8;
|
||||||
|
*b = dc.col[x].color.blue >> 8;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
xsetcolorname(int x, const char *name)
|
xsetcolorname(int x, const char *name)
|
||||||
{
|
{
|
||||||
@ -889,8 +863,8 @@ xclear(int x1, int y1, int x2, int y2)
|
|||||||
void
|
void
|
||||||
xhints(void)
|
xhints(void)
|
||||||
{
|
{
|
||||||
XClassHint class = {opt_name ? opt_name : "st",
|
XClassHint class = {opt_name ? opt_name : termname,
|
||||||
opt_class ? opt_class : "St"};
|
opt_class ? opt_class : termname};
|
||||||
XWMHints wm = {.flags = InputHint, .input = 1};
|
XWMHints wm = {.flags = InputHint, .input = 1};
|
||||||
XSizeHints *sizeh;
|
XSizeHints *sizeh;
|
||||||
|
|
||||||
@ -899,8 +873,8 @@ xhints(void)
|
|||||||
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
||||||
sizeh->height = win.h;
|
sizeh->height = win.h;
|
||||||
sizeh->width = win.w;
|
sizeh->width = win.w;
|
||||||
sizeh->height_inc = 1;
|
sizeh->height_inc = win.ch;
|
||||||
sizeh->width_inc = 1;
|
sizeh->width_inc = win.cw;
|
||||||
sizeh->base_height = 2 * borderpx;
|
sizeh->base_height = 2 * borderpx;
|
||||||
sizeh->base_width = 2 * borderpx;
|
sizeh->base_width = 2 * borderpx;
|
||||||
sizeh->min_height = win.ch + 2 * borderpx;
|
sizeh->min_height = win.ch + 2 * borderpx;
|
||||||
@ -1011,7 +985,7 @@ xloadfont(Font *f, FcPattern *pattern)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
xloadfonts(char *fontstr, double fontsize)
|
xloadfonts(const char *fontstr, double fontsize)
|
||||||
{
|
{
|
||||||
FcPattern *pattern;
|
FcPattern *pattern;
|
||||||
double fontval;
|
double fontval;
|
||||||
@ -1019,7 +993,7 @@ xloadfonts(char *fontstr, double fontsize)
|
|||||||
if (fontstr[0] == '-')
|
if (fontstr[0] == '-')
|
||||||
pattern = XftXlfdParse(fontstr, False, False);
|
pattern = XftXlfdParse(fontstr, False, False);
|
||||||
else
|
else
|
||||||
pattern = FcNameParse((FcChar8 *)fontstr);
|
pattern = FcNameParse((const FcChar8 *)fontstr);
|
||||||
|
|
||||||
if (!pattern)
|
if (!pattern)
|
||||||
die("can't open font %s\n", fontstr);
|
die("can't open font %s\n", fontstr);
|
||||||
@ -1085,7 +1059,7 @@ xloadsparefont(FcPattern *pattern, int flags)
|
|||||||
{
|
{
|
||||||
FcPattern *match;
|
FcPattern *match;
|
||||||
FcResult result;
|
FcResult result;
|
||||||
|
|
||||||
match = FcFontMatch(NULL, pattern, &result);
|
match = FcFontMatch(NULL, pattern, &result);
|
||||||
if (!match) {
|
if (!match) {
|
||||||
return 1;
|
return 1;
|
||||||
@ -1127,50 +1101,50 @@ xloadsparefonts(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (fp = font2; fp - font2 < fc; ++fp) {
|
for (fp = font2; fp - font2 < fc; ++fp) {
|
||||||
|
|
||||||
if (**fp == '-')
|
if (**fp == '-')
|
||||||
pattern = XftXlfdParse(*fp, False, False);
|
pattern = XftXlfdParse(*fp, False, False);
|
||||||
else
|
else
|
||||||
pattern = FcNameParse((FcChar8 *)*fp);
|
pattern = FcNameParse((FcChar8 *)*fp);
|
||||||
|
|
||||||
if (!pattern)
|
if (!pattern)
|
||||||
die("can't open spare font %s\n", *fp);
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
if (defaultfontsize > 0) {
|
if (defaultfontsize > 0) {
|
||||||
sizeshift = usedfontsize - defaultfontsize;
|
sizeshift = usedfontsize - defaultfontsize;
|
||||||
if (sizeshift != 0 &&
|
if (sizeshift != 0 &&
|
||||||
FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
|
FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
|
||||||
FcResultMatch) {
|
FcResultMatch) {
|
||||||
fontval += sizeshift;
|
fontval += sizeshift;
|
||||||
FcPatternDel(pattern, FC_PIXEL_SIZE);
|
FcPatternDel(pattern, FC_PIXEL_SIZE);
|
||||||
FcPatternDel(pattern, FC_SIZE);
|
FcPatternDel(pattern, FC_SIZE);
|
||||||
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
|
FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FcPatternAddBool(pattern, FC_SCALABLE, 1);
|
FcPatternAddBool(pattern, FC_SCALABLE, 1);
|
||||||
|
|
||||||
FcConfigSubstitute(NULL, pattern, FcMatchPattern);
|
FcConfigSubstitute(NULL, pattern, FcMatchPattern);
|
||||||
XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
|
XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
|
||||||
|
|
||||||
if (xloadsparefont(pattern, FRC_NORMAL))
|
if (xloadsparefont(pattern, FRC_NORMAL))
|
||||||
die("can't open spare font %s\n", *fp);
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
FcPatternDel(pattern, FC_SLANT);
|
FcPatternDel(pattern, FC_SLANT);
|
||||||
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
|
||||||
if (xloadsparefont(pattern, FRC_ITALIC))
|
if (xloadsparefont(pattern, FRC_ITALIC))
|
||||||
die("can't open spare font %s\n", *fp);
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
FcPatternDel(pattern, FC_WEIGHT);
|
FcPatternDel(pattern, FC_WEIGHT);
|
||||||
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
|
FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
|
||||||
if (xloadsparefont(pattern, FRC_ITALICBOLD))
|
if (xloadsparefont(pattern, FRC_ITALICBOLD))
|
||||||
die("can't open spare font %s\n", *fp);
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
FcPatternDel(pattern, FC_SLANT);
|
FcPatternDel(pattern, FC_SLANT);
|
||||||
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
|
FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
|
||||||
if (xloadsparefont(pattern, FRC_BOLD))
|
if (xloadsparefont(pattern, FRC_BOLD))
|
||||||
die("can't open spare font %s\n", *fp);
|
die("can't open spare font %s\n", *fp);
|
||||||
|
|
||||||
FcPatternDestroy(pattern);
|
FcPatternDestroy(pattern);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1262,21 +1236,11 @@ 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)))
|
||||||
|
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())
|
||||||
@ -1289,12 +1253,12 @@ xinit(int cols, int rows)
|
|||||||
xloadsparefonts();
|
xloadsparefonts();
|
||||||
|
|
||||||
/* colors */
|
/* colors */
|
||||||
xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
|
xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
|
||||||
xloadcols();
|
xloadcols();
|
||||||
|
|
||||||
/* adjust fixed window geometry */
|
/* adjust fixed window geometry */
|
||||||
win.w = 2 * win.hborderpx + cols * win.cw;
|
win.w = 2 * borderpx + cols * win.cw;
|
||||||
win.h = 2 * win.vborderpx + rows * win.ch;
|
win.h = 2 * borderpx + rows * win.ch;
|
||||||
if (xw.gm & XNegative)
|
if (xw.gm & XNegative)
|
||||||
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
|
xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
|
||||||
if (xw.gm & YNegative)
|
if (xw.gm & YNegative)
|
||||||
@ -1309,15 +1273,19 @@ 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, xw.depth, InputOutput,
|
win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), 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;
|
||||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
|
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
||||||
dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
|
&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);
|
||||||
|
|
||||||
@ -1381,7 +1349,7 @@ xinit(int cols, int rows)
|
|||||||
int
|
int
|
||||||
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
|
xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
|
||||||
{
|
{
|
||||||
float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
|
float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
|
||||||
ushort mode, prevmode = USHRT_MAX;
|
ushort mode, prevmode = USHRT_MAX;
|
||||||
Font *font = &dc.font;
|
Font *font = &dc.font;
|
||||||
int frcflags = FRC_NORMAL;
|
int frcflags = FRC_NORMAL;
|
||||||
@ -1522,7 +1490,7 @@ void
|
|||||||
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
|
||||||
{
|
{
|
||||||
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
|
||||||
int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
|
int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
|
||||||
width = charlen * win.cw;
|
width = charlen * win.cw;
|
||||||
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
|
||||||
XRenderColor colfg, colbg;
|
XRenderColor colfg, colbg;
|
||||||
@ -1612,17 +1580,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
|||||||
|
|
||||||
/* Intelligent cleaning up of the borders. */
|
/* Intelligent cleaning up of the borders. */
|
||||||
if (x == 0) {
|
if (x == 0) {
|
||||||
xclear(0, (y == 0)? 0 : winy, win.vborderpx,
|
xclear(0, (y == 0)? 0 : winy, borderpx,
|
||||||
winy + win.ch +
|
winy + win.ch +
|
||||||
((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
|
((winy + win.ch >= borderpx + win.th)? win.h : 0));
|
||||||
}
|
}
|
||||||
if (winx + width >= win.hborderpx + win.tw) {
|
if (winx + width >= borderpx + win.tw) {
|
||||||
xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
xclear(winx + width, (y == 0)? 0 : winy, win.w,
|
||||||
((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
|
((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
|
||||||
}
|
}
|
||||||
if (y == 0)
|
if (y == 0)
|
||||||
xclear(winx, 0, winx + width, win.hborderpx);
|
xclear(winx, 0, winx + width, borderpx);
|
||||||
if (winy + win.ch >= win.vborderpx + win.th)
|
if (winy + win.ch >= borderpx + win.th)
|
||||||
xclear(winx, winy + win.ch, winx + width, win.h);
|
xclear(winx, winy + win.ch, winx + width, win.h);
|
||||||
|
|
||||||
/* Clean up the region we want to draw to. */
|
/* Clean up the region we want to draw to. */
|
||||||
@ -1723,35 +1691,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int le
|
|||||||
case 3: /* Blinking Underline */
|
case 3: /* Blinking Underline */
|
||||||
case 4: /* Steady Underline */
|
case 4: /* Steady Underline */
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + cx * win.cw,
|
borderpx + cx * win.cw,
|
||||||
win.vborderpx + (cy + 1) * win.ch - \
|
borderpx + (cy + 1) * win.ch - \
|
||||||
cursorthickness,
|
cursorthickness,
|
||||||
win.cw, cursorthickness);
|
win.cw, cursorthickness);
|
||||||
break;
|
break;
|
||||||
case 5: /* Blinking bar */
|
case 5: /* Blinking bar */
|
||||||
case 6: /* Steady bar */
|
case 6: /* Steady bar */
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + cx * win.cw,
|
borderpx + cx * win.cw,
|
||||||
win.vborderpx + cy * win.ch,
|
borderpx + cy * win.ch,
|
||||||
cursorthickness, win.ch);
|
cursorthickness, win.ch);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + cx * win.cw,
|
borderpx + cx * win.cw,
|
||||||
win.vborderpx + cy * win.ch,
|
borderpx + cy * win.ch,
|
||||||
win.cw - 1, 1);
|
win.cw - 1, 1);
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + cx * win.cw,
|
borderpx + cx * win.cw,
|
||||||
win.vborderpx + cy * win.ch,
|
borderpx + cy * win.ch,
|
||||||
1, win.ch - 1);
|
1, win.ch - 1);
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + (cx + 1) * win.cw - 1,
|
borderpx + (cx + 1) * win.cw - 1,
|
||||||
win.vborderpx + cy * win.ch,
|
borderpx + cy * win.ch,
|
||||||
1, win.ch - 1);
|
1, win.ch - 1);
|
||||||
XftDrawRect(xw.draw, &drawcol,
|
XftDrawRect(xw.draw, &drawcol,
|
||||||
win.hborderpx + cx * win.cw,
|
borderpx + cx * win.cw,
|
||||||
win.vborderpx + (cy + 1) * win.ch - 1,
|
borderpx + (cy + 1) * win.ch - 1,
|
||||||
win.cw, 1);
|
win.cw, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1771,8 +1739,9 @@ xseticontitle(char *p)
|
|||||||
XTextProperty prop;
|
XTextProperty prop;
|
||||||
DEFAULT(p, opt_title);
|
DEFAULT(p, opt_title);
|
||||||
|
|
||||||
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
|
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
|
||||||
&prop);
|
&prop) != Success)
|
||||||
|
return;
|
||||||
XSetWMIconName(xw.dpy, xw.win, &prop);
|
XSetWMIconName(xw.dpy, xw.win, &prop);
|
||||||
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmiconname);
|
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmiconname);
|
||||||
XFree(prop.value);
|
XFree(prop.value);
|
||||||
@ -1784,8 +1753,9 @@ xsettitle(char *p)
|
|||||||
XTextProperty prop;
|
XTextProperty prop;
|
||||||
DEFAULT(p, opt_title);
|
DEFAULT(p, opt_title);
|
||||||
|
|
||||||
Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
|
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
|
||||||
&prop);
|
&prop) != Success)
|
||||||
|
return;
|
||||||
XSetWMName(xw.dpy, xw.win, &prop);
|
XSetWMName(xw.dpy, xw.win, &prop);
|
||||||
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
|
XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
|
||||||
XFree(prop.value);
|
XFree(prop.value);
|
||||||
@ -1929,22 +1899,12 @@ focus(XEvent *ev)
|
|||||||
xseturgency(0);
|
xseturgency(0);
|
||||||
if (IS_SET(MODE_FOCUS))
|
if (IS_SET(MODE_FOCUS))
|
||||||
ttywrite("\033[I", 3, 0);
|
ttywrite("\033[I", 3, 0);
|
||||||
if (!focused) {
|
|
||||||
focused = 1;
|
|
||||||
xloadcols();
|
|
||||||
tfulldirt();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
if (xw.ime.xic)
|
if (xw.ime.xic)
|
||||||
XUnsetICFocus(xw.ime.xic);
|
XUnsetICFocus(xw.ime.xic);
|
||||||
win.mode &= ~MODE_FOCUSED;
|
win.mode &= ~MODE_FOCUSED;
|
||||||
if (IS_SET(MODE_FOCUS))
|
if (IS_SET(MODE_FOCUS))
|
||||||
ttywrite("\033[O", 3, 0);
|
ttywrite("\033[O", 3, 0);
|
||||||
if (focused) {
|
|
||||||
focused = 0;
|
|
||||||
xloadcols();
|
|
||||||
tfulldirt();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2173,59 +2133,6 @@ run(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
|
|
||||||
{
|
|
||||||
char **sdst = dst;
|
|
||||||
int *idst = dst;
|
|
||||||
float *fdst = dst;
|
|
||||||
|
|
||||||
char fullname[256];
|
|
||||||
char fullclass[256];
|
|
||||||
char *type;
|
|
||||||
XrmValue ret;
|
|
||||||
|
|
||||||
snprintf(fullname, sizeof(fullname), "%s.%s",
|
|
||||||
opt_name ? opt_name : "st", name);
|
|
||||||
snprintf(fullclass, sizeof(fullclass), "%s.%s",
|
|
||||||
opt_class ? opt_class : "St", name);
|
|
||||||
fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
|
|
||||||
|
|
||||||
XrmGetResource(db, fullname, fullclass, &type, &ret);
|
|
||||||
if (ret.addr == NULL || strncmp("String", type, 64))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
switch (rtype) {
|
|
||||||
case STRING:
|
|
||||||
*sdst = ret.addr;
|
|
||||||
break;
|
|
||||||
case INTEGER:
|
|
||||||
*idst = strtoul(ret.addr, NULL, 10);
|
|
||||||
break;
|
|
||||||
case FLOAT:
|
|
||||||
*fdst = strtof(ret.addr, NULL);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
config_init(void)
|
|
||||||
{
|
|
||||||
char *resm;
|
|
||||||
XrmDatabase db;
|
|
||||||
ResourcePref *p;
|
|
||||||
|
|
||||||
XrmInitialize();
|
|
||||||
resm = XResourceManagerString(xw.dpy);
|
|
||||||
if (!resm)
|
|
||||||
return;
|
|
||||||
|
|
||||||
db = XrmGetStringDatabase(resm);
|
|
||||||
for (p = resources; p < resources + LEN(resources); p++)
|
|
||||||
resource_load(db, p->name, p->type, p->dst);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
usage(void)
|
usage(void)
|
||||||
{
|
{
|
||||||
@ -2250,9 +2157,6 @@ main(int argc, char *argv[])
|
|||||||
case 'a':
|
case 'a':
|
||||||
allowaltscreen = 0;
|
allowaltscreen = 0;
|
||||||
break;
|
break;
|
||||||
case 'A':
|
|
||||||
opt_alpha = EARGF(usage());
|
|
||||||
break;
|
|
||||||
case 'c':
|
case 'c':
|
||||||
opt_class = EARGF(usage());
|
opt_class = EARGF(usage());
|
||||||
break;
|
break;
|
||||||
@ -2302,15 +2206,8 @@ run:
|
|||||||
|
|
||||||
setlocale(LC_CTYPE, "");
|
setlocale(LC_CTYPE, "");
|
||||||
XSetLocaleModifiers("");
|
XSetLocaleModifiers("");
|
||||||
|
|
||||||
if(!(xw.dpy = XOpenDisplay(NULL)))
|
|
||||||
die("Can't open display\n");
|
|
||||||
|
|
||||||
config_init();
|
|
||||||
cols = MAX(cols, 1);
|
cols = MAX(cols, 1);
|
||||||
rows = MAX(rows, 1);
|
rows = MAX(rows, 1);
|
||||||
defaultbg = MAX(LEN(colorname), 256);
|
|
||||||
alphaUnfocus = alpha-alphaOffset;
|
|
||||||
tnew(cols, rows);
|
tnew(cols, rows);
|
||||||
xinit(cols, rows);
|
xinit(cols, rows);
|
||||||
xsetenv();
|
xsetenv();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user