From 90e3c1b6534233a7f6b8bc973a07dd7e2f8d0476 Mon Sep 17 00:00:00 2001 From: Ryan Kes <> Date: Sat, 5 Dec 2020 17:24:54 +0100 Subject: [PATCH] removed morecolors patch --- PKGBUILD | 4 +--- README.org | 1 - config.h | 5 ++--- config_desktop.h | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 286c55f..098d3ca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,11 +10,10 @@ license=('MIT') depends=('sh' 'glibc' 'coreutils' 'libx11' 'libxinerama' 'freetype2' 'fontconfig' 'libfontconfig.so' 'menu-calc' 'pass' 'yubikey-oath-dmenu') sha512sums=('2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3' - 'c06a195f2e8bc4247c360f7bc9d39994dfd6cf134829a89a345fbf233fa4ac49d8fc2e9c7455b63e10d2f5173b0b8da0768a81d1c4201b487de72c444b38bfa2' + 'f2f1c94b5d39d23b99d0832450e820b7652e9e3e3a591c473b3e0edbd895b75d5b056b5723d7321b1026f76b599e2f5b53d3bb41a7527c7871c9628594293d2c' 'beed0f7725d84b4d73cb35fb7d78d7db90c7fa15ed0ac4d6cf19e6469caf83167bc3edae246c30a2f0a79e765b46d9a37997a9a72f5dec147cc0a904fa2ef790' 'ce806c6481b20d5b2352fc387816878c75285162f6404b3a969a95f9dbd6c7476fd4c6571f260886fa30ccc40e4a388ea8f6902e40ff90447e04bec3faf0669d' '6ce4ce0ddb9c1058f253ce46cdae8949c468d97ce7d787831d8a4f4ebd4db672761e2552703f58d36d01b2933dea624a30627629027b9a5960b404542a40a732' - 'dd46c1ac2ea8d5ffc29c01ec83ef7dc771d50475252a5723495a4969e5315e29ce059c2ee4f82f6c8b75d12868e27b3d9dfe74f9825ab86ac7a407902b29a2ab' 'e6ff377a4a4ed9e98d05a8870d6c57a5f89f853b0ec1160c3702642f899d8079eca595775b3d9f436bd67626fd4df659e511faa6d026130b07eef09a7c0c8b85' '15d88ea4f10c2fa6fb3eb7478f23b24210a0da3542ae7a5be609013500c15564eedd8153d850f079c2c1f4bab1f5e61ff51153e4c85445ee04a0de5c851e305a' 'fe0167c56ca9381928b5dd20383d36554729fb5417bf42f0db2e1634a1f82774f068cbea347e68c6cb3adc6c1a5f97ab263c8a9450f0b2c6429ac66de3edf894') @@ -23,7 +22,6 @@ _patches=( "dmenu-border-4.9.diff" "dmenu-fuzzyhighlight-4.9.diff" "dmenu-fuzzymatch-4.9.diff" - "local-dmenu-morecolor-20190922-4bf895b.diff" "local-dmenu-mousesupport-5.0.diff" "dmenu-numbers-4.9.diff" "local-allow-color-fonts.diff" diff --git a/README.org b/README.org index ff7d43a..0e63aad 100644 --- a/README.org +++ b/README.org @@ -5,7 +5,6 @@ - [[https://tools.suckless.org/dmenu/patches/center/][center]] - [[https://tools.suckless.org/dmenu/patches/fuzzyhighlight/][fuzzyhighlight]] - [[https://tools.suckless.org/dmenu/patches/fuzzymatch/][fuzzymatch]] -- [[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) diff --git a/config.h b/config.h index 0796ed9..cd2a992 100644 --- a/config.h +++ b/config.h @@ -7,8 +7,8 @@ static int fuzzy = 1; /* -F option; if 0, dmenu doesn't use fuzzy matching */ /* -fn option overrides fonts[0]; default X11 font or font set */ static const char *fonts[] = { - "Hack Nerd Font Mono:size=16:antialias=true:autohint=true", - "JoyPixels:pixelsize=16:antialias=true:autohint=true" + "Hack Nerd Font Mono:size=12:antialias=true:autohint=true", + "JoyPixels:pixelsize=12:antialias=true:autohint=true" }; static const char *prompt = @@ -20,7 +20,6 @@ static const char *colors[SchemeLast][2] = { [SchemeSelHighlight] = {"#ffc978", "#005577"}, [SchemeNormHighlight] = {"#ffc978", "#222222"}, [SchemeOut] = {"#000000", "#00ffff"}, - [SchemeMid] = {"#eeeeee", "#770000"}, }; /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ static unsigned int lines = 0; diff --git a/config_desktop.h b/config_desktop.h index fa4e755..cd2a992 100644 --- a/config_desktop.h +++ b/config_desktop.h @@ -20,7 +20,6 @@ static const char *colors[SchemeLast][2] = { [SchemeSelHighlight] = {"#ffc978", "#005577"}, [SchemeNormHighlight] = {"#ffc978", "#222222"}, [SchemeOut] = {"#000000", "#00ffff"}, - [SchemeMid] = {"#eeeeee", "#770000"}, }; /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ static unsigned int lines = 0;