add everforest hard themes

This patch adds a ring buffer for scrollback to the terminal.  The
advantage of using a ring buffer is that the common case, scrolling with
no static screen content, can be achieved very efficiently by
incrementing and decrementing the starting line (modulo buffer size).

The scrollback buffer is limited to HISTSIZE lines in order to bound
memory usage. As the lines are allocated on demand, it is possible to
implement unlimited scrollback with few changes.  If the terminal is
reset, the scroll back buffer is reset, too.

(apply st-scrollback-ringbuffer-0.8.5.diff on top of colorscheme)

Makefile

@@ -7,7 +7,13 @@ include config.mk
 SRC = st.c x.c
 OBJ = $(SRC:.c=.o)
 
-all: st
+all: options st
+
+options:
+	@echo st build options:
+	@echo "CFLAGS  = $(STCFLAGS)"
+	@echo "LDFLAGS = $(STLDFLAGS)"
+	@echo "CC      = $(CC)"
 
 config.h:
 	cp config.def.h config.h
@@ -15,7 +21,7 @@ config.h:
 .c.o:
 	$(CC) $(STCFLAGS) -c $<
 
-st.o: config.h st.h win.h normalMode.h normalMode.c utils.h
+st.o: config.h st.h win.h
 x.o: arg.h config.h st.h win.h
 
 $(OBJ): config.h config.mk
@@ -48,4 +54,4 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/st
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
 
-.PHONY: all clean dist install uninstall
+.PHONY: all options clean dist install uninstall

config.def.h

@@ -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 = "FiraCode Nerd Font Ret:size=10";
 static int borderpx = 2;
 
 /*
@@ -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 = 2;
+static double minlatency = 8;
 static double maxlatency = 33;
 
 /*
@@ -93,61 +93,94 @@ char *termname = "st-256color";
  */
 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",
+typedef struct {
+	const char* const colors[260]; /* terminal colors */
+	unsigned int fg;               /* foreground */
+	unsigned int bg;               /* background */
+	unsigned int cs;               /* cursor */
+	unsigned int rcs;              /* reverse cursor */
+} ColorScheme;
+/*
+ * Terminal colors (16 first used in escape sequence,
+ * 2 last for custom cursor color),
+ * foreground, background, cursor, reverse cursor
+ */
+static const ColorScheme schemes[] = {
+	// everforest-dark-hard
+	{{ "#414b50", "#e67e80", "#a7c080", "#dbbc7f",
+	   "#7fbbb3", "#d699b6", "#83c092", "#d3c6aa",
+	   "#475258", "#e67e80", "#a7c080", "#dbbc7f",
+	   "#7fbbb3", "#d699b6", "#83c092", "#d3c6aa",
+	   [256] = "#a7c080", "#555555", "#d3c6aa", "#272e33"}, 258, 259, 256, 257},
 
-	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
+	// everforest-light-hard
+	{{ "#5c6a72", "#f85552", "#8da101", "#dfa000",
+	   "#3a94c5", "#df69ba", "#35a77c", "#e8e5d5",
+	   "#5c6a72", "#f85552", "#8da101", "#dfa000",
+	   "#3a94c5", "#df69ba", "#35a77c", "#e8e5d5",
+	   [256] = "#35a77c", "#555555", "#5c6a72", "#fffbef"}, 258, 259, 256, 257},
 
-	[255] = 0,
+	// tokyonight-storm
+	{{"#1d202f", "#f7768e", "#9ece6a", "#e0af68",
+	  "#7aa2f7", "#bb9af7", "#7dcfff", "#a9b1d6",
+	  "#414868", "#f7768e", "#9ece6a", "#e0af68",
+	  "#7aa2f7", "#bb9af7", "#7dcfff", "#c0caf5",
+	  [256]="#81A1C1", "#555555", "#c0caf5", "#24283b"}, 258, 259, 256, 257},
 
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
+	// tokyonight-day
+	{{"#e9e9ed", "#f52a65", "#587539", "#8c6c3e",
+	  "#2e7de9", "#9854f1", "#007197", "#6172b0",
+	  "#a1a6c5", "#f52a65", "#587539", "#8c6c3e",
+	  "#2e7de9", "#9854f1", "#007197", "#3760bf",
+	  [256]="#3879C5", "#555555", "#3760bf", "#e1e2e7"}, 258, 259, 256, 257},
+
+	// One Half dark
+	{{"#282c34", "#e06c75", "#98c379", "#e5c07b",
+	  "#61afef", "#c678dd", "#56b6c2", "#dcdfe4",
+	  "#282c34", "#e06c75", "#98c379", "#e5c07b",
+	  "#61afef", "#c678dd", "#56b6c2", "#dcdfe4",
+	  [256]="#cccccc", "#555555", "black", "black"}, 7, 0, 256, 257},
+
+	// One Half light
+	{{"#fafafa", "#e45649", "#50a14f", "#c18401",
+      "#0184bc", "#a626a4", "#0997b3", "#383a42",
+	  "#fafafa", "#e45649", "#50a14f", "#c18401",
+	  "#0184bc", "#a626a4", "#0997b3", "#383a42",
+	  [256]="#cccccc", "#555555", "black", "black"}, 7, 0, 256, 257},
+
+	// Solarized dark
+	{{"#073642", "#dc322f", "#859900", "#b58900",
+	  "#268bd2", "#d33682", "#2aa198", "#eee8d5",
+	  "#002b36", "#cb4b16", "#586e75", "#657b83",
+	  "#839496", "#6c71c4", "#93a1a1", "#fdf6e3",
+	  [256]="#93a1a1", "#fdf6e3", "black", "black"}, 12, 8, 256, 257},
+
+	// Solarized light
+	{{"#eee8d5", "#dc322f", "#859900", "#b58900",
+	  "#268bd2", "#d33682", "#2aa198", "#073642",
+	  "#fdf6e3", "#cb4b16", "#93a1a1", "#839496",
+	  "#657b83", "#6c71c4", "#586e75", "#002b36",
+	  [256]="#586e75", "#002b36", "black", "black"}, 12, 8, 256, 257},
+
+	// st (dark)
+	{{"black", "red3", "green3", "yellow3",
+	  "blue2", "magenta3", "cyan3", "gray90",
+	  "gray50", "red", "green", "yellow",
+	  "#5c5cff", "magenta", "cyan", "white",
+	  [256]="#cccccc", "#555555", "black", "black"}, 7, 0, 256, 257},
 };
 
