Compare commits
34 Commits
a8ce2e14cf
...
patched-4
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e0c60a428 | |||
|
|
91f0a5a008 | ||
| 6dd2af8162 | |||
| 98a2dd55b0 | |||
| 634f6cb5ad | |||
| 3c9aef2597 | |||
| ffd5e8750d | |||
| 1a19738a57 | |||
| a6f61c8b65 | |||
| a88f2f16ef | |||
|
|
7cbc44eba5 | ||
|
|
9fef53395a | ||
|
|
6e97047474 | ||
|
|
5a4666c19e | ||
|
|
d6c431859c | ||
|
|
f114bcedd1 | ||
|
|
98610fcd37 | ||
|
|
6009e6e25b | ||
|
|
a0274bc20e | ||
|
|
5dbcca4926 | ||
|
|
d63b9eb902 | ||
|
|
497a756382 | ||
|
|
8c68ec5241 | ||
|
|
5ce9716281 | ||
|
|
f20e169a20 | ||
|
|
95f22c5305 | ||
|
|
7473a8d1a5 | ||
|
|
a3f7420310 | ||
|
|
9846a56bd7 | ||
|
|
559fdc2786 | ||
|
|
8abe4bcb41 | ||
|
|
2fc7e532b2 | ||
|
|
a6bbc0c96b | ||
|
|
eb3b894f40 |
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
|
||||
@@ -54,4 +48,4 @@ uninstall:
|
||||
rm -f $(DESTDIR)$(PREFIX)/bin/st
|
||||
rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
|
||||
|
||||
.PHONY: all options clean dist install uninstall
|
||||
.PHONY: all clean dist install uninstall
|
||||
|
||||
54
config.def.h
54
config.def.h
@@ -5,9 +5,43 @@
|
||||
*
|
||||
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
|
||||
*/
|
||||
static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
|
||||
static char *font = "FiraCode Nerd Font:size=10";
|
||||
static int borderpx = 2;
|
||||
|
||||
|
||||
static char *externaleditcmd[] = { "/bin/sh", "-c",
|
||||
"tmpfile=$(mktemp /tmp/st-edit.XXXXXX)\n"
|
||||
"trap 'rm \"$tmpfile\"' 0 1 15\n"
|
||||
"cat > \"$tmpfile\"\n"
|
||||
"st -e vis \"$tmpfile\"\n",
|
||||
NULL};
|
||||
|
||||
int lightmode = 0;
|
||||
|
||||
#define COL_GRAY1 "'#222222'"
|
||||
#define COL_GRAY2 "'#444444'"
|
||||
#define COL_GRAY3 "'#bbbbbb'"
|
||||
#define COL_GRAY4 "'#eeeeee'"
|
||||
#define COL_CYAN "'#005577'"
|
||||
#define DMENU_DARK "-l 10 -fn 'FiraCode Nerd Font:size=10' -nb " COL_GRAY1 " -nf " COL_GRAY3 " -sb " COL_CYAN " -sf " COL_GRAY4
|
||||
#define DMENU_LIGHT "-l 10 -fn 'FiraCode Nerd Font:size=10' -nb " COL_GRAY3 " -nf " COL_GRAY1 " -sb " COL_CYAN " -sf " COL_GRAY4
|
||||
|
||||
static char *externalcopydarkcmd[] = { "/bin/sh", "-c",
|
||||
"sed 's/[ \t][ \t]*/\\n/g' | tac | awk 'BEGIN{x[\"\"]++} !x[$0]++' | dmenu " DMENU_DARK " -w $WINDOWID -p Copy | tr -d '\\n' | vis-clipboard --copy",
|
||||
NULL};
|
||||
|
||||
static char *externalpastedarkcmd[] = { "/bin/sh", "-c",
|
||||
"sed 's/[ \t][ \t]*/\\n/g' | tac | awk 'BEGIN{x[\"\"]++} !x[$0]++' | dmenu " DMENU_DARK " -w $WINDOWID -p Paste | tr -d '\\n'",
|
||||
NULL};
|
||||
|
||||
static char *externalcopylightcmd[] = { "/bin/sh", "-c",
|
||||
"sed 's/[ \t][ \t]*/\\n/g' | tac | awk 'BEGIN{x[\"\"]++} !x[$0]++' | dmenu " DMENU_LIGHT " -w $WINDOWID -p Copy | tr -d '\\n' | vis-clipboard --copy",
|
||||
NULL};
|
||||
|
||||
static char *externalpastelightcmd[] = { "/bin/sh", "-c",
|
||||
"sed 's/[ \t][ \t]*/\\n/g' | tac | awk 'BEGIN{x[\"\"]++} !x[$0]++' | dmenu " DMENU_LIGHT " -w $WINDOWID -p Paste | tr -d '\\n'",
|
||||
NULL};
|
||||
|
||||
/*
|
||||
* What program is execed by st depends of these precedence rules:
|
||||
* 1: program passed with -e
|
||||
@@ -53,7 +87,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;
|
||||
|
||||
/*
|
||||
@@ -199,8 +233,13 @@ static Shortcut shortcuts[] = {
|
||||
{ TERMMOD, XK_C, clipcopy, {.i = 0} },
|
||||
{ TERMMOD, XK_V, clippaste, {.i = 0} },
|
||||
{ TERMMOD, XK_Y, selpaste, {.i = 0} },
|
||||
{ TERMMOD, XK_E, externalpipe, { .v = externaleditcmd } },
|
||||
{ TERMMOD, XK_K, externalpipecopy, { 0 } },
|
||||
{ TERMMOD, XK_I, externalpipepaste, { 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} },
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -472,3 +511,14 @@ static char ascii_printable[] =
|
||||
" !\"#$%&'()*+,-./0123456789:;<=>?"
|
||||
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
|
||||
"`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||
|
||||
/*
|
||||
* Open urls starting with urlprefixes, contatining urlchars
|
||||
* by passing as ARG1 to urlhandler.
|
||||
*/
|
||||
char* urlhandler = "xdg-open";
|
||||
char urlchars[] =
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"0123456789-._~:/?#@!$&'*+,;=%";
|
||||
char* urlprefixes[] = {"http://", "https://", NULL};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# st version
|
||||
VERSION = 0.9
|
||||
VERSION = 0.9.3
|
||||
|
||||
# Customize below to fit your system
|
||||
|
||||
|
||||
45
st.h
45
st.h
@@ -10,15 +10,16 @@
|
||||
#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b))
|
||||
#define DIVCEIL(n, d) (((n) + ((d) - 1)) / (d))
|
||||
#define DEFAULT(a, b) (a) = (a) ? (a) : (b)
|
||||
#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
|
||||
#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || \
|
||||
(a).bg != (b).bg)
|
||||
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + \
|
||||
(t1.tv_nsec-t2.tv_nsec)/1E6)
|
||||
#define LIMIT(x, a, b) (x) = (x)<(a) ? (a) : (x)>(b) ? (b) : (x)
|
||||
#define ATTRCMP(a, b) \
|
||||
((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
|
||||
#define TIMEDIFF(t1, t2) \
|
||||
((t1.tv_sec - t2.tv_sec) * 1000 + (t1.tv_nsec - t2.tv_nsec) / 1E6)
|
||||
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
|
||||
|
||||
#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
|
||||
#define TRUECOLOR(r, g, b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
|
||||
#define IS_TRUECOL(x) (1 << 24 & (x))
|
||||
#define HISTSIZE 2000
|
||||
|
||||
enum glyph_attribute {
|
||||
ATTR_NULL = 0,
|
||||
@@ -34,23 +35,14 @@ enum glyph_attribute {
|
||||
ATTR_WIDE = 1 << 9,
|
||||
ATTR_WDUMMY = 1 << 10,
|
||||
ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
|
||||
ATTR_URL = 1 << 14,
|
||||
};
|
||||
|
||||
enum selection_mode {
|
||||
SEL_IDLE = 0,
|
||||
SEL_EMPTY = 1,
|
||||
SEL_READY = 2
|
||||
};
|
||||
enum selection_mode { SEL_IDLE = 0, SEL_EMPTY = 1, SEL_READY = 2 };
|
||||
|
||||
enum selection_type {
|
||||
SEL_REGULAR = 1,
|
||||
SEL_RECTANGULAR = 2
|
||||
};
|
||||
enum selection_type { SEL_REGULAR = 1, SEL_RECTANGULAR = 2 };
|
||||
|
||||
enum selection_snap {
|
||||
SNAP_WORD = 1,
|
||||
SNAP_LINE = 2
|
||||
};
|
||||
enum selection_snap { SNAP_WORD = 1, SNAP_LINE = 2 };
|
||||
|
||||
typedef unsigned char uchar;
|
||||
typedef unsigned int uint;
|
||||
@@ -81,6 +73,9 @@ void die(const char *, ...);
|
||||
void redraw(void);
|
||||
void draw(void);
|
||||
|
||||
void externalpipe(const Arg *);
|
||||
void externalpipecopy(const Arg *);
|
||||
void externalpipepaste(const Arg *);
|
||||
void printscreen(const Arg *);
|
||||
void printsel(const Arg *);
|
||||
void sendbreak(const Arg *);
|
||||
@@ -105,6 +100,10 @@ void selextend(int, int, int, int);
|
||||
int selected(int, int);
|
||||
char *getsel(void);
|
||||
|
||||
void highlighturls(void);
|
||||
void unhighlighturls(void);
|
||||
void followurl(int, int);
|
||||
|
||||
size_t utf8encode(Rune, char *);
|
||||
|
||||
void *xmalloc(size_t);
|
||||
@@ -119,8 +118,16 @@ extern char *vtiden;
|
||||
extern wchar_t *worddelimiters;
|
||||
extern int allowaltscreen;
|
||||
extern int allowwindowops;
|
||||
extern int lightmode;
|
||||
extern char *termname;
|
||||
extern unsigned int tabspaces;
|
||||
extern unsigned int defaultfg;
|
||||
extern unsigned int defaultbg;
|
||||
extern unsigned int defaultcs;
|
||||
extern char *urlhandler;
|
||||
extern char urlchars[];
|
||||
extern char *urlprefixes[];
|
||||
extern int nurlprefixes;
|
||||
|
||||
char **externalcopycmd();
|
||||
char **externalpastecmd();
|
||||
|
||||
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)
|
||||
|
||||
177
x.c
177
x.c
@@ -14,6 +14,7 @@
|
||||
#include <X11/keysym.h>
|
||||
#include <X11/Xft/Xft.h>
|
||||
#include <X11/XKBlib.h>
|
||||
#include <X11/Xresource.h>
|
||||
|
||||
char *argv0;
|
||||
#include "arg.h"
|
||||
@@ -59,10 +60,22 @@ static void zoom(const Arg *);
|
||||
static void zoomabs(const Arg *);
|
||||
static void zoomreset(const Arg *);
|
||||
static void ttysend(const Arg *);
|
||||
void kscrollup(const Arg *);
|
||||
void kscrolldown(const Arg *);
|
||||
|
||||
/* config.h for applying patches and the configuration. */
|
||||
#include "config.h"
|
||||
|
||||
char **externalcopycmd()
|
||||
{
|
||||
return (lightmode) ? externalcopylightcmd : externalcopydarkcmd;
|
||||
}
|
||||
|
||||
char **externalpastecmd()
|
||||
{
|
||||
return (lightmode) ? externalpastelightcmd : externalpastedarkcmd;
|
||||
}
|
||||
|
||||
/* XEMBED messages */
|
||||
#define XEMBED_FOCUS_IN 4
|
||||
#define XEMBED_FOCUS_OUT 5
|
||||
@@ -191,6 +204,7 @@ static void usage(void);
|
||||
|
||||
static void (*handler[LASTEvent])(XEvent *) = {
|
||||
[KeyPress] = kpress,
|
||||
[KeyRelease] = kpress,
|
||||
[ClientMessage] = cmessage,
|
||||
[ConfigureNotify] = resize,
|
||||
[VisibilityNotify] = visibility,
|
||||
@@ -452,6 +466,15 @@ mouseaction(XEvent *e, uint release)
|
||||
/* ignore Button<N>mask for Button<N> - it's set on release */
|
||||
uint state = e->xbutton.state & ~buttonmask(e->xbutton.button);
|
||||
|
||||
if (release == 0 &&
|
||||
e->xbutton.button == Button1 &&
|
||||
(match(ControlMask, state) ||
|
||||
match(ControlMask, state & ~forcemousemod))) {
|
||||
followurl(evrow(e), evcol(e));
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
|
||||
if (ms->release == release &&
|
||||
ms->button == e->xbutton.button &&
|
||||
@@ -818,7 +841,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;
|
||||
@@ -833,7 +856,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))
|
||||
@@ -869,8 +892,8 @@ xhints(void)
|
||||
sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
|
||||
sizeh->height = win.h;
|
||||
sizeh->width = win.w;
|
||||
sizeh->height_inc = win.ch;
|
||||
sizeh->width_inc = win.cw;
|
||||
sizeh->height_inc = 1;
|
||||
sizeh->width_inc = 1;
|
||||
sizeh->base_height = 2 * borderpx;
|
||||
sizeh->base_width = 2 * borderpx;
|
||||
sizeh->min_height = win.ch + 2 * borderpx;
|
||||
@@ -1131,7 +1154,7 @@ xinit(int cols, int rows)
|
||||
{
|
||||
XGCValues gcvalues;
|
||||
Cursor cursor;
|
||||
Window parent;
|
||||
Window parent, root;
|
||||
pid_t thispid = getpid();
|
||||
XColor xmousefg, xmousebg;
|
||||
|
||||
@@ -1168,16 +1191,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));
|
||||
@@ -1492,7 +1518,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
|
||||
XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
|
||||
|
||||
/* Render underline and strikethrough. */
|
||||
if (base.mode & ATTR_UNDERLINE) {
|
||||
if (base.mode & ATTR_UNDERLINE || base.mode & ATTR_URL) {
|
||||
XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
|
||||
width, 1);
|
||||
}
|
||||
@@ -1617,6 +1643,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;
|
||||
@@ -1631,6 +1660,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;
|
||||
@@ -1850,6 +1882,18 @@ kpress(XEvent *ev)
|
||||
} else {
|
||||
len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
|
||||
}
|
||||
|
||||
/* 0. highlight URLs when control held */
|
||||
if (ksym == XK_Control_L) {
|
||||
highlighturls();
|
||||
} else if (ev->type == KeyRelease && e->keycode == XKeysymToKeycode(e->display, XK_Control_L)) {
|
||||
unhighlighturls();
|
||||
}
|
||||
|
||||
/* KeyRelease not relevant to shortcuts */
|
||||
if (ev->type == KeyRelease)
|
||||
return;
|
||||
|
||||
/* 1. shortcuts */
|
||||
for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
|
||||
if (ksym == bp->keysym && match(bp->mod, e->state)) {
|
||||
@@ -2014,6 +2058,119 @@ run(void)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#define XRESOURCE_LOAD_META(NAME) \
|
||||
if(!XrmGetResource(xrdb, "st." NAME, "st." NAME, &type, &ret)) \
|
||||
XrmGetResource(xrdb, "*." NAME, "*." NAME, &type, &ret); \
|
||||
if (ret.addr != NULL && !strncmp("String", type, 64))
|
||||
|
||||
#define XRESOURCE_LOAD_STRING(NAME, DST) \
|
||||
XRESOURCE_LOAD_META(NAME) \
|
||||
DST = ret.addr;
|
||||
|
||||
#define XRESOURCE_LOAD_CHAR(NAME, DST) \
|
||||
XRESOURCE_LOAD_META(NAME) \
|
||||
DST = ret.addr[0];
|
||||
|
||||
#define XRESOURCE_LOAD_INTEGER(NAME, DST) \
|
||||
XRESOURCE_LOAD_META(NAME) \
|
||||
DST = strtoul(ret.addr, NULL, 10);
|
||||
|
||||
#define XRESOURCE_LOAD_FLOAT(NAME, DST) \
|
||||
XRESOURCE_LOAD_META(NAME) \
|
||||
DST = strtof(ret.addr, NULL);
|
||||
|
||||
void
|
||||
xrdb_load(void)
|
||||
{
|
||||
/* XXX */
|
||||
char *xrm;
|
||||
char *type;
|
||||
XrmDatabase xrdb;
|
||||
XrmValue ret;
|
||||
Display *dpy;
|
||||
|
||||
if(!(dpy = XOpenDisplay(NULL)))
|
||||
die("Can't open display\n");
|
||||
|
||||
XrmInitialize();
|
||||
xrm = XResourceManagerString(dpy);
|
||||
|
||||
if (xrm != NULL) {
|
||||
xrdb = XrmGetStringDatabase(xrm);
|
||||
|
||||
/* handling colors here without macros to do via loop. */
|
||||
int i = 0;
|
||||
char loadValue[12] = "";
|
||||
for (i = 0; i < 256; i++)
|
||||
{
|
||||
sprintf(loadValue, "%s%d", "st.color", i);
|
||||
|
||||
if(!XrmGetResource(xrdb, loadValue, loadValue, &type, &ret))
|
||||
{
|
||||
sprintf(loadValue, "%s%d", "*.color", i);
|
||||
if (!XrmGetResource(xrdb, loadValue, loadValue, &type, &ret))
|
||||
/* reset if not found (unless in range for defaults). */
|
||||
if (i > 15)
|
||||
colorname[i] = NULL;
|
||||
}
|
||||
|
||||
if (ret.addr != NULL && !strncmp("String", type, 64))
|
||||
colorname[i] = ret.addr;
|
||||
}
|
||||
|
||||
XRESOURCE_LOAD_STRING("foreground", colorname[defaultfg]);
|
||||
XRESOURCE_LOAD_STRING("background", colorname[defaultbg]);
|
||||
XRESOURCE_LOAD_STRING("cursorColor", colorname[defaultcs])
|
||||
else {
|
||||
// this looks confusing because we are chaining off of the if
|
||||
// in the macro. probably we should be wrapping everything blocks
|
||||
// so this isn't possible...
|
||||
defaultcs = defaultfg;
|
||||
}
|
||||
XRESOURCE_LOAD_STRING("reverse-cursor", colorname[defaultrcs])
|
||||
else {
|
||||
// see above.
|
||||
defaultrcs = defaultbg;
|
||||
}
|
||||
|
||||
XRESOURCE_LOAD_STRING("font", font);
|
||||
XRESOURCE_LOAD_STRING("termname", termname);
|
||||
|
||||
XRESOURCE_LOAD_INTEGER("blinktimeout", blinktimeout);
|
||||
XRESOURCE_LOAD_INTEGER("bellvolume", bellvolume);
|
||||
XRESOURCE_LOAD_INTEGER("borderpx", borderpx);
|
||||
XRESOURCE_LOAD_INTEGER("cursorshape", cursorshape);
|
||||
XRESOURCE_LOAD_INTEGER("lightmode", lightmode);
|
||||
|
||||
XRESOURCE_LOAD_FLOAT("cwscale", cwscale);
|
||||
XRESOURCE_LOAD_FLOAT("chscale", chscale);
|
||||
}
|
||||
XFlush(dpy);
|
||||
}
|
||||
|
||||
void
|
||||
reload(int sig)
|
||||
{
|
||||
xrdb_load();
|
||||
|
||||
/* colors, fonts */
|
||||
xloadcols();
|
||||
xunloadfonts();
|
||||
xloadfonts(font, 0);
|
||||
|
||||
/* pretend the window just got resized */
|
||||
cresize(win.w, win.h);
|
||||
|
||||
redraw();
|
||||
|
||||
/* triggers re-render if we're visible. */
|
||||
ttywrite("\033[O", 3, 1);
|
||||
|
||||
signal(SIGUSR1, reload);
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
usage(void)
|
||||
{
|
||||
@@ -2087,6 +2244,8 @@ run:
|
||||
|
||||
setlocale(LC_CTYPE, "");
|
||||
XSetLocaleModifiers("");
|
||||
xrdb_load();
|
||||
signal(SIGUSR1, reload);
|
||||
cols = MAX(cols, 1);
|
||||
rows = MAX(rows, 1);
|
||||
tnew(cols, rows);
|
||||
|
||||
Reference in New Issue
Block a user