Added appsync part2 v2020-06-18 patch

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,6 +56,12 @@ 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.
@@ -210,7 +202,6 @@ 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} },

config.mk

@@ -20,8 +20,6 @@ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
        `$(PKG_CONFIG) --libs fontconfig` \
        `$(PKG_CONFIG) --libs freetype2`
 
-LIBS += -lXrandr
-
 # flags
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
 STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)

st.c

@@ -232,6 +232,33 @@ static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 static const Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
 static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
+#include <time.h>
+static int su = 0;
+struct timespec sutv;
+
+static void
+tsync_begin()
+{
+	clock_gettime(CLOCK_MONOTONIC, &sutv);
+	su = 1;
+}
+
+static void
+tsync_end()
+{
+	su = 0;
+}
+
+int
+tinsync(uint timeout)
+{
+	struct timespec now;
+	if (su && !clock_gettime(CLOCK_MONOTONIC, &now)
+	       && TIMEDIFF(now, sutv) >= timeout)
+		su = 0;
+	return su;
+}
+
 ssize_t
 xwrite(int fd, const char *s, size_t len)
 {
@@ -814,6 +841,9 @@ ttynew(const char *line, char *cmd, const char *out, char **args)
 	return cmdfd;
 }
 
+static int twrite_aborted = 0;
+int ttyread_pending() { return twrite_aborted; }
+
 size_t
 ttyread(void)
 {
@@ -822,7 +852,7 @@ ttyread(void)
 	int ret, written;
 
 	/* append read bytes to unprocessed bytes */
-	ret = read(cmdfd, buf+buflen, LEN(buf)-buflen);
+	ret = twrite_aborted ? 1 : read(cmdfd, buf+buflen, LEN(buf)-buflen);
 
 	switch (ret) {
 	case 0:
@@ -830,7 +860,7 @@ ttyread(void)
 	case -1:
 		die("couldn't read from shell: %s\n", strerror(errno));
 	default:
-		buflen += ret;
+		buflen += twrite_aborted ? 0 : ret;
 		written = twrite(buf, buflen, 0);
 		buflen -= written;
 		/* keep any incomplete UTF-8 byte sequence for the next call */
@@ -990,6 +1020,7 @@ tsetdirtattr(int attr)
 void
 tfulldirt(void)
 {
+	tsync_end();
 	tsetdirt(0, term.row-1);
 }
 
@@ -1959,6 +1990,12 @@ strhandle(void)
 		xsettitle(strescseq.args[0]);
 		return;
 	case 'P': /* DCS -- Device Control String */
+		/* https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec */
+		if (strstr(strescseq.buf, "=1s") == strescseq.buf)
+			tsync_begin();  /* BSU */
+		else if (strstr(strescseq.buf, "=2s") == strescseq.buf)
+			tsync_end();  /* ESU */
+		return;
 	case '_': /* APC -- Application Program Command */
 	case '^': /* PM -- Privacy Message */
 		return;
@@ -2507,6 +2544,9 @@ twrite(const char *buf, int buflen, int show_ctrl)
 	Rune u;
 	int n;
 
+	int su0 = su;
+	twrite_aborted = 0;
+
 	for (n = 0; n < buflen; n += charsize) {
 		if (IS_SET(MODE_UTF8)) {
 			/* process a complete utf8 char */
@@ -2517,6 +2557,10 @@ twrite(const char *buf, int buflen, int show_ctrl)
 			u = buf[n] & 0xFF;
 			charsize = 1;
 		}
+		if (su0 && !su) {
+			twrite_aborted = 1;
+			break;  // ESU - allow rendering before a new BSU
+		}
 		if (show_ctrl && ISCONTROL(u)) {
 			if (u & 0x80) {
 				u &= 0x7f;

st.info

@@ -191,6 +191,7 @@ 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,

x.c

@@ -14,7 +14,6 @@
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
-#include <X11/extensions/Xrandr.h>
 
 char *argv0;
 #include "arg.h"
@@ -46,19 +45,6 @@ typedef struct {
 	signed char appcursor; /* application cursor */
 } Key;
 
-typedef struct {
-	const char *name;
-	float defaultfontsize;
-} MonitorConfig;
-
-typedef struct {
-	Atom name;
-	int x, y, w, h;
-	float defaultfontsize, usedfontsize;
-} MonitorInfo;
-
-static void refreshxrandr(const Arg *dummy);
-
 /* X modifiers */
 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0
@@ -229,11 +215,6 @@ static void (*handler[LASTEvent])(XEvent *) = {
 	[SelectionRequest] = selrequest,
 };
 
-static double defaultrelfontsize = 0;
-static MonitorInfo *monitors_info = NULL;
-static int monitors_num = 0;
-static int prev_mindex = -1;
-
 /* Globals */
 static DC dc;
 static XWindow xw;
@@ -1772,144 +1753,6 @@ xseturgency(int add)
 	XFree(h);
 }
 
-static void
-cachemonitorinfo()
-{
-	int prev_num = monitors_num;
-	MonitorInfo *prev_info = monitors_info;
-	XRRMonitorInfo *xmonitors = XRRGetMonitors(xw.dpy, XRootWindow(xw.dpy, xw.scr), 1, &monitors_num);
-	if (!monitors_num)
-		die("xrandr found no monitors");
-
-	monitors_info = xmalloc(monitors_num * sizeof(MonitorInfo));
-
-	for (int i = 0; i < monitors_num; ++i) {
-		XRRMonitorInfo *xm = &xmonitors[i];
-		MonitorInfo *m = &monitors_info[i];
-
-		m->name = xm->name;
-		m->x = xm->x;
-		m->y = xm->y;
-		m->w = xm->width;
-		m->h = xm->height;
-
-		float px_mm = ((float)m->w / xm->mwidth + (float)m->h / xm->mheight) / 2;
-		float px_pt = 25.4 * px_mm / 72;
-		m->defaultfontsize = defaultrelfontsize * px_pt;
-
-		// Override defaultfontsize (dpi) by user config
-		char *name = XGetAtomName(xw.dpy, xm->name);
-		for (int j = 0; j < LEN(monitors_config); ++j)
-			if (!strcmp(name, monitors_config[j].name)) {
-				m->defaultfontsize = monitors_config[j].defaultfontsize;
-				if (m->defaultfontsize < 0)
-					m->defaultfontsize *= -px_pt;
-				break;
-			}
-		// fprintf(stderr, "%s: %fpx, %f\n", name, m->defaultfontsize, m->usedfontsize);
-		XFree(name);
-
-		// Restore usedfontsize (zoom) after re-cache for monitors with the same name
-		m->usedfontsize = m->defaultfontsize;
-		for (int j = 0; j < prev_num; ++j)
-			if (prev_info[j].name == m->name) {
-				m->usedfontsize = prev_info[j].usedfontsize;
-				break;
-			}
-	}
-
-	XRRFreeMonitors(xmonitors);
-	free(prev_info);
-}
-
-static int
-getmonitorindex_threshold(int w, int h, int x, int y)
-{
-	int mindex = -1;
-	float fontsize = 0;
-	int thresholdarea = winmovethreshold * w * h;
-
-	for (int i = 0; i < monitors_num; ++i) {
-		MonitorInfo *m = &monitors_info[i];
-		int overlap_w = MAX(0, MIN(x + w, m->x + m->w) - MAX(x, m->x));
-		int overlap_h = MAX(0, MIN(y + h, m->y + m->h) - MAX(y, m->y));
-		int area = overlap_w * overlap_h;
-		// Choose monitor with largest dpi (defaultfontsize)
-		//  from all "mirrored"/overlapped (e.g. projector)
-		if (area >= thresholdarea && fontsize < m->defaultfontsize) {
-			fontsize = m->defaultfontsize;
-			mindex = i;
-		}
-	}
-	return mindex;
-}
-
-static int
-getmonitorindex_nearest(int w, int h, int x, int y)
-{
-	int mindex = -1;
-	float fontsize = 0;
-	int overlaparea = 0;
-
-	for (int i = 0; i < monitors_num; ++i) {
-		MonitorInfo *m = &monitors_info[i];
-		int overlap_w = MAX(0, MIN(x + w, m->x + m->w) - MAX(x, m->x));
-		int overlap_h = MAX(0, MIN(y + h, m->y + m->h) - MAX(y, m->y));
-		int area = overlap_w * overlap_h;
-		// Choose monitor with largest overlapping area
-		//  e.g. when "st" is initially spawned in-between monitors
-		if (area > overlaparea) {
-			overlaparea = area;
-			mindex = i;
-		}
-	}
-	return mindex;
-}
-
-static void
-adjustmonitorfontsize(int mindex)
-{
-	if (mindex < 0 || prev_mindex == mindex)
-		return;
-	// Save zoom of current monitor before switching
-	if (prev_mindex >= 0)
-		monitors_info[prev_mindex].usedfontsize = usedfontsize;
-
-	defaultfontsize = monitors_info[mindex].defaultfontsize;
-	// fprintf(stderr, "Crossing: %fpx\n", defaultfontsize);
-
-	// NOTE: do nothing if font size differs by less than 1%
-	double fontsize = monitors_info[mindex].usedfontsize;
-	double delta = 0.01 * usedfontsize;
-	if (!BETWEEN(fontsize - usedfontsize, -delta, delta)) {
-		// fprintf(stderr, "Adjusted: %fpx\n", fontsize);
-		xunloadfonts();
-		xloadfonts(usedfont, fontsize);
-	}
-	prev_mindex = mindex;
-}
-
-void
-refreshxrandr(const Arg *dummy)
-{
-	// Reset index to detect change of window association on "xrandr ... --primary"
-	//  otherwise: zoom won't be saved on switching and new font size won't be loaded
-	// CRIT!!! event from xrandr may place another monitor into same index
-	if (prev_mindex >= 0)
-		monitors_info[prev_mindex].usedfontsize = usedfontsize;
-	prev_mindex = -1;
-
-	XWindowAttributes xattr = {0};
-	cachemonitorinfo();
-	XGetWindowAttributes(xw.dpy, xw.win, &xattr);
-
-	int mindex = getmonitorindex_threshold(xattr.width, xattr.height, xattr.x, xattr.y);
-	if (mindex < 0)
-		mindex = getmonitorindex_nearest(xattr.width, xattr.height, xattr.x, xattr.y);
-	adjustmonitorfontsize(mindex);
-}
-
-
 void
 xbell(void)
 {
@@ -2062,20 +1905,15 @@ cmessage(XEvent *e)
 void
 resize(XEvent *e)
 {
-	// BAD: no resize on monitor plug/unplug/reconfigure -- until window itself is kept in the same place
-	// NOTE: no resize event on zoomabs()
-	// fprintf(stderr, "Resize: %dx%d+%d+%d\n",
-	//     e->xconfigure.width, e->xconfigure.height, e->xconfigure.x, e->xconfigure.y);
-
-	adjustmonitorfontsize(getmonitorindex_threshold(
-	    e->xconfigure.width, e->xconfigure.height, e->xconfigure.x, e->xconfigure.y));
-
 	if (e->xconfigure.width == win.w && e->xconfigure.height == win.h)
 		return;
 
 	cresize(e->xconfigure.width, e->xconfigure.height);
 }
 
+int tinsync(uint);
+int ttyread_pending();
+
 void
 run(void)
 {
@@ -2102,22 +1940,6 @@ run(void)
 		}
 	} while (ev.type != MapNotify);
 
-	int rr_event_base, rr_error_base, rr_major, rr_minor;
-	if (!XRRQueryExtension (xw.dpy, &rr_event_base, &rr_error_base) ||
-	    !XRRQueryVersion (xw.dpy, &rr_major, &rr_minor) ||
-	    rr_major < 1 || (rr_major == 1 && rr_minor < 5))
-	{
-		die("RandR 1.5 extension isn't available\n");
-	}
-	XRRSelectInput(xw.dpy, xw.win, RRCrtcChangeNotifyMask);
-
-	// WARN: can query actual window size/pos only after window is mapped and its width/height are adjusted by WM
-	//  * x/y are WM-dependent and can't be determined beforehand anyway
-	//  * defaultfontsize isn't available until font is loaded and actual Fc*() size queried
-	// BAD: fonts on startup are always reloaded -- how to specify their size beforehand ?
-	FcPatternGetDouble(dc.font.match->pattern, FC_SIZE, 0, &defaultrelfontsize);
-	refreshxrandr(0);
-
 	ttyfd = ttynew(opt_line, shell, opt_io, opt_cmd);
 	cresize(w, h);
 
@@ -2126,7 +1948,7 @@ run(void)
 		FD_SET(ttyfd, &rfd);
 		FD_SET(xfd, &rfd);
 
-		if (XPending(xw.dpy))
+		if (XPending(xw.dpy) || ttyread_pending())
 			timeout = 0;  /* existing events might not set xfd */
 
 		seltv.tv_sec = timeout / 1E3;
@@ -2140,7 +1962,8 @@ run(void)
 		}
 		clock_gettime(CLOCK_MONOTONIC, &now);
 
-		if (FD_ISSET(ttyfd, &rfd))
+		int ttyin = FD_ISSET(ttyfd, &rfd) || ttyread_pending();
+		if (ttyin)
 			ttyread();
 
 		xev = 0;
@@ -2149,16 +1972,6 @@ run(void)
 			XNextEvent(xw.dpy, &ev);
 			if (XFilterEvent(&ev, None))
 				continue;
-			if (LASTEvent <= ev.type) {
-				if (rr_event_base + RRNotify == ev.type &&
-					RRNotify_CrtcChange == ((XRRNotifyEvent *)&ev)->subtype)
-				{
-					XRRUpdateConfiguration(&ev);
-					// fprintf(stderr, "Monitor change: %d > %d\n", rr_event_base, LASTEvent);
-					refreshxrandr(0);
-				}
-				continue;
-			}
 			if (handler[ev.type])
 				(handler[ev.type])(&ev);
 		}
@@ -2174,7 +1987,7 @@ run(void)
 		 * maximum latency intervals during `cat huge.txt`, and perfect
 		 * sync with periodic updates from animations/key-repeats/etc.
 		 */
-		if (FD_ISSET(ttyfd, &rfd) || xev) {
+		if (ttyin || xev) {
 			if (!drawing) {
 				trigger = now;
 				drawing = 1;
@@ -2185,6 +1998,18 @@ run(void)
 				continue;  /* we have time, try to find idle */
 		}
 
+		if (tinsync(su_timeout)) {
+			/*
+			 * on synchronized-update draw-suspension: don't reset
+			 * drawing so that we draw ASAP once we can (just after
+			 * ESU). it won't be too soon because we already can
+			 * draw now but we skip. we set timeout > 0 to draw on
+			 * SU-timeout even without new content.
+			 */
+			timeout = minlatency;
+			continue;
+		}
+
 		/* idle detected or maxlatency exhausted -> draw */
 		timeout = -1;
 		if (blinktimeout && tattrset(ATTR_BLINK)) {