update patches

config.h

@@ -5,14 +5,14 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "FiraCode Nerd Font:pixelsize=14";
+static char *font = "FiraCode Nerd Font:size=12";
 /* Spare fonts */
 static char *font2[] = {
-    "Noto Color Emoji:pixelsize=14",
+    "Noto Color Emoji:size=12",
 };
 
 
-static int borderpx = 2;
+static int borderpx = 0;
 
 /* modkey options: ControlMask, ShiftMask or XK_ANY_MOD */
 static uint url_opener_modkey = XK_ANY_MOD;

config.mk

@@ -25,7 +25,7 @@ LIGATURES_INC = `$(PKG_CONFIG) --cflags harfbuzz`
 LIGATURES_LIBS = `$(PKG_CONFIG) --libs harfbuzz`
 
 # Uncomment this for the SIXEL patch / SIXEL_PATCH
-SIXEL_C = sixel.c sixel_hls.c
+# SIXEL_C = sixel.c sixel_hls.c
 
 # includes and libs, uncomment harfbuzz for the ligatures patch
 INCS = -I$(X11INC) \

patches.h

@@ -32,12 +32,12 @@
 /* This patch allows st to resize to any pixel size rather than snapping to character width/height.
  * https://st.suckless.org/patches/anysize/
  */
-#define ANYSIZE_PATCH 0
+#define ANYSIZE_PATCH 1
 
 /* A simple variant of the anysize patch that only changes the resize hints to allow the window to
  * be resized to any size.
  */
-#define ANYSIZE_SIMPLE_PATCH 1
+#define ANYSIZE_SIMPLE_PATCH 0
 
 /* Draws a background image in farbfeld format in place of the defaultbg color allowing for pseudo
  * transparency.
@@ -242,7 +242,7 @@
  * same CWD (current working directory) as the original st instance.
  * https://st.suckless.org/patches/newterm/
  */
-#define NEWTERM_PATCH 0
+#define NEWTERM_PATCH 1
 
 /* This patch will set the _MOTIF_WM_HINTS property for the st window which, if the window manager
  * respects it, will show the st window without window decorations.
@@ -312,7 +312,7 @@
  *
  * https://gist.github.com/saitoha/70e0fdf22e3e8f63ce937c7f7da71809
  */
-#define SIXEL_PATCH 1
+#define SIXEL_PATCH 0
 
 /* This patch allows clients to embed into the st window and is useful if you tend to
  * start X applications from the terminal. For example:

patches/selection-colors.diff

@@ -1,17 +1,17 @@
 --- a/st.h
 +++ b/st.h
-@@ -43,6 +43,7 @@ enum glyph_attribute {
+@@ -42,6 +42,7 @@ enum glyph_attribute {
+ 	ATTR_WDUMMY     = 1 << 10,
  	ATTR_BOXDRAW    = 1 << 11,
  	ATTR_LIGA       = 1 << 12,
- 	ATTR_SIXEL      = 1 << 13,
-+	ATTR_SELECTED   = 1 << 14,
++    ATTR_SELECTED   = 1 << 13,
  	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
  	ATTR_DIRTYUNDERLINE = 1 << 15,
  };
 --- a/x.c
 +++ b/x.c
-@@ -1568,6 +1568,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- 		bg = temp;
+@@ -1565,6 +1565,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
+ 		}
  	}
  
 +	if (base.mode & ATTR_SELECTED) {
@@ -23,20 +23,20 @@
  	if (base.mode & ATTR_BLINK && win.mode & MODE_BLINK)
  		fg = bg;
  
-@@ -2008,7 +2014,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int le
+@@ -2005,7 +2011,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int le
  
  	/* remove the old cursor */
  	if (selected(ox, oy))
 -		og.mode ^= ATTR_REVERSE;
-+		og.mode |= ATTR_SELECTED;
++ 		og.mode |= ATTR_SELECTED;
  	/* Redraw the line where cursor was previously.
  	 * It will restore the ligatures broken by the cursor. */
  	xdrawline(line, 0, oy, len);
-@@ -2023,25 +2029,13 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int le
+@@ -2020,25 +2026,13 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int le
  
  	if (IS_SET(MODE_REVERSE)) {
  		g.mode |= ATTR_REVERSE;
-+		g.fg = defaultcs;
++ 		g.fg = defaultcs;
  		g.bg = defaultfg;
 -		if (selected(cx, cy)) {
 -			drawcol = dc.col[defaultcs];
@@ -45,7 +45,7 @@
 -			drawcol = dc.col[defaultrcs];
 -			g.fg = defaultcs;
 -		}
-+		drawcol = dc.col[defaultrcs];
++ 		drawcol = dc.col[defaultrcs];
  	} else {
 -		if (selected(cx, cy)) {
 -			g.fg = defaultfg;
@@ -57,18 +57,18 @@
 -		}
 -
 -		drawcol = dc.col[g.bg];
-+		g.fg = defaultbg;
-+		g.bg = defaultcs;
-+		drawcol = dc.col[defaultcs];
++ 		g.fg = defaultbg;
++ 		g.bg = defaultcs;
++ 		drawcol = dc.col[defaultcs];
  	}
  
  	/* draw the new one */
-@@ -2199,7 +2193,7 @@ xdrawline(Line line, int x1, int y1, int x2)
+@@ -2196,7 +2190,7 @@ xdrawline(Line line, int x1, int y1, int x2)
  			if (new.mode == ATTR_WDUMMY)
  				continue;
  			if (selected(x, y1))
 -				new.mode ^= ATTR_REVERSE;
-+			    new.mode |= ATTR_SELECTED;
++ 			    new.mode |= ATTR_SELECTED;
  			if (i > 0 && ATTRCMP(base, new)) {
  				xdrawglyphfontspecs(specs, base, i, ox, y1, dmode);
  				specs += i;