From 83b71de2c8fa40a96242556b421d21399c0f6fbf Mon Sep 17 00:00:00 2001
From: DustVoice <info@dustvoice.de>
Date: Mon, 3 Aug 2020 14:52:33 +0200
Subject: [PATCH] Remove relativeborder patch

---
 .gitignore                   |  5 +++++
 config.def.h                 |  4 +---
 st-relativeborder-0.8.3.diff | 39 ------------------------------------
 st.h                         |  1 -
 x.c                          |  2 --
 5 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 st-relativeborder-0.8.3.diff

diff --git a/.gitignore b/.gitignore
index 7143054..7f43bb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,9 @@
 !/win.h
 !/x.c
 
+!/st-anysize-0.8.1.diff
+!/st-clipboard-0.8.3.diff
 !/st-dracula-0.8.2.diff
+!/st-hidecursor-0.8.3.diff
+!/st-scrollback-20200419-72e3f6c.diff
+!/st-universcroll-0.8.4.diff
diff --git a/config.def.h b/config.def.h
index f9b5553..3c2be98 100644
--- a/config.def.h
+++ b/config.def.h
@@ -4,11 +4,9 @@
  * appearance
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- * borderperc: percentage of cell width to use as a border
- *		0 = no border, 100 = border width is same as cell width
  */
 static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-static int borderperc = 20;
+static int borderpx = 2;
 
 /*
  * What program is execed by st depends of these precedence rules:
diff --git a/st-relativeborder-0.8.3.diff b/st-relativeborder-0.8.3.diff
deleted file mode 100644
index 55839d2..0000000
--- a/st-relativeborder-0.8.3.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up ../st-0.8.3/config.def.h ./config.def.h
---- ../st-0.8.3/config.def.h	2020-04-27 13:58:27.000000000 +0200
-+++ ./config.def.h	2020-05-24 18:27:19.179361165 +0200
-@@ -4,9 +4,11 @@
-  * appearance
-  *
-  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
-+ * borderperc: percentage of cell width to use as a border
-+ *		0 = no border, 100 = border width is same as cell width
-  */
- static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
--static int borderpx = 2;
-+static int borderperc = 20;
-
- /*
-  * What program is execed by st depends of these precedence rules:
-diff -up ../st-0.8.3/st.h ./st.h
---- ../st-0.8.3/st.h	2020-04-27 13:58:27.000000000 +0200
-+++ ./st.h	2020-05-24 18:27:20.255369735 +0200
-@@ -52,6 +52,7 @@ enum selection_snap {
- 	SNAP_LINE = 2
- };
-
-+int borderpx;
- typedef unsigned char uchar;
- typedef unsigned int uint;
- typedef unsigned long ulong;
-diff -up ../st-0.8.3/x.c ./x.c
---- ../st-0.8.3/x.c	2020-04-27 13:58:27.000000000 +0200
-+++ ./x.c	2020-05-24 18:27:17.551348200 +0200
-@@ -1001,6 +1001,8 @@ xloadfonts(char *fontstr, double fontsiz
- 	win.cw = ceilf(dc.font.width * cwscale);
- 	win.ch = ceilf(dc.font.height * chscale);
-
-+	borderpx = ceilf(((float)borderperc / 100) * win.cw);
-+
- 	FcPatternDel(pattern, FC_SLANT);
- 	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
- 	if (xloadfont(&dc.ifont, pattern))
diff --git a/st.h b/st.h
index 9977bb1..36cdb65 100644
--- a/st.h
+++ b/st.h
@@ -52,7 +52,6 @@ enum selection_snap {
 	SNAP_LINE = 2
 };
 
-int borderpx;
 typedef unsigned char uchar;
 typedef unsigned int uint;
 typedef unsigned long ulong;
diff --git a/x.c b/x.c
index 1a63b9e..9a4bfc8 100644
--- a/x.c
+++ b/x.c
@@ -1020,8 +1020,6 @@ xloadfonts(char *fontstr, double fontsize)
 	win.cw = ceilf(dc.font.width * cwscale);
 	win.ch = ceilf(dc.font.height * chscale);
 
-	borderpx = ceilf(((float)borderperc / 100) * win.cw);
-
 	FcPatternDel(pattern, FC_SLANT);
 	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
 	if (xloadfont(&dc.ifont, pattern))