NapoleonDynamite/dmenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:LukeSmithxyz/dmenu

Browse source
This commit is contained in:
Luke Smith 2022-10-01 08:16:18 -04:00
commit 8d6175da85
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.h
View file

@ -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 */ /* -fn option overrides fonts[0]; default X11 font or font set */
static const char *fonts[] = { static const char *fonts[] = {
"monospace:size=10", "monospace:size=10",
"JoyPixels:pixelsize=8:antialias=true:autohint=true" "NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"
}; };
static const unsigned int bgalpha = 0xe0; static const unsigned int bgalpha = 0xe0;
static const unsigned int fgalpha = OPAQUE; static const unsigned int fgalpha = OPAQUE;
@ -31,3 +31,4 @@ static unsigned int lines = 0;
* for example: " /?\"&[]" * for example: " /?\"&[]"
*/ */
static const char worddelimiters[] = " "; static const char worddelimiters[] = " ";

30
dmenu.c
View file

@ -918,6 +918,21 @@ main(int argc, char *argv[])
XWindowAttributes wa; XWindowAttributes wa;
int i, fast = 0; 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++) for (i = 1; i < argc; i++)
/* these options take no arguments */ /* these options take no arguments */
if (!strcmp(argv[i], "-v")) { /* prints version information */ if (!strcmp(argv[i], "-v")) { /* prints version information */
@ -958,20 +973,6 @@ main(int argc, char *argv[])
else else
usage(); 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))) if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
die("no fonts could be loaded."); die("no fonts could be loaded.");
lrpad = drw->fonts->h; lrpad = drw->fonts->h;
@ -993,3 +994,4 @@ main(int argc, char *argv[])
return 1; /* unreachable */ return 1; /* unreachable */
} }

1
drw.c
View file

@ -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); fcpattern = FcPatternDuplicate(drw->fonts->pattern);
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
FcDefaultSubstitute(fcpattern); FcDefaultSubstitute(fcpattern);