mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-08-12 09:54:39 +02:00
Code Issues Projects Releases Wiki Activity

Update to v096r01 release.

Browse Source 
byuu says:

Changelog:

- restructured the project and removed a whole bunch of old/dead
  directives from higan/GNUmakefile
- huge amounts of work on hiro/cocoa (compiles but ~70% of the
  functionality is commented out)
- fixed a masking error in my ARM CPU disassembler [Lioncash]
- SFC: decided to change board cic=(411,413) back to board
  region=(ntsc,pal) ... the former was too obtuse

If you rename Boolean (it's a problem with an include from ruby, not
from hiro) and disable all the ruby drivers, you can compile an
OS X binary, but obviously it's not going to do anything.

It's a boring WIP, I just wanted to push out the project structure
change now at the start of this WIP cycle.
This commit is contained in:
Tim Allen
2015-12-30 17:41:46 +11:00
parent 27660505c8
commit 47d4bd4d81
707 changed files with 3789 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
hiro/cocoa/font.cpp
View File

@@ -1,59 +1,51 @@
namespace phoenix {
#if defined(Hiro_Font)
string pFont::serif(unsigned size, string style) {
if(size == 0) size = 8;
if(style == "") style = "Normal";
return {"Georgia, ", size, ", ", style};
}
namespace hiro {
string pFont::sans(unsigned size, string style) {
if(size == 0) size = 8;
if(style == "") style = "Normal";
return {"Lucida Grande, ", size, ", ", style};
}
string pFont::monospace(unsigned size, string style) {
if(size == 0) size = 8;
if(style == "") style = "Normal";
return {"Menlo, ", size, ", ", style};
}
Size pFont::size(string font, string text) {
auto pFont::size(const Font& font, const string& text) -> Size {
@autoreleasepool {
if(NSFont* nsFont = cocoaFont(font)) {
if(NSFont* nsFont = create(font)) {
return size(nsFont, text);
}
}
return {0, 0};
}
NSFont* pFont::cocoaFont(string description) {
lstring part = description.split<2>(",").strip();
auto pFont::size(NSFont* font, const string& text) -> Size {
@autoreleasepool {
NSString* cocoaText = [NSString stringWithUTF8String:text];
NSDictionary* fontAttributes = [NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, nil];
NSSize size = [cocoaText sizeWithAttributes:fontAttributes];
return {(int)size.width, (int)size.height};
}
}
NSString* family = @"Lucida Grande";
auto pFont::family(const string& family) -> string {
if(family == Font::Sans ) return "Lucida Grande";
if(family == Font::Serif) return "Georgia";
if(family == Font::Mono ) return "Menlo";
return "Lucida Grande";
}
auto pFont::create(const Font& font) -> NSFont* {
auto fontName = family(font.family());
NSString* family = [NSString stringWithUTF8String:fontName];
CGFloat size = (float)(font.size() ? font.size() : 8);
NSFontTraitMask traits = 0;
CGFloat size = 8.0;
if(!part(0).empty()) family = [NSString stringWithUTF8String:part(0)];
if(!part(1).empty()) size = part(1).natural();
if(part(2).ifind("bold")) traits |= NSBoldFontMask;
if(part(2).ifind("italic")) traits |= NSItalicFontMask;
if(part(2).ifind("narrow")) traits |= NSNarrowFontMask;
if(part(2).ifind("expanded")) traits |= NSExpandedFontMask;
if(part(2).ifind("condensed")) traits |= NSCondensedFontMask;
if(part(2).ifind("smallcaps")) traits |= NSSmallCapsFontMask;
if(font.bold()) traits |= NSBoldFontMask;
if(font.italic()) traits |= NSItalicFontMask;
//note: below properties are not exposed by hiro::Font; traits are saved here for possible future use
//if(font.narrow()) traits |= NSNarrowFontMask;
//if(font.expanded()) traits |= NSExpandedFontMask;
//if(font.condensed()) traits |= NSCondensedFontMask;
//if(font.smallCaps()) traits |= NSSmallCapsFontMask;
size *= 1.5; //scale to point sizes (for consistency with other operating systems)
return [[NSFontManager sharedFontManager] fontWithFamily:family traits:traits weight:5 size:size];
}
Size pFont::size(NSFont* font, string text) {
@autoreleasepool {
NSString* cocoaText = [NSString stringWithUTF8String:text];
NSDictionary* fontAttributes = [NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, nil];
NSSize size = [cocoaText sizeWithAttributes:fontAttributes];
return {size.width, size.height};
}
}
}
#endif