From 94b8512d0629dc662fde0df99a01f6b94e94fba2 Mon Sep 17 00:00:00 2001 From: Ray Andrew <4437323+rayandrew@users.noreply.github.com> Date: Mon, 7 Oct 2024 21:46:07 -0500 Subject: [PATCH] add status font --- config.def.h | 15 +++++++++++---- drw.c | 18 ++++++++++-------- drw.h | 6 +++--- dwm.c | 26 +++++++++++++------------- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/config.def.h b/config.def.h index dd34dc0..6f580f4 100644 --- a/config.def.h +++ b/config.def.h @@ -20,7 +20,12 @@ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 0; /* 0 means bottom bar */ static const int vertpad = 0; /* vertical padding of bar */ static const int sidepad = 5; /* horizontal padding of bar */ -static const char *fonts[] = { "JetBrainsMonoNL Nerd Font:size=20", "Iosevka Nerd Font:size=20" }; +static const char *fonts[] = { + "JetBrainsMonoNL Nerd Font:size=20", + "Iosevka Nerd Font:size=20" , + "monospace:size=8:antialias=true:autohint=true", + "DM Mono:size=20:antialias=true:autohint=true" +}; static const char dmenufont[] = "monospace:size=10"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; @@ -37,7 +42,9 @@ static const char *const autostart[] = { "dunst", NULL, NULL /* terminate */ }; - +/* Select the font index for you statusbar + * the index is zero based*/ +static const int statusfontindex = 3; /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" }; @@ -98,13 +105,13 @@ static const Layout layouts[] = { #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* commands */ -#define TERM_CMD "wezterm", "-e" +#define TERM_CMD "wezterm" #define TERM(cmd) { .v = (const char*[]){ TERM_CMD, cmd, NULL } } static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static const char *dmenucmd[] = { "rofi", "-dpi", "1", "-show", "drun", NULL }; static const char *calccmd[] = { "rofi", "-dpi", "1", "-show", "calc", "-modi", "calc", "-no-show-match", "-no-sort", "-kb-accept-custom", "Return", "-kb-accept-entry", "Control+Return", "-calc-command", "\"echo -n '{result}' | xclip\"", "-theme", "~/.config/rofi/calc.rasi", NULL}; static const char *clipboardcmd[] = { "rofi", "-dpi", "1", "-modi", "clipboard:~/bin/cliphist-rofi-img", "-show", "clipboard", "-show-icons", "-theme", "~/.config/rofi/clipboard.rasi", NULL }; -static const char *termcmd[] = { "wezterm", "-e", NULL }; +static const char *termcmd[] = { TERM_CMD, NULL }; static const char *volmicmutecmd[] = { "/usr/bin/pactl", "set-source-mute", "@DEFAULT_SOURCE@", "toggle", NULL }; static const char *volsoundmutecmd[] = { "/usr/bin/wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", "toggle", NULL }; static const char *voldecreasecmd[] = { "/usr/bin/wpctl", "set-volume", "-l", "1.0", "@DEFAULT_AUDIO_SINK@", "5%-", NULL }; diff --git a/drw.c b/drw.c index a58a2b4..d0de3f7 100644 --- a/drw.c +++ b/drw.c @@ -236,7 +236,7 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, 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, int statusfontindex ) { int i, ty, ellipsis_x = 0; unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; @@ -272,14 +272,16 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp usedfont = drw->fonts; if (!ellipsis_width && render) - ellipsis_width = drw_fontset_getwidth(drw, "..."); + ellipsis_width = drw_fontset_getwidth(drw, "...",0); while (1) { ew = ellipsis_len = utf8strlen = 0; utf8str = text; nextfont = NULL; while (*text) { utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); - for (curfont = drw->fonts; curfont; curfont = curfont->next) { + curfont = drw->fonts; + for (int i=0;inext;} + for (; curfont; curfont = curfont->next) { charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); if (charexists) { drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); @@ -326,7 +328,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp w -= ew; } if (render && overflow) - drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); + drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert,statusfontindex); if (!*text || overflow) { break; @@ -395,19 +397,19 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) } unsigned int -drw_fontset_getwidth(Drw *drw, const char *text) +drw_fontset_getwidth(Drw *drw, const char *text,int statusfontindex) { if (!drw || !drw->fonts || !text) return 0; - return drw_text(drw, 0, 0, 0, 0, 0, text, 0); + return drw_text(drw, 0, 0, 0, 0, 0, text, 0,statusfontindex); } unsigned int -drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) +drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n, int statusfontindex) { unsigned int tmp = 0; if (drw && drw->fonts && text && n) - tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); + tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n,statusfontindex); return MIN(n, tmp); } diff --git a/drw.h b/drw.h index 6471431..50b7577 100644 --- a/drw.h +++ b/drw.h @@ -34,8 +34,8 @@ void drw_free(Drw *drw); /* Fnt abstraction */ Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); void drw_fontset_free(Fnt* set); -unsigned int drw_fontset_getwidth(Drw *drw, const char *text); -unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); +unsigned int drw_fontset_getwidth(Drw *drw, const char *text,int statusfontindex); +unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n, int statusfontindex); void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); /* Colorscheme abstraction */ @@ -52,7 +52,7 @@ 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); +int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, int statusfontindex ); /* Map functions */ void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); diff --git a/dwm.c b/dwm.c index a2f4b4c..7773882 100644 --- a/dwm.c +++ b/dwm.c @@ -61,7 +61,8 @@ #define WIDTH(X) ((X)->w + 2 * (X)->bw) #define HEIGHT(X) ((X)->h + 2 * (X)->bw) #define TAGMASK ((1 << LENGTH(tags)) - 1) -#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) +#define TEXTW(X,F) (drw_fontset_getwidth(drw, (X),(F)) + lrpad) +// #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) #define SYSTEM_TRAY_REQUEST_DOCK 0 #define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0 @@ -555,14 +556,14 @@ buttonpress(XEvent *e) /* Do not reserve space for vacant tags */ if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) continue; - x += TEXTW(tags[i]); + x += TEXTW(tags[i], 0); } while (ev->x >= x && ++i < LENGTH(tags)); if (i < LENGTH(tags)) { click = ClkTagBar; arg.ui = 1 << i; - } else if (ev->x < x + TEXTW(selmon->ltsymbol)) + } else if (ev->x < x + TEXTW(selmon->ltsymbol, 0)) click = ClkLtSymbol; - else if (ev->x > selmon->ww - TEXTW(stext) - getsystraywidth()) + else if (ev->x > selmon->ww - TEXTW(stext, 0) - getsystraywidth()) click = ClkStatusText; else click = ClkWinTitle; @@ -928,9 +929,8 @@ drawbar(Monitor *m) /* draw status first so it can be overdrawn by tags later */ if (m == selmon || 1) { /* status is only drawn on selected monitor */ drw_setscheme(drw, scheme[SchemeNorm]); - tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */ - // drw_text(drw, m->ww - tw - 2 * sp, 0, tw, bh, 0, stext, 0); - drw_text(drw, m->ww - tw - stw, 0, tw, bh, 0, stext, 0); + tw = TEXTW(stext, statusfontindex) - lrpad + 2; /* 2px right padding */ + drw_text(drw, m->ww - tw - stw, 0, tw, bh, 0, stext, 0, statusfontindex); } resizebarwin(m); @@ -944,22 +944,22 @@ drawbar(Monitor *m) /* Do not draw vacant tags */ if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) continue; - w = TEXTW(tags[i]); + w = TEXTW(tags[i], statusfontindex); drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); - if (ulineall || m->tagset[m->seltags] & 1 << i) /* if there are conflicts, just move these lines directly underneath both 'drw_setscheme' and 'drw_text' :) */ + drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i, statusfontindex); + if (ulineall || m->tagset[m->seltags] & 1 << i) drw_rect(drw, x + ulinepad, bh - ulinestroke - ulinevoffset, w - (ulinepad * 2), ulinestroke, 1, 0); x += w; } - w = TEXTW(m->ltsymbol); + w = TEXTW(m->ltsymbol, statusfontindex); drw_setscheme(drw, scheme[SchemeNorm]); - 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, statusfontindex); if ((w = m->ww - tw - stw - x) > bh) { if (m->sel) { drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); - drw_text(drw, x, 0, w - 2 * sp, bh, lrpad / 2, m->sel->name, 0); + drw_text(drw, x, 0, w - 2 * sp, bh, lrpad / 2, m->sel->name, 0, statusfontindex); if (m->sel->isfloating) drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); } else {