Moved to upstream git source, config is now a patch instead of the whole config.h. is now st-tl so it doesn't mask st from official repos
This commit is contained in:
parent
1a69ba84bc
commit
3cced591a2
41
PKGBUILD
41
PKGBUILD
|
|
@ -1,40 +1,47 @@
|
||||||
# Contributor: Patrick Jackson <PatrickSJackson gmail com>
|
# Maintainer: David Thurstenson <thurstylark@gmail.com>
|
||||||
# Maintainer: Christoph Vigano <mail@cvigano.de>
|
|
||||||
|
|
||||||
pkgname=st
|
pkgname=st-tl
|
||||||
pkgver=0.7
|
_pkgname=st
|
||||||
|
pkgver=0.7.r17.gc63a87c
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='A simple virtual terminal emulator for X.'
|
pkgdesc='A simple virtual terminal emulator for X.'
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
depends=('libxft' 'libxext' 'xorg-fonts-misc' 'dmenu' 'xurls')
|
depends=('libxft' 'libxext' 'xorg-fonts-misc' 'dmenu' 'xurls')
|
||||||
makedepends=('ncurses')
|
makedepends=('ncurses')
|
||||||
|
conflicts=('st')
|
||||||
url="http://st.suckless.org"
|
url="http://st.suckless.org"
|
||||||
source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz
|
source=(git://git.suckless.org/st
|
||||||
config.h
|
tl-config.diff
|
||||||
http://st.suckless.org/patches/st-externalpipe-20160727-308bfbf.diff
|
st-externalpipe.diff::http://st.suckless.org/patches/st-externalpipe-20161125-e448324.diff
|
||||||
http://st.suckless.org/patches/st-hidecursor-20160727-308bfbf.diff)
|
st-hidecursor.diff::http://st.suckless.org/patches/st-hidecursor-20160727-308bfbf.diff)
|
||||||
md5sums=('29b2a599cf1511c8062ed8f025c84c63'
|
md5sums=('SKIP'
|
||||||
'660d6802bd0dcce12d474bf911ffb6db'
|
'29764c3efbc4ed6d7eb1b39219391382'
|
||||||
'47d628501defd776efd0d4fbb1968895'
|
'c54c87489342b8d77c6dd8f3c2ff997e'
|
||||||
'8ff8a77b34dfc09a4dd0d2cf876d68e7')
|
'8ff8a77b34dfc09a4dd0d2cf876d68e7')
|
||||||
|
|
||||||
|
pkgver() {
|
||||||
|
cd "$_pkgname"
|
||||||
|
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
|
||||||
|
}
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd $srcdir/$pkgname-$pkgver
|
cd $srcdir/$_pkgname
|
||||||
# skip terminfo which conflicts with nsurses
|
# skip terminfo which conflicts with nsurses
|
||||||
sed -i '/\@tic /d' Makefile
|
sed -i '/\@tic /d' Makefile
|
||||||
cp $srcdir/config.h config.h
|
cp config.def.h config.h
|
||||||
patch -Np1 -i $srcdir/st-externalpipe-20160727-308bfbf.diff
|
patch -Np1 -i $srcdir/tl-config.diff
|
||||||
patch -Np1 -i $srcdir/st-hidecursor-20160727-308bfbf.diff
|
patch -Np1 -i $srcdir/st-externalpipe.diff
|
||||||
|
patch -Np1 -i $srcdir/st-hidecursor.diff
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $srcdir/$pkgname-$pkgver
|
cd $srcdir/$_pkgname
|
||||||
make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
|
make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cd $srcdir/$pkgname-$pkgver
|
cd $srcdir/$_pkgname
|
||||||
make PREFIX=/usr DESTDIR="$pkgdir" TERMINFO="$pkgdir/usr/share/terminfo" install
|
make PREFIX=/usr DESTDIR="$pkgdir" TERMINFO="$pkgdir/usr/share/terminfo" install
|
||||||
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||||
install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
|
install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
|
||||||
|
|
|
||||||
446
config.h
446
config.h
|
|
@ -1,446 +0,0 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* appearance
|
|
||||||
*
|
|
||||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
|
||||||
*/
|
|
||||||
static char font[] = "Monospace-10";
|
|
||||||
static int borderpx = 2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* What program is execed by st depends of these precedence rules:
|
|
||||||
* 1: program passed with -e
|
|
||||||
* 2: utmp option
|
|
||||||
* 3: SHELL environment variable
|
|
||||||
* 4: value of shell in /etc/passwd
|
|
||||||
* 5: value of shell in config.h
|
|
||||||
*/
|
|
||||||
static char shell[] = "/bin/sh";
|
|
||||||
static char *utmp = NULL;
|
|
||||||
static char stty_args[] = "stty raw pass8 nl -echo -iexten -cstopb 38400";
|
|
||||||
|
|
||||||
/* identification sequence returned in DA and DECID */
|
|
||||||
static 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: " `'\"()[]{}"
|
|
||||||
*/
|
|
||||||
static char worddelimiters[] = " ";
|
|
||||||
|
|
||||||
/* selection timeouts (in milliseconds) */
|
|
||||||
static unsigned int doubleclicktimeout = 300;
|
|
||||||
static unsigned int tripleclicktimeout = 600;
|
|
||||||
|
|
||||||
/* alt screens */
|
|
||||||
static int allowaltscreen = 1;
|
|
||||||
|
|
||||||
/* frames per second st should at maximum draw to the screen */
|
|
||||||
static unsigned int xfps = 120;
|
|
||||||
static unsigned int actionfps = 30;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
|
|
||||||
* attribute.
|
|
||||||
*/
|
|
||||||
static unsigned int blinktimeout = 800;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* thickness of underline and bar cursors
|
|
||||||
*/
|
|
||||||
static unsigned int cursorthickness = 2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
|
||||||
* it
|
|
||||||
*/
|
|
||||||
static int bellvolume = 50;
|
|
||||||
|
|
||||||
/* default TERM value */
|
|
||||||
static 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
|
|
||||||
*/
|
|
||||||
static unsigned int tabspaces = 8;
|
|
||||||
|
|
||||||
/*TERMINAL.SEXY START*/
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
|
||||||
static const char *colorname[] = {
|
|
||||||
|
|
||||||
/* 8 normal colors */
|
|
||||||
[0] = "#1c1c1c", /* black */
|
|
||||||
[1] = "#b40f0f", /* red */
|
|
||||||
[2] = "#12981b", /* green */
|
|
||||||
[3] = "#faff00", /* yellow */
|
|
||||||
[4] = "#048ac7", /* blue */
|
|
||||||
[5] = "#833c9f", /* magenta */
|
|
||||||
[6] = "#0ac1cd", /* cyan */
|
|
||||||
[7] = "#e5e5e5", /* white */
|
|
||||||
|
|
||||||
/* 8 bright colors */
|
|
||||||
[8] = "#666666", /* black */
|
|
||||||
[9] = "#e31313", /* red */
|
|
||||||
[10] = "#1ce129", /* green */
|
|
||||||
[11] = "#fbff3f", /* yellow */
|
|
||||||
[12] = "#48c6ff", /* blue */
|
|
||||||
[13] = "#be67e1", /* magenta */
|
|
||||||
[14] = "#63e7f0", /* cyan */
|
|
||||||
[15] = "#f3f3f3", /* white */
|
|
||||||
|
|
||||||
/* special colors */
|
|
||||||
[256] = "#131313", /* background */
|
|
||||||
[257] = "#dddddd", /* foreground */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* * Default colors (colorname index)
|
|
||||||
* * foreground, background, cursor
|
|
||||||
* */
|
|
||||||
static unsigned int defaultfg = 257;
|
|
||||||
static unsigned int defaultbg = 256;
|
|
||||||
static unsigned int defaultcs = 257;
|
|
||||||
static unsigned int defaultrcs = 256;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* * Colors used, when the specific fg == defaultfg. So in reverse mode this
|
|
||||||
* * will reverse too. Another logic would only make the simple feature too
|
|
||||||
* * complex.
|
|
||||||
* */
|
|
||||||
static unsigned int defaultitalic = 7;
|
|
||||||
static unsigned int defaultunderline = 7;
|
|
||||||
|
|
||||||
/*TERMINAL.SEXY END*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default shape of cursor
|
|
||||||
* 2: Block ("█")
|
|
||||||
* 4: Underline ("_")
|
|
||||||
* 6: Bar ("|")
|
|
||||||
* 7: Snowman ("☃")
|
|
||||||
*/
|
|
||||||
static unsigned int cursorshape = 2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default colour and shape of the mouse cursor
|
|
||||||
*/
|
|
||||||
static unsigned int mouseshape = XC_xterm;
|
|
||||||
static unsigned int mousefg = 7;
|
|
||||||
static unsigned int mousebg = 0;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Internal mouse shortcuts.
|
|
||||||
* Beware that overloading Button1 will disable the selection.
|
|
||||||
*/
|
|
||||||
static MouseShortcut mshortcuts[] = {
|
|
||||||
/* button mask string */
|
|
||||||
{ Button4, XK_ANY_MOD, "\031" },
|
|
||||||
{ Button5, XK_ANY_MOD, "\005" },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Internal keyboard shortcuts. */
|
|
||||||
#define MODKEY Mod1Mask
|
|
||||||
|
|
||||||
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} },
|
|
||||||
{ MODKEY|ShiftMask, XK_Prior, xzoom, {.f = +1} },
|
|
||||||
{ MODKEY|ShiftMask, XK_Next, xzoom, {.f = -1} },
|
|
||||||
{ MODKEY|ShiftMask, XK_Home, xzoomreset, {.f = 0} },
|
|
||||||
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
|
|
||||||
{ ControlMask|ShiftMask, XK_V, clippaste, {.i = 0} },
|
|
||||||
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
|
|
||||||
{ ControlMask|ShiftMask, XK_X, externalpipe, { .v = "xurls | tac | dmenu -l 10 | xargs -r chromium" } },
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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
|
|
||||||
* crlf value
|
|
||||||
* * 0: no value
|
|
||||||
* * > 0: crlf mode is enabled
|
|
||||||
* * < 0: crlf mode is 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;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Override mouse-select 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 forceselmod = ShiftMask;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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 crlf */
|
|
||||||
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1, 0},
|
|
||||||
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
|
|
||||||
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
|
|
||||||
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
|
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0},
|
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
|
|
||||||
{ XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
|
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0, 0},
|
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
|
|
||||||
{ XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
|
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0, 0},
|
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
|
|
||||||
{ XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
|
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0, 0},
|
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
|
|
||||||
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
|
|
||||||
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
|
|
||||||
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
|
|
||||||
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0},
|
|
||||||
{ XK_KP_End, ControlMask, "\033[J", -1, 0, 0},
|
|
||||||
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0},
|
|
||||||
{ XK_KP_End, ShiftMask, "\033[K", -1, 0, 0},
|
|
||||||
{ XK_KP_End, ShiftMask, "\033[1;2F", +1, 0, 0},
|
|
||||||
{ XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
|
|
||||||
{ XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
|
|
||||||
{ XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
|
|
||||||
{ XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
|
|
||||||
{ XK_KP_Insert, ShiftMask, "\033[4l", -1, 0, 0},
|
|
||||||
{ XK_KP_Insert, ControlMask, "\033[L", -1, 0, 0},
|
|
||||||
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
|
|
||||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
|
|
||||||
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
|
|
||||||
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0, 0},
|
|
||||||
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
|
|
||||||
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0},
|
|
||||||
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
|
|
||||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
|
|
||||||
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
|
|
||||||
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
|
|
||||||
{ XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
|
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
|
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0, -1},
|
|
||||||
{ XK_KP_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1},
|
|
||||||
{ XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0, 0},
|
|
||||||
{ XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0, 0},
|
|
||||||
{ XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0, 0},
|
|
||||||
{ XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0, 0},
|
|
||||||
{ XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0, 0},
|
|
||||||
{ XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0, 0},
|
|
||||||
{ XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0, 0},
|
|
||||||
{ XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0, 0},
|
|
||||||
{ XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0, 0},
|
|
||||||
{ XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0, 0},
|
|
||||||
{ XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0, 0},
|
|
||||||
{ XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0, 0},
|
|
||||||
{ XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0, 0},
|
|
||||||
{ XK_Up, ShiftMask, "\033[1;2A", 0, 0, 0},
|
|
||||||
{ XK_Up, ControlMask, "\033[1;5A", 0, 0, 0},
|
|
||||||
{ XK_Up, Mod1Mask, "\033[1;3A", 0, 0, 0},
|
|
||||||
{ XK_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
|
|
||||||
{ XK_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
|
|
||||||
{ XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0},
|
|
||||||
{ XK_Down, ControlMask, "\033[1;5B", 0, 0, 0},
|
|
||||||
{ XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0},
|
|
||||||
{ XK_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
|
|
||||||
{ XK_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
|
|
||||||
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0},
|
|
||||||
{ XK_Left, ControlMask, "\033[1;5D", 0, 0, 0},
|
|
||||||
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0},
|
|
||||||
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
|
|
||||||
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
|
|
||||||
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0},
|
|
||||||
{ XK_Right, ControlMask, "\033[1;5C", 0, 0, 0},
|
|
||||||
{ XK_Right, Mod1Mask, "\033[1;3C", 0, 0, 0},
|
|
||||||
{ XK_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
|
|
||||||
{ XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
|
|
||||||
{ XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 0},
|
|
||||||
{ XK_Return, Mod1Mask, "\033\r", 0, 0, -1},
|
|
||||||
{ XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1},
|
|
||||||
{ XK_Return, XK_ANY_MOD, "\r", 0, 0, -1},
|
|
||||||
{ XK_Return, XK_ANY_MOD, "\r\n", 0, 0, +1},
|
|
||||||
{ XK_Insert, ShiftMask, "\033[4l", -1, 0, 0},
|
|
||||||
{ XK_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
|
|
||||||
{ XK_Insert, ControlMask, "\033[L", -1, 0, 0},
|
|
||||||
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
|
|
||||||
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
|
|
||||||
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
|
|
||||||
{ XK_Delete, ControlMask, "\033[M", -1, 0, 0},
|
|
||||||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
|
|
||||||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
|
|
||||||
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
|
|
||||||
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
|
|
||||||
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
|
|
||||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
|
|
||||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
|
|
||||||
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
|
|
||||||
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
|
|
||||||
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
|
|
||||||
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
|
|
||||||
{ XK_End, ControlMask, "\033[J", -1, 0, 0},
|
|
||||||
{ XK_End, ControlMask, "\033[1;5F", +1, 0, 0},
|
|
||||||
{ XK_End, ShiftMask, "\033[K", -1, 0, 0},
|
|
||||||
{ XK_End, ShiftMask, "\033[1;2F", +1, 0, 0},
|
|
||||||
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
|
|
||||||
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0, 0},
|
|
||||||
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
|
|
||||||
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
|
|
||||||
{ XK_Next, ControlMask, "\033[6;5~", 0, 0, 0},
|
|
||||||
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
|
|
||||||
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
|
|
||||||
{ XK_F1, XK_NO_MOD, "\033OP" , 0, 0, 0},
|
|
||||||
{ XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0, 0},
|
|
||||||
{ XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0, 0},
|
|
||||||
{ XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0, 0},
|
|
||||||
{ XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0, 0},
|
|
||||||
{ XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0, 0},
|
|
||||||
{ XK_F2, XK_NO_MOD, "\033OQ" , 0, 0, 0},
|
|
||||||
{ XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0, 0},
|
|
||||||
{ XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0, 0},
|
|
||||||
{ XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0, 0},
|
|
||||||
{ XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0, 0},
|
|
||||||
{ XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0, 0},
|
|
||||||
{ XK_F3, XK_NO_MOD, "\033OR" , 0, 0, 0},
|
|
||||||
{ XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0, 0},
|
|
||||||
{ XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0, 0},
|
|
||||||
{ XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0, 0},
|
|
||||||
{ XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0, 0},
|
|
||||||
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0},
|
|
||||||
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0},
|
|
||||||
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0},
|
|
||||||
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0, 0},
|
|
||||||
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0},
|
|
||||||
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0},
|
|
||||||
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0},
|
|
||||||
{ XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0, 0},
|
|
||||||
{ XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0, 0},
|
|
||||||
{ XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0, 0},
|
|
||||||
{ XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0, 0},
|
|
||||||
{ XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0},
|
|
||||||
{ XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0, 0},
|
|
||||||
{ XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0, 0},
|
|
||||||
{ XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0, 0},
|
|
||||||
{ XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0, 0},
|
|
||||||
{ XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0},
|
|
||||||
{ XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0, 0},
|
|
||||||
{ XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0, 0},
|
|
||||||
{ XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0, 0},
|
|
||||||
{ XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0, 0},
|
|
||||||
{ XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0},
|
|
||||||
{ XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0, 0},
|
|
||||||
{ XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0, 0},
|
|
||||||
{ XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0, 0},
|
|
||||||
{ XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0, 0},
|
|
||||||
{ XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0},
|
|
||||||
{ XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0, 0},
|
|
||||||
{ XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0, 0},
|
|
||||||
{ XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0, 0},
|
|
||||||
{ XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0, 0},
|
|
||||||
{ XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0},
|
|
||||||
{ XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0, 0},
|
|
||||||
{ XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0, 0},
|
|
||||||
{ XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0, 0},
|
|
||||||
{ XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0, 0},
|
|
||||||
{ XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0},
|
|
||||||
{ XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0, 0},
|
|
||||||
{ XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0, 0},
|
|
||||||
{ XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0, 0},
|
|
||||||
{ XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0, 0},
|
|
||||||
{ XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0},
|
|
||||||
{ XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0, 0},
|
|
||||||
{ XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0, 0},
|
|
||||||
{ XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0, 0},
|
|
||||||
{ XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0, 0},
|
|
||||||
{ XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0, 0},
|
|
||||||
{ XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0, 0},
|
|
||||||
{ XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0, 0},
|
|
||||||
{ XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0, 0},
|
|
||||||
{ XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0, 0},
|
|
||||||
{ XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0, 0},
|
|
||||||
{ XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0, 0},
|
|
||||||
{ XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0, 0},
|
|
||||||
{ XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0, 0},
|
|
||||||
{ XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0, 0},
|
|
||||||
{ XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0, 0},
|
|
||||||
{ XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0, 0},
|
|
||||||
{ XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0, 0},
|
|
||||||
{ XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0, 0},
|
|
||||||
{ XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0, 0},
|
|
||||||
{ XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0, 0},
|
|
||||||
{ XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0, 0},
|
|
||||||
{ XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0, 0},
|
|
||||||
{ XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0, 0},
|
|
||||||
{ XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0, 0},
|
|
||||||
{ XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0, 0},
|
|
||||||
{ XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0, 0},
|
|
||||||
{ XK_F35, XK_NO_MOD, "\033[23;5~", 0, 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{|}~";
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,126 @@
|
||||||
|
--- a/config.h 2017-01-18 12:28:57.057151443 -0600
|
||||||
|
+++ b/config.h 2017-01-18 13:08:33.104482488 -0600
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
*
|
||||||
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
|
*/
|
||||||
|
-static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
||||||
|
+static char font[] = "Monospace:pixelsize=13:antialias=true:autohint=true";
|
||||||
|
static int borderpx = 2;
|
||||||
|
|
||||||
|
/*
|
||||||
|
@@ -60,7 +60,7 @@
|
||||||
|
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
|
||||||
|
* it
|
||||||
|
*/
|
||||||
|
-static int bellvolume = 0;
|
||||||
|
+static int bellvolume = 50;
|
||||||
|
|
||||||
|
/* default TERM value */
|
||||||
|
static char termname[] = "st-256color";
|
||||||
|
@@ -82,33 +82,32 @@
|
||||||
|
*/
|
||||||
|
static unsigned int tabspaces = 8;
|
||||||
|
|
||||||
|
+/*TERMINAL.SEXY START*/
|
||||||
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
|
static const char *colorname[] = {
|
||||||
|
/* 8 normal colors */
|
||||||
|
- "black",
|
||||||
|
- "red3",
|
||||||
|
- "green3",
|
||||||
|
- "yellow3",
|
||||||
|
- "blue2",
|
||||||
|
- "magenta3",
|
||||||
|
- "cyan3",
|
||||||
|
- "gray90",
|
||||||
|
+ [0] = "#1c1c1c", /* black */
|
||||||
|
+ [1] = "#b40f0f", /* red */
|
||||||
|
+ [2] = "#12981b", /* green */
|
||||||
|
+ [3] = "#faff00", /* yellow */
|
||||||
|
+ [4] = "#048ac7", /* blue */
|
||||||
|
+ [5] = "#833c9f", /* magenta */
|
||||||
|
+ [6] = "#0ac1cd", /* cyan */
|
||||||
|
+ [7] = "#e5e5e5", /* white */
|
||||||
|
|
||||||
|
/* 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",
|
||||||
|
+ [8] = "#666666", /* black */
|
||||||
|
+ [9] = "#e31313", /* red */
|
||||||
|
+ [10] = "#1ce129", /* green */
|
||||||
|
+ [11] = "#fbff3f", /* yellow */
|
||||||
|
+ [12] = "#48c6ff", /* blue */
|
||||||
|
+ [13] = "#be67e1", /* magenta */
|
||||||
|
+ [14] = "#63e7f0", /* cyan */
|
||||||
|
+ [15] = "#f3f3f3", /* white */
|
||||||
|
+
|
||||||
|
+ /* special colors */
|
||||||
|
+ [256] = "#131313", /* background */
|
||||||
|
+ [257] = "#dddddd", /* foreground */
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@@ -116,10 +115,10 @@
|
||||||
|
* Default colors (colorname index)
|
||||||
|
* foreground, background, cursor, reverse cursor
|
||||||
|
*/
|
||||||
|
-static unsigned int defaultfg = 7;
|
||||||
|
-static unsigned int defaultbg = 0;
|
||||||
|
-static unsigned int defaultcs = 256;
|
||||||
|
-static unsigned int defaultrcs = 257;
|
||||||
|
+static unsigned int defaultfg = 257;
|
||||||
|
+static unsigned int defaultbg = 256;
|
||||||
|
+static unsigned int defaultcs = 257;
|
||||||
|
+static unsigned int defaultrcs = 256;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default shape of cursor
|
||||||
|
@@ -164,20 +163,21 @@
|
||||||
|
#define MODKEY Mod1Mask
|
||||||
|
|
||||||
|
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} },
|
||||||
|
- { MODKEY|ShiftMask, XK_Prior, xzoom, {.f = +1} },
|
||||||
|
- { MODKEY|ShiftMask, XK_Next, xzoom, {.f = -1} },
|
||||||
|
- { MODKEY|ShiftMask, XK_Home, xzoomreset, {.f = 0} },
|
||||||
|
- { ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||||
|
- { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
|
||||||
|
- { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
|
||||||
|
- { MODKEY|ShiftMask, XK_V, clippaste, {.i = 0} },
|
||||||
|
- { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
- { MODKEY, XK_Control_L, iso14755, {.i = 0} },
|
||||||
|
+ /* 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} },
|
||||||
|
+ { MODKEY|ShiftMask, XK_Prior, xzoom, {.f = +1} },
|
||||||
|
+ { MODKEY|ShiftMask, XK_Next, xzoom, {.f = -1} },
|
||||||
|
+ { MODKEY|ShiftMask, XK_Home, xzoomreset, {.f = 0} },
|
||||||
|
+ { ShiftMask, XK_Insert, selpaste, {.i = 0} },
|
||||||
|
+ { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
|
||||||
|
+ { MODKEY|ShiftMask, XK_C, clipcopy, {.i = 0} },
|
||||||
|
+ { ControlMask|ShiftMask, XK_V, clippaste, {.i = 0} },
|
||||||
|
+ { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
|
||||||
|
+ { ControlMask|ShiftMask, XK_X, externalpipe, { .v = "xurls | tac | dmenu -l 10 | xargs -r chromium" } },
|
||||||
|
+ { MODKEY, XK_Control_L, iso14755, {.i = 0} },
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
Loading…
Reference in New Issue