config.def.h

@@ -8,20 +8,6 @@
 static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
 static int borderpx = 2;
 
-/*
- * Override/adjust fontsize of choosen monitors:
- */
-MonitorConfig monitors_config[] = {
-	// skip = fixed relative points size (monitor dpi)
-	//   =0 : fixed absolute pixel size (default screen dpi)
-	//   >0 : auto absolute pixel size (monitor dpi)
-	//   <0 : auto relative points size (monitor dpi)
-	// {"DP-1", 0}, // BUG:(size=0): not restored to default after back'n'forth
-	{"HDMI-0~1", -20},  // BUG:(ignored DPI=220): = 20 is eqv to 10pt (DPI=110)
-	{"HDMI-0~2", -14},
-};
-float winmovethreshold = 0.6;
-
 /*
  * What program is execed by st depends of these precedence rules:
  * 1: program passed with -e
@@ -70,12 +56,6 @@ int allowwindowops = 0;
 static double minlatency = 8;
 static double maxlatency = 33;
 
-/*
- * Synchronized-Update timeout in ms
- * https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec
- */
-static uint su_timeout = 200;
-
 /*
  * blinking timeout (set to 0 to disable blinking) for the terminal blinking
  * attribute.
@@ -125,30 +105,35 @@ 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 */
-	[0] = "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+	"black",
-	[1] = "#cc241d", /* red     */
+	"red3",
-	[2] = "#98971a", /* green   */
+	"green3",
-	[3] = "#d79921", /* yellow  */
+	"yellow3",
-	[4] = "#458588", /* blue    */
+	"blue2",
-	[5] = "#b16286", /* magenta */
+	"magenta3",
-	[6] = "#689d6a", /* cyan    */
+	"cyan3",
-	[7] = "#a89984", /* white   */
+	"gray90",
 
 	/* 8 bright colors */
-	[8]  = "#928374", /* black   */
+	"gray50",
-	[9]  = "#fb4934", /* red     */
+	"red",
-	[10] = "#b8bb26", /* green   */
+	"green",
-	[11] = "#fabd2f", /* yellow  */
+	"yellow",
-	[12] = "#83a598", /* blue    */
+	"#5c5cff",
-	[13] = "#d3869b", /* magenta */
+	"magenta",
-	[14] = "#8ec07c", /* cyan    */
+	"cyan",
-	[15] = "#ebdbb2", /* white   */
+	"white",
+
+	[255] = 0,
+
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#555555",
+	"gray90", /* default foreground colour */
+	"black", /* default background colour */
 };
 
 
@@ -156,9 +141,9 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 15;
+unsigned int defaultfg = 258;
-unsigned int defaultbg = 0;
+unsigned int defaultbg = 259;
-unsigned int defaultcs = 15;
+unsigned int defaultcs = 256;
 static unsigned int defaultrcs = 257;
 
 /*
@@ -197,42 +182,6 @@ static unsigned int defaultattr = 11;
  */
 static uint forcemousemod = ShiftMask;
 
-/*
- * 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] },
-		{ "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 },
-};
-
 /*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
@@ -259,14 +208,11 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
 	{ TERMMOD,              XK_Next,        zoom,           {.f = -1} },
 	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
-	{ TERMMOD,              XK_End,         refreshxrandr,  {.i =  0} },
 	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
 	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
 	{ 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} },
 };
 
 /*
@@ -538,27 +484,3 @@ static char ascii_printable[] =
 	" !\"#$%&'()*+,-./0123456789:;<=>?"
 	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
 	"`abcdefghijklmnopqrstuvwxyz{|}~";
-
-/**
- * Undercurl style. Set UNDERCURL_STYLE to one of the available styles.
- *
- * Curly: Dunno how to draw it *shrug*
- *  _   _   _   _
- * ( ) ( ) ( ) ( )
- *	 (_) (_) (_) (_)
- *
- * Spiky:
- * /\  /\   /\	/\
- *   \/  \/	  \/
- *
- * Capped:
- *	_     _     _
- * / \   / \   / \
- *    \_/   \_/
- */
-// Available styles
-#define UNDERCURL_CURLY 0
-#define UNDERCURL_SPIKY 1
-#define UNDERCURL_CAPPED 2
-// Active style
-#define UNDERCURL_STYLE UNDERCURL_SPIKY

