From 9a71b0161e5468e6fcde511d3dc4f89a0e1d6c77 Mon Sep 17 00:00:00 2001
From: Jakub <jakubb.06@protonmail.com>
Date: Wed, 11 Jan 2023 10:04:50 -0500
Subject: [PATCH] dynamic cursor color patch

---
 patches/st-dynamic-cursor-color-0.8.4.diff | 52 ++++++++++++++++++++++
 x.c                                        | 19 +++++++-
 2 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 patches/st-dynamic-cursor-color-0.8.4.diff

diff --git a/patches/st-dynamic-cursor-color-0.8.4.diff b/patches/st-dynamic-cursor-color-0.8.4.diff
new file mode 100644
index 0000000..a763d6d
--- /dev/null
+++ b/patches/st-dynamic-cursor-color-0.8.4.diff
@@ -0,0 +1,52 @@
+From 01e706efbc13194a4a4404e91b93a9638a3c1bea Mon Sep 17 00:00:00 2001
+From: Kipras Melnikovas <kipras@kipras.org>
+Date: Thu, 25 Feb 2021 14:31:26 +0200
+Subject: [PATCH] refactor dynamic-cursor-color patch
+
+Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
+---
+ x.c | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/x.c b/x.c
+index 120e495..ab66364 100644
+--- a/x.c
++++ b/x.c
+@@ -1489,6 +1489,7 @@ void
+ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
+ {
+ 	Color drawcol;
++	XRenderColor colbg;
+ 
+ 	/* remove the old cursor */
+ 	if (selected(ox, oy))
+@@ -1518,10 +1519,24 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
+ 			g.fg = defaultfg;
+ 			g.bg = defaultrcs;
+ 		} else {
++			/** this is the main part of the dynamic cursor color patch */
++			g.bg = g.fg;
+ 			g.fg = defaultbg;
+-			g.bg = defaultcs;
+ 		}
+-		drawcol = dc.col[g.bg];
++
++		/**
++		 * and this is the second part of the dynamic cursor color patch.
++		 * it handles the `drawcol` variable
++		*/
++		if (IS_TRUECOL(g.bg)) {
++			colbg.alpha = 0xffff;
++			colbg.red = TRUERED(g.bg);
++			colbg.green = TRUEGREEN(g.bg);
++			colbg.blue = TRUEBLUE(g.bg);
++			XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol);
++		} else {
++			drawcol = dc.col[g.bg];
++		}
+ 	}
+ 
+ 	/* draw the new one */
+-- 
+2.30.1
+
diff --git a/x.c b/x.c
index 122ba05..2e7907b 100644
--- a/x.c
+++ b/x.c
@@ -1550,6 +1550,7 @@ void
 xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
 {
 	Color drawcol;
+	XRenderColor colbg;
 
 	/* remove the old cursor */
 	if (selected(ox, oy))
@@ -1579,10 +1580,24 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
 			g.fg = defaultfg;
 			g.bg = defaultrcs;
 		} else {
+			/** this is the main part of the dynamic cursor color patch */
+			g.bg = g.fg;
 			g.fg = defaultbg;
-			g.bg = defaultcs;
 		}
-		drawcol = dc.col[g.bg];
+
+		/**
+		 * and this is the second part of the dynamic cursor color patch.
+		 * it handles the `drawcol` variable
+		*/
+		if (IS_TRUECOL(g.bg)) {
+			colbg.alpha = 0xffff;
+			colbg.red = TRUERED(g.bg);
+			colbg.green = TRUEGREEN(g.bg);
+			colbg.blue = TRUEBLUE(g.bg);
+			XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &drawcol);
+		} else {
+			drawcol = dc.col[g.bg];
+		}
 	}
 
 	/* draw the new one */