+static const char * const * colorname;
+int colorscheme = 0;
 
 /*
  * 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;
-unsigned int const currentBg = 6, buffSize = 2048;
-/// Enable double / triple click yanking / selection of word / line.
-int const mouseYank = 1, mouseSelect = 0;
-/// [Vim Browse] Colors for search results currently on screen.
-unsigned int const highlightBg = 160, highlightFg = 15;
-char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t";
-char *nmKeys [] = {              ///< Shortcusts executed in normal mode
-  "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n",
-  "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf"
-};
-unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys);
-/// Style of the {command, search} string shown in the right corner (y,v,V,/)
-Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16};
-Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11},
-                 {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}};
+unsigned int defaultfg;
+unsigned int defaultbg;
+unsigned int defaultcs;
+static unsigned int defaultrcs;
 
 /*
  * Default shape of cursor
@@ -216,7 +249,19 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ MODKEY,               XK_c,           normalMode,     {.i =  0} },
+	{ MODKEY,               XK_F1,          selectscheme,   {.i =  0} },
+	{ MODKEY,               XK_F2,          selectscheme,   {.i =  1} },
+	{ MODKEY,               XK_F3,          selectscheme,   {.i =  2} },
+	{ MODKEY,               XK_F4,          selectscheme,   {.i =  3} },
+	{ MODKEY,               XK_F5,          selectscheme,   {.i =  4} },
+	{ MODKEY,               XK_F6,          selectscheme,   {.i =  5} },
+	{ MODKEY,               XK_F7,          selectscheme,   {.i =  6} },
+	{ MODKEY,               XK_F8,          selectscheme,   {.i =  7} },
+	{ MODKEY,               XK_F9,          selectscheme,   {.i =  8} },
+	{ MODKEY,               XK_F10,         nextscheme,     {.i = +1} },
+	{ MODKEY|ControlMask,   XK_F10,         nextscheme,     {.i = -1} },
+	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
+	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
 };
 
 /*

config.mk

@@ -1,5 +1,5 @@
 # st version
-VERSION = 0.9.3
+VERSION = 0.9
 
 # Customize below to fit your system
 

normalMode.c

@@ -1,284 +0,0 @@
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-
-#include "normalMode.h"
-#include "utils.h"
-
-extern Glyph const styleSearch, style[];
-extern char const wDelS[], wDelL[], *nmKeys[];
-extern unsigned int bg[], fg, currentBg, highlightBg, highlightFg, amountNmKeys;
-
-typedef struct { int p[3]; } Pos;
-
-typedef enum {visual='v', visualLine='V', yank = 'y'} Op;
-typedef enum {infix_none=0, infix_i='i', infix_a='a'} Infix;
-typedef enum {fw='/', bw='?'} Search;
-struct NormalModeState {
-	struct OperationState { Op op; Infix infix; } cmd;
-	struct MotionState { uint32_t c; int active; Pos searchPos; Search search; } m;
-} defaultNormalMode, state;
-
-DynamicArray searchStr=UTF8_ARRAY, cCmd=UTF8_ARRAY, lCmd=UTF8_ARRAY;
-Glyph styleCmd;
-char posBuffer[10], braces[6][3] = { {"()"}, {"<>"}, {"{}"}, {"[]"}, {"\"\""}, {"''"}};
-int exited=1, overlay=1;
-static inline Rune cChar() { return term.line[term.c.y][term.c.x].u; }
-static inline int pos(int p, int h) {return IS_SET(MODE_ALTSCREEN)?p:rangeY(p+h*histOff-insertOff);}
-static inline int contains(Rune l, char const * values, size_t const memSize) {
-	for (uint32_t i = 0; i < memSize; ++i) if (l == values[i]) return 1;
-	return 0;
-}
-static inline void decodeTo(char const *cs, size_t len, DynamicArray *arr) {
-	char *var = expand(arr);
-	if (!var) empty(arr); else utf8decode(cs, (Rune*)(var), len);
-}
-static inline void applyPos(Pos p) {
-	term.c.x = p.p[0], term.c.y = p.p[1];
-	if (!IS_SET(MODE_ALTSCREEN) && histOp) term.line = &buf[histOff = p.p[2]];
-}
-/// Find string in history buffer, and provide string-match-lookup for highlighting matches
-static int highlighted(int x, int y) {
-	int const s=term.row*term.col, i=y*term.col+x, sz=size(&searchStr);
-	return sz && i<s && mark[i]!=sz && i+mark[i]<s && !mark[i+mark[i]];
-}
-static void markSearchMatches(int all) {
-	int sz = size(&searchStr), ox = 0, oy = 0, oi=0;
-	for (int y=0; sz && all && y<term.row; ++y)
-		for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
-	for (int y = 0, wi=0, owi=0, i=0; sz && y < term.row; ++y)
-		for (int x=0; x<term.col; ++x, wi%=sz, ++i, owi=wi)
-			if (all || term.dirty[y]) {
-				mark[i]=sz-(wi=(getU32(&searchStr,wi,1)==term.line[y][x].u?wi+1:0));
-				if (wi==1) ox=x, oy=y, oi=i; else if (!wi && owi) x=ox, y=oy, i=oi;
-			}
-	for (int y=0; sz &&all &&y<term.row; ++y)
-		for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
-}
-static int findString(int s, int all) {
-	Pos p = (Pos) {.p={term.c.x, term.c.y, IS_SET(MODE_ALTSCREEN) ? 0 : histOff}};
-	historyMove(s, 0, 0);
-	uint32_t strSz=size(&searchStr), maxIter=rows()*term.col+strSz, wIdx=0;
-	for (uint32_t i=0, wi = 0; wIdx<strSz && ++i<=maxIter; historyMove(s, 0, 0), wi=wIdx) {
-		wIdx = (getU32(&searchStr, wIdx, s>0)==cChar())?wIdx+1:0;
-		if (wi && !wIdx) historyMove(-(int)(s*wi), 0, 0);
-	}
-	if (wIdx == strSz && wIdx) historyMove(-(int)(s*strSz), 0, 0);
-	else applyPos(p);
-	markSearchMatches(all);
-	return wIdx == strSz;
-}
-/// Execute series of normal-mode commands from char array / decoded from dynamic array
-ExitState pressKeys(char const* s, size_t e) {
-	ExitState x=success;
-	for (size_t i=0; i<e && (x=(!s[i] ? x : kPressHist(&s[i], 1, 0, NULL))); ++i);
-	return x;
-}
-static ExitState executeCommand(uint32_t *cs, size_t z) {
-	ExitState x=success;
-	char dc [32];
-	for (size_t i=0; i<z && (x=kPressHist(dc, utf8encode(cs[i],dc),0,NULL));++i);
-	return x;
-}
-/// Get character for overlay, if the overlay (st) has something to show, else normal char.
-static void getChar(DynamicArray *st, Glyph *glyphChange, int y, int xEnd, int width, int x) {
-	if (x < xEnd - min(min(width,xEnd), size(st))) *glyphChange = term.line[y][x];
-	else if (x<xEnd) glyphChange->u = *((Rune*)(st->content + (size(st)+x-xEnd)*st->elSize));
-}
-/// Expand "infix" expression: for instance (w =>)       l     b     |   | v     e    |   | y
-static ExitState expandExpression(char l) { //    ({ =>)       l  ?  {  \n | l | v  /  } \n | h | y
-	int a=state.cmd.infix==infix_a, yank=state.cmd.op=='y', lc=tolower(l), found=1;
-	state.cmd.infix = infix_none;
-	if(!yank && state.cmd.op!=visual && state.cmd.op!=visualLine) return failed;
-	char mot[11] = {'l', 0, 'b', 0, 0, 'v', 0, 'e', 0, 0, (char)(yank ? 'y' : 0)};
-	if (lc == 'w') mot[2] = (char) ('b' - lc + l), mot[7] = (char) ((a ? 'w' : 'e') - lc + l), mot[9]=(char)(a?'h':0);
-	else {
-		mot[1]='?', mot[3]=mot[8]='\n', mot[6]='/', mot[4]=(char)(a?0:'l'), mot[9]=(char)(a?0:'h');
-		for (int i=found=0; !found && i < 6; ++i)
-			if ((found=contains(l,braces[i],2))) mot[2]=braces[i][0], mot[7]=braces[i][1];
-	}
-	if (!found) return failed;
-	assign(&lCmd, &cCmd);
-	empty(&cCmd);
-	state.cmd = defaultNormalMode.cmd;
-	return pressKeys(mot, 11);
-}
-
-ExitState executeMotion(char const cs, KeySym const *const ks) {
-	state.m.c = state.m.c < 1u ? 1u : state.m.c;
-	if      (ks && *ks == XK_d) historyMove(0, 0, term.row / 2);
-	else if (ks && *ks == XK_u) historyMove(0, 0, -term.row / 2);
-	else if (ks && *ks == XK_f) historyMove(0, 0, term.row-1+(term.c.y=0));
-	else if (ks && *ks == XK_b) historyMove(0, 0, -(term.c.y=term.row-1));
-	else if (ks && *ks == XK_h) overlay = !overlay;
-	else if (cs == 'K') historyMove(0, 0, -(int)state.m.c);
-	else if (cs == 'J') historyMove(0, 0,  (int)state.m.c);
-	else if (cs == 'k') historyMove(0, -(int)state.m.c, 0);
-	else if (cs == 'j') historyMove(0,  (int)state.m.c, 0);
-	else if (cs == 'h') historyMove(-(int)state.m.c, 0, 0);
-	else if (cs == 'l') historyMove( (int)state.m.c, 0, 0);
-	else if (cs == 'H') term.c.y = 0;
-	else if (cs == 'M') term.c.y = term.bot / 2;
-	else if (cs == 'L') term.c.y = term.bot;
-	else if (cs == 's' || cs == 'S') altToggle = cs == 's' ? !altToggle : 1;
-	else if (cs == 'G' || cs == 'g') {
-		if (cs == 'G') term.c = c[0] = c[IS_SET(MODE_ALTSCREEN)+1];
-		if (!IS_SET(MODE_ALTSCREEN)) term.line = &buf[histOff=insertOff];
-	} else if (cs == '0') term.c.x = 0;
-	else if (cs == '$') term.c.x = term.col-1;
-	else if (cs == 't') sel.type = sel.type==SEL_REGULAR ? SEL_RECTANGULAR : SEL_REGULAR;
-	else if (cs == 'n' || cs == 'N') {
-		int const d = ((cs=='N')!=(state.m.search==bw))?-1:1;
-		for (uint32_t i = state.m.c; i && findString(d, 0); --i);
-	} else if (contains(cs, "wWeEbB", 6)) {
-		int const low=cs<=90, off=tolower(cs)!='w', sgn=(tolower(cs)=='b')?-1:1;
-		size_t const l=strlen(wDelL), s=strlen(wDelS), maxIt=rows()*term.col;
-		for (int it=0, on=0; state.m.c > 0 && it < maxIt; ++it) {
-		    // If an offset is to be performed in beginning or not in beginning, move in history.
-			if ((off || it) && historyMove(sgn, 0, 0)) break;
-			// Determine if the category of the current letter changed since last iteration.
-			int n = 1<<(contains(cChar(),wDelS,s) ?(2-low) :!contains(cChar(),wDelL,l)),
-			    found = (on|=n)^n && ((off ?on^n :n)!=1);
-			// If a reverse offset is to be performed and this is the last letter:
-			if (found && off) historyMove(-sgn, 0, 0);
-			// Terminate iteration: reset #it and old n value #on and decrease operation count:
-			if (found) it=-1, on=0, --state.m.c;
-		}
-	} else return failed;
-	state.m.c = 0;
-	return state.cmd.op == yank ? exitMotion : success;
-}
-
-ExitState kPressHist(char const *cs, size_t len, int ctrl, KeySym const *kSym) {
-	historyOpToggle(1, 1);
-	int const prevYOff=IS_SET(MODE_ALTSCREEN)?0:histOff, search=state.m.search&&state.m.active,
-	          prevAltToggle=altToggle, prevOverlay=overlay;
-	int const noOp=!state.cmd.op&&!state.cmd.infix, num=len==1&&BETWEEN(cs[0],48,57),
-	          esc=kSym&&*kSym==XK_Escape, ret=(kSym&&*kSym==XK_Return)||(len==1&&cs[0]=='\n'),
-	          quantifier=num&&(cs[0]!='0'||state.m.c), ins=!search &&noOp &&len &&cs[0]=='i';
-	exited = 0;
-	ExitState result = success;
-	if (esc || ret || ins) { result = exitMotion, len = 0;
-	} else if (kSym && *kSym == XK_BackSpace) {
-		if ((search || state.m.c) && size(&cCmd)) pop(&cCmd);
-		if (search) {
-			if (size(&searchStr)) pop(&searchStr);
-			else result = exitMotion;
-			if (!size(&searchStr)) tfulldirt();
-			applyPos(state.m.searchPos);
-			findString(state.m.search==fw ? 1 : -1, 1);
-		} else if (state.m.c) state.m.c /= 10;
-		len = 0;
-	} else if (search) {
-		if (len >= 1) decodeTo(cs, len, &searchStr);
-		applyPos(state.m.searchPos);
-		findString(state.m.search==fw ? 1 : -1, 1);
-	} else if (len == 0) { result = failed;
-	} else if (quantifier) { state.m.c = min(SHRT_MAX, (int)state.m.c*10+cs[0]-48);
-	} else if (state.cmd.infix && state.cmd.op && (result = expandExpression(cs[0]), len=0)) {
-    } else if (cs[0] == 'd') { state = defaultNormalMode; result = exitMotion; state.m.active = 1;
-	} else if (cs[0] == '.') {
-		if (size(&cCmd)) assign(&lCmd, &cCmd);
-		empty(&cCmd);
-		executeCommand((uint32_t*) lCmd.content, size(&lCmd));
-		empty(&cCmd);
-		len = 0;
-	} else if (cs[0] == 'r') { tfulldirt();
-	} else if (cs[0] == 'c') {
-		empty(&lCmd);
-		empty(&cCmd);
-		empty(&searchStr);
-		tfulldirt();
-		len = 0;
-	} else if (cs[0] == fw || cs[0] == bw) {
-		empty(&searchStr);
-		state.m.search = (Search) cs[0];
-		state.m.searchPos = (Pos){.p={term.c.x, term.c.y, prevYOff}};
-		state.m.active = 1;
-	} else if (cs[0]==infix_i || cs[0]==infix_a) { state.cmd.infix=(Infix) cs[0];
-	} else if (cs[0] == 'y') {
-		if (state.cmd.op) {
-			result = (state.cmd.op == yank || state.cmd.op == visualLine) ? exitOp : exitMotion;
-			if (state.cmd.op == yank) selstart(0, term.c.y, 0);
-		} else selstart(term.c.x, term.c.y, 0);
-		state.cmd.op = yank;
-	} else if (cs[0] == visual || cs[0] == visualLine) {
-		if (state.cmd.op != (Op) cs[0]) {
-			state.cmd = defaultNormalMode.cmd;
-			state.cmd.op = (Op) cs[0];
-			selstart(cs[0] == visualLine ?0 :term.c.x, term.c.y, 0);
-		} else result = exitOp;
-	} else if (!(result =executeMotion((char) (len?cs[0]:0), ctrl?kSym:NULL))) {
-		result=failed;
-		for (size_t i = 0; !ctrl && i < amountNmKeys; ++i)
-			if (cs[0]==nmKeys[i][0] &&
-			   failed!=(result=pressKeys(&nmKeys[i][1], strlen(nmKeys[i])-1))) goto end;
-	} // Operation/Motion finished if valid: update cmd string, extend selection, update search
-	if (result != failed) {
-		if (len == 1 && !ctrl) decodeTo(cs, len, &cCmd);
-		if ((state.cmd.op == visualLine) || ((state.cmd.op == yank) && (result == exitOp))) {
-			int const off = term.c.y + (IS_SET(MODE_ALTSCREEN) ? 0 : histOff) < sel.ob.y; //< Selection start below end.
-			sel.ob.x = off ? term.col - 1 : 0;
-			selextend(off ? 0 : term.col-1, term.c.y, sel.type, 0);
-		} else if (sel.oe.x != -1) {
-			selextend(term.c.x, term.c.y, sel.type, 0);
-		}
-	} // Set repaint for motion or status bar
-	if (!IS_SET(MODE_ALTSCREEN) && prevYOff != histOff) tfulldirt();
-	// Terminate Motion / operation if thus indicated
-	if (result == exitMotion) {
-		if (!state.m.active) result = (exited=noOp) ? finish : exitOp;
-		 state.m.active = (int) (state.m.c = 0u);
-	}
-	if (result == exitOp || result == finish) {
-		if (state.cmd.op == yank) {
-			xsetsel(getsel());
-			xclipcopy();
-		}
-		state = defaultNormalMode;
-		selclear();
-		if (!esc) assign(&lCmd, &cCmd);
-		empty(&cCmd);
-	} // Update the content displayed in the history overlay
-	styleCmd = style[state.cmd.op==yank ? 1 : (state.cmd.op==visual ? 2 :
-	                (state.cmd.op==visualLine ? 3 :0))];
-	int const posLin = !IS_SET(MODE_ALTSCREEN) ? rangeY(insertOff-histOff):0, h=rows()-term.row;
-	if (!posLin || posLin==h || !h) strcpy(posBuffer, posLin ? " [BOT] " : " [TOP] ");
-	else sprintf(posBuffer, " % 3d%c  ", min(100, max(0, (int)(.5 + posLin * 100. / h))),'%');
-	if ((overlay || overlay!=prevOverlay) && term.col>9 && term.row>4) {
-		if (!term.dirty[term.row-1]) xdrawline(term.line[term.row-1], term.col*2/3, term.row-1, term.col-1);
-		if (!term.dirty[term.row-2]) xdrawline(term.line[term.row-2], term.col*2/3, term.row-2, term.col-1);
-	}
-	if (result==finish) altToggle = 0;
-	if (altToggle != prevAltToggle) tswapscreen();
-end:
-	historyOpToggle(-1, 1);
-	return result;
-}
-
-void historyOverlay(int x, int y, Glyph* g) {
-	if (!histMode) return;
-	TCursor const *cHist = histOp ? &term.c : &c[0];
-	if(overlay && term.col > 9 && term.row > 4 && (x > (2*term.col/3)) && (y >= (term.row-2))) {
-		*g = (y == term.row - 2) ? styleSearch : styleCmd;
-		if (y == term.row-2) getChar(&searchStr, g, term.row-2, term.col-2, term.col/3, x);
-		else if (x > term.col - 7) g->u = (Rune)(posBuffer[x - term.col + 7]);
-		else getChar(size(&cCmd) ?&cCmd :&lCmd, g, term.row-1, term.col-7, term.col/3-6, x);
-	} else if (highlighted(x, y)) g->bg = highlightBg, g->fg = highlightFg;
-	else if ((x==cHist->x) ^ (y==cHist->y)) g->bg = currentBg;
-	else if (x==cHist->x) g->mode^=ATTR_REVERSE;
-}
-void historyPreDraw() {
-	static Pos op = {.p={0, 0, 0}};
-	historyOpToggle(1, 0);
-	// Draw the cursor cross if changed
-	if (term.c.y >= term.row || op.p[1] >= term.row) tfulldirt();
-	else if (exited || (op.p[1] != term.c.y)) term.dirty[term.c.y] = term.dirty[op.p[1]] = 1;
-	for (int i=0; (exited || term.c.x != op.p[0]) && i<term.row; ++i) if (!term.dirty[i]) {
-		xdrawline(term.line[i], term.c.x, i, term.c.x + 1);
-		xdrawline(term.line[i], op.p[0], i, op.p[0] + 1);
-	}
-	// Update search results either only for lines with new content or all results if exiting
-	markSearchMatches(exited);
-	op = (Pos){.p = {term.c.x, term.c.y, 0}};
-	historyOpToggle(-1, 0);
-}

normalMode.h

@@ -1,8 +0,0 @@
-void normalMode();
-void historyPreDraw();
-void historyOverlay(int x, int y, Glyph* g);
-void historyModeToggle(int start);
-void historyOpToggle(int, int);
-typedef enum {failed=0, success=1, exitMotion=2, exitOp=3, finish=4} ExitState;
-ExitState kPressHist(char const *txt, size_t len, int ctrl, KeySym const *kSym);
-ExitState pressKeys(char const* s, size_t e);

st.h

@@ -8,7 +8,6 @@
 #define MAX(a, b)		((a) < (b) ? (b) : (a))
 #define LEN(a)			(sizeof(a) / sizeof(a)[0])
 #define BETWEEN(x, a, b)	((a) <= (x) && (x) <= (b))
-#define OUT(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)
@@ -20,6 +19,7 @@
 
 #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,
@@ -37,6 +37,12 @@ enum glyph_attribute {
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
 };
 
+enum drawing_mode {
+    DRAW_NONE = 0,
+    DRAW_BG = 1 << 0,
+    DRAW_FG = 1 << 1,
+};
+
 enum selection_mode {
 	SEL_IDLE = 0,
 	SEL_EMPTY = 1,
@@ -82,7 +88,6 @@ void die(const char *, ...);
 void redraw(void);
 void draw(void);
 
-void externalpipe(const Arg *);
 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);
@@ -91,8 +96,9 @@ void toggleprinter(const Arg *);
 int tattrset(int);
 void tnew(int, int);
 void tresize(int, int);
-void tmoveto(int x, int y);
 void tsetdirtattr(int);
+void tupdatebgcolor(int, int);
+void tupdatefgcolor(int, int);
 void ttyhangup(void);
 int ttynew(const char *, char *, const char *, char **);
 size_t ttyread(void);

st.info

@@ -184,10 +184,6 @@ 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)

utils.h

@@ -1,23 +0,0 @@
-/// Dynamic memory-chunk, with (1) datatype size, (2/3) initialized / allocated chunk, (4) content
-typedef struct { uint8_t const elSize; uint32_t init, alloc; char* content; } DynamicArray;
-#define UTF8_ARRAY {4, 0, 0, NULL}
-
-static inline int p_alloc(DynamicArray *s, uint32_t amount) {
-	uint32_t const diff=s->init+s->elSize*amount-s->alloc, nas=s->alloc+max(diff,15)*s->elSize;
-	if (s->alloc < s->init + s->elSize * amount) {
-		char* tmp = realloc(s->content, nas);
-		if (!tmp) return 0;
-		s->alloc = nas, s->content = tmp;
-	}
-	return 1;
-}
-static inline char *view(DynamicArray * s, uint32_t i) { return s->content + i*s->elSize; }
-static inline char *end(DynamicArray *s, uint32_t i) { return s->content +s->init-(i+1)*s->elSize; }
-static inline uint32_t getU32(DynamicArray* s, uint32_t i, int b) { return *((uint32_t*) (b ?view(s,i) :end(s,i))); }
-static char *expand(DynamicArray *s) { if (!p_alloc(s, 1)) return NULL; s->init += s->elSize; return end(s, 0); }
-static inline void pop(DynamicArray* s) { s->init -= s->elSize; }
-static inline void empty(DynamicArray* s) { s->init = 0; }
-static inline int size(DynamicArray const * s) { return s->init / s->elSize; }
-static inline void assign(DynamicArray* s, DynamicArray const *o) { 
-	if (p_alloc(s, size(o))) memcpy(s->content, o->content, (s->init=o->init));
-}

win.h

@@ -19,7 +19,6 @@ enum win_mode {
 	MODE_MOUSEMANY   = 1 << 15,
 	MODE_BRCKTPASTE  = 1 << 16,
 	MODE_NUMLOCK     = 1 << 17,
-	MODE_NORMAL      = 1 << 18,
 	MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
 	                  |MODE_MOUSEMANY,
 };

x.c

@@ -14,13 +14,11 @@
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
-#include <X11/Xresource.h>
 
 char *argv0;
 #include "arg.h"
 #include "st.h"
 #include "win.h"
-#include "normalMode.h"
 
 /* types used in config.h */
 typedef struct {
@@ -61,6 +59,10 @@ static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);
 static void ttysend(const Arg *);
