diff options
| -rw-r--r-- | patch.diff | 2576 |
1 files changed, 2576 insertions, 0 deletions
diff --git a/patch.diff b/patch.diff new file mode 100644 index 0000000..22758c7 --- /dev/null +++ b/patch.diff @@ -0,0 +1,2576 @@ +diff --git a/Makefile b/Makefile +index 470ac86..eacc2ef 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ + + include config.mk + +-SRC = st.c x.c ++SRC = st.c x.c hb.c + OBJ = $(SRC:.c=.o) + + all: options st +@@ -22,7 +22,8 @@ config.h: + $(CC) $(STCFLAGS) -c $< + + st.o: config.h st.h win.h +-x.o: arg.h config.h st.h win.h ++x.o: arg.h config.h st.h win.h hb.h ++hb.o: st.h + + $(OBJ): config.h config.mk + +@@ -49,9 +50,12 @@ install: st + chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1 + tic -sx st.info + @echo Please see the README file regarding the terminfo entry of st. ++ mkdir -p $(DESTDIR)$(PREFIX)/share/applications ++ cp -f st.desktop $(DESTDIR)$(PREFIX)/share/applications + + uninstall: + rm -f $(DESTDIR)$(PREFIX)/bin/st + rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1 ++ rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop + + .PHONY: all options clean dist install uninstall +diff --git a/config.def.h b/config.def.h +index 91ab8ca..1f9b5e3 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -6,6 +6,13 @@ + * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html + */ + static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; ++/* Spare fonts */ ++static char *font2[] = { ++/* "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */ ++/* "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */ ++ "Symbola:pixelsize=11:antialias=true:autohint=true" ++}; ++ + static int borderpx = 2; + + /* +@@ -93,6 +100,9 @@ char *termname = "st-256color"; + */ + unsigned int tabspaces = 8; + ++/* bg opacity */ ++float alpha = 0.8; ++ + /* Terminal colors (16 first used in escape sequence) */ + static const char *colorname[] = { + /* 8 normal colors */ +@@ -163,6 +173,43 @@ static unsigned int mousebg = 0; + */ + static unsigned int defaultattr = 11; + ++/* ++ * Xresources preferences to load at startup ++ */ ++ResourcePref resources[] = { ++ { "font", STRING, &font }, ++ { "color0", STRING, &colorname[0] }, ++ { "color1", STRING, &colorname[1] }, ++ { "color2", STRING, &colorname[2] }, ++ { "color3", STRING, &colorname[3] }, ++ { "color4", STRING, &colorname[4] }, ++ { "color5", STRING, &colorname[5] }, ++ { "color6", STRING, &colorname[6] }, ++ { "color7", STRING, &colorname[7] }, ++ { "color8", STRING, &colorname[8] }, ++ { "color9", STRING, &colorname[9] }, ++ { "color10", STRING, &colorname[10] }, ++ { "color11", STRING, &colorname[11] }, ++ { "color12", STRING, &colorname[12] }, ++ { "color13", STRING, &colorname[13] }, ++ { "color14", STRING, &colorname[14] }, ++ { "color15", STRING, &colorname[15] }, ++ { "background", STRING, &colorname[256] }, ++ { "foreground", STRING, &colorname[257] }, ++ { "cursorColor", STRING, &colorname[258] }, ++ { "reverseCursor",STRING, &colorname[259] }, ++ { "termname", STRING, &termname }, ++ { "shell", STRING, &shell }, ++ { "minlatency", INTEGER, &minlatency }, ++ { "maxlatency", INTEGER, &maxlatency }, ++ { "blinktimeout", INTEGER, &blinktimeout }, ++ { "bellvolume", INTEGER, &bellvolume }, ++ { "tabspaces", INTEGER, &tabspaces }, ++ { "borderpx", INTEGER, &borderpx }, ++ { "cwscale", FLOAT, &cwscale }, ++ { "chscale", FLOAT, &chscale }, ++}; ++ + /* + * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set). + * Note that if you want to use ShiftMask with selmasks, set this to an other +@@ -170,12 +217,20 @@ static unsigned int defaultattr = 11; + */ + static uint forcemousemod = ShiftMask; + ++/* ++ * Command used to query unicode glyphs. ++ */ ++char *iso14755_cmd = "dmenu -w \"$WINDOWID\" -p codepoint: </dev/null"; ++ + /* + * Internal mouse shortcuts. + * Beware that overloading Button1 will disable the selection. + */ ++const unsigned int mousescrollincrement = 1; + static MouseShortcut mshortcuts[] = { + /* mask button function argument release */ ++ { XK_ANY_MOD, Button4, kscrollup, {.i = mousescrollincrement}, 0, /* !alt */ -1 }, ++ { XK_ANY_MOD, Button5, kscrolldown, {.i = mousescrollincrement}, 0, /* !alt */ -1 }, + { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, + { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, + { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, +@@ -201,6 +256,9 @@ static Shortcut shortcuts[] = { + { TERMMOD, XK_Y, selpaste, {.i = 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} }, ++ { TERMMOD, XK_I, iso14755, {.i = 0} }, + }; + + /* +diff --git a/config.mk b/config.mk +index 4c4c5d5..201a144 100644 +--- a/config.mk ++++ b/config.mk +@@ -15,12 +15,15 @@ PKG_CONFIG = pkg-config + # includes and libs + INCS = -I$(X11INC) \ + `$(PKG_CONFIG) --cflags fontconfig` \ +- `$(PKG_CONFIG) --cflags freetype2` +-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ ++ `$(PKG_CONFIG) --cflags freetype2` \ ++ `$(PKG_CONFIG) --cflags harfbuzz` ++LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\ + `$(PKG_CONFIG) --libs fontconfig` \ +- `$(PKG_CONFIG) --libs freetype2` ++ `$(PKG_CONFIG) --libs freetype2` \ ++ `$(PKG_CONFIG) --libs harfbuzz` + + # flags ++CFLAGS= -Wall -pedantic -O3 -march=native -std=c99 + STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 + STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) + STLDFLAGS = $(LIBS) $(LDFLAGS) +diff --git a/hb.c b/hb.c +new file mode 100644 +index 0000000..7df2828 +--- /dev/null ++++ b/hb.c +@@ -0,0 +1,136 @@ ++#include <stdlib.h> ++#include <stdio.h> ++#include <math.h> ++#include <X11/Xft/Xft.h> ++#include <hb.h> ++#include <hb-ft.h> ++ ++#include "st.h" ++ ++void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length); ++hb_font_t *hbfindfont(XftFont *match); ++ ++typedef struct { ++ XftFont *match; ++ hb_font_t *font; ++} HbFontMatch; ++ ++static int hbfontslen = 0; ++static HbFontMatch *hbfontcache = NULL; ++ ++void ++hbunloadfonts() ++{ ++ for (int i = 0; i < hbfontslen; i++) { ++ hb_font_destroy(hbfontcache[i].font); ++ XftUnlockFace(hbfontcache[i].match); ++ } ++ ++ if (hbfontcache != NULL) { ++ free(hbfontcache); ++ hbfontcache = NULL; ++ } ++ hbfontslen = 0; ++} ++ ++hb_font_t * ++hbfindfont(XftFont *match) ++{ ++ for (int i = 0; i < hbfontslen; i++) { ++ if (hbfontcache[i].match == match) ++ return hbfontcache[i].font; ++ } ++ ++ /* Font not found in cache, caching it now. */ ++ hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 1)); ++ FT_Face face = XftLockFace(match); ++ hb_font_t *font = hb_ft_font_create(face, NULL); ++ if (font == NULL) ++ die("Failed to load Harfbuzz font."); ++ ++ hbfontcache[hbfontslen].match = match; ++ hbfontcache[hbfontslen].font = font; ++ hbfontslen += 1; ++ ++ return font; ++} ++ ++void ++hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y) ++{ ++ int start = 0, length = 1, gstart = 0; ++ hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t)); ++ ++ for (int idx = 1, specidx = 1; idx < len; idx++) { ++ if (glyphs[idx].mode & ATTR_WDUMMY) { ++ length += 1; ++ continue; ++ } ++ ++ if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) { ++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length); ++ ++ /* Reset the sequence. */ ++ length = 1; ++ start = specidx; ++ gstart = idx; ++ } else { ++ length += 1; ++ } ++ ++ specidx++; ++ } ++ ++ /* EOL. */ ++ hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length); ++ ++ /* Apply the transformation to glyph specs. */ ++ for (int i = 0, specidx = 0; i < len; i++) { ++ if (glyphs[i].mode & ATTR_WDUMMY) ++ continue; ++ ++ if (codepoints[i] != specs[specidx].glyph) ++ ((Glyph *)glyphs)[i].mode |= ATTR_LIGA; ++ ++ specs[specidx++].glyph = codepoints[i]; ++ } ++ ++ free(codepoints); ++} ++ ++void ++hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length) ++{ ++ hb_font_t *font = hbfindfont(xfont); ++ if (font == NULL) ++ return; ++ ++ Rune rune; ++ ushort mode = USHRT_MAX; ++ hb_buffer_t *buffer = hb_buffer_create(); ++ hb_buffer_set_direction(buffer, HB_DIRECTION_LTR); ++ ++ /* Fill buffer with codepoints. */ ++ for (int i = start; i < (start+length); i++) { ++ rune = string[i].u; ++ mode = string[i].mode; ++ if (mode & ATTR_WDUMMY) ++ rune = 0x0020; ++ hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1); ++ } ++ ++ /* Shape the segment. */ ++ hb_shape(font, buffer, NULL, 0); ++ ++ /* Get new glyph info. */ ++ hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL); ++ ++ /* Write new codepoints. */ ++ for (int i = 0; i < length; i++) { ++ hb_codepoint_t gid = info[i].codepoint; ++ codepoints[start+i] = gid; ++ } ++ ++ /* Cleanup. */ ++ hb_buffer_destroy(buffer); ++} +diff --git a/hb.h b/hb.h +new file mode 100644 +index 0000000..b3e02d0 +--- /dev/null ++++ b/hb.h +@@ -0,0 +1,7 @@ ++#include <X11/Xft/Xft.h> ++#include <hb.h> ++#include <hb-ft.h> ++ ++void hbunloadfonts(); ++void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int); ++ +diff --git a/icon.h b/icon.h +new file mode 100644 +index 0000000..7ab09d0 +--- /dev/null ++++ b/icon.h +@@ -0,0 +1,686 @@ ++unsigned long icon[] = { ++ 64, 64, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, ++ 0x03000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, ++ 0x20181818, 0x4e868686, 0x74b2b2b2, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, ++ 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x74b2b2b2, ++ 0x4e868686, 0x20181818, 0x03000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x03000000, 0x46717171, 0xcef3f3f3, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xcdf3f3f3, ++ 0x456f6f6f, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x211f1f1f, 0xd1f4f4f4, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xd0f3f3f3, 0x20181818, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x59959595, 0xffffffff, ++ 0xffffffff, 0xff8b8b8b, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff8c8c8c, 0xffffffff, 0xffffffff, 0x58919191, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x83b3b3b3, 0xffffffff, 0xffffffff, 0xff262626, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff, ++ 0xffffffff, 0x83b3b3b3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff2c2c2c, 0xffe0e0e0, 0xff1c1c1c, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff202020, ++ 0xff6c6c6c, 0xffffffff, 0xff6d6d6d, 0xff3c3c3c, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff2d2d2d, 0xffe1e1e1, 0xffc3c3c3, 0xffffffff, ++ 0xffa1a1a1, 0xffdddddd, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff7f7f7f, 0xffbfbfbf, 0xff303030, 0xffffffff, 0xff1c1c1c, 0xff181818, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff717171, 0xffe1e1e1, ++ 0xff545454, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff1c1c1c, 0xffa1a1a1, 0xfff6f6f6, 0xffffffff, ++ 0xffaeaeae, 0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff343434, 0xffffffff, 0xff979797, 0xfff9f9f9, ++ 0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff303030, 0xffffffff, 0xff1c1c1c, 0xffb3b3b3, 0xff8d8d8d, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff686868, 0xff616161, 0xff3c3c3c, 0xffffffff, ++ 0xff545454, 0xffe8e8e8, 0xff5b5b5b, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff4b4b4b, 0xffb3b3b3, 0xffe1e1e1, 0xffffffff, 0xffcccccc, 0xff717171, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff303030, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff2b2b2b, 0xffd1d1d1, ++ 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff7f7f7f, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9, ++ 0xffe9e9e9, 0xffe9e9e9, 0xff444444, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff, ++ 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, ++ 0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x8aacacac, 0xffffffff, 0xffffffff, 0xff262626, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, ++ 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff, ++ 0xffffffff, 0x8aacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x62858585, 0xffffffff, 0xffffffff, 0xff8c8c8c, 0xff373737, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, ++ 0xff363636, 0xff373737, 0xff8d8d8d, 0xffffffff, 0xffffffff, 0x62828282, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x21171717, 0xdee2e2e2, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xdee1e1e1, 0x1f101010, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x03000000, 0x5f4e4e4e, 0xdbe1e1e1, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xdae1e1e1, ++ 0x5f4b4b4b, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x12000000, 0x48040404, 0x6d595959, 0x8d929292, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, ++ 0x90979797, 0x8d929292, 0x6d595959, 0x48040404, 0x12000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x06000000, 0x22000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, ++ 0x22000000, 0x06000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++ 0x00000000, 0x00000000, 0x00000000, 0x00000000, ++}; +diff --git a/st.1 b/st.1 +index 39120b4..4a98626 100644 +--- a/st.1 ++++ b/st.1 +@@ -159,6 +159,10 @@ Copy the selected text to the clipboard selection. + .TP + .B Ctrl-Shift-v + Paste from the clipboard selection. ++.TP ++.B Ctrl-Shift-i ++Launch dmenu to enter a unicode codepoint and send the corresponding glyph ++to st. + .SH CUSTOMIZATION + .B st + can be customized by creating a custom config.h and (re)compiling the source +diff --git a/st.c b/st.c +index 51049ba..8b687d7 100644 +--- a/st.c ++++ b/st.c +@@ -35,6 +35,7 @@ + #define ESC_ARG_SIZ 16 + #define STR_BUF_SIZ ESC_BUF_SIZ + #define STR_ARG_SIZ ESC_ARG_SIZ ++#define HISTSIZE 2000 + + /* macros */ + #define IS_SET(flag) ((term.mode & (flag)) != 0) +@@ -42,6 +43,11 @@ + #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) + #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) + #define ISDELIM(u) (u && wcschr(worddelimiters, u)) ++#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \ ++ term.scr + HISTSIZE + 1) % HISTSIZE] : \ ++ term.line[(y) - term.scr]) ++#define STRESCARGREST(n) ((n) == 0 ? strescseq.buf : strescseq.argp[(n)-1] + 1) ++#define STRESCARGJUST(n) (*(strescseq.argp[n]) = '\0', STRESCARGREST(n)) + + enum term_mode { + MODE_WRAP = 1 << 0, +@@ -115,6 +121,9 @@ typedef struct { + int col; /* nb col */ + Line *line; /* screen */ + Line *alt; /* alternate screen */ ++ Line hist[HISTSIZE]; /* history buffer */ ++ int histi; /* history index */ ++ int scr; /* scroll back */ + int *dirty; /* dirtyness of lines */ + TCursor c; /* cursor */ + int ocx; /* old cursor col */ +@@ -148,7 +157,7 @@ typedef struct { + char *buf; /* allocated raw string */ + size_t siz; /* allocation size */ + size_t len; /* raw string length */ +- char *args[STR_ARG_SIZ]; ++ char *argp[STR_ARG_SIZ]; /* pointers to the end of nth argument */ + int narg; /* nb of args */ + } STREscape; + +@@ -184,8 +193,8 @@ static void tnewline(int); + static void tputtab(int); + static void tputc(Rune); + static void treset(void); +-static void tscrollup(int, int); +-static void tscrolldown(int, int); ++static void tscrollup(int, int, int); ++static void tscrolldown(int, int, int); + static void tsetattr(const int *, int); + static void tsetchar(Rune, const Glyph *, int, int); + static void tsetdirt(int, int); +@@ -416,10 +425,10 @@ tlinelen(int y) + { + int i = term.col; + +- if (term.line[y][i - 1].mode & ATTR_WRAP) ++ if (TLINE(y)[i - 1].mode & ATTR_WRAP) + return i; + +- while (i > 0 && term.line[y][i - 1].u == ' ') ++ while (i > 0 && TLINE(y)[i - 1].u == ' ') + --i; + + return i; +@@ -528,7 +537,7 @@ selsnap(int *x, int *y, int direction) + * Snap around if the word wraps around at the end or + * beginning of a line. + */ +- prevgp = &term.line[*y][*x]; ++ prevgp = &TLINE(*y)[*x]; + prevdelim = ISDELIM(prevgp->u); + for (;;) { + newx = *x + direction; +@@ -543,14 +552,14 @@ selsnap(int *x, int *y, int direction) + yt = *y, xt = *x; + else + yt = newy, xt = newx; +- if (!(term.line[yt][xt].mode & ATTR_WRAP)) ++ if (!(TLINE(yt)[xt].mode & ATTR_WRAP)) + break; + } + + if (newx >= tlinelen(newy)) + break; + +- gp = &term.line[newy][newx]; ++ gp = &TLINE(newy)[newx]; + delim = ISDELIM(gp->u); + if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim + || (delim && gp->u != prevgp->u))) +@@ -571,14 +580,14 @@ selsnap(int *x, int *y, int direction) + *x = (direction < 0) ? 0 : term.col - 1; + if (direction < 0) { + for (; *y > 0; *y += direction) { +- if (!(term.line[*y-1][term.col-1].mode ++ if (!(TLINE(*y-1)[term.col-1].mode + & ATTR_WRAP)) { + break; + } + } + } else if (direction > 0) { + for (; *y < term.row-1; *y += direction) { +- if (!(term.line[*y][term.col-1].mode ++ if (!(TLINE(*y)[term.col-1].mode + & ATTR_WRAP)) { + break; + } +@@ -609,13 +618,13 @@ getsel(void) + } + + if (sel.type == SEL_RECTANGULAR) { +- gp = &term.line[y][sel.nb.x]; ++ gp = &TLINE(y)[sel.nb.x]; + lastx = sel.ne.x; + } else { +- gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0]; ++ gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0]; + lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; + } +- last = &term.line[y][MIN(lastx, linelen-1)]; ++ last = &TLINE(y)[MIN(lastx, linelen-1)]; + while (last >= gp && last->u == ' ') + --last; + +@@ -725,8 +734,14 @@ sigchld(int a) + if ((p = waitpid(pid, &stat, WNOHANG)) < 0) + die("waiting for pid %hd failed: %s\n", pid, strerror(errno)); + +- if (pid != p) ++ if (pid != p) { ++ if (p == 0 && wait(&stat) < 0) ++ die("wait: %s\n", strerror(errno)); ++ ++ /* reinstall sigchld handler */ ++ signal(SIGCHLD, sigchld); + return; ++ } + + if (WIFEXITED(stat) && WEXITSTATUS(stat)) + die("child exited with status %d\n", WEXITSTATUS(stat)); +@@ -851,6 +866,9 @@ void + ttywrite(const char *s, size_t n, int may_echo) + { + const char *next; ++ Arg arg = (Arg) { .i = term.scr }; ++ ++ kscrolldown(&arg); + + if (may_echo && IS_SET(MODE_ECHO)) + twrite(s, n, 1); +@@ -1050,6 +1068,11 @@ tnew(int col, int row) + treset(); + } + ++int tisaltscr(void) ++{ ++ return IS_SET(MODE_ALTSCREEN); ++} ++ + void + tswapscreen(void) + { +@@ -1062,13 +1085,53 @@ tswapscreen(void) + } + + void +-tscrolldown(int orig, int n) ++kscrolldown(const Arg* a) ++{ ++ int n = a->i; ++ ++ if (n < 0) ++ n = term.row + n; ++ ++ if (n > term.scr) ++ n = term.scr; ++ ++ if (term.scr > 0) { ++ term.scr -= n; ++ selscroll(0, -n); ++ tfulldirt(); ++ } ++} ++ ++void ++kscrollup(const Arg* a) ++{ ++ int n = a->i; ++ ++ if (n < 0) ++ n = term.row + n; ++ ++ if (term.scr <= HISTSIZE-n) { ++ term.scr += n; ++ selscroll(0, n); ++ tfulldirt(); ++ } ++} ++ ++void ++tscrolldown(int orig, int n, int copyhist) + { + int i; + Line temp; + + LIMIT(n, 0, term.bot-orig+1); + ++ if (copyhist) { ++ term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE; ++ temp = term.hist[term.histi]; ++ term.hist[term.histi] = term.line[term.bot]; ++ term.line[term.bot] = temp; ++ } ++ + tsetdirt(orig, term.bot-n); + tclearregion(0, term.bot-n+1, term.col-1, term.bot); + +@@ -1078,17 +1141,28 @@ tscrolldown(int orig, int n) + term.line[i-n] = temp; + } + +- selscroll(orig, n); ++ if (term.scr == 0) ++ selscroll(orig, n); + } + + void +-tscrollup(int orig, int n) ++tscrollup(int orig, int n, int copyhist) + { + int i; + Line temp; + + LIMIT(n, 0, term.bot-orig+1); + ++ if (copyhist) { ++ term.histi = (term.histi + 1) % HISTSIZE; ++ temp = term.hist[term.histi]; ++ term.hist[term.histi] = term.line[orig]; ++ term.line[orig] = temp; ++ } ++ ++ if (term.scr > 0 && term.scr < HISTSIZE) ++ term.scr = MIN(term.scr + n, HISTSIZE-1); ++ + tclearregion(0, orig, term.col-1, orig+n-1); + tsetdirt(orig+n, term.bot); + +@@ -1098,7 +1172,8 @@ tscrollup(int orig, int n) + term.line[i+n] = temp; + } + +- selscroll(orig, -n); ++ if (term.scr == 0) ++ selscroll(orig, -n); + } + + void +@@ -1127,7 +1202,7 @@ tnewline(int first_col) + int y = term.c.y; + + if (y == term.bot) { +- tscrollup(term.top, 1); ++ tscrollup(term.top, 1, 1); + } else { + y++; + } +@@ -1292,14 +1367,14 @@ void + tinsertblankline(int n) + { + if (BETWEEN(term.c.y, term.top, term.bot)) +- tscrolldown(term.c.y, n); ++ tscrolldown(term.c.y, n, 0); + } + + void + tdeleteline(int n) + { + if (BETWEEN(term.c.y, term.top, term.bot)) +- tscrollup(term.c.y, n); ++ tscrollup(term.c.y, n, 0); + } + + int32_t +@@ -1736,11 +1811,11 @@ csihandle(void) + break; + case 'S': /* SU -- Scroll <n> line up */ + DEFAULT(csiescseq.arg[0], 1); +- tscrollup(term.top, csiescseq.arg[0]); ++ tscrollup(term.top, csiescseq.arg[0], 0); + break; + case 'T': /* SD -- Scroll <n> line down */ + DEFAULT(csiescseq.arg[0], 1); +- tscrolldown(term.top, csiescseq.arg[0]); ++ tscrolldown(term.top, csiescseq.arg[0], 0); + break; + case 'L': /* IL -- Insert <n> blank lines */ + DEFAULT(csiescseq.arg[0], 1); +@@ -1809,6 +1884,33 @@ csihandle(void) + goto unknown; + } + break; ++ case 't': /* title stack operations */ ++ switch (csiescseq.arg[0]) { ++ case 22: /* pust current title on stack */ ++ switch (csiescseq.arg[1]) { ++ case 0: ++ case 1: ++ case 2: ++ xpushtitle(); ++ break; ++ default: ++ goto unknown; ++ } ++ break; ++ case 23: /* pop last title from stack */ ++ switch (csiescseq.arg[1]) { ++ case 0: ++ case 1: ++ case 2: ++ xsettitle(NULL, 1); ++ break; ++ default: ++ goto unknown; ++ } ++ break; ++ default: ++ goto unknown; ++ } + } + } + +@@ -1885,29 +1987,30 @@ strhandle(void) + int j, narg, par; + + term.esc &= ~(ESC_STR_END|ESC_STR); +- strparse(); +- par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0; ++ strescseq.buf[strescseq.len] = '\0'; + + switch (strescseq.type) { + case ']': /* OSC -- Operating System Command */ ++ strparse(); ++ par = (narg = strescseq.narg) ? atoi(STRESCARGJUST(0)) : 0; + switch (par) { + case 0: + if (narg > 1) { +- xsettitle(strescseq.args[1]); +- xseticontitle(strescseq.args[1]); ++ xsettitle(STRESCARGREST(1), 0); ++ xseticontitle(STRESCARGREST(1)); + } + return; + case 1: + if (narg > 1) +- xseticontitle(strescseq.args[1]); ++ xsettitle(STRESCARGREST(1), 0); + return; + case 2: + if (narg > 1) +- xsettitle(strescseq.args[1]); ++ xsettitle(STRESCARGREST(1), 0); + return; + case 52: + if (narg > 2 && allowwindowops) { +- dec = base64dec(strescseq.args[2]); ++ dec = base64dec(STRESCARGJUST(2)); + if (dec) { + xsetsel(dec); + xclipcopy(); +@@ -1916,11 +2019,12 @@ strhandle(void) + } + } + return; +- case 10: ++ /* ++ case 10: + if (narg < 2) + break; + +- p = strescseq.args[1]; ++ p = STRESCARGREST(1); + + if (!strcmp(p, "?")) + osc_color_response(defaultfg, 10); +@@ -1933,7 +2037,7 @@ strhandle(void) + if (narg < 2) + break; + +- p = strescseq.args[1]; ++ p = STRESCARGREST(1); + + if (!strcmp(p, "?")) + osc_color_response(defaultbg, 11); +@@ -1946,7 +2050,7 @@ strhandle(void) + if (narg < 2) + break; + +- p = strescseq.args[1]; ++ p = STRESCARGREST(1); + + if (!strcmp(p, "?")) + osc_color_response(defaultcs, 12); +@@ -1955,13 +2059,44 @@ strhandle(void) + else + redraw(); + return; ++ */ ++ case 10: /* set foreground color */ ++ if (narg < 2) ++ break; ++ ++ p = STRESCARGJUST(1); ++ if (xsetcolorname(defaultfg, p)) ++ fprintf(stderr, "erresc: invalid foreground color %s\n", p); ++ else ++ redraw(); ++ break; ++ case 11: /* set background color */ ++ if (narg < 2) ++ break; ++ ++ p = STRESCARGJUST(1); ++ if (xsetcolorname(defaultbg, p)) ++ fprintf(stderr, "erresc: invalid background color %s\n", p); ++ else ++ redraw(); ++ break; ++ case 12: /* set cursor color */ ++ if (narg < 2) ++ break; ++ ++ p = STRESCARGJUST(1); ++ if (xsetcolorname(defaultcs, p)) ++ fprintf(stderr, "erresc: invalid cursor color %s\n", p); ++ else ++ redraw(); ++ break; + case 4: /* color set */ + if (narg < 3) + break; +- p = strescseq.args[2]; ++ p = STRESCARGJUST(2); + /* FALLTHROUGH */ + case 104: /* color reset */ +- j = (narg > 1) ? atoi(strescseq.args[1]) : -1; ++ j = (narg > 1) ? atoi(STRESCARGJUST(1)) : -1; + + if (p && !strcmp(p, "?")) + osc4_color_response(j); +@@ -1975,13 +2110,15 @@ strhandle(void) + * TODO if defaultbg color is changed, borders + * are dirty + */ ++ if (j == defaultbg) ++ xclearwin(); + redraw(); + } + return; + } + break; + case 'k': /* old title set compatibility */ +- xsettitle(strescseq.args[0]); ++ xsettitle(strescseq.buf, 0); + return; + case 'P': /* DCS -- Device Control String */ + case '_': /* APC -- Application Program Command */ +@@ -2000,21 +2137,73 @@ strparse(void) + char *p = strescseq.buf; + + strescseq.narg = 0; +- strescseq.buf[strescseq.len] = '\0'; + + if (*p == '\0') + return; + + while (strescseq.narg < STR_ARG_SIZ) { +- strescseq.args[strescseq.narg++] = p; + while ((c = *p) != ';' && c != '\0') +- ++p; ++ p++; ++ strescseq.argp[strescseq.narg++] = p; + if (c == '\0') + return; +- *p++ = '\0'; ++ p++; + } + } + ++void ++externalpipe(const Arg *arg) ++{ ++ int to[2]; ++ char buf[UTF_SIZ]; ++ void (*oldsigpipe)(int); ++ Glyph *bp, *end; ++ int lastpos, n, newline; ++ ++ if (pipe(to) == -1) ++ return; ++ ++ switch (fork()) { ++ case -1: ++ close(to[0]); ++ close(to[1]); ++ return; ++ case 0: ++ dup2(to[0], STDIN_FILENO); ++ close(to[0]); ++ close(to[1]); ++ execvp(((char **)arg->v)[0], (char **)arg->v); ++ fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]); ++ perror("failed"); ++ exit(0); ++ } ++ ++ close(to[0]); ++ /* ignore sigpipe for now, in case child exists early */ ++ oldsigpipe = signal(SIGPIPE, SIG_IGN); ++ newline = 0; ++ for (n = 0; n < term.row; n++) { ++ bp = term.line[n]; ++ lastpos = MIN(tlinelen(n) + 1, term.col) - 1; ++ if (lastpos < 0) ++ break; ++ end = &bp[lastpos + 1]; ++ for (; bp < end; ++bp) ++ if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0) ++ break; ++ if ((newline = term.line[n][lastpos].mode & ATTR_WRAP)) ++ continue; ++ if (xwrite(to[1], "\n", 1) < 0) ++ break; ++ newline = 0; ++ } ++ if (newline) ++ (void)xwrite(to[1], "\n", 1); ++ close(to[1]); ++ /* restore */ ++ signal(SIGPIPE, oldsigpipe); ++} ++ + void + strdump(void) + { +@@ -2068,6 +2257,28 @@ tprinter(char *s, size_t len) + } + } + ++void ++iso14755(const Arg *arg) ++{ ++ FILE *p; ++ char *us, *e, codepoint[9], uc[UTF_SIZ]; ++ unsigned long utf32; ++ ++ if (!(p = popen(iso14755_cmd, "r"))) ++ return; ++ ++ us = fgets(codepoint, sizeof(codepoint), p); ++ pclose(p); ++ ++ if (!us || *us == '\0' || *us == '-' || strlen(us) > 7) ++ return; ++ if ((utf32 = strtoul(us, &e, 16)) == ULONG_MAX || ++ (*e != '\n' && *e != '\0')) ++ return; ++ ++ ttywrite(uc, utf8encode(utf32, uc), 1); ++} ++ + void + toggleprinter(const Arg *arg) + { +@@ -2330,7 +2541,7 @@ eschandle(uchar ascii) + return 0; + case 'D': /* IND -- Linefeed */ + if (term.c.y == term.bot) { +- tscrollup(term.top, 1); ++ tscrollup(term.top, 1, 1); + } else { + tmoveto(term.c.x, term.c.y+1); + } +@@ -2343,7 +2554,7 @@ eschandle(uchar ascii) + break; + case 'M': /* RI -- Reverse index */ + if (term.c.y == term.top) { +- tscrolldown(term.top, 1); ++ tscrolldown(term.top, 1, 1); + } else { + tmoveto(term.c.x, term.c.y-1); + } +@@ -2353,6 +2564,7 @@ eschandle(uchar ascii) + break; + case 'c': /* RIS -- Reset to initial state */ + treset(); ++ xfreetitlestack(); + resettitle(); + xloadcols(); + break; +@@ -2557,7 +2769,7 @@ twrite(const char *buf, int buflen, int show_ctrl) + void + tresize(int col, int row) + { +- int i; ++ int i, j; + int minrow = MIN(row, term.row); + int mincol = MIN(col, term.col); + int *bp; +@@ -2594,6 +2806,14 @@ tresize(int col, int row) + term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); + term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); + ++ for (i = 0; i < HISTSIZE; i++) { ++ term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph)); ++ for (j = mincol; j < col; j++) { ++ term.hist[i][j] = term.c.attr; ++ term.hist[i][j].u = ' '; ++ } ++ } ++ + /* resize each row to new width, zero-pad if needed */ + for (i = 0; i < minrow; i++) { + term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); +@@ -2639,7 +2859,7 @@ tresize(int col, int row) + void + resettitle(void) + { +- xsettitle(NULL); ++ xsettitle(NULL, 0); + } + + void +@@ -2652,7 +2872,7 @@ drawregion(int x1, int y1, int x2, int y2) + continue; + + term.dirty[y] = 0; +- xdrawline(term.line[y], x1, y, x2); ++ xdrawline(TLINE(y), x1, y, x2); + } + } + +@@ -2673,8 +2893,10 @@ draw(void) + cx--; + + drawregion(0, 0, term.col, term.row); +- xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], +- term.ocx, term.ocy, term.line[term.ocy][term.ocx]); ++ if (term.scr == 0) ++ xdrawcursor(cx, term.c.y, term.line[term.c.y][cx], ++ term.ocx, term.ocy, term.line[term.ocy][term.ocx], ++ term.line[term.ocy], term.col); + term.ocx = cx; + term.ocy = term.c.y; + xfinishdraw(); +diff --git a/st.desktop b/st.desktop +new file mode 100644 +index 0000000..49029d8 +--- /dev/null ++++ b/st.desktop +@@ -0,0 +1,8 @@ ++[Desktop Entry] ++Name=st ++Comment=st is a simple terminal implementation for X ++Exec=st ++Icon=utilities-terminal ++Terminal=false ++Type=Application ++Categories=System;TerminalEmulator; +diff --git a/st.h b/st.h +index 519b9bd..22af9d5 100644 +--- a/st.h ++++ b/st.h +@@ -11,7 +11,8 @@ + #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 || \ ++#define ATTRCMP(a, b) (((a).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \ ++ (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) +@@ -33,6 +34,7 @@ enum glyph_attribute { + ATTR_WRAP = 1 << 8, + ATTR_WIDE = 1 << 9, + ATTR_WDUMMY = 1 << 10, ++ ATTR_LIGA = 1 << 11, + ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, + }; + +@@ -81,12 +83,17 @@ void die(const char *, ...); + void redraw(void); + void draw(void); + ++void iso14755(const Arg *); ++void externalpipe(const Arg *); ++void kscrolldown(const Arg *); ++void kscrollup(const Arg *); + void printscreen(const Arg *); + void printsel(const Arg *); + void sendbreak(const Arg *); + void toggleprinter(const Arg *); + + int tattrset(int); ++int tisaltscr(void); + void tnew(int, int); + void tresize(int, int); + void tsetdirtattr(int); +@@ -126,3 +133,5 @@ extern unsigned int tabspaces; + extern unsigned int defaultfg; + extern unsigned int defaultbg; + extern unsigned int defaultcs; ++extern char *iso14755_cmd; ++extern float alpha; +diff --git a/win.h b/win.h +index e6e4369..1eff487 100644 +--- a/win.h ++++ b/win.h +@@ -25,16 +25,19 @@ enum win_mode { + + void xbell(void); + void xclipcopy(void); +-void xdrawcursor(int, int, Glyph, int, int, Glyph); ++void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int); + void xdrawline(Line, int, int, int); + void xfinishdraw(void); + void xloadcols(void); + int xsetcolorname(int, const char *); + void xseticontitle(char *); +-void xsettitle(char *); ++void xfreetitlestack(void); ++void xsettitle(char *, int); ++void xpushtitle(void); + int xsetcursor(int); + void xsetmode(int, unsigned int); + void xsetpointermotion(int); + void xsetsel(char *); + int xstartdraw(void); + void xximspot(int, int); ++void xclearwin(void); +diff --git a/x.c b/x.c +index 8a16faa..5f8c2b6 100644 +--- a/x.c ++++ b/x.c +@@ -14,11 +14,14 @@ + #include <X11/keysym.h> + #include <X11/Xft/Xft.h> + #include <X11/XKBlib.h> ++#include <X11/Xresource.h> + + char *argv0; + #include "arg.h" ++#include "icon.h" + #include "st.h" + #include "win.h" ++#include "hb.h" + + /* types used in config.h */ + typedef struct { +@@ -34,6 +37,7 @@ typedef struct { + void (*func)(const Arg *); + const Arg arg; + uint release; ++ int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */ + } MouseShortcut; + + typedef struct { +@@ -45,6 +49,19 @@ typedef struct { + signed char appcursor; /* application cursor */ + } Key; + ++/* Xresources preferences */ ++enum resource_type { ++ STRING = 0, ++ INTEGER = 1, ++ FLOAT = 2 ++}; ++ ++typedef struct { ++ char *name; ++ enum resource_type type; ++ void *dst; ++} ResourcePref; ++ + /* X modifiers */ + #define XK_ANY_MOD UINT_MAX + #define XK_NO_MOD 0 +@@ -63,6 +80,9 @@ static void ttysend(const Arg *); + /* config.h for applying patches and the configuration. */ + #include "config.h" + ++/* size of title stack */ ++#define TITLESTACKSIZE 8 ++ + /* XEMBED messages */ + #define XEMBED_FOCUS_IN 4 + #define XEMBED_FOCUS_OUT 5 +@@ -81,8 +101,10 @@ typedef XftGlyphFontSpec GlyphFontSpec; + typedef struct { + int tw, th; /* tty width and height */ + int w, h; /* window width and height */ ++ int hborderpx, vborderpx; + int ch; /* char height */ + int cw; /* char width */ ++ int cyo; /* char y offset */ + int mode; /* window state/mode flags */ + int cursor; /* cursor style */ + } TermWindow; +@@ -93,7 +115,7 @@ typedef struct { + Window win; + Drawable buf; + GlyphFontSpec *specbuf; /* font spec buffer used for rendering */ +- Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmpid; ++ Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmicon, netwmpid; + struct { + XIM xim; + XIC xic; +@@ -103,8 +125,14 @@ typedef struct { + Draw draw; + Visual *vis; + XSetWindowAttributes attrs; ++ /* Here, we use the term *pointer* to differentiate the cursor ++ * one sees when hovering the mouse over the terminal from, e.g., ++ * a green rectangle where text would be entered. */ ++ Cursor vpointer, bpointer; /* visible and hidden pointers */ ++ int pointerisvisible; + int scr; + int isfixed; /* is fixed geometry? */ ++ int depth; /* bit depth */ + int l, t; /* left and top offset */ + int gm; /* geometry mask */ + } XWindow; +@@ -157,6 +185,8 @@ static void xhints(void); + static int xloadcolor(int, const char *, Color *); + static int xloadfont(Font *, FcPattern *); + static void xloadfonts(const char *, double); ++static int xloadsparefont(FcPattern *, int); ++static void xloadsparefonts(void); + static void xunloadfont(Font *); + static void xunloadfonts(void); + static void xsetenv(void); +@@ -178,7 +208,6 @@ static void bpress(XEvent *); + static void bmotion(XEvent *); + static void propnotify(XEvent *); + static void selnotify(XEvent *); +-static void selclear_(XEvent *); + static void selrequest(XEvent *); + static void setsel(char *, Time); + static void mousesel(XEvent *, int); +@@ -220,6 +249,8 @@ static DC dc; + static XWindow xw; + static XSelection xsel; + static TermWindow win; ++static int tstki; /* title stack index */ ++static char *titlestack[TITLESTACKSIZE]; /* title stack */ + + /* Font Ring Cache */ + enum { +@@ -243,6 +274,7 @@ static char *usedfont = NULL; + static double usedfontsize = 0; + static double defaultfontsize = 0; + ++static char *opt_alpha = NULL; + static char *opt_class = NULL; + static char **opt_cmd = NULL; + static char *opt_embed = NULL; +@@ -306,6 +338,7 @@ zoomabs(const Arg *arg) + { + xunloadfonts(); + xloadfonts(usedfont, arg->f); ++ xloadsparefonts(); + cresize(0, 0); + redraw(); + xhints(); +@@ -331,7 +364,7 @@ ttysend(const Arg *arg) + int + evcol(XEvent *e) + { +- int x = e->xbutton.x - borderpx; ++ int x = e->xbutton.x - win.hborderpx; + LIMIT(x, 0, win.tw - 1); + return x / win.cw; + } +@@ -339,7 +372,7 @@ evcol(XEvent *e) + int + evrow(XEvent *e) + { +- int y = e->xbutton.y - borderpx; ++ int y = e->xbutton.y - win.vborderpx; + LIMIT(y, 0, win.th - 1); + return y / win.ch; + } +@@ -448,6 +481,7 @@ mouseaction(XEvent *e, uint release) + for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { + if (ms->release == release && + ms->button == e->xbutton.button && ++ (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) && + (match(ms->mod, state) || /* exact or forced */ + match(ms->mod, state & ~forcemousemod))) { + ms->func(&(ms->arg)); +@@ -599,12 +633,6 @@ xclipcopy(void) + clipcopy(NULL); + } + +-void +-selclear_(XEvent *e) +-{ +- selclear(); +-} +- + void + selrequest(XEvent *e) + { +@@ -675,6 +703,7 @@ setsel(char *str, Time t) + XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); + if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) + selclear(); ++ clipcopy(NULL); + } + + void +@@ -700,6 +729,13 @@ brelease(XEvent *e) + void + bmotion(XEvent *e) + { ++ if (!xw.pointerisvisible) { ++ XDefineCursor(xw.dpy, xw.win, xw.vpointer); ++ xw.pointerisvisible = 1; ++ if (!IS_SET(MODE_MOUSEMANY)) ++ xsetpointermotion(0); ++ } ++ + if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) { + mousereport(e); + return; +@@ -723,6 +759,9 @@ cresize(int width, int height) + col = MAX(1, col); + row = MAX(1, row); + ++ win.hborderpx = (win.w - col * win.cw) / 2; ++ win.vborderpx = (win.h - row * win.ch) / 2; ++ + tresize(col, row); + xresize(col, row); + ttyresize(win.tw, win.th); +@@ -736,7 +775,7 @@ xresize(int col, int row) + + XFreePixmap(xw.dpy, xw.buf); + xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, +- DefaultDepth(xw.dpy, xw.scr)); ++ xw.depth); + XftDrawChange(xw.draw, xw.buf); + xclear(0, 0, win.w, win.h); + +@@ -796,6 +835,13 @@ xloadcols(void) + else + die("could not allocate color %d\n", i); + } ++ ++ /* set alpha value of bg color */ ++ if (opt_alpha) ++ alpha = strtof(opt_alpha, NULL); ++ dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha); ++ dc.col[defaultbg].pixel &= 0x00FFFFFF; ++ dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24; + loaded = 1; + } + +@@ -840,11 +886,17 @@ xclear(int x1, int y1, int x2, int y2) + x1, y1, x2-x1, y2-y1); + } + ++void ++xclearwin(void) ++{ ++ xclear(0, 0, win.w, win.h); ++} ++ + void + xhints(void) + { +- XClassHint class = {opt_name ? opt_name : termname, +- opt_class ? opt_class : termname}; ++ XClassHint class = {opt_name ? opt_name : "st", ++ opt_class ? opt_class : "St"}; + XWMHints wm = {.flags = InputHint, .input = 1}; + XSizeHints *sizeh; + +@@ -853,8 +905,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; +@@ -1015,6 +1067,7 @@ xloadfonts(const char *fontstr, double fontsize) + /* Setting character width and height. */ + win.cw = ceilf(dc.font.width * cwscale); + win.ch = ceilf(dc.font.height * chscale); ++ win.cyo = ceilf(dc.font.height * (chscale - 1) / 2); + + FcPatternDel(pattern, FC_SLANT); + FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); +@@ -1034,6 +1087,101 @@ xloadfonts(const char *fontstr, double fontsize) + FcPatternDestroy(pattern); + } + ++int ++xloadsparefont(FcPattern *pattern, int flags) ++{ ++ FcPattern *match; ++ FcResult result; ++ ++ match = FcFontMatch(NULL, pattern, &result); ++ if (!match) { ++ return 1; ++ } ++ ++ if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) { ++ FcPatternDestroy(match); ++ return 1; ++ } ++ ++ frc[frclen].flags = flags; ++ /* Believe U+0000 glyph will present in each default font */ ++ frc[frclen].unicodep = 0; ++ frclen++; ++ ++ return 0; ++} ++ ++void ++xloadsparefonts(void) ++{ ++ FcPattern *pattern; ++ double sizeshift, fontval; ++ int fc; ++ char **fp; ++ ++ if (frclen != 0) ++ die("can't embed spare fonts. cache isn't empty"); ++ ++ /* Calculate count of spare fonts */ ++ fc = sizeof(font2) / sizeof(*font2); ++ if (fc == 0) ++ return; ++ ++ /* Allocate memory for cache entries. */ ++ if (frccap < 4 * fc) { ++ frccap += 4 * fc - frccap; ++ frc = xrealloc(frc, frccap * sizeof(Fontcache)); ++ } ++ ++ for (fp = font2; fp - font2 < fc; ++fp) { ++ ++ if (**fp == '-') ++ pattern = XftXlfdParse(*fp, False, False); ++ else ++ pattern = FcNameParse((FcChar8 *)*fp); ++ ++ if (!pattern) ++ die("can't open spare font %s\n", *fp); ++ ++ if (defaultfontsize > 0) { ++ sizeshift = usedfontsize - defaultfontsize; ++ if (sizeshift != 0 && ++ FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == ++ FcResultMatch) { ++ fontval += sizeshift; ++ FcPatternDel(pattern, FC_PIXEL_SIZE); ++ FcPatternDel(pattern, FC_SIZE); ++ FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval); ++ } ++ } ++ ++ FcPatternAddBool(pattern, FC_SCALABLE, 1); ++ ++ FcConfigSubstitute(NULL, pattern, FcMatchPattern); ++ XftDefaultSubstitute(xw.dpy, xw.scr, pattern); ++ ++ if (xloadsparefont(pattern, FRC_NORMAL)) ++ die("can't open spare font %s\n", *fp); ++ ++ FcPatternDel(pattern, FC_SLANT); ++ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); ++ if (xloadsparefont(pattern, FRC_ITALIC)) ++ die("can't open spare font %s\n", *fp); ++ ++ FcPatternDel(pattern, FC_WEIGHT); ++ FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); ++ if (xloadsparefont(pattern, FRC_ITALICBOLD)) ++ die("can't open spare font %s\n", *fp); ++ ++ FcPatternDel(pattern, FC_SLANT); ++ FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); ++ if (xloadsparefont(pattern, FRC_BOLD)) ++ die("can't open spare font %s\n", *fp); ++ ++ FcPatternDestroy(pattern); ++ } ++} ++ + void + xunloadfont(Font *f) + { +@@ -1046,6 +1194,9 @@ xunloadfont(Font *f) + void + xunloadfonts(void) + { ++ /* Clear Harfbuzz font cache. */ ++ hbunloadfonts(); ++ + /* Free the loaded fonts in the font cache. */ + while (frclen > 0) + XftFontClose(xw.dpy, frc[--frclen].font); +@@ -1114,15 +1265,25 @@ void + xinit(int cols, int rows) + { + XGCValues gcvalues; +- Cursor cursor; + Window parent; + pid_t thispid = getpid(); + XColor xmousefg, xmousebg; ++ Pixmap blankpm; ++ XWindowAttributes attr; ++ XVisualInfo vis; + +- if (!(xw.dpy = XOpenDisplay(NULL))) +- die("can't open display\n"); + xw.scr = XDefaultScreen(xw.dpy); +- xw.vis = XDefaultVisual(xw.dpy, xw.scr); ++ ++ if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) { ++ parent = XRootWindow(xw.dpy, xw.scr); ++ xw.depth = 32; ++ } else { ++ XGetWindowAttributes(xw.dpy, parent, &attr); ++ xw.depth = attr.depth; ++ } ++ ++ XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis); ++ xw.vis = vis.visual; + + /* font */ + if (!FcInit()) +@@ -1131,13 +1292,16 @@ xinit(int cols, int rows) + usedfont = (opt_font == NULL)? font : opt_font; + xloadfonts(usedfont, 0); + ++ /* spare fonts */ ++ xloadsparefonts(); ++ + /* colors */ +- xw.cmap = XDefaultColormap(xw.dpy, xw.scr); ++ xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None); + xloadcols(); + + /* adjust fixed window geometry */ +- win.w = 2 * borderpx + cols * win.cw; +- win.h = 2 * borderpx + rows * win.ch; ++ win.w = 2 * win.hborderpx + 2 * borderpx + cols * win.cw; ++ win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch; + if (xw.gm & XNegative) + xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2; + if (xw.gm & YNegative) +@@ -1152,19 +1316,15 @@ xinit(int cols, int rows) + | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; + xw.attrs.colormap = xw.cmap; + +- 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, +- win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, ++ win.w, win.h, 0, xw.depth, InputOutput, + xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity + | CWEventMask | CWColormap, &xw.attrs); + + memset(&gcvalues, 0, sizeof(gcvalues)); + gcvalues.graphics_exposures = False; +- dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures, +- &gcvalues); +- xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, +- DefaultDepth(xw.dpy, xw.scr)); ++ xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth); ++ dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues); + XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel); + XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h); + +@@ -1181,8 +1341,9 @@ xinit(int cols, int rows) + } + + /* white cursor, black outline */ +- cursor = XCreateFontCursor(xw.dpy, mouseshape); +- XDefineCursor(xw.dpy, xw.win, cursor); ++ xw.pointerisvisible = 1; ++ xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape); ++ XDefineCursor(xw.dpy, xw.win, xw.vpointer); + + if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) { + xmousefg.red = 0xffff; +@@ -1196,7 +1357,10 @@ xinit(int cols, int rows) + xmousebg.blue = 0x0000; + } + +- XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg); ++ XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg); ++ blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1); ++ xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm, ++ &xmousefg, &mousebg, 0, 0); + + xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False); + xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False); +@@ -1204,6 +1368,10 @@ xinit(int cols, int rows) + xw.netwmiconname = XInternAtom(xw.dpy, "_NET_WM_ICON_NAME", False); + XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); + ++ xw.netwmicon = XInternAtom(xw.dpy, "_NET_WM_ICON", False); ++ XChangeProperty(xw.dpy, xw.win, xw.netwmicon, XA_CARDINAL, 32, ++ PropModeReplace, (uchar *)&icon, LEN(icon)); ++ + xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False); + XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32, + PropModeReplace, (uchar *)&thispid, 1); +@@ -1226,7 +1394,7 @@ xinit(int cols, int rows) + int + xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) + { +- float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp; ++ float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp; + ushort mode, prevmode = USHRT_MAX; + Font *font = &dc.font; + int frcflags = FRC_NORMAL; +@@ -1239,13 +1407,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x + FcCharSet *fccharset; + int i, f, numspecs = 0; + +- for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) { ++ for (i = 0, xp = winx, yp = winy + font->ascent + win.cyo; i < len; ++i) { + /* Fetch rune and mode for current glyph. */ + rune = glyphs[i].u; + mode = glyphs[i].mode; + + /* Skip dummy wide-character spacing. */ +- if (mode == ATTR_WDUMMY) ++ if (mode & ATTR_WDUMMY) + continue; + + /* Determine font for glyph if different from previous glyph. */ +@@ -1264,7 +1432,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x + font = &dc.bfont; + frcflags = FRC_BOLD; + } +- yp = winy + font->ascent; ++ yp = winy + font->ascent + win.cyo; + } + + /* Lookup character index with default font. */ +@@ -1352,6 +1520,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x + numspecs++; + } + ++ /* Harfbuzz transformation for ligatures. */ ++ hbtransform(specs, glyphs, len, x, y); ++ + return numspecs; + } + +@@ -1359,7 +1530,7 @@ void + xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y) + { + int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1); +- int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, ++ int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, + width = charlen * win.cw; + Color *fg, *bg, *temp, revfg, revbg, truefg, truebg; + XRenderColor colfg, colbg; +@@ -1449,17 +1620,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i + + /* Intelligent cleaning up of the borders. */ + if (x == 0) { +- xclear(0, (y == 0)? 0 : winy, borderpx, ++ xclear(0, (y == 0)? 0 : winy, win.vborderpx, + winy + win.ch + +- ((winy + win.ch >= borderpx + win.th)? win.h : 0)); ++ ((winy + win.ch >= win.vborderpx + win.th)? win.h : 0)); + } +- if (winx + width >= borderpx + win.tw) { ++ if (winx + width >= win.hborderpx + win.tw) { + xclear(winx + width, (y == 0)? 0 : winy, win.w, +- ((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch))); ++ ((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch))); + } + if (y == 0) +- xclear(winx, 0, winx + width, borderpx); +- if (winy + win.ch >= borderpx + win.th) ++ xclear(winx, 0, winx + width, win.vborderpx); ++ if (winy + win.ch >= win.vborderpx + win.th) + xclear(winx, winy + win.ch, winx + width, win.h); + + /* Clean up the region we want to draw to. */ +@@ -1477,12 +1648,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i + + /* Render underline and strikethrough. */ + if (base.mode & ATTR_UNDERLINE) { +- XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, ++ XftDrawRect(xw.draw, fg, winx, winy + win.cyo + dc.font.ascent + 1, + width, 1); + } + + if (base.mode & ATTR_STRUCK) { +- XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, ++ XftDrawRect(xw.draw, fg, winx, winy + win.cyo + 2 * dc.font.ascent / 3, + width, 1); + } + +@@ -1501,14 +1672,17 @@ xdrawglyph(Glyph g, int x, int y) + } + + void +-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) ++xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len) + { + Color drawcol; + + /* remove the old cursor */ + if (selected(ox, oy)) + og.mode ^= ATTR_REVERSE; +- xdrawglyph(og, ox, oy); ++ ++ /* Redraw the line where cursor was previously. ++ * It will restore the ligatures broken by the cursor. */ ++ xdrawline(line, 0, oy, len); + + if (IS_SET(MODE_HIDE)) + return; +@@ -1553,35 +1727,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og) + case 3: /* Blinking Underline */ + case 4: /* Steady Underline */ + XftDrawRect(xw.draw, &drawcol, +- borderpx + cx * win.cw, +- borderpx + (cy + 1) * win.ch - \ ++ win.hborderpx + cx * win.cw, ++ win.vborderpx + (cy + 1) * win.ch - \ + cursorthickness, + win.cw, cursorthickness); + break; + case 5: /* Blinking bar */ + case 6: /* Steady bar */ + XftDrawRect(xw.draw, &drawcol, +- borderpx + cx * win.cw, +- borderpx + cy * win.ch, ++ win.hborderpx + cx * win.cw, ++ win.vborderpx + cy * win.ch, + cursorthickness, win.ch); + break; + } + } else { + XftDrawRect(xw.draw, &drawcol, +- borderpx + cx * win.cw, +- borderpx + cy * win.ch, ++ win.hborderpx + cx * win.cw, ++ win.vborderpx + cy * win.ch, + win.cw - 1, 1); + XftDrawRect(xw.draw, &drawcol, +- borderpx + cx * win.cw, +- borderpx + cy * win.ch, ++ win.hborderpx + cx * win.cw, ++ win.vborderpx + cy * win.ch, + 1, win.ch - 1); + XftDrawRect(xw.draw, &drawcol, +- borderpx + (cx + 1) * win.cw - 1, +- borderpx + cy * win.ch, ++ win.hborderpx + (cx + 1) * win.cw - 1, ++ win.vborderpx + cy * win.ch, + 1, win.ch - 1); + XftDrawRect(xw.draw, &drawcol, +- borderpx + cx * win.cw, +- borderpx + (cy + 1) * win.ch - 1, ++ win.hborderpx + cx * win.cw, ++ win.vborderpx + (cy + 1) * win.ch - 1, + win.cw, 1); + } + } +@@ -1609,23 +1783,51 @@ xseticontitle(char *p) + XFree(prop.value); + } + ++void xfreetitlestack(void) ++{ ++ for (int i = 0; i < LEN(titlestack); i++) { ++ free(titlestack[i]); ++ titlestack[i] = NULL; ++ } ++} ++ + void +-xsettitle(char *p) ++xsettitle(char *p, int pop) + { + XTextProperty prop; +- DEFAULT(p, opt_title); + +- if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, +- &prop) != Success) +- return; ++ free(titlestack[tstki]); ++ if (pop) { ++ titlestack[tstki] = NULL; ++ tstki = (tstki - 1 + TITLESTACKSIZE) % TITLESTACKSIZE; ++ p = titlestack[tstki] ? titlestack[tstki] : opt_title; ++ } else if (p) { ++ titlestack[tstki] = xstrdup(p); ++ } else { ++ titlestack[tstki] = NULL; ++ p = opt_title; ++ } ++ ++ Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, &prop); + XSetWMName(xw.dpy, xw.win, &prop); + XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); + XFree(prop.value); + } + ++void ++xpushtitle(void) ++{ ++ int tstkin = (tstki + 1) % TITLESTACKSIZE; ++ free(titlestack[tstkin]); ++ titlestack[tstkin] = titlestack[tstki] ? xstrdup(titlestack[tstki]) : NULL; ++ tstki = tstkin; ++} ++ + int + xstartdraw(void) + { ++ if (IS_SET(MODE_VISIBLE)) ++ XCopyArea(xw.dpy, xw.win, xw.buf, dc.gc, 0, 0, win.w, win.h, 0, 0); + return IS_SET(MODE_VISIBLE); + } + +@@ -1705,6 +1907,8 @@ unmap(XEvent *ev) + void + xsetpointermotion(int set) + { ++ if (!set && !xw.pointerisvisible) ++ return; + MODBIT(xw.attrs.event_mask, set, PointerMotionMask); + XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs); + } +@@ -1824,6 +2028,12 @@ kpress(XEvent *ev) + Status status; + Shortcut *bp; + ++ if (xw.pointerisvisible) { ++ XDefineCursor(xw.dpy, xw.win, xw.bpointer); ++ xsetpointermotion(1); ++ xw.pointerisvisible = 0; ++ } ++ + if (IS_SET(MODE_KBDLOCK)) + return; + +@@ -1995,6 +2205,59 @@ run(void) + } + } + ++int ++resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst) ++{ ++ char **sdst = dst; ++ int *idst = dst; ++ float *fdst = dst; ++ ++ char fullname[256]; ++ char fullclass[256]; ++ char *type; ++ XrmValue ret; ++ ++ snprintf(fullname, sizeof(fullname), "%s.%s", ++ opt_name ? opt_name : "st", name); ++ snprintf(fullclass, sizeof(fullclass), "%s.%s", ++ opt_class ? opt_class : "St", name); ++ fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0'; ++ ++ XrmGetResource(db, fullname, fullclass, &type, &ret); ++ if (ret.addr == NULL || strncmp("String", type, 64)) ++ return 1; ++ ++ switch (rtype) { ++ case STRING: ++ *sdst = ret.addr; ++ break; ++ case INTEGER: ++ *idst = strtoul(ret.addr, NULL, 10); ++ break; ++ case FLOAT: ++ *fdst = strtof(ret.addr, NULL); ++ break; ++ } ++ return 0; ++} ++ ++void ++config_init(void) ++{ ++ char *resm; ++ XrmDatabase db; ++ ResourcePref *p; ++ ++ XrmInitialize(); ++ resm = XResourceManagerString(xw.dpy); ++ if (!resm) ++ return; ++ ++ db = XrmGetStringDatabase(resm); ++ for (p = resources; p < resources + LEN(resources); p++) ++ resource_load(db, p->name, p->type, p->dst); ++} ++ + void + usage(void) + { +@@ -2019,6 +2282,9 @@ main(int argc, char *argv[]) + case 'a': + allowaltscreen = 0; + break; ++ case 'A': ++ opt_alpha = EARGF(usage()); ++ break; + case 'c': + opt_class = EARGF(usage()); + break; +@@ -2068,6 +2334,11 @@ run: + + setlocale(LC_CTYPE, ""); + XSetLocaleModifiers(""); ++ ++ if(!(xw.dpy = XOpenDisplay(NULL))) ++ die("Can't open display\n"); ++ ++ config_init(); + cols = MAX(cols, 1); + rows = MAX(rows, 1); + tnew(cols, rows); |