From dc9d624e8b8b7451e87d064604801cdb9986781e Mon Sep 17 00:00:00 2001 From: Dejan Kutle Date: Wed, 25 May 2022 13:25:16 +0200 Subject: [PATCH 1/4] fix allow color font --- drw.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drw.c b/drw.c index 7694955..ac1d696 100644 --- a/drw.c +++ b/drw.c @@ -339,7 +339,6 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp fcpattern = FcPatternDuplicate(drw->fonts->pattern); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); - FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); FcDefaultSubstitute(fcpattern); From 9b1b209c88bf3e32ec021442533e17dab8e5bc1e Mon Sep 17 00:00:00 2001 From: Dejan Kutle Date: Fri, 24 Jun 2022 09:40:36 +0200 Subject: [PATCH 2/4] change default font to a installed one --- config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.h b/config.h index 5fbe225..86d2470 100644 --- a/config.h +++ b/config.h @@ -5,7 +5,7 @@ static int topbar = 1; /* -b option; if 0, dmenu appears a /* -fn option overrides fonts[0]; default X11 font or font set */ static const char *fonts[] = { "monospace:size=10", - "JoyPixels:pixelsize=8:antialias=true:autohint=true" + "NotoColor:pixelsize=8:antialias=true:autohint=true" }; static const unsigned int bgalpha = 0xe0; static const unsigned int fgalpha = OPAQUE; @@ -31,3 +31,4 @@ static unsigned int lines = 0; * for example: " /?\"&[]" */ static const char worddelimiters[] = " "; + From c1152e1336e2c9dda2557d30e0d6591f66c2dc26 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 28 Jun 2022 10:23:49 -0400 Subject: [PATCH 3/4] fix #2 --- dmenu.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dmenu.c b/dmenu.c index bde0869..34d0943 100644 --- a/dmenu.c +++ b/dmenu.c @@ -918,6 +918,21 @@ main(int argc, char *argv[]) XWindowAttributes wa; int i, fast = 0; + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if (!(dpy = XOpenDisplay(NULL))) + die("cannot open display"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + if (!embed || !(parentwin = strtol(embed, NULL, 0))) + parentwin = root; + if (!XGetWindowAttributes(dpy, parentwin, &wa)) + die("could not get embedding window attributes: 0x%lx", + parentwin); + xinitvisual(); + drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap); + read_Xresources(); + for (i = 1; i < argc; i++) /* these options take no arguments */ if (!strcmp(argv[i], "-v")) { /* prints version information */ @@ -958,20 +973,6 @@ main(int argc, char *argv[]) else usage(); - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); - if (!embed || !(parentwin = strtol(embed, NULL, 0))) - parentwin = root; - if (!XGetWindowAttributes(dpy, parentwin, &wa)) - die("could not get embedding window attributes: 0x%lx", - parentwin); - xinitvisual(); - drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap); - read_Xresources(); if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) die("no fonts could be loaded."); lrpad = drw->fonts->h; @@ -993,3 +994,4 @@ main(int argc, char *argv[]) return 1; /* unreachable */ } + From d07de2ea5f8b68715fe6910d3197d1082e58c016 Mon Sep 17 00:00:00 2001 From: Dejan Kutle Date: Mon, 1 Aug 2022 12:17:32 +0200 Subject: [PATCH 4/4] fix font name --- config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.h b/config.h index 86d2470..acc8457 100644 --- a/config.h +++ b/config.h @@ -5,7 +5,7 @@ static int topbar = 1; /* -b option; if 0, dmenu appears a /* -fn option overrides fonts[0]; default X11 font or font set */ static const char *fonts[] = { "monospace:size=10", - "NotoColor:pixelsize=8:antialias=true:autohint=true" + "NotoColorEmoji:pixelsize=8:antialias=true:autohint=true" }; static const unsigned int bgalpha = 0xe0; static const unsigned int fgalpha = OPAQUE;