+static void nextscheme(const Arg *);
+static void selectscheme(const Arg *);
+void kscrollup(const Arg *);
+void kscrolldown(const Arg *);
 
 /* config.h for applying patches and the configuration. */
 #include "config.h"
@@ -144,7 +146,7 @@ typedef struct {
 
 static inline ushort sixd_to_16bit(int);
 static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
-static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
+static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int);
 static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static int xgeommasktogravity(int);
@@ -187,6 +189,7 @@ static void mousesel(XEvent *, int);
 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
 static int match(uint, uint);
+static void updatescheme(void);
 
 static void run(void);
 static void usage(void);
@@ -263,7 +266,6 @@ clipcopy(const Arg *dummy)
 
 	free(xsel.clipboard);
 	xsel.clipboard = NULL;
-	xsetsel(getsel());
 
 	if (xsel.primary != NULL) {
 		xsel.clipboard = xstrdup(xsel.primary);
@@ -473,6 +475,7 @@ bpress(XEvent *e)
 {
 	int btn = e->xbutton.button;
 	struct timespec now;
+	int snap;
 
 	if (1 <= btn && btn <= 11)
 		buttons |= 1 << (btn-1);
@@ -491,34 +494,17 @@ bpress(XEvent *e)
 		 * snapping behaviour is exposed.
 		 */
 		clock_gettime(CLOCK_MONOTONIC, &now);
-		int const tripleClick = TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout,
-		doubleClick = TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout;
-		if ((mouseYank || mouseSelect) && (tripleClick || doubleClick)) {
-			if (!IS_SET(MODE_NORMAL)) normalMode();
-			historyOpToggle(1, 1);
-			tmoveto(evcol(e), evrow(e));
-			if (tripleClick) {
-				if (mouseYank) pressKeys("dVy", 3);
-				if (mouseSelect) pressKeys("dV", 2);
-			} else if (doubleClick) {
-				if (mouseYank) pressKeys("dyiW", 4);
-				if (mouseSelect) {
-					tmoveto(evcol(e), evrow(e));
-					pressKeys("viW", 3);
-				}
-			}
-			historyOpToggle(-1, 1);
+		if (TIMEDIFF(now, xsel.tclick2) <= tripleclicktimeout) {
+			snap = SNAP_LINE;
+		} else if (TIMEDIFF(now, xsel.tclick1) <= doubleclicktimeout) {
+			snap = SNAP_WORD;
 		} else {
-			if (!IS_SET(MODE_NORMAL)) selstart(evcol(e), evrow(e), 0);
-			else {
-				historyOpToggle(1, 1);
-				tmoveto(evcol(e), evrow(e));
-				pressKeys("v", 1);
-				historyOpToggle(-1, 1);
-			}
+			snap = 0;
 		}
 		xsel.tclick2 = xsel.tclick1;
 		xsel.tclick1 = now;
+
+		selstart(evcol(e), evrow(e), snap);
 	}
 }
 
@@ -728,7 +714,8 @@ brelease(XEvent *e)
 
 	if (mouseaction(e, 1))
 		return;
-	if (btn == Button1 && !IS_SET(MODE_NORMAL)) mousesel(e, 1);
+	if (btn == Button1)
+		mousesel(e, 1);
 }
 
 void
