From feee0cb1fe84a119755d74d29f2ce154f6c874b5 Mon Sep 17 00:00:00 2001
From: Alexander Weidinger <alexwegoo@gmail.com>
Date: Mon, 21 Oct 2019 06:28:39 +0200
Subject: [PATCH] Replace dracula with nord; Add scrollback

---
 PKGBUILD        | 14 ++++++---
 config.h        | 11 +++++--
 st-dracula.diff | 80 -------------------------------------------------
 3 files changed, 19 insertions(+), 86 deletions(-)
 delete mode 100644 st-dracula.diff

diff --git a/PKGBUILD b/PKGBUILD
index 6dcbfe2..aee9e29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,16 +13,22 @@ makedepends=('ncurses')
 url="http://st.suckless.org"
 source=(http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz
 	config.h
-	st-dracula.diff)
+	https://st.suckless.org/patches/nordtheme/st-nordtheme-0.8.2.diff
+	https://st.suckless.org/patches/scrollback/st-scrollback-20190331-21367a0.diff
+	https://st.suckless.org/patches/scrollback/st-scrollback-mouse-0.8.diff)
 sha256sums=('aeb74e10aa11ed364e1bcc635a81a523119093e63befd2f231f8b0705b15bf35'
-            '9a6af29f1ecd2d872a602fbb731b6a3a0a85c922b2851cee653c2fabd90fa068'
-            '85cd0e107b802cc93b63fbcf269902ce5012a0c19e548d546c4147cf4198e3ee')
+            '8fc9a87a5bac9e4eebd4f7683e009aa34d74e9e0cbd0f2cc5e60f3fd01d40f3f'
+            'bd7c467dba6027c156d1bd1f3b65d8666787d3c2ff5c743e54e19c6d79a5ba96'
+            'f974bc0e11bda909a6d6d529d28abde4c97e651107b6a6047f2fab8837010b43'
+            '3fb38940cc3bad3f9cd1e2a0796ebd0e48950a07860ecf8523a5afd0cd1b5a44')
 
 prepare() {
   # user is supposed to maintain config.h him/herself
   cp $srcdir/config.h $srcdir/$pkgname-$pkgver/config.h
   cd $srcdir/$pkgname-$pkgver/
-  patch -p1 < $srcdir/st-dracula.diff
+  patch -p1 config.h < $srcdir/st-nordtheme-0.8.2.diff
+  patch -p1 -F3 < $srcdir/st-scrollback-20190331-21367a0.diff
+  patch -p1 -F3 < $srcdir/st-scrollback-mouse-0.8.diff
 }
 
 build() {
diff --git a/config.h b/config.h
index d462670..4fab6e8 100644
--- a/config.h
+++ b/config.h
@@ -156,8 +156,13 @@ static unsigned int defaultattr = 11;
  */
 static MouseShortcut mshortcuts[] = {
 	/* button               mask            string */
-	{ Button4,              XK_ANY_MOD,     "\031" },
-	{ Button5,              XK_ANY_MOD,     "\005" },
+	{ Button4,              XK_NO_MOD,      "\031" },
+	{ Button5,              XK_NO_MOD,      "\005" },
+};
+
+MouseKey mkeys[] = {
+	{ Button4,              ShiftMask,      kscrollup,   {.i = 1} },
+	{ Button5,              ShiftMask,      kscrolldown, {.i = 1} },
 };
 
 /* Internal keyboard shortcuts. */
@@ -178,6 +183,8 @@ static Shortcut shortcuts[] = {
 	{ 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} },
 };
 
 /*
diff --git a/st-dracula.diff b/st-dracula.diff
deleted file mode 100644
index c6f5587..0000000
--- a/st-dracula.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-Adaption of https://st.suckless.org/patches/dracula/
-
-diff --git a/config.h b/config.h
-index d462670..c19eee7 100644
---- a/config.h
-+++ b/config.h
-@@ -85,42 +85,47 @@ unsigned int tabspaces = 8;
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
- 	/* 8 normal colors */
--	"black",
--	"red3",
--	"green3",
--	"yellow3",
--	"blue2",
--	"magenta3",
--	"cyan3",
--	"gray90",
-+	[0] = "#000000", /* black   */
-+	[1] = "#ff5555", /* red     */
-+	[2] = "#50fa7b", /* green   */
-+	[3] = "#f1fa8c", /* yellow  */
-+	[4] = "#bd93f9", /* blue    */
-+	[5] = "#ff79c6", /* magenta */
-+	[6] = "#8be9fd", /* cyan    */
-+	[7] = "#bbbbbb", /* white   */
- 
- 	/* 8 bright colors */
--	"gray50",
--	"red",
--	"green",
--	"yellow",
--	"#5c5cff",
--	"magenta",
--	"cyan",
--	"white",
--
--	[255] = 0,
--
--	/* more colors can be added after 255 to use with DefaultXX */
--	"#cccccc",
--	"#555555",
-+	[8]  = "#44475a", /* black   */
-+	[9]  = "#ff5555", /* red     */
-+	[10] = "#50fa7b", /* green   */
-+	[11] = "#f1fa8c", /* yellow  */
-+	[12] = "#bd93f9", /* blue    */
-+	[13] = "#ff79c6", /* magenta */
-+	[14] = "#8be9fd", /* cyan    */
-+	[15] = "#ffffff", /* white   */
-+
-+	/* special colors */
-+	[256] = "#282a36", /* background */
-+	[257] = "#f8f8f2", /* foreground */
- };
- 
- 
- /*
-  * Default colors (colorname index)
-- * foreground, background, cursor, reverse cursor
-+ * foreground, background, cursor
-  */
--unsigned int defaultfg = 7;
--unsigned int defaultbg = 0;
--static unsigned int defaultcs = 256;
-+unsigned int defaultfg = 257;
-+unsigned int defaultbg = 256;
-+static unsigned int defaultcs = 257;
- static unsigned int defaultrcs = 257;
- 
-+/*
-+ * Colors used, when the specific fg == defaultfg. So in reverse mode this
-+ * will reverse too. Another logic would only make the simple feature too
-+ * complex.
-+ */
-+unsigned int defaultitalic = 7;
-+unsigned int defaultunderline = 7;
- /*
-  * Default shape of cursor
-  * 2: Block ("█")