Merge remote-tracking branch 'suckless/master'
This commit is contained in:
commit
590c404824
GPG Key ID:
9D8E987C4B2E1E9C
10
Makefile
10
Makefile
@ -7,13 +7,7 @@ include config.mk
|
||||
SRC = st.c x.c
|
||||
OBJ = $(SRC:.c=.o)
|
||||
|
||||
all: options st
|
||||
|
||||
options:
|
||||
@echo st build options:
|
||||
@echo "CFLAGS = $(STCFLAGS)"
|
||||
@echo "LDFLAGS = $(STLDFLAGS)"
|
||||
@echo "CC = $(CC)"
|
||||
all: st
|
||||
|
||||
config.h:
|
||||
cp config.def.h config.h
|
||||
@ -57,4 +51,4 @@ uninstall:
|
||||
rm -f $(DESTDIR)$(APPPREFIX)/st.desktop
|
||||
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
||||
|
||||
.PHONY: all options clean dist install uninstall
|
||||
.PHONY: all clean dist install uninstall
|
||||
|
||||
@ -53,7 +53,7 @@ int allowwindowops = 0;
|
||||
* 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 minlatency = 2;
|
||||
static double maxlatency = 33;
|
||||
|
||||
/*
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# st version
|
||||
VERSION = 0.9
|
||||
VERSION = 0.9.3
|
||||
|
||||
# Customize below to fit your system
|
||||
|
||||
|
||||
63
st.c
63
st.c
@ -1103,7 +1103,7 @@ tscrollup(int orig, int n)
|
||||
void
|
||||
selscroll(int orig, int n)
|
||||
{
|
||||
if (sel.ob.x == -1)
|
||||
if (sel.ob.x == -1 || sel.alt != IS_SET(MODE_ALTSCREEN))
|
||||
return;
|
||||
|
||||
if (BETWEEN(sel.nb.y, orig, term.bot) != BETWEEN(sel.ne.y, orig, term.bot)) {
|
||||
@ -1138,6 +1138,7 @@ csiparse(void)
|
||||
{
|
||||
char *p = csiescseq.buf, *np;
|
||||
long int v;
|
||||
int sep = ';'; /* colon or semi-colon, but not both */
|
||||
|
||||
csiescseq.narg = 0;
|
||||
if (*p == '?') {
|
||||
@ -1155,7 +1156,9 @@ csiparse(void)
|
||||
v = -1;
|
||||
csiescseq.arg[csiescseq.narg++] = v;
|
||||
p = np;
|
||||
if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
|
||||
if (sep == ';' && *p == ':')
|
||||
sep = ':'; /* allow override to colon once */
|
||||
if (*p != sep || csiescseq.narg == ESC_ARG_SIZ)
|
||||
break;
|
||||
p++;
|
||||
}
|
||||
@ -1423,16 +1426,22 @@ tsetattr(const int *attr, int l)
|
||||
if ((idx = tdefcolor(attr, &i, l)) >= 0)
|
||||
term.c.attr.fg = idx;
|
||||
break;
|
||||
case 39:
|
||||
case 39: /* set foreground color to default */
|
||||
term.c.attr.fg = defaultfg;
|
||||
break;
|
||||
case 48:
|
||||
if ((idx = tdefcolor(attr, &i, l)) >= 0)
|
||||
term.c.attr.bg = idx;
|
||||
break;
|
||||
case 49:
|
||||
case 49: /* set background color to default */
|
||||
term.c.attr.bg = defaultbg;
|
||||
break;
|
||||
case 58:
|
||||
/* This starts a sequence to change the color of
|
||||
* "underline" pixels. We don't support that and
|
||||
* instead eat up a following "5;n" or "2;r;g;b". */
|
||||
tdefcolor(attr, &i, l);
|
||||
break;
|
||||
default:
|
||||
if (BETWEEN(attr[i], 30, 37)) {
|
||||
term.c.attr.fg = attr[i] - 30;
|
||||
@ -1529,7 +1538,7 @@ tsetmode(int priv, int set, const int *args, int narg)
|
||||
case 1006: /* 1006: extended reporting mode */
|
||||
xsetmode(set, MODE_MOUSESGR);
|
||||
break;
|
||||
case 1034:
|
||||
case 1034: /* 1034: enable 8-bit mode for keyboard input */
|
||||
xsetmode(set, MODE_8BIT);
|
||||
break;
|
||||
case 1049: /* swap screen & set/restore cursor as xterm */
|
||||
@ -1537,8 +1546,8 @@ tsetmode(int priv, int set, const int *args, int narg)
|
||||
break;
|
||||
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
|
||||
/* FALLTHROUGH */
|
||||
case 47: /* swap screen */
|
||||
case 1047:
|
||||
case 47: /* swap screen buffer */
|
||||
case 1047: /* swap screen buffer */
|
||||
if (!allowaltscreen)
|
||||
break;
|
||||
alt = IS_SET(MODE_ALTSCREEN);
|
||||
@ -1551,7 +1560,7 @@ tsetmode(int priv, int set, const int *args, int narg)
|
||||
if (*args != 1049)
|
||||
break;
|
||||
/* FALLTHROUGH */
|
||||
case 1048:
|
||||
case 1048: /* save/restore cursor (like DECSC/DECRC) */
|
||||
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
|
||||
break;
|
||||
case 2004: /* 2004: bracketed paste mode */
|
||||
@ -1649,7 +1658,7 @@ csihandle(void)
|
||||
ttywrite(vtiden, strlen(vtiden), 0);
|
||||
break;
|
||||
case 'b': /* REP -- if last char is printable print it <n> more times */
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
LIMIT(csiescseq.arg[0], 1, 65535);
|
||||
if (term.lastc)
|
||||
while (csiescseq.arg[0]-- > 0)
|
||||
tputc(term.lastc);
|
||||
@ -1708,7 +1717,7 @@ csihandle(void)
|
||||
}
|
||||
break;
|
||||
case 1: /* above */
|
||||
if (term.c.y > 1)
|
||||
if (term.c.y > 0)
|
||||
tclearregion(0, 0, term.col-1, term.c.y-1);
|
||||
tclearregion(0, term.c.y, term.c.x, term.c.y);
|
||||
break;
|
||||
@ -1734,6 +1743,7 @@ csihandle(void)
|
||||
}
|
||||
break;
|
||||
case 'S': /* SU -- Scroll <n> line up */
|
||||
if (csiescseq.priv) break;
|
||||
DEFAULT(csiescseq.arg[0], 1);
|
||||
tscrollup(term.top, csiescseq.arg[0]);
|
||||
break;
|
||||
@ -1803,7 +1813,11 @@ csihandle(void)
|
||||
tcursor(CURSOR_SAVE);
|
||||
break;
|
||||
case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
|
||||
tcursor(CURSOR_LOAD);
|
||||
if (csiescseq.priv) {
|
||||
goto unknown;
|
||||
} else {
|
||||
tcursor(CURSOR_LOAD);
|
||||
}
|
||||
break;
|
||||
case ' ':
|
||||
switch (csiescseq.mode[1]) {
|
||||
@ -1905,7 +1919,7 @@ strhandle(void)
|
||||
if (narg > 1)
|
||||
xsettitle(strescseq.args[1]);
|
||||
return;
|
||||
case 52:
|
||||
case 52: /* manipulate selection data */
|
||||
if (narg > 2 && allowwindowops) {
|
||||
dec = base64dec(strescseq.args[2]);
|
||||
if (dec) {
|
||||
@ -1916,9 +1930,9 @@ strhandle(void)
|
||||
}
|
||||
}
|
||||
return;
|
||||
case 10:
|
||||
case 11:
|
||||
case 12:
|
||||
case 10: /* set dynamic VT100 text foreground color */
|
||||
case 11: /* set dynamic VT100 text background color */
|
||||
case 12: /* set dynamic text cursor color */
|
||||
if (narg < 2)
|
||||
break;
|
||||
p = strescseq.args[1];
|
||||
@ -1959,6 +1973,19 @@ strhandle(void)
|
||||
tfulldirt();
|
||||
}
|
||||
return;
|
||||
case 110: /* reset dynamic VT100 text foreground color */
|
||||
case 111: /* reset dynamic VT100 text background color */
|
||||
case 112: /* reset dynamic text cursor color */
|
||||
if (narg != 1)
|
||||
break;
|
||||
if ((j = par - 110) < 0 || j >= LEN(osc_table))
|
||||
break; /* shouldn't be possible */
|
||||
if (xsetcolorname(osc_table[j].idx, NULL)) {
|
||||
fprintf(stderr, "erresc: %s color not found\n", osc_table[j].str);
|
||||
} else {
|
||||
tfulldirt();
|
||||
}
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 'k': /* old title set compatibility */
|
||||
@ -2389,6 +2416,7 @@ eschandle(uchar ascii)
|
||||
treset();
|
||||
resettitle();
|
||||
xloadcols();
|
||||
xsetmode(0, MODE_HIDE);
|
||||
break;
|
||||
case '=': /* DECPAM -- Application keypad */
|
||||
xsetmode(1, MODE_APPKEYPAD);
|
||||
@ -2536,7 +2564,10 @@ check_control_code:
|
||||
}
|
||||
|
||||
if (term.c.x+width > term.col) {
|
||||
tnewline(1);
|
||||
if (IS_SET(MODE_WRAP))
|
||||
tnewline(1);
|
||||
else
|
||||
tmoveto(term.col - width, term.c.y);
|
||||
gp = &term.line[term.c.y][term.c.x];
|
||||
}
|
||||
|
||||
|
||||
4
st.info
4
st.info
@ -184,6 +184,10 @@ st-mono| simpleterm monocolor,
|
||||
# XTerm extensions
|
||||
rmxx=\E[29m,
|
||||
smxx=\E[9m,
|
||||
BE=\E[?2004h,
|
||||
BD=\E[?2004l,
|
||||
PS=\E[200~,
|
||||
PE=\E[201~,
|
||||
# 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)
|
||||
|
||||
21
x.c
21
x.c
@ -819,7 +819,7 @@ xloadcols(void)
|
||||
int
|
||||
xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b)
|
||||
{
|
||||
if (!BETWEEN(x, 0, dc.collen))
|
||||
if (!BETWEEN(x, 0, dc.collen - 1))
|
||||
return 1;
|
||||
|
||||
*r = dc.col[x].color.red >> 8;
|
||||
@ -834,7 +834,7 @@ xsetcolorname(int x, const char *name)
|
||||
{
|
||||
Color ncolor;
|
||||
|
||||
if (!BETWEEN(x, 0, dc.collen))
|
||||
if (!BETWEEN(x, 0, dc.collen - 1))
|
||||
return 1;
|
||||
|
||||
if (!xloadcolor(x, name, &ncolor))
|
||||
@ -1132,7 +1132,7 @@ xinit(int cols, int rows)
|
||||
{
|
||||
XGCValues gcvalues;
|
||||
Cursor cursor;
|
||||
Window parent;
|
||||
Window parent, root;
|
||||
pid_t thispid = getpid();
|
||||
XColor xmousefg, xmousebg;
|
||||
|
||||
@ -1169,16 +1169,19 @@ xinit(int cols, int rows)
|
||||
| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
|
||||
xw.attrs.colormap = xw.cmap;
|
||||
|
||||
root = XRootWindow(xw.dpy, xw.scr);
|
||||
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,
|
||||
parent = root;
|
||||
xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t,
|
||||
win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
|
||||
xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
|
||||
| CWEventMask | CWColormap, &xw.attrs);
|
||||
if (parent != root)
|
||||
XReparentWindow(xw.dpy, xw.win, parent, xw.l, xw.t);
|
||||
|
||||
memset(&gcvalues, 0, sizeof(gcvalues));
|
||||
gcvalues.graphics_exposures = False;
|
||||
dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
|
||||
dc.gc = XCreateGC(xw.dpy, xw.win, GCGraphicsExposures,
|
||||
&gcvalues);
|
||||
xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
|
||||
DefaultDepth(xw.dpy, xw.scr));
|
||||
@ -1625,6 +1628,9 @@ xseticontitle(char *p)
|
||||
XTextProperty prop;
|
||||
DEFAULT(p, opt_title);
|
||||
|
||||
if (p[0] == '\0')
|
||||
p = opt_title;
|
||||
|
||||
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
|
||||
&prop) != Success)
|
||||
return;
|
||||
@ -1639,6 +1645,9 @@ xsettitle(char *p)
|
||||
XTextProperty prop;
|
||||
DEFAULT(p, opt_title);
|
||||
|
||||
if (p[0] == '\0')
|
||||
p = opt_title;
|
||||
|
||||
if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
|
||||
&prop) != Success)
|
||||
return;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user