@@ -808,8 +795,6 @@ xloadcolor(int i, const char *name, Color *ncolor)
 	return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
 }
 
-void normalMode() { historyModeToggle((win.mode ^=MODE_NORMAL) & MODE_NORMAL); }
-
 void
 xloadcols(void)
 {
@@ -821,7 +806,7 @@ xloadcols(void)
 		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.collen = 260;
 		dc.col = xmalloc(dc.collen * sizeof(Color));
 	}
 
@@ -838,7 +823,7 @@ xloadcols(void)
 int
 xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b)
 {
-	if (!BETWEEN(x, 0, dc.collen - 1))
+	if (!BETWEEN(x, 0, dc.collen))
 		return 1;
 
 	*r = dc.col[x].color.red >> 8;
@@ -853,7 +838,7 @@ xsetcolorname(int x, const char *name)
 {
 	Color ncolor;
 
-	if (!BETWEEN(x, 0, dc.collen - 1))
+	if (!BETWEEN(x, 0, dc.collen))
 		return 1;
 
 	if (!xloadcolor(x, name, &ncolor))
@@ -1151,7 +1136,7 @@ xinit(int cols, int rows)
 {
 	XGCValues gcvalues;
 	Cursor cursor;
-	Window parent, root;
+	Window parent;
 	pid_t thispid = getpid();
 	XColor xmousefg, xmousebg;
 
@@ -1188,19 +1173,16 @@ 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 = root;
-	xw.win = XCreateWindow(xw.dpy, root, xw.l, xw.t,
+		parent = XRootWindow(xw.dpy, xw.scr);
+	xw.win = XCreateWindow(xw.dpy, parent, 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, xw.win, GCGraphicsExposures,
+	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
 			&gcvalues);
 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
 			DefaultDepth(xw.dpy, xw.scr));
@@ -1280,10 +1262,8 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 
 	for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
 		/* Fetch rune and mode for current glyph. */
-		Glyph g = glyphs[i];
-		historyOverlay(x+i, y, &g);
-		rune = g.u;
-		mode = g.mode;
+		rune = glyphs[i].u;
+		mode = glyphs[i].mode;
 
 		/* Skip dummy wide-character spacing. */
 		if (mode == ATTR_WDUMMY)
@@ -1397,7 +1377,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 }
 
 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 dmode)
 {
 	int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
 	int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
@@ -1488,6 +1468,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 	if (base.mode & ATTR_INVISIBLE)
 		fg = bg;
 
+    if (dmode & DRAW_BG) {
         /* Intelligent cleaning up of the borders. */
         if (x == 0) {
             xclear(0, (y == 0)? 0 : winy, borderpx,
@@ -1502,33 +1483,25 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
             xclear(winx, 0, winx + width, borderpx);
         if (winy + win.ch >= borderpx + win.th)
             xclear(winx, winy + win.ch, winx + width, win.h);
-
-	/* Clean up the region we want to draw to. */
+        /* Fill the background */
         XftDrawRect(xw.draw, bg, winx, winy, width, win.ch);
+    }
 
-	/* Set the clip region because Xft is sometimes dirty. */
-	r.x = 0;
-	r.y = 0;
-	r.height = win.ch;
-	r.width = width;
-	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
-
+    if (dmode & DRAW_FG) {
         /* Render the glyphs. */
         XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
 
         /* Render underline and strikethrough. */
         if (base.mode & ATTR_UNDERLINE) {
-		XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
+            XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
                         width, 1);
         }
 
         if (base.mode & ATTR_STRUCK) {
-		XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
+            XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
                         width, 1);
         }
-
-	/* Reset clip to none. */
-	XftDrawSetClip(xw.draw, 0);
+    }
 }
 
 void
@@ -1538,7 +1511,7 @@ xdrawglyph(Glyph g, int x, int y)
 	XftGlyphFontSpec spec;
 
 	numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
-	xdrawglyphfontspecs(&spec, g, numspecs, x, y);
+	xdrawglyphfontspecs(&spec, g, numspecs, x, y, DRAW_BG | DRAW_FG);
 }
 
 void
