Use pango, add support for pango markup. This *does* add pango as a
dependency, however i will likely add #ifs for this later. If this is a problem, get this diff and patch -R it on your build.
This commit is contained in:
parent
0d5a47831d
commit
cef970ac27
|
@ -1,6 +1,7 @@
|
||||||
-- Dependencies --
|
-- Dependencies --
|
||||||
These are absolutely necessary, speedwm will NOT compile without them
|
These are absolutely necessary, speedwm will NOT compile without them
|
||||||
- libxft
|
- libxft
|
||||||
|
- pango
|
||||||
- libXinerama
|
- libXinerama
|
||||||
- Can be disabled through editing toggle.mk if you're not interested in multiple monitors.
|
- Can be disabled through editing toggle.mk if you're not interested in multiple monitors.
|
||||||
- imlib2
|
- imlib2
|
||||||
|
|
|
@ -58,9 +58,7 @@
|
||||||
!@
|
!@
|
||||||
!! Font options
|
!! Font options
|
||||||
!@
|
!@
|
||||||
- speedwm.fonts.font1: NotoSans-Regular:size=8:antialiasing=true
|
- speedwm.fonts.font: NotoSans Regular 8
|
||||||
- speedwm.fonts.font2: fontawesome:size=8:antialiasing=true
|
|
||||||
- speedwm.fonts.font3: Noto Color Emoji:size=8:antialiasing=true
|
|
||||||
!@
|
!@
|
||||||
!! Color options
|
!! Color options
|
||||||
!@
|
!@
|
||||||
|
|
309
draw.c
309
draw.c
|
@ -10,6 +10,10 @@
|
||||||
/* include xft for drawing text */
|
/* include xft for drawing text */
|
||||||
#include <X11/Xft/Xft.h>
|
#include <X11/Xft/Xft.h>
|
||||||
|
|
||||||
|
/* pango */
|
||||||
|
#include <pango/pango.h>
|
||||||
|
#include <pango/pangoxft.h>
|
||||||
|
|
||||||
/* include draw header */
|
/* include draw header */
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
|
|
||||||
|
@ -24,66 +28,11 @@
|
||||||
#include <Imlib2.h>
|
#include <Imlib2.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define UTF_INVALID 0xFFFD
|
|
||||||
#define UTF_SIZ 4
|
|
||||||
|
|
||||||
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
|
|
||||||
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
|
|
||||||
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
|
||||||
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
|
|
||||||
|
|
||||||
unsigned int ew;
|
unsigned int ew;
|
||||||
|
|
||||||
/* transition scheme for powerlines */
|
/* transition scheme for powerlines */
|
||||||
Clr transcheme[3];
|
Clr transcheme[3];
|
||||||
|
|
||||||
/* decode utf byte */
|
|
||||||
static long
|
|
||||||
utf8decodebyte(const char c, size_t *i)
|
|
||||||
{
|
|
||||||
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
|
|
||||||
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
|
|
||||||
return (unsigned char)c & ~utfmask[*i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* validate utf */
|
|
||||||
static size_t
|
|
||||||
utf8validate(long *u, size_t i)
|
|
||||||
{
|
|
||||||
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
for (i = 1; *u > utfmax[i]; ++i)
|
|
||||||
;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* decode utf */
|
|
||||||
static size_t
|
|
||||||
utf8decode(const char *c, long *u, size_t clen)
|
|
||||||
{
|
|
||||||
size_t i, j, len, type;
|
|
||||||
long udecoded;
|
|
||||||
|
|
||||||
*u = UTF_INVALID;
|
|
||||||
if (!clen)
|
|
||||||
return 0;
|
|
||||||
udecoded = utf8decodebyte(c[0], &len);
|
|
||||||
if (!BETWEEN(len, 1, UTF_SIZ))
|
|
||||||
return 1;
|
|
||||||
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
|
|
||||||
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
|
|
||||||
if (type)
|
|
||||||
return j;
|
|
||||||
}
|
|
||||||
if (j < len)
|
|
||||||
return 0;
|
|
||||||
*u = udecoded;
|
|
||||||
utf8validate(u, len);
|
|
||||||
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* setup */
|
/* setup */
|
||||||
Drw *
|
Drw *
|
||||||
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
|
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
|
||||||
|
@ -180,59 +129,38 @@ drw_free(Drw *drw)
|
||||||
#endif
|
#endif
|
||||||
XFreePixmap(drw->dpy, drw->drawable);
|
XFreePixmap(drw->dpy, drw->drawable);
|
||||||
XFreeGC(drw->dpy, drw->gc);
|
XFreeGC(drw->dpy, drw->gc);
|
||||||
drw_fontset_free(drw->fonts);
|
drw_font_free(drw->font);
|
||||||
free(drw);
|
free(drw);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This function is an implementation detail. Library users should use
|
/* This function is an implementation detail. Library users should use
|
||||||
* drw_fontset_create instead.
|
* drw_font_create instead.
|
||||||
*/
|
*/
|
||||||
static Fnt *
|
static Fnt *
|
||||||
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
xfont_create(Drw *drw, const char *fontname)
|
||||||
{
|
{
|
||||||
Fnt *font;
|
Fnt *font;
|
||||||
XftFont *xfont = NULL;
|
PangoFontMap *fontmap;
|
||||||
FcPattern *pattern = NULL;
|
PangoContext *context;
|
||||||
|
PangoFontDescription *desc;
|
||||||
if (fontname) {
|
PangoFontMetrics *metrics;
|
||||||
/* Using the pattern found at font->xfont->pattern does not yield the
|
|
||||||
* same substitution results as using the pattern returned by
|
|
||||||
* FcNameParse; using the latter results in the desired fallback
|
|
||||||
* behaviour whereas the former just results in missing-character
|
|
||||||
* rectangles being drawn, at least with some fonts. */
|
|
||||||
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
|
|
||||||
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
|
|
||||||
XftFontClose(drw->dpy, xfont);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else if (fontpattern) {
|
|
||||||
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
|
|
||||||
fprintf(stderr, "error, cannot load font from pattern.\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
die("no font specified.");
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Workaround for the old libXft crash. */
|
|
||||||
#if USEXFTWORKAROUND
|
|
||||||
FcBool iscol;
|
|
||||||
if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
|
|
||||||
XftFontClose(drw->dpy, xfont);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
font = ecalloc(1, sizeof(Fnt));
|
font = ecalloc(1, sizeof(Fnt));
|
||||||
font->xfont = xfont;
|
|
||||||
font->pattern = pattern;
|
|
||||||
font->h = xfont->ascent + xfont->descent;
|
|
||||||
font->dpy = drw->dpy;
|
font->dpy = drw->dpy;
|
||||||
|
|
||||||
|
fontmap = pango_xft_get_font_map(drw->dpy, drw->screen);
|
||||||
|
context = pango_font_map_create_context(fontmap);
|
||||||
|
desc = pango_font_description_from_string(fontname);
|
||||||
|
font->layout = pango_layout_new(context);
|
||||||
|
pango_layout_set_font_description(font->layout, desc);
|
||||||
|
|
||||||
|
metrics = pango_context_get_metrics(context, desc, NULL);
|
||||||
|
font->h = pango_font_metrics_get_height(metrics) / PANGO_SCALE;
|
||||||
|
|
||||||
|
pango_font_metrics_unref(metrics);
|
||||||
|
g_object_unref(context);
|
||||||
|
|
||||||
|
|
||||||
return font;
|
return font;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -241,35 +169,28 @@ xfont_free(Fnt *font)
|
||||||
{
|
{
|
||||||
if (!font)
|
if (!font)
|
||||||
return;
|
return;
|
||||||
if (font->pattern)
|
if (font->layout)
|
||||||
FcPatternDestroy(font->pattern);
|
g_object_unref(font->layout);
|
||||||
XftFontClose(font->dpy, font->xfont);
|
|
||||||
free(font);
|
free(font);
|
||||||
}
|
}
|
||||||
|
|
||||||
Fnt*
|
Fnt*
|
||||||
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
|
drw_font_create(Drw* drw, char font[])
|
||||||
{
|
{
|
||||||
Fnt *cur, *ret = NULL;
|
Fnt *fnt = NULL;
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (!drw || !fonts)
|
if (!drw || !font)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
for (i = 1; i <= fontcount; i++) {
|
fnt = xfont_create(drw, font);
|
||||||
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
|
|
||||||
cur->next = ret;
|
return (drw->font = fnt);
|
||||||
ret = cur;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (drw->fonts = ret);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
drw_fontset_free(Fnt *font)
|
drw_font_free(Fnt *font)
|
||||||
{
|
{
|
||||||
if (font) {
|
if (font) {
|
||||||
drw_fontset_free(font->next);
|
|
||||||
xfont_free(font);
|
xfont_free(font);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -309,13 +230,6 @@ drw_scm_create(Drw *drw, char *clrnames[], const unsigned int alphas[], size_t c
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
drw_setfontset(Drw *drw, Fnt *set)
|
|
||||||
{
|
|
||||||
if (drw)
|
|
||||||
drw->fonts = set;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
drw_setscheme(Drw *drw, Clr *scm)
|
drw_setscheme(Drw *drw, Clr *scm)
|
||||||
{
|
{
|
||||||
|
@ -420,23 +334,17 @@ drw_polygon(Drw *drw, int x, int y, int ow, int oh, int sw, int sh, const XPoint
|
||||||
|
|
||||||
/* function for drawing text */
|
/* function for drawing text */
|
||||||
int
|
int
|
||||||
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
|
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup)
|
||||||
{
|
{
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
int ty;
|
int ty, th;
|
||||||
|
unsigned int ew, eh;
|
||||||
XftDraw *d = NULL;
|
XftDraw *d = NULL;
|
||||||
Fnt *usedfont, *curfont, *nextfont;
|
|
||||||
size_t i, len;
|
size_t i, len;
|
||||||
int utf8strlen, utf8charlen, render = x || y || w || h;
|
|
||||||
long utf8codepoint = 0;
|
|
||||||
const char *utf8str;
|
|
||||||
FcCharSet *fccharset;
|
|
||||||
FcPattern *fcpattern;
|
|
||||||
FcPattern *match;
|
|
||||||
XftResult result;
|
|
||||||
int charexists = 0;
|
|
||||||
|
|
||||||
if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
|
int render = x || y || w || h;
|
||||||
|
|
||||||
|
if (!drw || (render && !drw->scheme) || !text || !drw->font)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!render) {
|
if (!render) {
|
||||||
|
@ -449,102 +357,44 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
|
||||||
w -= lpad;
|
w -= lpad;
|
||||||
}
|
}
|
||||||
|
|
||||||
usedfont = drw->fonts;
|
len = strlen(text);
|
||||||
while (1) {
|
|
||||||
utf8strlen = 0;
|
|
||||||
utf8str = text;
|
|
||||||
nextfont = NULL;
|
|
||||||
while (*text) {
|
|
||||||
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
|
|
||||||
for (curfont = drw->fonts; curfont; curfont = curfont->next) {
|
|
||||||
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
|
|
||||||
if (charexists) {
|
|
||||||
if (curfont == usedfont) {
|
|
||||||
utf8strlen += utf8charlen;
|
|
||||||
text += utf8charlen;
|
|
||||||
} else {
|
|
||||||
nextfont = curfont;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!charexists || nextfont)
|
if (len) {
|
||||||
break;
|
drw_font_getexts(drw->font, text, len, &ew, &eh, markup);
|
||||||
else
|
th = eh;
|
||||||
charexists = 0;
|
|
||||||
|
/* shorten text if necessary */
|
||||||
|
for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--) {
|
||||||
|
drw_font_getexts(drw->font, text, len, &ew, &eh, markup);
|
||||||
|
if (eh > th)
|
||||||
|
th = eh;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (utf8strlen) {
|
if (len) {
|
||||||
drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
|
memcpy(buf, text, len);
|
||||||
/* shorten text if necessary */
|
buf[len] = '\0';
|
||||||
for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
|
if (len < strlen(text))
|
||||||
drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
|
for (i = len; i && i > len - 3; buf[--i] = '.')
|
||||||
|
; /* NOP */
|
||||||
|
|
||||||
if (len) {
|
if (render) {
|
||||||
memcpy(buf, utf8str, len);
|
ty = y + (h - th) / 2;
|
||||||
buf[len] = '\0';
|
|
||||||
if (len < utf8strlen)
|
|
||||||
for (i = len; i && i > len - 3; buf[--i] = '.')
|
|
||||||
; /* NOP */
|
|
||||||
|
|
||||||
if (render) {
|
if(markup)
|
||||||
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
|
pango_layout_set_markup(drw->font->layout, buf, len);
|
||||||
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
|
else
|
||||||
usedfont->xfont, x, ty, (XftChar8 *)buf, len);
|
pango_layout_set_text(drw->font->layout, buf, len);
|
||||||
}
|
pango_xft_render_layout(d, &drw->scheme[invert ? ColBg : ColFg],
|
||||||
x += ew;
|
drw->font->layout, x * PANGO_SCALE, ty * PANGO_SCALE);
|
||||||
w -= ew;
|
if(markup) /* clear markup attributes */
|
||||||
|
pango_layout_set_attributes(drw->font->layout, NULL);
|
||||||
}
|
}
|
||||||
}
|
x += ew;
|
||||||
|
w -= ew;
|
||||||
|
|
||||||
if (!*text) {
|
|
||||||
break;
|
|
||||||
} else if (nextfont) {
|
|
||||||
charexists = 0;
|
|
||||||
usedfont = nextfont;
|
|
||||||
} else {
|
|
||||||
/* Regardless of whether or not a fallback font is found, the
|
|
||||||
* character must be drawn. */
|
|
||||||
charexists = 1;
|
|
||||||
|
|
||||||
fccharset = FcCharSetCreate();
|
|
||||||
FcCharSetAddChar(fccharset, utf8codepoint);
|
|
||||||
|
|
||||||
if (!drw->fonts->pattern) {
|
|
||||||
/* Refer to the comment in xfont_create for more information. */
|
|
||||||
die("the first font in the cache must be loaded from a font string.");
|
|
||||||
}
|
|
||||||
|
|
||||||
fcpattern = FcPatternDuplicate(drw->fonts->pattern);
|
|
||||||
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
|
|
||||||
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
|
|
||||||
|
|
||||||
/* add color bool (libxft workaround) */
|
|
||||||
#if USEXFTWORKAROUND
|
|
||||||
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
|
|
||||||
FcDefaultSubstitute(fcpattern);
|
|
||||||
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
|
|
||||||
|
|
||||||
FcCharSetDestroy(fccharset);
|
|
||||||
FcPatternDestroy(fcpattern);
|
|
||||||
|
|
||||||
if (match) {
|
|
||||||
usedfont = xfont_create(drw, NULL, match);
|
|
||||||
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
|
|
||||||
for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
|
|
||||||
; /* NOP */
|
|
||||||
curfont->next = usedfont;
|
|
||||||
} else {
|
|
||||||
xfont_free(usedfont);
|
|
||||||
usedfont = drw->fonts;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (d)
|
if (d)
|
||||||
XftDrawDestroy(d);
|
XftDrawDestroy(d);
|
||||||
|
|
||||||
|
@ -574,26 +424,31 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int
|
unsigned int
|
||||||
drw_fontset_getwidth(Drw *drw, const char *text)
|
drw_font_getwidth(Drw *drw, const char *text, Bool markup)
|
||||||
{
|
{
|
||||||
if (!drw || !drw->fonts || !text)
|
if (!drw || !drw->font || !text)
|
||||||
return 0;
|
return 0;
|
||||||
return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
|
return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
|
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup)
|
||||||
{
|
{
|
||||||
XGlyphInfo ext;
|
|
||||||
|
|
||||||
if (!font || !text)
|
if (!font || !text)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
|
PangoRectangle r;
|
||||||
|
if(markup)
|
||||||
|
pango_layout_set_markup(font->layout, text, len);
|
||||||
|
else
|
||||||
|
pango_layout_set_text(font->layout, text, len);
|
||||||
|
pango_layout_get_extents(font->layout, 0, &r);
|
||||||
|
if(markup) /* clear markup attributes */
|
||||||
|
pango_layout_set_attributes(font->layout, NULL);
|
||||||
if (w)
|
if (w)
|
||||||
*w = ext.xOff;
|
*w = r.width / PANGO_SCALE;
|
||||||
if (h)
|
if (h)
|
||||||
*h = font->h;
|
*h = r.height / PANGO_SCALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create cursor */
|
/* create cursor */
|
||||||
|
|
17
draw.h
17
draw.h
|
@ -9,9 +9,7 @@ typedef struct {
|
||||||
typedef struct Fnt {
|
typedef struct Fnt {
|
||||||
Display *dpy;
|
Display *dpy;
|
||||||
unsigned int h;
|
unsigned int h;
|
||||||
XftFont *xfont;
|
PangoLayout *layout;
|
||||||
FcPattern *pattern;
|
|
||||||
struct Fnt *next;
|
|
||||||
} Fnt;
|
} Fnt;
|
||||||
|
|
||||||
enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
|
enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */
|
||||||
|
@ -31,7 +29,7 @@ typedef struct {
|
||||||
#endif
|
#endif
|
||||||
GC gc;
|
GC gc;
|
||||||
Clr *scheme;
|
Clr *scheme;
|
||||||
Fnt *fonts;
|
Fnt *font;
|
||||||
} Drw;
|
} Drw;
|
||||||
|
|
||||||
/* Drawable abstraction */
|
/* Drawable abstraction */
|
||||||
|
@ -40,10 +38,10 @@ void drw_resize(Drw *drw, unsigned int w, unsigned int h);
|
||||||
void drw_free(Drw *drw);
|
void drw_free(Drw *drw);
|
||||||
|
|
||||||
/* Fnt abstraction */
|
/* Fnt abstraction */
|
||||||
Fnt *drw_fontset_create(Drw* drw, const char *fontarray[], size_t fontcount);
|
Fnt *drw_font_create(Drw* drw, char font[]);
|
||||||
void drw_fontset_free(Fnt* set);
|
void drw_font_free(Fnt* set);
|
||||||
unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
|
unsigned int drw_font_getwidth(Drw *drw, const char *text, Bool markup);
|
||||||
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
|
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup);
|
||||||
|
|
||||||
/* Colorscheme abstraction */
|
/* Colorscheme abstraction */
|
||||||
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
|
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
|
||||||
|
@ -54,7 +52,6 @@ Cur *drw_cur_create(Drw *drw, int shape);
|
||||||
void drw_cur_free(Drw *drw, Cur *cursor);
|
void drw_cur_free(Drw *drw, Cur *cursor);
|
||||||
|
|
||||||
/* Drawing context manipulation */
|
/* Drawing context manipulation */
|
||||||
void drw_setfontset(Drw *drw, Fnt *set);
|
|
||||||
void drw_setscheme(Drw *drw, Clr *scm);
|
void drw_setscheme(Drw *drw, Clr *scm);
|
||||||
void drw_settrans(Drw *drw, Clr *psc, Clr *nsc);
|
void drw_settrans(Drw *drw, Clr *psc, Clr *nsc);
|
||||||
|
|
||||||
|
@ -65,7 +62,7 @@ Picture drw_picture_create_resized(Drw *drw, char *src, unsigned int src_w, unsi
|
||||||
/* Drawing functions */
|
/* Drawing functions */
|
||||||
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
|
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
|
||||||
void drw_polygon(Drw *drw, int x, int y, int ow, int oh, int sw, int sh, const XPoint *points, int npoints, int shape, int filled);
|
void drw_polygon(Drw *drw, int x, int y, int ow, int oh, int sw, int sh, const XPoint *points, int npoints, int shape, int filled);
|
||||||
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
|
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup);
|
||||||
void drw_arrow(Drw* drw, int x, int y, unsigned int w, unsigned int h, int direction, int slash);
|
void drw_arrow(Drw* drw, int x, int y, unsigned int w, unsigned int h, int direction, int slash);
|
||||||
#if USEWINICON
|
#if USEWINICON
|
||||||
void drw_pic(Drw *drw, int x, int y, unsigned int w, unsigned int h, Picture pic);
|
void drw_pic(Drw *drw, int x, int y, unsigned int w, unsigned int h, Picture pic);
|
||||||
|
|
4
main.h
4
main.h
|
@ -1,7 +1,11 @@
|
||||||
/* See LICENSE file for copyright and license details. */
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
|
#ifndef MAX
|
||||||
#define MAX(A, B) ((A) > (B) ? (A) : (B))
|
#define MAX(A, B) ((A) > (B) ? (A) : (B))
|
||||||
|
#endif
|
||||||
|
#ifndef MIN
|
||||||
#define MIN(A, B) ((A) < (B) ? (A) : (B))
|
#define MIN(A, B) ((A) < (B) ? (A) : (B))
|
||||||
|
#endif
|
||||||
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
|
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
|
||||||
|
|
||||||
#if USEIPC
|
#if USEIPC
|
||||||
|
|
|
@ -132,13 +132,8 @@ static int autofocus = 0; /* Allow clients to automatic
|
||||||
static int automove = 0; /* Allow clients to automatically move when they request it */
|
static int automove = 0; /* Allow clients to automatically move when they request it */
|
||||||
static int autoresize = 0; /* Allow resizing clients automatically when they request it. */
|
static int autoresize = 0; /* Allow resizing clients automatically when they request it. */
|
||||||
|
|
||||||
/* Font options
|
/* Font options */
|
||||||
*
|
static char font[] = "NotoSans Regular 8";
|
||||||
* Main fonts
|
|
||||||
*/
|
|
||||||
static char font1[] = { "NotoSans-Regular:size=8:antialiasing=true" }; /* First font */
|
|
||||||
static char font2[] = { "fontawesome:size=8:antialiasing=true" }; /* Second font */
|
|
||||||
static char font3[] = { "Noto Color Emoji:size=8:antialiasing=true" }; /* Third font */
|
|
||||||
|
|
||||||
/* Status options */
|
/* Status options */
|
||||||
static char status[] = "speedwm_status"; /* Status bar to use, stellar for stellar, dwmblocks for dwmblocks, slstatus for slstatus, etc. */
|
static char status[] = "speedwm_status"; /* Status bar to use, stellar for stellar, dwmblocks for dwmblocks, slstatus for slstatus, etc. */
|
||||||
|
|
|
@ -10,8 +10,8 @@ X11INC = /usr/X11R6/include
|
||||||
X11LIB = /usr/X11R6/lib
|
X11LIB = /usr/X11R6/lib
|
||||||
|
|
||||||
# includes and libs
|
# includes and libs
|
||||||
INCS = -I${X11INC} -I${FREETYPEINC} -I${YAJLINC}
|
INCS = -I${X11INC} -I${FREETYPEINC} -I${YAJLINC} `pkg-config --cflags xft pango pangoxft`
|
||||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender ${IMLIB2LIBS} -lX11-xcb -lxcb -lxcb-res -lXext ${YAJLLIBS}
|
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender ${IMLIB2LIBS} -lX11-xcb -lxcb -lxcb-res -lXext ${YAJLLIBS} `pkg-config --libs xft pango pangoxft`
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
|
|
63
speedwm.c
63
speedwm.c
|
@ -34,6 +34,7 @@
|
||||||
#include <X11/extensions/Xinerama.h>
|
#include <X11/extensions/Xinerama.h>
|
||||||
#endif /* XINERAMA */
|
#endif /* XINERAMA */
|
||||||
#include <X11/Xft/Xft.h>
|
#include <X11/Xft/Xft.h>
|
||||||
|
#include <pango/pango.h>
|
||||||
#if USESWITCHER
|
#if USESWITCHER
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -66,7 +67,8 @@
|
||||||
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
||||||
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
||||||
#define TAGSLENGTH (LENGTH(tags))
|
#define TAGSLENGTH (LENGTH(tags))
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
#define TEXTW(X) (drw_font_getwidth(drw, (X), False) + lrpad)
|
||||||
|
#define TEXTWM(X) (drw_font_getwidth(drw, (X), True) + lrpad)
|
||||||
#define RIGHTOF(a,b) (a.y_org > b.y_org) || \
|
#define RIGHTOF(a,b) (a.y_org > b.y_org) || \
|
||||||
((a.y_org == b.y_org) && (a.x_org > b.x_org))
|
((a.y_org == b.y_org) && (a.x_org > b.x_org))
|
||||||
|
|
||||||
|
@ -881,8 +883,6 @@ static int systraypinningfailfirst = 1;
|
||||||
#include "toggle/ipc-yajl.c"
|
#include "toggle/ipc-yajl.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static char *fontarray[] = { font1, font2, font3 }; /* All fonts */
|
|
||||||
|
|
||||||
unsigned int tagw[LENGTH(tags)];
|
unsigned int tagw[LENGTH(tags)];
|
||||||
|
|
||||||
struct Pertag {
|
struct Pertag {
|
||||||
|
@ -1377,7 +1377,6 @@ buttonpress(XEvent *e)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
checkotherwm(void)
|
checkotherwm(void)
|
||||||
{
|
{
|
||||||
|
@ -2061,7 +2060,7 @@ statuslength(char* stext)
|
||||||
if (!isCode) {
|
if (!isCode) {
|
||||||
isCode = 1;
|
isCode = 1;
|
||||||
text[i] = '\0';
|
text[i] = '\0';
|
||||||
w += TEXTW(text) - lrpad;
|
w += TEXTWM(text) - lrpad;
|
||||||
text[i] = '^';
|
text[i] = '^';
|
||||||
if (text[++i] == 'f')
|
if (text[++i] == 'f')
|
||||||
w += atoi(text + ++i);
|
w += atoi(text + ++i);
|
||||||
|
@ -2073,7 +2072,7 @@ statuslength(char* stext)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!isCode)
|
if (!isCode)
|
||||||
w += TEXTW(text) - lrpad;
|
w += TEXTWM(text) - lrpad;
|
||||||
free(p);
|
free(p);
|
||||||
return w;
|
return w;
|
||||||
}
|
}
|
||||||
|
@ -2108,7 +2107,7 @@ drawstatusbar(Monitor *m, int bh, char* stext) {
|
||||||
if (!isCode) {
|
if (!isCode) {
|
||||||
isCode = 1;
|
isCode = 1;
|
||||||
text[i] = '\0';
|
text[i] = '\0';
|
||||||
w += TEXTW(text) - lrpad;
|
w += TEXTWM(text) - lrpad;
|
||||||
text[i] = '^';
|
text[i] = '^';
|
||||||
if (text[++i] == 'f')
|
if (text[++i] == 'f')
|
||||||
w += atoi(text + ++i);
|
w += atoi(text + ++i);
|
||||||
|
@ -2120,7 +2119,7 @@ drawstatusbar(Monitor *m, int bh, char* stext) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!isCode)
|
if (!isCode)
|
||||||
w += TEXTW(text) - lrpad;
|
w += TEXTWM(text) - lrpad;
|
||||||
else
|
else
|
||||||
isCode = 0;
|
isCode = 0;
|
||||||
text = p;
|
text = p;
|
||||||
|
@ -2142,8 +2141,8 @@ drawstatusbar(Monitor *m, int bh, char* stext) {
|
||||||
isCode = 1;
|
isCode = 1;
|
||||||
|
|
||||||
text[i] = '\0';
|
text[i] = '\0';
|
||||||
w = TEXTW(text) - lrpad;
|
w = TEXTWM(text) - lrpad;
|
||||||
drw_text(drw, x, 0, w, bh, 0, text, 0);
|
drw_text(drw, x, 0, w, bh, 0, text, 0, True);
|
||||||
|
|
||||||
x += w;
|
x += w;
|
||||||
|
|
||||||
|
@ -2188,8 +2187,8 @@ drawstatusbar(Monitor *m, int bh, char* stext) {
|
||||||
drw_setscheme(drw, scheme[SchemeStatus]);
|
drw_setscheme(drw, scheme[SchemeStatus]);
|
||||||
|
|
||||||
if (!isCode) {
|
if (!isCode) {
|
||||||
w = TEXTW(text) - lrpad;
|
w = TEXTWM(text) - lrpad;
|
||||||
drw_text(drw, x, 0, w, bh, 0, text, 0);
|
drw_text(drw, x, 0, w, bh, 0, text, 0, True);
|
||||||
w = 0;
|
w = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2344,14 +2343,14 @@ drawbaritems(Monitor *m)
|
||||||
Clr *prevscheme, *nxtscheme; /* powerline schemes */
|
Clr *prevscheme, *nxtscheme; /* powerline schemes */
|
||||||
|
|
||||||
if (!selmon->hidetagpowerline || !selmon->hidetitlepowerline) {
|
if (!selmon->hidetagpowerline || !selmon->hidetitlepowerline) {
|
||||||
plw = drw->fonts->h / 2 + 1;
|
plw = drw->font->h / 2 + 1;
|
||||||
plt = plw;
|
plt = plw;
|
||||||
} else
|
} else
|
||||||
plw = 0;
|
plw = 0;
|
||||||
|
|
||||||
/* indicators */
|
/* indicators */
|
||||||
int boxs = drw->fonts->h / 9;
|
int boxs = drw->font->h / 9;
|
||||||
int boxw = drw->fonts->h / 6 + 2;
|
int boxw = drw->font->h / 6 + 2;
|
||||||
|
|
||||||
/* monocle layout */
|
/* monocle layout */
|
||||||
unsigned int s = 0, a = 0;
|
unsigned int s = 0, a = 0;
|
||||||
|
@ -2385,7 +2384,7 @@ resizebarwin(m);
|
||||||
if ((unsigned char)(*s) < ' ') {
|
if ((unsigned char)(*s) < ' ') {
|
||||||
ch = *s;
|
ch = *s;
|
||||||
*s = '\0';
|
*s = '\0';
|
||||||
tw = TEXTW(text) - lrpad;
|
tw = TEXTWM(text) - lrpad;
|
||||||
x += tw;
|
x += tw;
|
||||||
*s = ch;
|
*s = ch;
|
||||||
text = s + 1;
|
text = s + 1;
|
||||||
|
@ -2413,7 +2412,7 @@ resizebarwin(m);
|
||||||
else
|
else
|
||||||
drw_setscheme(drw, scheme[SchemeStatus]);
|
drw_setscheme(drw, scheme[SchemeStatus]);
|
||||||
|
|
||||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0, False);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* draw tags */
|
/* draw tags */
|
||||||
|
@ -2448,7 +2447,7 @@ resizebarwin(m);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* draw tag text */
|
/* draw tag text */
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, tagtext, urg & 1 << i);
|
drw_text(drw, x, 0, w, bh, lrpad / 2, tagtext, urg & 1 << i, False);
|
||||||
|
|
||||||
/* underline */
|
/* underline */
|
||||||
if (underlineall || m->tagset[m->seltags] & 1 << i)
|
if (underlineall || m->tagset[m->seltags] & 1 << i)
|
||||||
|
@ -2495,7 +2494,7 @@ resizebarwin(m);
|
||||||
else
|
else
|
||||||
drw_setscheme(drw, scheme[SchemeStatus]);
|
drw_setscheme(drw, scheme[SchemeStatus]);
|
||||||
|
|
||||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0, False);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if USESYSTRAY
|
#if USESYSTRAY
|
||||||
|
@ -2587,10 +2586,10 @@ resizebarwin(m);
|
||||||
#if USEWINICON
|
#if USEWINICON
|
||||||
if (selmon->hideicon) {
|
if (selmon->hideicon) {
|
||||||
#endif
|
#endif
|
||||||
drw_text(drw, x + pltitle, 0, tabw, bh, lrpad / 2, c->name, 0);
|
drw_text(drw, x + pltitle, 0, tabw, bh, lrpad / 2, c->name, 0, False);
|
||||||
#if USEWINICON
|
#if USEWINICON
|
||||||
} else {
|
} else {
|
||||||
drw_text(drw, x + pltitle, 0, tabw, bh, lrpad / 2 + (c->icon ? c->icw + selmon->iconspacing : 0), c->name, 0); /* draw, with icon spacing and width added */
|
drw_text(drw, x + pltitle, 0, tabw, bh, lrpad / 2 + (c->icon ? c->icw + selmon->iconspacing : 0), c->name, 0, True); /* draw, with icon spacing and width added */
|
||||||
if (c->icon && !selmon->hidetitlepowerline && selmon->colorselectedtitle)
|
if (c->icon && !selmon->hidetitlepowerline && selmon->colorselectedtitle)
|
||||||
drw_pic(drw, x + pltitle + lrpad / 2, (bh - c->ich) / 2, c->icw, c->ich, c->icon); /* draw icon */
|
drw_pic(drw, x + pltitle + lrpad / 2, (bh - c->ich) / 2, c->icw, c->ich, c->icon); /* draw icon */
|
||||||
else if (c->icon)
|
else if (c->icon)
|
||||||
|
@ -3511,8 +3510,8 @@ setbarheight(const Arg *arg)
|
||||||
|
|
||||||
bh += arg->i;
|
bh += arg->i;
|
||||||
|
|
||||||
if (bh < drw->fonts->h)
|
if (bh < drw->font->h)
|
||||||
bh = altbar ? 0 : drw->fonts->h;
|
bh = altbar ? 0 : drw->font->h;
|
||||||
|
|
||||||
updatebarpos(selmon);
|
updatebarpos(selmon);
|
||||||
resizebarwin(selmon);
|
resizebarwin(selmon);
|
||||||
|
@ -3525,7 +3524,7 @@ resetbarheight(const Arg *arg)
|
||||||
if (altbar)
|
if (altbar)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
bh = altbar ? 0 : drw->fonts->h + barheight;
|
bh = altbar ? 0 : drw->font->h + barheight;
|
||||||
|
|
||||||
updatebarpos(selmon);
|
updatebarpos(selmon);
|
||||||
resizebarwin(selmon);
|
resizebarwin(selmon);
|
||||||
|
@ -4119,7 +4118,7 @@ drawswitcher(int nwins, int first, Monitor *m)
|
||||||
|
|
||||||
n++;
|
n++;
|
||||||
drw_setscheme(drw, scheme[(c == m->sel) ? SchemeTitleSel : SchemeBar]);
|
drw_setscheme(drw, scheme[(c == m->sel) ? SchemeTitleSel : SchemeBar]);
|
||||||
drw_text(drw, 0, y, selmon->maxwidth, h, 0, c->name, 0);
|
drw_text(drw, 0, y, selmon->maxwidth, h, 0, c->name, 0, False);
|
||||||
y += h;
|
y += h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5443,10 +5442,10 @@ setup(void)
|
||||||
root = RootWindow(dpy, screen);
|
root = RootWindow(dpy, screen);
|
||||||
xinitvisual();
|
xinitvisual();
|
||||||
drw = drw_create(dpy, screen, root, tw, sh, visual, depth, cmap);
|
drw = drw_create(dpy, screen, root, tw, sh, visual, depth, cmap);
|
||||||
if (!drw_fontset_create(drw, fontarray, LENGTH(fontarray)))
|
if (!drw_font_create(drw, font))
|
||||||
die("no fonts could be loaded.");
|
die("no fonts could be loaded.");
|
||||||
lrpad = drw->fonts->h;
|
lrpad = drw->font->h;
|
||||||
bh = altbar ? 0 : drw->fonts->h + barheight;
|
bh = altbar ? 0 : drw->font->h + barheight;
|
||||||
|
|
||||||
/* barpadding */
|
/* barpadding */
|
||||||
sp = barpaddingh;
|
sp = barpaddingh;
|
||||||
|
@ -6567,7 +6566,7 @@ updatestatus(void)
|
||||||
Monitor* m;
|
Monitor* m;
|
||||||
if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)) && !selmon->hidestatus) {
|
if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)) && !selmon->hidestatus) {
|
||||||
strcpy(stext, defaultstatus);
|
strcpy(stext, defaultstatus);
|
||||||
statusw = TEXTW(stext) - lrpad + 2;
|
statusw = TEXTWM(stext) - lrpad + 2;
|
||||||
} else {
|
} else {
|
||||||
if (!selmon->hidestatus) {
|
if (!selmon->hidestatus) {
|
||||||
copyvalidchars(stext, rawstext);
|
copyvalidchars(stext, rawstext);
|
||||||
|
@ -6577,12 +6576,12 @@ updatestatus(void)
|
||||||
if ((unsigned char)(*s) < ' ') {
|
if ((unsigned char)(*s) < ' ') {
|
||||||
ch = *s;
|
ch = *s;
|
||||||
*s = '\0';
|
*s = '\0';
|
||||||
statusw += TEXTW(text) - lrpad;
|
statusw += TEXTWM(text) - lrpad;
|
||||||
*s = ch;
|
*s = ch;
|
||||||
text = s + 1;
|
text = s + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
statusw += TEXTW(text) - lrpad + 2;
|
statusw += TEXTWM(text) - lrpad + 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (statusallmons) {
|
if (statusallmons) {
|
||||||
|
@ -7010,7 +7009,7 @@ updatesystray(void)
|
||||||
else
|
else
|
||||||
y += vp;
|
y += vp;
|
||||||
|
|
||||||
unsigned int sw = TEXTW(stext) - lrpad + systrayspacing;
|
unsigned int sw = TEXTWM(stext) - lrpad + systrayspacing;
|
||||||
unsigned int w = 1;
|
unsigned int w = 1;
|
||||||
|
|
||||||
if (selmon->hidesystray)
|
if (selmon->hidesystray)
|
||||||
|
|
|
@ -7,9 +7,7 @@
|
||||||
*
|
*
|
||||||
* Value in .Xresources Type Value internally */
|
* Value in .Xresources Type Value internally */
|
||||||
ResourcePref resources[] = {
|
ResourcePref resources[] = {
|
||||||
{ "fonts.font1", STRING, &font1 },
|
{ "fonts.font", STRING, &font },
|
||||||
{ "fonts.font2", STRING, &font2 },
|
|
||||||
{ "fonts.font3", STRING, &font3 },
|
|
||||||
{ "col.background", STRING, &col_background },
|
{ "col.background", STRING, &col_background },
|
||||||
{ "col.titlenorm", STRING, &col_titlenorm },
|
{ "col.titlenorm", STRING, &col_titlenorm },
|
||||||
{ "col.titlesel", STRING, &col_titlesel },
|
{ "col.titlesel", STRING, &col_titlesel },
|
||||||
|
|
Loading…
Reference in a new issue