add nfont FontTextExtents functions

diff --git a/application/nfont.c b/application/nfont.c
index cce3666c282ab219cdb71dbb2161d030d0eea256..ab8c921e47247df9410f58b2820c5b5f82d4cf6c 100644 (file)
--- a/application/nfont.c
+++ b/application/nfont.c
@@ -281,3 +281,79 @@ void FontDrawString32(
     }
 
 }
+
+void FontTextExtents8(
+        Display *dpy,
+        NFont *font,
+        const FcChar8 *string,
+        int len,
+        XGlyphInfo *extents)
+{
+    FcChar32 static_buffer[128];
+    FcChar32 *buf = static_buffer;
+    if(len >= 128) {
+        buf = calloc(len, sizeof(FcChar32));
+    }
+    
+    // convert string from utf8 to utf32
+    int c = 0;
+    for(int i=0;i<len;) {
+        int n = FcUtf8ToUcs4(string+i, &buf[c++], len-i);
+        i += n;
+    }
+    
+    FontTextExtents32(dpy, font, buf, c, extents);
+    
+    if(buf != static_buffer) {
+        free(buf);
+    }
+}
+
+void FontTextExtents32(
+        Display *dpy,
+        NFont *font,
+        const FcChar32 *string,
+        int len,
+        XGlyphInfo *extents)
+{
+    XGlyphInfo ret = { 0 };
+    
+    XftFont *currentFont = FontDefault(font);
+    int pos = 0;
+    for(int i=0;i<len;i++) {
+        XftFont *cFont = FindFont(font, string[i]);
+        if(cFont != currentFont && i > pos) {
+            const FcChar32 *segStr = string+pos;
+            int segLen = i-pos;
+            
+            // get extents of string segment
+            XGlyphInfo ext;
+            XftTextExtents32(dpy, currentFont, segStr, segLen, &ext);
+            
+            if(ext.height > ret.height) {
+                ret.height = ext.height;
+            }
+            ret.width += ext.width;
+            ret.xOff += ext.xOff;
+            
+            pos = i;
+        }
+        currentFont = cFont;
+    }
+    
+    if(pos < len) {
+        const FcChar32 *segStr = string+pos;
+        int segLen = len-pos;
+        // get extents of string segment
+        XGlyphInfo ext;
+        XftTextExtents32(dpy, currentFont, segStr, segLen, &ext);
+
+        if(ext.height > ret.height) {
+            ret.height = ext.height;
+        }
+        ret.width += ext.width;
+        ret.xOff += ext.xOff;
+    }
+    
+    *extents = ret;
+}

diff --git a/application/nfont.h b/application/nfont.h
index cbefd86edb967c25a74b223e313f05145055f00d..65c720bd6c41a26ce9f032da9e481988d314d214 100644 (file)
--- a/application/nfont.h
+++ b/application/nfont.h
@@ -81,6 +81,20 @@ void FontDrawString32(
         const FcChar32 *string,
         int len);
 
+void FontTextExtents8(
+        Display *dpy,
+        NFont *font,
+        const FcChar8 *string,
+        int len,
+        XGlyphInfo *extents);
+
+void FontTextExtents32(
+        Display *dpy,
+        NFont *font,
+        const FcChar32 *string,
+        int len,
+        XGlyphInfo *extents);
+
 #ifdef __cplusplus
 }
 #endif