@@ -1642,9 +1615,6 @@ 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;
@@ -1659,9 +1629,6 @@ 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;
@@ -1679,21 +1646,26 @@ xstartdraw(void)
 void
 xdrawline(Line line, int x1, int y1, int x2)
 {
-	int i, x, ox, numspecs;
+	int i, x, ox, numspecs, numspecs_cached;
 	Glyph base, new;
-	XftGlyphFontSpec *specs = xw.specbuf;
+	XftGlyphFontSpec *specs;
 
-	numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
+	numspecs_cached = xmakeglyphfontspecs(xw.specbuf, &line[x1], x2 - x1, x1, y1);
+
+	/* Draw line in 2 passes: background and foreground. This way wide glyphs
+       won't get truncated (#223) */
+	for (int dmode = DRAW_BG; dmode <= DRAW_FG; dmode <<= 1) {
+		specs = xw.specbuf;
+		numspecs = numspecs_cached;
 		i = ox = 0;
 		for (x = x1; x < x2 && i < numspecs; x++) {
 			new = line[x];
-		historyOverlay(x, y1, &new);
 			if (new.mode == ATTR_WDUMMY)
 				continue;
 			if (selected(x, y1))
 				new.mode ^= ATTR_REVERSE;
 			if (i > 0 && ATTRCMP(base, new)) {
-			xdrawglyphfontspecs(specs, base, i, ox, y1);
+				xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
 				specs += i;
 				numspecs -= i;
 				i = 0;
@@ -1705,7 +1677,8 @@ xdrawline(Line line, int x1, int y1, int x2)
 			i++;
 		}
 		if (i > 0)
-		xdrawglyphfontspecs(specs, base, i, ox, y1);
+			xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
+	}
 }
 
 void
@@ -1882,11 +1855,6 @@ kpress(XEvent *ev)
 	} else {
 		len = XLookupString(e, buf, sizeof buf, &ksym, NULL);
 	}
