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

Started putting uiFontButton back in on OS X. Just a bunch of boilerplate for now, namely the function to take a CTFontDesciptorRef and convert it into a uiDrawFontDescriptor.

This commit is contained in:
Pietro Gagliardi 2017-02-11 00:53:52 -05:00
parent 49094bb340
commit bebaf72de3
3 changed files with 84 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darwin/CMakeLists.txt
View File

@ -17,7 +17,7 @@ list(APPEND _LIBUI_SOURCES
darwin/drawtext.m
darwin/editablecombo.m
darwin/entry.m
#TODO darwin/fontbutton.m
darwin/fontbutton.m
darwin/fontmatch.m
darwin/form.m
darwin/graphemes.m

82
darwin/fontmatch.m
View File

@ -253,3 +253,85 @@ CTFontDescriptorRef fontdescToCTFontDescriptor(uiDrawFontDescriptor *fd)
fd->Italic,
stretchesToCTWidths[fd->Stretch]);
}
// TODO deduplicate this from italicCloseness()
static uiDrawTextItalic italicFromCTItalic(CTFontDescriptorRef desc, CFDictionaryRef traits)
{
CFNumberRef cfnum;
CTFontSymbolicTraits symbolic;
// there is no kCFNumberUInt32Type, but CTFontSymbolicTraits is uint32_t, so SInt32 should work
SInt32 s;
CFStringRef styleName;
BOOL isOblique;
cfnum = CFDictionaryGetValue(traits, kCTFontSymbolicTrait);
if (cfnum == NULL) {
// TODO
}
if (CFNumberGetValue(cfnum, kCFNumberSInt32Type, &s) == false) {
// TODO
}
symbolic = (CTFontSymbolicTraits) s;
// Get Rule; do not release cfnum
if ((symbolic & kCTFontItalicTrait) == 0)
return uiDrawTextItalicNormal;
// Okay, now we know it's either Italic or Oblique
// Pango's Core Text code just does a g_strrstr() (backwards case-sensitive search) for "Oblique" in the font's style name (see https://git.gnome.org/browse/pango/tree/pango/pangocoretext-fontmap.c); let's do that too I guess
isOblique = NO; // default value
styleName = (CFStringRef) CTFontDescriptorCopyAttribute(desc, kCTFontStyleNameAttribute);
// TODO is styleName guaranteed?
if (styleName != NULL) {
CFRange range;
// note the use of the toll-free bridge for the string literal, since CFSTR() *can* return NULL
// TODO is this really the case? or is that just a copy-paste error from the other CFStringCreateXxx() functions? and what's this about -fconstant-cfstring?
range = CFStringFind(styleName, (CFStringRef) @"Oblique", kCFCompareBackwards);
if (range.location != kCFNotFound)
isOblique = YES;
CFRelease(styleName);
}
if (isOblique)
return uiDrawTextItalicOblique;
return uiDrawTextItalicItalic;
}
void fontdescFromCTFontDescriptor(CTFontDescriptorRef ctdesc, uiDrawFontDescriptor *uidesc)
{
CFStringRef cffamily;
CFDictionaryRef traits;
double ctweight, ctstretch;
int wc;
uiDrawTextStretch stretch;
cffamily = (CFStringRef) CTFontDescriptorCopyAttribute(cfdesc, kCTFontFamilyNameAttribute);
if (cffamily == NULL) {
// TODO
}
// TODO normalize this by adding a uiDarwinCFStringToText()
uidesc->Family = uiDarwinNSStringToText((NSString *) cffamily);
CFRelease(cffamily);
traits = (CFDictionaryRef) CTFontDescriptorCopyAttribute(cfdesc, kCTFontTraitsAttribute);
if (traits == NULL) {
// TODO
}
ctweight = doubleAttr(traits, kCTFontWeightTrait);
uidesc->Italic = italicFromCTItalic(ctdesc, traits);
ctstretch = doubleAttr(traits, kCTFontWidthTrait);
CFRelease(traits);
// TODO make sure this is correct
for (wc = 0; wc < 10; wc++)
if (ctweight >= weightsToCTWeights[wc])
if (ctweight < weightsToCTWeights[wc + 1])
break;
uidesc->Weight = ((ctweight - weightsToCTWeights[wc]) / (weightsToCTWeights[wc + 1] - weightsToCTWeights[wc])) * 100;
uidesc->Weight += wc * 100;
// TODO is this correct?
for (stretch = uiDrawTextStretchUltraCondensed; stretch < uiDrawTextStretchUltraExpanded; stretch++)
if (ctstretch <= stretchesToCTWidth[stretch])
break;
uidesc->Stretch = stretch;
}

8
darwin/uipriv_darwin.h
View File

@ -109,15 +109,9 @@ extern uiDrawContext *newContext(CGContextRef, CGFloat);
extern void freeContext(uiDrawContext *);
// fontbutton.m
#if 0 /* TODO */
extern BOOL fontButtonInhibitSendAction(SEL sel, id from, id to);
extern BOOL fontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override);
extern void setupFontPanel(void);
#else
static inline BOOL fontButtonInhibitSendAction(SEL sel, id from, id to) { return NO; }
static inline BOOL fontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override) { return NO; }
static inline void setupFontPanel(void) {}
#endif
// colorbutton.m
extern BOOL colorButtonInhibitSendAction(SEL sel, id from, id to);
@ -148,4 +142,4 @@ extern void doManualResize(NSWindow *w, NSEvent *initialEvent, uiWindowResizeEdg
// fontmatch.m
extern CTFontDescriptorRef fontdescToCTFontDescriptor(uiDrawFontDescriptor *fd);
extern NSFontDescriptor *fontdescToNSFontDescriptor(uiDrawFontDescriptor *fd);
extern void fontdescFromCTFontDescriptor(CTFontDescriptorRef ctdesc, uiDrawFontDescriptor *uidesc);