Compare commits
10 Commits
9c30066e73
...
config
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
044680c9cf | ||
|
|
4afa49363c | ||
|
|
0048ea34ad | ||
|
|
9c4a7d9b1f | ||
|
|
5ec07dcba3 | ||
|
|
475a0a36cb | ||
|
|
e8392b282c | ||
|
|
f8afebdfa0 | ||
|
|
bda9c9ffa6 | ||
|
|
045a0fab4f |
40
config.def.h
40
config.def.h
@@ -5,7 +5,7 @@
|
|||||||
*
|
*
|
||||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||||
*/
|
*/
|
||||||
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
static char *font = "SauceCodePro Nerd Font Mono:pixelsize=15:antialias=true:autohint=true";
|
||||||
static int borderpx = 2;
|
static int borderpx = 2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -34,7 +34,7 @@ static float chscale = 1.0;
|
|||||||
*
|
*
|
||||||
* More advanced example: L" `'\"()[]{}"
|
* More advanced example: L" `'\"()[]{}"
|
||||||
*/
|
*/
|
||||||
wchar_t *worddelimiters = L" ";
|
wchar_t *worddelimiters = L" `'\"()[]{}";
|
||||||
|
|
||||||
/* selection timeouts (in milliseconds) */
|
/* selection timeouts (in milliseconds) */
|
||||||
static unsigned int doubleclicktimeout = 300;
|
static unsigned int doubleclicktimeout = 300;
|
||||||
@@ -87,29 +87,29 @@ char *termname = "st-256color";
|
|||||||
*
|
*
|
||||||
* stty tabs
|
* stty tabs
|
||||||
*/
|
*/
|
||||||
unsigned int tabspaces = 8;
|
unsigned int tabspaces = 4;
|
||||||
|
|
||||||
/* Terminal colors (16 first used in escape sequence) */
|
/* Terminal colors (16 first used in escape sequence) */
|
||||||
static const char *colorname[] = {
|
static const char *colorname[] = {
|
||||||
/* 8 normal colors */
|
/* 8 normal colors */
|
||||||
"black",
|
"#0c0d0e",
|
||||||
"red3",
|
"#e31a1c",
|
||||||
"green3",
|
"#31a354",
|
||||||
"yellow3",
|
"#dca060",
|
||||||
"blue2",
|
"#3182db",
|
||||||
"magenta3",
|
"#756bb1",
|
||||||
"cyan3",
|
"#80b1d3",
|
||||||
"gray90",
|
"#b7b8b9",
|
||||||
|
|
||||||
/* 8 bright colors */
|
/* 8 bright colors */
|
||||||
"gray50",
|
"#737475",
|
||||||
"red",
|
"#e31a1c",
|
||||||
"green",
|
"#31a354",
|
||||||
"yellow",
|
"#dca060",
|
||||||
"#5c5cff",
|
"#3182db",
|
||||||
"magenta",
|
"#756bb1",
|
||||||
"cyan",
|
"#80b1d3",
|
||||||
"white",
|
"#fcfdfe",
|
||||||
|
|
||||||
[255] = 0,
|
[255] = 0,
|
||||||
|
|
||||||
@@ -171,7 +171,9 @@ static uint forcemousemod = ShiftMask;
|
|||||||
static MouseShortcut mshortcuts[] = {
|
static MouseShortcut mshortcuts[] = {
|
||||||
/* mask button function argument release */
|
/* mask button function argument release */
|
||||||
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
{ XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
|
||||||
|
{ ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} },
|
||||||
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
{ XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
|
||||||
|
{ ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} },
|
||||||
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
{ XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
26
st.c
26
st.c
@@ -1106,28 +1106,18 @@ selscroll(int orig, int n)
|
|||||||
if (sel.ob.x == -1)
|
if (sel.ob.x == -1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
|
if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
|
||||||
if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
|
selclear();
|
||||||
|
} else if (BETWEEN(sel.nb.y, orig, term.bot)) {
|
||||||
|
sel.ob.y += n;
|
||||||
|
sel.oe.y += n;
|
||||||
|
if (sel.ob.y < term.top || sel.ob.y > term.bot ||
|
||||||
|
sel.oe.y < term.top || sel.oe.y > term.bot) {
|
||||||
selclear();
|
selclear();
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (sel.type == SEL_RECTANGULAR) {
|
|
||||||
if (sel.ob.y < term.top)
|
|
||||||
sel.ob.y = term.top;
|
|
||||||
if (sel.oe.y > term.bot)
|
|
||||||
sel.oe.y = term.bot;
|
|
||||||
} else {
|
} else {
|
||||||
if (sel.ob.y < term.top) {
|
|
||||||
sel.ob.y = term.top;
|
|
||||||
sel.ob.x = 0;
|
|
||||||
}
|
|
||||||
if (sel.oe.y > term.bot) {
|
|
||||||
sel.oe.y = term.bot;
|
|
||||||
sel.oe.x = term.col;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
selnormalize();
|
selnormalize();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
3
st.info
3
st.info
@@ -47,7 +47,7 @@ st-mono| simpleterm monocolor,
|
|||||||
indn=\E[%p1%dS,
|
indn=\E[%p1%dS,
|
||||||
invis=\E[8m,
|
invis=\E[8m,
|
||||||
is2=\E[4l\E>\E[?1034l,
|
is2=\E[4l\E>\E[?1034l,
|
||||||
it#8,
|
it#4,
|
||||||
kel=\E[1;2F,
|
kel=\E[1;2F,
|
||||||
ked=\E[1;5F,
|
ked=\E[1;5F,
|
||||||
ka1=\E[1~,
|
ka1=\E[1~,
|
||||||
@@ -158,6 +158,7 @@ st-mono| simpleterm monocolor,
|
|||||||
rc=\E8,
|
rc=\E8,
|
||||||
rev=\E[7m,
|
rev=\E[7m,
|
||||||
ri=\EM,
|
ri=\EM,
|
||||||
|
rin=\E[%p1%dT,
|
||||||
ritm=\E[23m,
|
ritm=\E[23m,
|
||||||
rmacs=\E(B,
|
rmacs=\E(B,
|
||||||
rmcup=\E[?1049l,
|
rmcup=\E[?1049l,
|
||||||
|
|||||||
Reference in New Issue
Block a user