-	if (IS_SET(MODE_NORMAL)) {
-		if (kPressHist(buf, len, match(ControlMask, e->state), &ksym)
-		                                      == finish) normalMode();
-		return;
-	}
 	/* 1. shortcuts */
 	for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
 		if (ksym == bp->keysym && match(bp->mod, e->state)) {
@@ -2051,118 +2019,6 @@ 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_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)
 {
@@ -2176,6 +2032,47 @@ usage(void)
 	    " [stty_args ...]\n", argv0, argv0);
 }
 
+void
+nextscheme(const Arg *arg)
+{
+	colorscheme += arg->i;
+	if (colorscheme >= (int)LEN(schemes))
+		colorscheme = 0;
+	else if (colorscheme < 0)
+		colorscheme = LEN(schemes) - 1;
+	updatescheme();
+}
+
+void
+selectscheme(const Arg *arg)
+{
+	if (BETWEEN(arg->i, 0, LEN(schemes)-1)) {
+		colorscheme = arg->i;
+		updatescheme();
+	}
+}
+
+void
+updatescheme(void)
+{
+	int oldbg, oldfg;
+
+	oldbg = defaultbg;
+	oldfg = defaultfg;
+	colorname = schemes[colorscheme].colors;
+	defaultbg = schemes[colorscheme].bg;
+	defaultfg = schemes[colorscheme].fg;
+	defaultcs = schemes[colorscheme].cs;
+	defaultrcs = schemes[colorscheme].rcs;
+	xloadcols();
+	if (defaultbg != oldbg)
+		tupdatebgcolor(oldbg, defaultbg);
+	if (defaultfg != oldfg)
+		tupdatefgcolor(oldfg, defaultfg);
+	cresize(win.w, win.h);
+	redraw();
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -2228,6 +2125,12 @@ main(int argc, char *argv[])
 	} ARGEND;
 
 run:
+	colorname = schemes[colorscheme].colors;
+	defaultbg = schemes[colorscheme].bg;
+	defaultfg = schemes[colorscheme].fg;
+	defaultcs = schemes[colorscheme].cs;
+	defaultrcs = schemes[colorscheme].rcs;
+
 	if (argc > 0) /* eat all remaining arguments */
 		opt_cmd = argv;
 
@@ -2236,8 +2139,6 @@ run:
 
 	setlocale(LC_CTYPE, "");
 	XSetLocaleModifiers("");
-	xrdb_load();
-	signal(SIGUSR1, reload);
 	cols = MAX(cols, 1);
 	rows = MAX(rows, 1);
 	tnew(cols, rows);