diff --git a/config.h b/config.h index 11bb5a4..9d3500a 100644 --- a/config.h +++ b/config.h @@ -2,7 +2,7 @@ static const Bool wmborder = True; static const char *fonts[] = { "FiraCode Nerd Font:style=Light:size=10:antialias=true:autohint=true", "Chiron Sans HK Light:style=Light:size=10", -"OpenMoji:style=Color", +"Openmoji Color glyf_colr_0:style=Regular:size=15",//Emoji }; static int fontsize = 10; diff --git a/drw.c b/drw.c index 868465c..a273722 100644 --- a/drw.c +++ b/drw.c @@ -133,19 +133,6 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) 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; diff --git a/drw.o b/drw.o index 87d440c..2a53c4e 100644 Binary files a/drw.o and b/drw.o differ diff --git a/layout.h b/layout.h index 87a84c3..138526c 100644 --- a/layout.h +++ b/layout.h @@ -1,5 +1,5 @@ //    -#define KEYS 71 +#define KEYS 69 static Key keys_en[KEYS] = { { "`~", XK_grave, 1 }, { "1!", XK_1, 1 }, @@ -63,14 +63,12 @@ static Key keys_en[KEYS] = { { "Ctrl", XK_Control_L, 2 }, { "Alt", XK_Alt_L, 2 }, { "", XK_Super_L, 2 }, - { "Hyper", XK_Hyper_L, 2 }, { "", XK_space, 5 }, { "←", XK_Left, 1 }, { "↓", XK_Down, 1 }, { "→", XK_Right, 1}, { "Alt", XK_Alt_R, 2 }, { "", XK_Super_R, 2 }, - { "Hyper", XK_Hyper_R, 2 }, { "Ctrl", XK_Control_R, 2 }, }; static Key keys_emoji [KEYS] = { diff --git a/svkbd b/svkbd index def9eaa..bb37f77 100755 Binary files a/svkbd and b/svkbd differ diff --git a/svkbd.o b/svkbd.o index 3a128f5..9b25602 100644 Binary files a/svkbd.o and b/svkbd.o differ