interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented the chars-to-bytes algorithm on the GTK+ code. Now to finally add attributes to uiDrawTextLayout!

This commit is contained in:
Pietro Gagliardi 2016-04-19 14:57:15 -04:00
parent 5b74b2752e
commit 6fdbd8d68f
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unix/draw.c
View File

@ -620,16 +620,33 @@ void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metri
// note: PangoCairoLayouts are tied to a given cairo_t, so we can't store one in this device-independent structure // note: PangoCairoLayouts are tied to a given cairo_t, so we can't store one in this device-independent structure
struct uiDrawTextLayout { struct uiDrawTextLayout {
char *s; char *s;
ptrdiff_t *charsToBytes;
PangoFont *defaultFont; PangoFont *defaultFont;
double width; double width;
}; };
static ptrdiff_t *computeCharsToBytes(const char *s)
{
ptrdiff_t *charsToBytes;
glong i, charlen;
// we INCLUDE the null terminator as a character in the string
// g_utf8_offset_to_pointer() doesn't stop on null terminator so this should work
charlen = g_utf8_strlen(s, -1) + 1;
charsToBytes = (ptrdiff_t *) uiAlloc(charlen * sizeof (ptrdiff_t), "ptrdiff_t[]");
// TODO speed this up by not needing to scan the whole string again
for (i = 0; i < charlen; i++)
charsToBytes[i] = g_utf8_offset_to_pointer(s, i) - s;
return charsToBytes;
}
uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultFont, double width) uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultFont, double width)
{ {
uiDrawTextLayout *layout; uiDrawTextLayout *layout;
layout = uiNew(uiDrawTextLayout); layout = uiNew(uiDrawTextLayout);
layout->s = g_strdup(text); layout->s = g_strdup(text);
layout->charsToBytes = computeCharsToBytes(layout->s);
layout->defaultFont = defaultFont->f; layout->defaultFont = defaultFont->f;
g_object_ref(layout->defaultFont); // retain a copy g_object_ref(layout->defaultFont); // retain a copy
uiDrawTextLayoutSetWidth(layout, width); uiDrawTextLayoutSetWidth(layout, width);
@ -639,6 +656,7 @@ uiDrawTextLayout *uiDrawNewTextLayout(const char *text, uiDrawTextFont *defaultF
void uiDrawFreeTextLayout(uiDrawTextLayout *layout) void uiDrawFreeTextLayout(uiDrawTextLayout *layout)
{ {
g_object_unref(layout->defaultFont); g_object_unref(layout->defaultFont);
uiFree(layout->charsToBytes);
g_free(layout->s); g_free(layout->s);
uiFree(layout); uiFree(layout);
} }