config.mk

@@ -17,11 +17,10 @@ INCS = -I$(X11INC) \
        `$(PKG_CONFIG) --cflags fontconfig` \
        `$(PKG_CONFIG) --cflags freetype2` \
        `$(PKG_CONFIG) --cflags harfbuzz`
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
        `$(PKG_CONFIG) --libs fontconfig` \
-       `$(PKG_CONFIG) --libs freetype2`
+       `$(PKG_CONFIG) --libs freetype2` \
-
+       `$(PKG_CONFIG) --libs harfbuzz`
-LIBS += -lXrandr
 
 # flags
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600

st.h

@@ -23,22 +23,19 @@
 
 enum glyph_attribute {
 	ATTR_NULL       = 0,
-	ATTR_SET        = 1 << 0,
+	ATTR_BOLD       = 1 << 0,
-	ATTR_BOLD       = 1 << 1,
+	ATTR_FAINT      = 1 << 1,
-	ATTR_FAINT      = 1 << 2,
+	ATTR_ITALIC     = 1 << 2,
-	ATTR_ITALIC     = 1 << 3,
+	ATTR_UNDERLINE  = 1 << 3,
-	ATTR_UNDERLINE  = 1 << 4,
+	ATTR_BLINK      = 1 << 4,
-	ATTR_BLINK      = 1 << 5,
+	ATTR_REVERSE    = 1 << 5,
-	ATTR_REVERSE    = 1 << 6,
+	ATTR_INVISIBLE  = 1 << 6,
-	ATTR_INVISIBLE  = 1 << 7,
+	ATTR_STRUCK     = 1 << 7,
-	ATTR_STRUCK     = 1 << 8,
+	ATTR_WRAP       = 1 << 8,
-	ATTR_WRAP       = 1 << 9,
+	ATTR_WIDE       = 1 << 9,
-	ATTR_WIDE       = 1 << 10,
+	ATTR_WDUMMY     = 1 << 10,
-	ATTR_WDUMMY     = 1 << 11,
 	ATTR_BOXDRAW    = 1 << 11,
-	ATTR_SELECTED   = 1 << 12,
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
-	ATTR_DIRTYUNDERLINE = 1 << 15,
 };
 
 enum drawing_mode {
@@ -76,8 +73,6 @@ typedef struct {
 	ushort mode;      /* attribute flags */
 	uint32_t fg;      /* foreground  */
 	uint32_t bg;      /* background  */
-	int ustyle;	  /* underline style */
-	int ucolor[3];    /* underline color */
 } Glyph;
 
 typedef Glyph *Line;
@@ -94,8 +89,6 @@ void die(const char *, ...);
 void redraw(void);
 void draw(void);
 
-void kscrolldown(const Arg *);
-void kscrollup(const Arg *);
 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);
@@ -103,7 +96,6 @@ void toggleprinter(const Arg *);
 
 int tattrset(int);
 void tnew(int, int);
-int tisaltscreen(void);
 void tresize(int, int);
 void tsetdirtattr(int);
 void ttyhangup(void);
@@ -149,4 +141,3 @@ extern unsigned int defaultfg;
 extern unsigned int defaultbg;
 extern unsigned int defaultcs;
 extern const int boxdraw, boxdraw_bold, boxdraw_braille;
-extern float alpha;

st.info

@@ -1,5 +1,4 @@
 st-mono| simpleterm monocolor,
-	Su,
 	acsc=+C\,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	am,
 	bce,
@@ -192,7 +191,6 @@ st-mono| simpleterm monocolor,
 	Ms=\E]52;%p1%s;%p2%s\007,
 	Se=\E[2 q,
 	Ss=\E[%p1%d q,
-	Sync=\EP=%p1%ds\E\\,
 
 st| simpleterm,
 	use=st-mono,