From 21d75d806eee3260b1163d6c989cdef229465a48 Mon Sep 17 00:00:00 2001 From: speedie Date: Wed, 8 Mar 2023 21:12:37 +0100 Subject: [PATCH] Add pango toggle, it is now optional for those of you who want a minimal spmenu instance. --- Makefile | 3 +- README.md | 6 +- docs/docs.md | 2 + host.mk | 14 +- libs/arg.c | 32 ++-- libs/rtl-none.c | 5 + libs/rtl-none.h | 1 + libs/rtl.c | 3 - libs/sl/draw-pango.c | 287 +++++++++++++++++++++++++++++ libs/sl/draw-pango.h | 57 ++++++ libs/sl/draw-xft.c | 424 +++++++++++++++++++++++++++++++++++++++++++ libs/sl/draw-xft.h | 60 ++++++ libs/sl/draw.c | 294 +----------------------------- libs/sl/draw.h | 66 +------ options.mk | 4 +- spmenu.1 | 3 + spmenu.c | 29 +-- toggle.mk | 20 +- 18 files changed, 919 insertions(+), 391 deletions(-) create mode 100644 libs/rtl-none.c create mode 100644 libs/rtl-none.h create mode 100644 libs/sl/draw-pango.c create mode 100644 libs/sl/draw-pango.h create mode 100644 libs/sl/draw-xft.c create mode 100644 libs/sl/draw-xft.h diff --git a/Makefile b/Makefile index 065bb76..3822394 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,7 @@ spmenu: spmenu.o libs/sl/draw.o libs/sl/main.o $(CC) -o $@ spmenu.o draw.o main.o $(LDFLAGS) clean: - rm -f spmenu \ - $(OBJ) \ + rm -f spmenu *.o \ spmenu-$(VERSION).tar.gz \ *zst* spmenu-$(VERSION).PKGBUILD diff --git a/README.md b/README.md index 286bc7a..d00ad85 100644 --- a/README.md +++ b/README.md @@ -49,12 +49,12 @@ Note: This is an incomplete list, it's just here to give you an idea of what thi - libXrender - freetype - imlib2 - - Used for image support, can be disabled if you don't want this by editing host.mk and defining NOIMAGE + - Used for image support, can be disabled if you don't want this by editing `toggle.mk`. - libXinerama - - Can be disabled if you don't want/need multi-monitor support. + - Can be disabled if you don't want/need multi-monitor support, edit `toggle.mk` - tcc compiler (you can swap it out for GCC by passing CC="gcc" to the `make` command if you want) - Pango (for drawing fonts) - - If you do not want to use pango, consider my [older dmenu build](https://github.com/speedie-de/dmenu) + - If you do not want to use pango, edit `toggle.mk` ### Installation (most GNU/Linux distributions) diff --git a/docs/docs.md b/docs/docs.md index 21df477..62956bb 100644 --- a/docs/docs.md +++ b/docs/docs.md @@ -11,6 +11,8 @@ a good more minimal alternative to spmenu. Unlike dmenu and the many builds out there, spmenu has features like color support, Vim-like modes, image support, proper keybind configuration, and more. +Most of these features can be disabled during compile time by editing `toggle.mk`. + ## 2. Usage On runtime, spmenu reads from standard input (stdin). spmenu items are diff --git a/host.mk b/host.mk index a1ce2d3..dfd27dc 100644 --- a/host.mk +++ b/host.mk @@ -20,11 +20,7 @@ FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = /usr/include/freetype2 # xft -XFT_CONF = xft - -# pango -PANGO_CONF = pango -PANGOXFT_CONF = pangoxft +XFTCONF = xft # xrender XRENDERLIBS = -lXrender @@ -33,7 +29,7 @@ XRENDERLIBS = -lXrender IMLIB2LIBS = -lImlib2 # openssl -OPENSSL_CONF = openssl +OPENSSLCONF = openssl # OpenBSD (uncomment) #FREETYPEINC = $(X11INC)/freetype2 @@ -43,8 +39,8 @@ OPENSSL_CONF = openssl #X11INC = /opt/X11/include #X11LIB = /opt/X11/lib -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMATOGGLE) $(BDTOGGLE) $(PANGOTOGGLE) $(IMLIB2TOGGLE) CFLAGS = -std=c99 -pedantic -Wall -O2 $(INCS) $(CPPFLAGS) LDFLAGS = $(LIBS) -INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFT_CONF) $(PANGO_CONF) $(PANGOXFT_CONF) $(OPENSSL_CONF)` -LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFT_CONF) $(PANGO_CONF) $(PANGOXFT_CONF) $(OPENSSL_CONF)` $(BDLIBS) $(IMLIB2LIBS) +INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)` +LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF)` $(BDLIBS) $(IMLIB2LIBS) diff --git a/libs/arg.c b/libs/arg.c index b1b90ac..2fe8319 100644 --- a/libs/arg.c +++ b/libs/arg.c @@ -301,30 +301,29 @@ out: void setimgsize(const Arg *arg) { - #if !USEIMAGE - return; - #endif - + #if USEIMAGE setimagesize(imagewidth + arg->i, imageheight + arg->i); + #endif } void flipimg(const Arg *arg) { - #if !USEIMAGE - return; - #endif + #if USEIMAGE if (!image) return; flip = flip ? 0 : arg->i ? 1 : 2; drawmenu(); + + #endif } void setimgpos(const Arg *arg) { + #if USEIMAGE if (!image || hideimage) return; if (imageposition < 3) { @@ -334,11 +333,13 @@ setimgpos(const Arg *arg) } drawmenu(); + #endif } void setimggaps(const Arg *arg) { + #if USEIMAGE imagegaps += arg->i; if (!image || hideimage) return; @@ -351,40 +352,38 @@ setimggaps(const Arg *arg) imagegaps -= arg->i; drawmenu(); + #endif } void rotateimg(const Arg *arg) { - #if !USEIMAGE - return; - #endif + #if USEIMAGE if (!image || hideimage) return; rotation += arg->i ? arg->i : 1; drawmenu(); + #endif } void toggleimg(const Arg *arg) { - #if !USEIMAGE - return; - #endif + #if USEIMAGE hideimage = !hideimage; drawmenu(); + + #endif } void defaultimg(const Arg *arg) { - #if !USEIMAGE - return; - #endif + #if USEIMAGE if (hideimage || !image) return; @@ -395,4 +394,5 @@ defaultimg(const Arg *arg) } drawmenu(); + #endif } diff --git a/libs/rtl-none.c b/libs/rtl-none.c new file mode 100644 index 0000000..e983944 --- /dev/null +++ b/libs/rtl-none.c @@ -0,0 +1,5 @@ +void +apply_fribidi(char *str) +{ + return; +} diff --git a/libs/rtl-none.h b/libs/rtl-none.h new file mode 100644 index 0000000..b3eb2ba --- /dev/null +++ b/libs/rtl-none.h @@ -0,0 +1 @@ +static void apply_fribidi(char *str); diff --git a/libs/rtl.c b/libs/rtl.c index 36ae42c..92008c8 100644 --- a/libs/rtl.c +++ b/libs/rtl.c @@ -1,9 +1,6 @@ void apply_fribidi(char *str) { - #if !USERTL - return; - #endif FriBidiStrIndex len = strlen(str); FriBidiChar logical[BUFSIZ]; FriBidiChar visual[BUFSIZ]; diff --git a/libs/sl/draw-pango.c b/libs/sl/draw-pango.c new file mode 100644 index 0000000..e77efc8 --- /dev/null +++ b/libs/sl/draw-pango.c @@ -0,0 +1,287 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include +#if USEPANGO +#include +#include +#endif + +#include "draw.h" +#include "main.h" + +Drw * +drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap) +{ + Drw *drw = ecalloc(1, sizeof(Drw)); + + drw->dpy = dpy; + drw->screen = screen; + drw->root = root; + drw->w = w; + drw->h = h; + drw->visual = visual; + drw->depth = depth; + drw->cmap = cmap; + drw->drawable = XCreatePixmap(dpy, root, w, h, depth); + drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL); + XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); + + return drw; +} + +void +drw_resize(Drw *drw, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + drw->w = w; + drw->h = h; + if (drw->drawable) + XFreePixmap(drw->dpy, drw->drawable); + drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth); +} + +void +drw_free(Drw *drw) +{ + XFreePixmap(drw->dpy, drw->drawable); + XFreeGC(drw->dpy, drw->gc); + drw_font_free(drw->font); + free(drw); +} + +static Fnt * +xfont_create(Drw *drw, const char *fontname) +{ + Fnt *font; + PangoFontMap *fontmap; + PangoContext *context; + PangoFontDescription *desc; + PangoFontMetrics *metrics; + + if (!fontname) { + die("no font specified."); + } + + font = ecalloc(1, sizeof(Fnt)); + 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, pango_language_from_string ("en-us")); + font->h = pango_font_metrics_get_height(metrics) / PANGO_SCALE; + + pango_font_metrics_unref(metrics); + g_object_unref(context); + + return font; +} + +static void +xfont_free(Fnt *font) +{ + if (!font) + return; + if (font->layout) + g_object_unref(font->layout); + free(font); +} + +Fnt* +drw_font_create(Drw* drw, const char font[], size_t fontcount) +{ + Fnt *fnt = NULL; + + if (!drw || !font) + return NULL; + + fnt = xfont_create(drw, font); + + return (drw->font = fnt); +} + +void +drw_font_free(Fnt *font) +{ + if (font) { + xfont_free(font); + } +} + +void +drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) +{ + if (!drw || !dest || !clrname) + return; + + if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap, + clrname, dest)) + die("error, cannot allocate color '%s'", clrname); + + dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24); +} + +/* Wrapper to create color schemes. The caller has to call free(3) on the + * returned color scheme when done using it. */ +Clr * +drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount) +{ + size_t i; + Clr *ret; + + /* need at least two colors for a scheme */ + if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) + return NULL; + + for (i = 0; i < clrcount; i++) + drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]); + return ret; +} + +void +drw_setscheme(Drw *drw, Clr *scm) +{ + if (drw) + drw->scheme = scm; +} + +void +drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) +{ + if (!drw || !drw->scheme) + return; + XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); + if (filled) + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + else + XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); +} + +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) +{ + char buf[1024]; + int ty; + unsigned int ew = 0; + XftDraw *d = NULL; + size_t i, len; + int render = x || y || w || h; + + if (!drw || (render && !drw->scheme) || !text || !drw->font) + return 0; + + if (!render) { + w = ~w; + } else { + XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap); + x += lpad; + w -= lpad; + } + + len = strlen(text); + + if (len) { + drw_font_getexts(drw->font, text, len, &ew, NULL, markup); + /* shorten text if necessary */ + for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--) + drw_font_getexts(drw->font, text, len, &ew, NULL, markup); + + if (len) { + memcpy(buf, text, len); + buf[len] = '\0'; + if (len < strlen(text)) + for (i = len; i && i > len - 3; buf[--i] = '.') + ; /* NOP */ + + if (render) { + ty = y + (h - drw->font->h) / 2; + if(markup) + pango_layout_set_markup(drw->font->layout, buf, len); + else + pango_layout_set_text(drw->font->layout, buf, len); + pango_xft_render_layout(d, &drw->scheme[invert ? ColBg : ColFg], + drw->font->layout, x * PANGO_SCALE, ty * PANGO_SCALE); + if(markup) /* clear markup attributes */ + pango_layout_set_attributes(drw->font->layout, NULL); + } + + x += ew; + w -= ew; + } + } + if (d) + XftDrawDestroy(d); + + return x + (render ? w : 0); +} + +void +drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); + XSync(drw->dpy, False); +} + +unsigned int +drw_font_getwidth(Drw *drw, const char *text, Bool markup) +{ + if (!drw || !drw->font || !text) + return 0; + return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup); +} + +void +drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup) +{ + if (!font || !text) + return; + + 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) + *w = r.width / PANGO_SCALE; + if (h) + *h = font->h; +} + +Cur * +drw_cur_create(Drw *drw, int shape) +{ + Cur *cur; + + if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) + return NULL; + + cur->cursor = XCreateFontCursor(drw->dpy, shape); + + return cur; +} + +void +drw_cur_free(Drw *drw, Cur *cursor) +{ + if (!cursor) + return; + + XFreeCursor(drw->dpy, cursor->cursor); + free(cursor); +} diff --git a/libs/sl/draw-pango.h b/libs/sl/draw-pango.h new file mode 100644 index 0000000..51fc14a --- /dev/null +++ b/libs/sl/draw-pango.h @@ -0,0 +1,57 @@ +/* See LICENSE file for copyright and license details. */ + +typedef struct { + Cursor cursor; +} Cur; + +typedef struct Fnt { + Display *dpy; + unsigned int h; + PangoLayout *layout; +} Fnt; + +enum { ColFg, ColBg }; /* Clr scheme index */ +typedef XftColor Clr; + +typedef struct { + unsigned int w, h; + Display *dpy; + int screen; + Window root; + Visual *visual; + unsigned int depth; + Colormap cmap; + Drawable drawable; + GC gc; + Clr *scheme; + Fnt *font; +} Drw; + +/* Drawable abstraction */ +Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap); +void drw_resize(Drw *drw, unsigned int w, unsigned int h); +void drw_free(Drw *drw); + +/* Fnt abstraction */ +Fnt *drw_font_create(Drw* drw, const char font[], size_t fontcount); +void drw_font_free(Fnt* set); +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, Bool markup); + +/* Colorscheme abstraction */ +void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, const unsigned int alpha); +Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); + +/* Cursor abstraction */ +Cur *drw_cur_create(Drw *drw, int shape); +void drw_cur_free(Drw *drw, Cur *cursor); + +/* Drawing context manipulation */ +void drw_setscheme(Drw *drw, Clr *scm); + +/* Drawing functions */ +void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, 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); + +/* Map functions */ +void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); diff --git a/libs/sl/draw-xft.c b/libs/sl/draw-xft.c new file mode 100644 index 0000000..c9c021e --- /dev/null +++ b/libs/sl/draw-xft.c @@ -0,0 +1,424 @@ +/* See LICENSE file for copyright and license details. */ +#include +#include +#include +#include +#include + +#include "draw.h" +#include "main.h" + +#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}; + +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; +} + +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; +} + +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; +} + +Drw * +drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap) +{ + Drw *drw = ecalloc(1, sizeof(Drw)); + + drw->dpy = dpy; + drw->screen = screen; + drw->root = root; + drw->w = w; + drw->h = h; + drw->visual = visual; + drw->depth = depth; + drw->cmap = cmap; + drw->drawable = XCreatePixmap(dpy, root, w, h, depth); + drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL); + XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); + + return drw; +} + +void +drw_resize(Drw *drw, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + drw->w = w; + drw->h = h; + if (drw->drawable) + XFreePixmap(drw->dpy, drw->drawable); + drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth); +} + +void +drw_free(Drw *drw) +{ + XFreePixmap(drw->dpy, drw->drawable); + XFreeGC(drw->dpy, drw->gc); + drw_font_free(drw->font); + free(drw); +} + +/* This function is an implementation detail. Library users should use + * drw_font_create instead. + */ +static Fnt * +xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) +{ + Fnt *font; + XftFont *xfont = NULL; + FcPattern *pattern = NULL; + + if (fontname) { + /* 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."); + } + + font = ecalloc(1, sizeof(Fnt)); + font->xfont = xfont; + font->pattern = pattern; + font->h = xfont->ascent + xfont->descent; + font->dpy = drw->dpy; + + return font; +} + +static void +xfont_free(Fnt *font) +{ + if (!font) + return; + if (font->pattern) + FcPatternDestroy(font->pattern); + XftFontClose(font->dpy, font->xfont); + free(font); +} + +Fnt* +drw_font_create(Drw* drw, char *font[], size_t fontcount) +{ + Fnt *cur, *ret = NULL; + size_t i; + + if (!drw || !font) + return NULL; + + for (i = 1; i <= fontcount; i++) { + if ((cur = xfont_create(drw, font[fontcount - i], NULL))) { + cur->next = ret; + ret = cur; + } + } + return (drw->font = ret); +} + +void +drw_font_free(Fnt *font) +{ + if (font) { + drw_font_free(font->next); + xfont_free(font); + } +} + +void +drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) +{ + if (!drw || !dest || !clrname) + return; + + if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap, + clrname, dest)) + die("error, cannot allocate color '%s'", clrname); + + dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24); +} + +/* Wrapper to create color schemes. The caller has to call free(3) on the + * returned color scheme when done using it. */ +Clr * +drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount) +{ + size_t i; + Clr *ret; + + /* need at least two colors for a scheme */ + if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) + return NULL; + + for (i = 0; i < clrcount; i++) + drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]); + return ret; +} + +void +drw_setfont(Drw *drw, Fnt *set) +{ + if (drw) + drw->font = set; +} + +void +drw_setscheme(Drw *drw, Clr *scm) +{ + if (drw) + drw->scheme = scm; +} + +void +drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) +{ + if (!drw || !drw->scheme) + return; + XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); + if (filled) + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + else + XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); +} + +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) +{ + char buf[1024]; + int ty; + unsigned int ew; + XftDraw *d = NULL; + Fnt *usedfont, *curfont, *nextfont; + 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->font) + return 0; + + if (!render) { + w = ~w; + } else { + XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); + XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); + d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap); + x += lpad; + w -= lpad; + } + + usedfont = drw->font; + while (1) { + utf8strlen = 0; + utf8str = text; + nextfont = NULL; + while (*text) { + utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); + for (curfont = drw->font; 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) + break; + else + charexists = 0; + } + + if (utf8strlen) { + drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL, True); + /* shorten text if necessary */ + for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) + drw_font_getexts(usedfont, utf8str, len, &ew, NULL, True); + + if (len) { + memcpy(buf, utf8str, len); + buf[len] = '\0'; + if (len < utf8strlen) + for (i = len; i && i > len - 3; buf[--i] = '.') + ; /* NOP */ + + if (render) { + ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; + XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], + usedfont->xfont, x, ty, (XftChar8 *)buf, len); + } + 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->font->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->font->pattern); + FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); + FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); + + 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->font; curfont->next; curfont = curfont->next) + ; /* NOP */ + curfont->next = usedfont; + } else { + xfont_free(usedfont); + usedfont = drw->font; + } + } + } + } + if (d) + XftDrawDestroy(d); + + return x + (render ? w : 0); +} + +void +drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) +{ + if (!drw) + return; + + XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); + XSync(drw->dpy, False); +} + +unsigned int +drw_font_getwidth(Drw *drw, const char *text, Bool markup) +{ + if (!drw || !drw->font || !text) + return 0; + return drw_text(drw, 0, 0, 0, 0, 0, text, 0, True); +} + +void +drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup) +{ + XGlyphInfo ext; + + if (!font || !text) + return; + + XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); + if (w) + *w = ext.xOff; + if (h) + *h = font->h; +} + +Cur * +drw_cur_create(Drw *drw, int shape) +{ + Cur *cur; + + if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) + return NULL; + + cur->cursor = XCreateFontCursor(drw->dpy, shape); + + return cur; +} + +void +drw_cur_free(Drw *drw, Cur *cursor) +{ + if (!cursor) + return; + + XFreeCursor(drw->dpy, cursor->cursor); + free(cursor); +} diff --git a/libs/sl/draw-xft.h b/libs/sl/draw-xft.h new file mode 100644 index 0000000..b400e9f --- /dev/null +++ b/libs/sl/draw-xft.h @@ -0,0 +1,60 @@ +/* See LICENSE file for copyright and license details. */ + +typedef struct { + Cursor cursor; +} Cur; + +typedef struct Fnt { + Display *dpy; + unsigned int h; + XftFont *xfont; + FcPattern *pattern; + struct Fnt *next; +} Fnt; + +enum { ColFg, ColBg }; /* Clr scheme index */ +typedef XftColor Clr; + +typedef struct { + unsigned int w, h; + Display *dpy; + int screen; + Window root; + Visual *visual; + unsigned int depth; + Colormap cmap; + Drawable drawable; + GC gc; + Clr *scheme; + Fnt *font; +} Drw; + +/* Drawable abstraction */ +Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap); +void drw_resize(Drw *drw, unsigned int w, unsigned int h); +void drw_free(Drw *drw); + +/* Fnt abstraction */ +Fnt *drw_font_create(Drw* drw, char *font[], size_t fontcount); +void drw_font_free(Fnt* set); +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, Bool markup); + +/* Colorscheme abstraction */ +void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha); +Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); + +/* Cursor abstraction */ +Cur *drw_cur_create(Drw *drw, int shape); +void drw_cur_free(Drw *drw, Cur *cursor); + +/* Drawing context manipulation */ +void drw_setfont(Drw *drw, Fnt *set); +void drw_setscheme(Drw *drw, Clr *scm); + +/* Drawing functions */ +void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, 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); + +/* Map functions */ +void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); diff --git a/libs/sl/draw.c b/libs/sl/draw.c index e80bf50..d03783e 100644 --- a/libs/sl/draw.c +++ b/libs/sl/draw.c @@ -1,285 +1,11 @@ -/* See LICENSE file for copyright and license details. */ -#include -#include -#include -#include -#include -#include -#include +#if PANGO +#define USEPANGO 1 +#else +#define USEPANGO 0 +#endif -#include "draw.h" -#include "main.h" - -Drw * -drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap) -{ - Drw *drw = ecalloc(1, sizeof(Drw)); - - drw->dpy = dpy; - drw->screen = screen; - drw->root = root; - drw->w = w; - drw->h = h; - drw->visual = visual; - drw->depth = depth; - drw->cmap = cmap; - drw->drawable = XCreatePixmap(dpy, root, w, h, depth); - drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL); - XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); - - return drw; -} - -void -drw_resize(Drw *drw, unsigned int w, unsigned int h) -{ - if (!drw) - return; - - drw->w = w; - drw->h = h; - if (drw->drawable) - XFreePixmap(drw->dpy, drw->drawable); - drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth); -} - -void -drw_free(Drw *drw) -{ - XFreePixmap(drw->dpy, drw->drawable); - XFreeGC(drw->dpy, drw->gc); - drw_font_free(drw->font); - free(drw); -} - -static Fnt * -xfont_create(Drw *drw, const char *fontname) -{ - Fnt *font; - PangoFontMap *fontmap; - PangoContext *context; - PangoFontDescription *desc; - PangoFontMetrics *metrics; - - if (!fontname) { - die("no font specified."); - } - - font = ecalloc(1, sizeof(Fnt)); - 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, pango_language_from_string ("en-us")); - font->h = pango_font_metrics_get_height(metrics) / PANGO_SCALE; - - pango_font_metrics_unref(metrics); - g_object_unref(context); - - return font; -} - -static void -xfont_free(Fnt *font) -{ - if (!font) - return; - if (font->layout) - g_object_unref(font->layout); - free(font); -} - -Fnt* -drw_font_create(Drw* drw, const char font[]) -{ - Fnt *fnt = NULL; - - if (!drw || !font) - return NULL; - - fnt = xfont_create(drw, font); - - return (drw->font = fnt); -} - -void -drw_font_free(Fnt *font) -{ - if (font) { - xfont_free(font); - } -} - -void -drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) -{ - if (!drw || !dest || !clrname) - return; - - if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap, - clrname, dest)) - die("error, cannot allocate color '%s'", clrname); - - dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24); -} - -/* Wrapper to create color schemes. The caller has to call free(3) on the - * returned color scheme when done using it. */ -Clr * -drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount) -{ - size_t i; - Clr *ret; - - /* need at least two colors for a scheme */ - if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) - return NULL; - - for (i = 0; i < clrcount; i++) - drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]); - return ret; -} - -void -drw_setscheme(Drw *drw, Clr *scm) -{ - if (drw) - drw->scheme = scm; -} - -void -drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) -{ - if (!drw || !drw->scheme) - return; - XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); - if (filled) - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - else - XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); -} - -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) -{ - char buf[1024]; - int ty; - unsigned int ew = 0; - XftDraw *d = NULL; - size_t i, len; - int render = x || y || w || h; - - if (!drw || (render && !drw->scheme) || !text || !drw->font) - return 0; - - if (!render) { - w = ~w; - } else { - XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); - d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap); - x += lpad; - w -= lpad; - } - - len = strlen(text); - - if (len) { - drw_font_getexts(drw->font, text, len, &ew, NULL, markup); - /* shorten text if necessary */ - for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--) - drw_font_getexts(drw->font, text, len, &ew, NULL, markup); - - if (len) { - memcpy(buf, text, len); - buf[len] = '\0'; - if (len < strlen(text)) - for (i = len; i && i > len - 3; buf[--i] = '.') - ; /* NOP */ - - if (render) { - ty = y + (h - drw->font->h) / 2; - if(markup) - pango_layout_set_markup(drw->font->layout, buf, len); - else - pango_layout_set_text(drw->font->layout, buf, len); - pango_xft_render_layout(d, &drw->scheme[invert ? ColBg : ColFg], - drw->font->layout, x * PANGO_SCALE, ty * PANGO_SCALE); - if(markup) /* clear markup attributes */ - pango_layout_set_attributes(drw->font->layout, NULL); - } - - x += ew; - w -= ew; - } - } - if (d) - XftDrawDestroy(d); - - return x + (render ? w : 0); -} - -void -drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) -{ - if (!drw) - return; - - XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); - XSync(drw->dpy, False); -} - -unsigned int -drw_font_getwidth(Drw *drw, const char *text, Bool markup) -{ - if (!drw || !drw->font || !text) - return 0; - return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup); -} - -void -drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup) -{ - if (!font || !text) - return; - - 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) - *w = r.width / PANGO_SCALE; - if (h) - *h = font->h; -} - -Cur * -drw_cur_create(Drw *drw, int shape) -{ - Cur *cur; - - if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) - return NULL; - - cur->cursor = XCreateFontCursor(drw->dpy, shape); - - return cur; -} - -void -drw_cur_free(Drw *drw, Cur *cursor) -{ - if (!cursor) - return; - - XFreeCursor(drw->dpy, cursor->cursor); - free(cursor); -} +#if USEPANGO +#include "draw-pango.c" +#else +#include "draw-xft.c" +#endif diff --git a/libs/sl/draw.h b/libs/sl/draw.h index 10b467d..0af0d54 100644 --- a/libs/sl/draw.h +++ b/libs/sl/draw.h @@ -1,57 +1,11 @@ -/* See LICENSE file for copyright and license details. */ +#if PANGO +#define USEPANGO 1 +#else +#define USEPANGO 0 +#endif -typedef struct { - Cursor cursor; -} Cur; - -typedef struct Fnt { - Display *dpy; - unsigned int h; - PangoLayout *layout; -} Fnt; - -enum { ColFg, ColBg }; /* Clr scheme index */ -typedef XftColor Clr; - -typedef struct { - unsigned int w, h; - Display *dpy; - int screen; - Window root; - Visual *visual; - unsigned int depth; - Colormap cmap; - Drawable drawable; - GC gc; - Clr *scheme; - Fnt *font; -} Drw; - -/* Drawable abstraction */ -Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap); -void drw_resize(Drw *drw, unsigned int w, unsigned int h); -void drw_free(Drw *drw); - -/* Fnt abstraction */ -Fnt *drw_font_create(Drw* drw, const char font[]); -void drw_font_free(Fnt* set); -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, Bool markup); - -/* Colorscheme abstraction */ -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, const unsigned int alpha); -Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); - -/* Cursor abstraction */ -Cur *drw_cur_create(Drw *drw, int shape); -void drw_cur_free(Drw *drw, Cur *cursor); - -/* Drawing context manipulation */ -void drw_setscheme(Drw *drw, Clr *scm); - -/* Drawing functions */ -void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, 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); - -/* Map functions */ -void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); +#if USEPANGO +#include "draw-pango.h" +#else +#include "draw-xft.h" +#endif diff --git a/options.mk b/options.mk index 4d04387..9986fa7 100644 --- a/options.mk +++ b/options.mk @@ -5,5 +5,5 @@ VERSION = 0.2.1 # includes and libs -INCS = -I$(X11INC) -I$(FREETYPEINC) $(BDINC) `pkg-config --cflags xft pango pangoxft` -LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) $(IMLIB2LIBS) $(BDLIBS) -lm `pkg-config --libs xft pango pangoxft` +INCS = -I$(X11INC) -I$(FREETYPEINC) $(BDINC) `pkg-config --cflags xft $(PANGO_CONF) $(PANGO_XFT_CONF)` +LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) $(IMLIB2LIBS) $(BDLIBS) -lm `pkg-config --libs xft $(PANGO_CONF) $(PANGO_XFT_CONF)` diff --git a/spmenu.1 b/spmenu.1 index 969fbc5..2dd84b0 100644 --- a/spmenu.1 +++ b/spmenu.1 @@ -27,6 +27,9 @@ alternative to spmenu. Unlike dmenu and the many builds out there, spmenu has features like color support, Vim-like modes, image support, proper keybind configuration, and more. +.PP +Most of these features can be disabled during compile time by editing +\f[V]toggle.mk\f[R]. .SS 2. Usage .PP On runtime, spmenu reads from standard input (stdin). diff --git a/spmenu.c b/spmenu.c index 95edfff..300e79e 100644 --- a/spmenu.c +++ b/spmenu.c @@ -26,14 +26,21 @@ #include /* check if we should enable right to left language support */ -#ifdef NORTL +#ifndef RTL #define USERTL 0 #else #define USERTL 1 #endif +/* check if we should enable pango support */ +#ifndef PANGO +#define USEPANGO 0 +#else +#define USEPANGO 1 +#endif + /* check if we should enable image support */ -#ifdef NOIMAGE +#ifndef IMAGE #define USEIMAGE 0 #else #define USEIMAGE 1 @@ -46,13 +53,6 @@ #define USEXINERAMA 0 #endif -/* NOXINERAMA overrides XINERAMA */ -#ifdef NOXINERAMA -#define USEXINERAMA 0 -#else -#define USEXINERAMA 1 -#endif - /* include right to left language library */ #if USERTL #include @@ -77,7 +77,10 @@ #include #include #include + +#if USEPANGO #include +#endif #include "libs/sl/draw.h" #include "libs/sl/main.h" @@ -159,6 +162,7 @@ static int rotation = 0; static int imagew = 0; static int imageh = 0; static int imageg = 0; +static int longestedge = 0; static int needredraw = 1; /* set an integer if to 1 if we have right to left language support enabled @@ -216,14 +220,15 @@ static int (*fstrncmp)(const char *, const char *, size_t) = strncasecmp; static char *(*fstrstr)(const char *, const char *) = cistrstr; #if USEIMAGE -static int longestedge = 0; /* longest edge */ - #include "libs/img.h" #include "libs/img.c" #endif #if USERTL #include "libs/rtl.h" #include "libs/rtl.c" +#else +#include "libs/rtl-none.h" +#include "libs/rtl-none.c" #endif #include "libs/event.h" #include "libs/event.c" @@ -998,7 +1003,7 @@ main(int argc, char *argv[]) xinitvisual(); drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap); - if (!drw_font_create(drw, font)) + if (!drw_font_create(drw, font, LENGTH(font))) die("no fonts could be loaded."); lrpad = drw->font->h; diff --git a/toggle.mk b/toggle.mk index a677da5..e82020b 100644 --- a/toggle.mk +++ b/toggle.mk @@ -4,10 +4,22 @@ # Multi-monitor support. # Requires libXinerama # Comment these lines if you don't need it. -XINERAMALIBS = -lXinerama -XINERAMAFLAGS = -DXINERAMA +XINERAMALIBS = -lXinerama +XINERAMATOGGLE = -DXINERAMA # Right to left language support # Comment these lines if you don't need it. -BDLIBS = -lfribidi -BDINC = /usr/include/fribidi +BDLIBS = -lfribidi +BDINC = /usr/include/fribidi +BDTOGGLE = -DFRIBIDI + +# Pango +# Comment these lines if you don't need it. +PANGOCONF = pango +PANGOXFTCONF = pangoxft +PANGOTOGGLE = -DPANGO + +# Image support +# Comment these lines if you don't need it. +IMLIB2LIBS = -lImlib2 +IMLIB2TOGGLE = -DIMAGE