p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Implement font fallbacks in the editor
Alpine 3.20 Success Details
Arch Linux AUR Success Details
OpenBSD 7.5 Scripts failed Details 

Opting for not making any changes in the XUI.
This commit is contained in:
Přemysl Eric Janouch 2024-09-02 21:28:53 +02:00
parent ec12e2ac25
commit 9d0acddf9a
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -2,6 +2,8 @@ Unreleased
* Made global search indicate the search terms, and match on filenames * Made global search indicate the search terms, and match on filenames
* X11: added support for font fallbacks to the editor as well
2.1.1 (2024-02-27) 2.1.1 (2024-02-27)

36
nncmpp.c
View File

@ -5895,28 +5895,36 @@ x11_render_editor (struct widget *self)
{ {
x11_render_padding (self); x11_render_padding (self);
XftFont *font = x11_widget_font (self)->list->font; struct x11_font *font = x11_widget_font (self);
XftColor color = { .color = *x11_fg (self) }; XftColor color = { .color = *x11_fg (self) };
// A simplistic adaptation of line_editor_write() follows. // A simplistic adaptation of tui_render_editor() follows.
int x = self->x, y = self->y + font->ascent; const struct line_editor *e = &g.editor;
XGlyphInfo extents = {}; int x = self->x;
if (g.editor.prompt) if (e->prompt)
{ {
FT_UInt i = XftCharIndex (g_xui.dpy, font, g.editor.prompt); hard_assert (e->prompt < 127);
XftDrawGlyphs (g_xui.xft_draw, &color, font, x, y, &i, 1); x += x11_font_draw (font, &color, x, self->y,
XftGlyphExtents (g_xui.dpy, font, &i, 1, &extents); (char[2]) { e->prompt, 0 }) + g_xui.vunit / 4;
x += extents.xOff + g_xui.vunit / 4;
} }
// TODO: Adapt x11_font_{hadvance,draw}().
// TODO: Make this scroll around the caret, and fade like labels. // TODO: Make this scroll around the caret, and fade like labels.
XftDrawString32 (g_xui.xft_draw, &color, font, x, y, size_t len;
g.editor.line, g.editor.len); ucs4_t *buf = xcalloc (e->len + 1, sizeof *buf);
*u32_pcpy (buf, e->line, e->point) = 0;
char *a = (char *) u32_to_u8 (buf, u32_strlen (buf) + 1, NULL, &len);
*u32_pcpy (buf, e->line + e->point, e->len - e->point) = 0;
char *b = (char *) u32_to_u8 (buf, u32_strlen (buf) + 1, NULL, &len);
free (buf);
x += x11_font_draw (font, &color, x, self->y, a);
int caret = x;
x += x11_font_draw (font, &color, x, self->y, b);
free (a);
free (b);
XftTextExtents32 (g_xui.dpy, font, g.editor.line, g.editor.point, &extents);
XRenderFillRectangle (g_xui.dpy, PictOpSrc, g_xui.x11_pixmap_picture, XRenderFillRectangle (g_xui.dpy, PictOpSrc, g_xui.x11_pixmap_picture,
&color.color, x + extents.xOff, self->y, 2, self->height); &color.color, caret, self->y, 2, self->height);
} }
static struct widget * static struct widget *