Update patches/st-w3m-0.8.3.diff

config.def.h

@@ -1,4 +1,4 @@
-static char *font = "FantasqueSansMono:pixelsize=18:antialias=true:autohint=true";
+static char *font = "Terminus:pixelsize=18:antialias=true:autohint=true";
 static int borderpx = 2;
 
 static char *shell = "/usr/local/bin/bash";
@@ -20,34 +20,39 @@ static unsigned int blinktimeout = 800;
 static unsigned int cursorthickness = 2;
 static int bellvolume = 0;
 char *termname = "xterm";
-unsigned int tabspaces = 8;
+unsigned int tabspaces = 2;
-static const char *colorname[] = {
-	[0] = "#101010", /* hard contrast: #1d2021 / soft contrast: #32302f */
-	[1] = "#cc241d", /* red     */
-	[2] = "#98971a", /* green   */
-	[3] = "#d79921", /* yellow  */
-	[4] = "#458588", /* blue    */
-	[5] = "#b16286", /* magenta */
-	[6] = "#689d6a", /* cyan    */
-	[7] = "#a89984", /* white   */
- 
- 	/* 8 bright colors */
-	[8]  = "#928374", /* black   */
-	[9]  = "#fb4934", /* red     */
-	[10] = "#b8bb26", /* green   */
-	[11] = "#fabd2f", /* yellow  */
-	[12] = "#83a598", /* blue    */
-	[13] = "#d3869b", /* magenta */
-	[14] = "#8ec07c", /* cyan    */
-	[15] = "#ebdbb2", /* white   */
 
+static const char *colorname[] = {
+  /* Normal colors */
+  [0] = "#262626", /* black   */
+  [1] = "#ee5396", /* red     */
+  [2] = "#42be65", /* green   */
+  [3] = "#ffe97b", /* yellow  */
+  [4] = "#33b1ff", /* blue    */
+  [5] = "#ff7eb6", /* magenta */
+  [6] = "#3ddbd9", /* cyan    */
+  [7] = "#dde1e6", /* white   */
+
+  /* Bright colors */
+  [8]  = "#393939", /* black   */
+  [9]  = "#ee5396", /* red     */
+  [10] = "#42be65", /* green   */
+  [11] = "#ffe97b", /* yellow  */
+  [12] = "#33b1ff", /* blue    */
+  [13] = "#ff7eb6", /* magenta */
+  [14] = "#3ddbd9", /* cyan    */
+  [15] = "#ffffff", /* white   */
+
+  /* Background and Foreground */
+  [256] = "#161616", /* background */
+  [257] = "#ffffff", /* foreground */
 };
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 15;
+unsigned int defaultfg = 257;
-unsigned int defaultbg = 0;
+unsigned int defaultbg = 256;
 unsigned int defaultcs = 15;
 static unsigned int defaultrcs = 257;
 
@@ -58,7 +63,7 @@ static unsigned int defaultrcs = 257;
  * 6: Bar ("|")
  * 7: Snowman ("☃")
  */
-static unsigned int cursorshape = 4;
+static unsigned int cursorshape = 2;
 static unsigned int cols = 80;
 static unsigned int rows = 24;
 static unsigned int mouseshape = XC_xterm;

config.mk

@@ -4,7 +4,7 @@ VERSION = 0.9.2
 # Customize below to fit your system
 
 # paths
-PREFIX = /usr/local
+PREFIX = /usr
 MANPREFIX = $(PREFIX)/share/man
 
 X11INC = ${PREFIX}/include
@@ -26,11 +26,11 @@ STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 STLDFLAGS = $(LIBS) $(LDFLAGS)
 
 # OpenBSD:
-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
+LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
-#       `$(PKG_CONFIG) --libs fontconfig` \
+       `$(PKG_CONFIG) --libs fontconfig` \
-#       `$(PKG_CONFIG) --libs freetype2`
+       `$(PKG_CONFIG) --libs freetype2`
-#MANPREFIX = ${PREFIX}/man
+MANPREFIX = ${PREFIX}/man
 
 # compiler and linker
 # CC = c99

patches/st-w3m-0.8.3.diff

@@ -0,0 +1,23 @@
+
+---
+ x.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/x.c b/x.c
+index e5f1737..b6ae162 100644
+--- a/x.c
++++ b/x.c
+@@ -1594,6 +1594,8 @@ xsettitle(char *p)
+ 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);
+ }
+ 
+
+base-commit: 43a395ae91f7d67ce694e65edeaa7bbc720dd027
+-- 
+2.17.1
+

st.c

@@ -180,7 +180,7 @@ static void tinsertblank(int);
 static void tinsertblankline(int);
 static int tlinelen(int);
 static void tmoveto(int, int);
-tatic void tmoveato(int, int);
+static void tmoveato(int, int);
 static void tnewline(int);
 static void tputtab(int);
 static void tputc(Rune);

x.c

@@ -1648,6 +1648,8 @@ xsettitle(char *p)
 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);
 }