diff --git a/FUNDING.yml b/FUNDING.yml
index f8e6076..c7c9a22 100644
--- a/FUNDING.yml
+++ b/FUNDING.yml
@@ -1,3 +1,2 @@
+custom: ["https://lukesmith.xyz/donate.html"]
github: lukesmithxyz
-custom: ["https://lukesmith.xyz/donate", "https://paypal.me/lukemsmith", "https://lukesmith.xyz/crypto"]
-patreon: lukesmith
diff --git a/README.md b/README.md
index 58de860..a5b85de 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,4 @@ Extra stuff added to vanilla dmenu:
## Installation
-You must have `libxft` with the `bgra` patch installed until the libxft upstream is fixed.
-
After making any config changes that you want, but `make`, `sudo make install` it.
diff --git a/config.h b/config.h
index 40e8af3..87dc3d5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
/* -fn option overrides fonts[0]; default X11 font or font set */
static const char *fonts[] = {
- "MesloLGS Nerd Font:pixelsize=14:antialias=true:autohint=true",
+ "MesloLGS NF:pixelsize=14:antialias=true:autohint=true",
"Joy Pixels:pixelsize=10:antialias=true:autohint=true",
"IPAGothic:pixelsize=14:antialias=true:autohint=true"
};
@@ -31,5 +31,5 @@ static unsigned int lines = 0;
* Characters not considered part of a word while deleting words
* for example: " /?\"&[]"
*/
-static const char worddelimiters[] = " | ";
+static const char worddelimiters[] = " ";
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 */
}
+
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);
|
