From 34224bd4d5afc6eb38486e19c4e6660b747d21fa Mon Sep 17 00:00:00 2001
From: Ryan Kes <>
Date: Sat, 28 Nov 2020 14:01:50 +0100
Subject: [PATCH] feat: enable emojis

---
 PKGBUILD                     |  7 ++++---
 README.org                   |  4 ++--
 local-allow-color-fonts.diff | 23 +++++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 local-allow-color-fonts.diff

diff --git a/PKGBUILD b/PKGBUILD
index 75da5fc..8b10224 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,14 @@ license=('MIT')
 depends=('sh' 'glibc' 'coreutils' 'libx11' 'libxinerama' 'freetype2' 'fontconfig' 'libfontconfig.so' 'menu-calc' 'pass' 'yubikey-oath-dmenu')
 
 sha512sums=('2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3'
-            '254cd0c4e82149700004897ca5ef6be63b02d791ce327c2a4f68d6ee6599645e5b469771514e80e188c4e531caa3e4349ecb035b2fdc10b687a380b7d6b36632'
-            'ad8183cca1ad1dd5b786896f94d127eeea53cece291c485f928388a7589402f49ed7e0ee8bdae71cc2ed41f3276b96591349cd820621f345376a54d557307fdf'
+            '9a9fb243aa799342378ff7dc89b2dd4fb369861549fc8f02d87335d176f0896cf5fefea1e3417a4a724e7b9f7bb5360fc2fe4bd77ef1418b7fe1f93683b6e38a'
             'beed0f7725d84b4d73cb35fb7d78d7db90c7fa15ed0ac4d6cf19e6469caf83167bc3edae246c30a2f0a79e765b46d9a37997a9a72f5dec147cc0a904fa2ef790'
             'ce806c6481b20d5b2352fc387816878c75285162f6404b3a969a95f9dbd6c7476fd4c6571f260886fa30ccc40e4a388ea8f6902e40ff90447e04bec3faf0669d'
             '6ce4ce0ddb9c1058f253ce46cdae8949c468d97ce7d787831d8a4f4ebd4db672761e2552703f58d36d01b2933dea624a30627629027b9a5960b404542a40a732'
             'dd46c1ac2ea8d5ffc29c01ec83ef7dc771d50475252a5723495a4969e5315e29ce059c2ee4f82f6c8b75d12868e27b3d9dfe74f9825ab86ac7a407902b29a2ab'
             'e6ff377a4a4ed9e98d05a8870d6c57a5f89f853b0ec1160c3702642f899d8079eca595775b3d9f436bd67626fd4df659e511faa6d026130b07eef09a7c0c8b85'
-            '15d88ea4f10c2fa6fb3eb7478f23b24210a0da3542ae7a5be609013500c15564eedd8153d850f079c2c1f4bab1f5e61ff51153e4c85445ee04a0de5c851e305a')
+            '15d88ea4f10c2fa6fb3eb7478f23b24210a0da3542ae7a5be609013500c15564eedd8153d850f079c2c1f4bab1f5e61ff51153e4c85445ee04a0de5c851e305a'
+            'fe0167c56ca9381928b5dd20383d36554729fb5417bf42f0db2e1634a1f82774f068cbea347e68c6cb3adc6c1a5f97ab263c8a9450f0b2c6429ac66de3edf894')
 
 _patches=(
     "dmenu-border-4.9.diff"
@@ -26,6 +26,7 @@ _patches=(
     "local-dmenu-morecolor-20190922-4bf895b.diff"
     "local-dmenu-mousesupport-5.0.diff"
     "dmenu-numbers-4.9.diff"
+    "local-allow-color-fonts.diff"
 )
 
 source=(https://dl.suckless.org/tools/dmenu-${pkgver}.tar.gz
diff --git a/README.org b/README.org
index b07faa5..971ae68 100644
--- a/README.org
+++ b/README.org
@@ -8,14 +8,14 @@
 - [[https://tools.suckless.org/dmenu/patches/morecolor/][morecolor]]
 - [[https://tools.suckless.org/dmenu/patches/mouse-support/][mousesupport]]
 - [[https://tools.suckless.org/dmenu/patches/numbers/][numbers]]
+- My own custom patch to enable colours (and thus emojis)
 
 * Install
 #+begin_src shell
 makepkg -si
 #+end_src
 
-- Default font is
-  [[https://github.com/ryanoasis/nerd-fonts/blob/master/patched-fonts/FiraCode][Fira Code Nerd Font Mono]]
+- Default font is monospace
 - When modifying [[https://github.com/alrayyes/dwm/blob/master/config.h][config.h]] be sure to run =updpkgsums= to update checksums before
   running =makepkg -si=
 
diff --git a/local-allow-color-fonts.diff b/local-allow-color-fonts.diff
new file mode 100644
index 0000000..0d56776
--- /dev/null
+++ b/local-allow-color-fonts.diff
@@ -0,0 +1,23 @@
+diff -up a/drw.c b/drw.c
+--- a/drw.c	2020-11-28 13:52:47.581529054 +0100
++++ b/drw.c	2020-11-28 13:53:32.351573846 +0100
+@@ -133,19 +133,6 @@ xfont_create(Drw *drw, const char *fontn
+ 		die("no font specified.");
+ 	}
+ 
+-	/* Do not allow using color fonts. This is a workaround for a BadLength
+-	 * error from Xft with color glyphs. Modelled on the Xterm workaround. See
+-	 * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
+-	 * https://lists.suckless.org/dev/1701/30932.html
+-	 * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
+-	 * and lots more all over the internet.
+-	 */
+-	FcBool iscol;
+-	if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
+-		XftFontClose(drw->dpy, xfont);
+-		return NULL;
+-	}
+-
+ 	font = ecalloc(1, sizeof(Fnt));
+ 	font->xfont = xfont;
+ 	font->pattern = pattern;