github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change cf::color_t → CGColorRef

Browse Source 
This change is required to introduce support for different color profiles.
This commit is contained in:
Allan Odgaard
2013-02-18 15:34:31 +01:00
parent 461756bc09
commit deeff330ee
2 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Frameworks/theme/src/theme.cc
View File

@@ -2,7 +2,6 @@
#include <cf/cf.h>
static theme_t::color_info_t read_color (std::string const& str_color);
static cf::color_t soften (cf::color_t color, CGFloat factor = 0.5);
static CGFloat read_font_size (std::string const& str_font_size);
static void get_key_path (plist::dictionary_t const& plist, std::string const& setting, theme_t::color_info_t& color)
@@ -26,6 +25,11 @@ static void get_key_path (plist::dictionary_t const& plist, std::string const& s
color = read_color(temp_str);
}
static CGColorPtr OakColorCreateFromThemeColor (theme_t::color_info_t const& color, CGColorSpaceRef colorspace)
{
return color.is_blank() ? CGColorPtr() : CGColorPtr(CGColorCreate(colorspace, (CGFloat[4]){ color.red, color.green, color.blue, color.alpha }), CGColorRelease);
}
theme_t::decomposed_style_t theme_t::shared_styles_t::parse_styles (plist::dictionary_t const& plist)
{
decomposed_style_t res;
@@ -142,28 +146,39 @@ theme_t::theme_t (bundles::item_ptr const& themeItem, std::string const& fontNam
_styles = find_shared_styles(themeItem);
}
static cf::color_t soften (cf::color_t color, CGFloat factor)
static cf::color_t soften (CGColorPtr cgColor, CGFloat factor)
{
CGFloat r = color.red(), g = color.green(), b = color.blue(), a = color.alpha();
if(color_is_dark(color))
CGFloat r = 0, g = 0, b = 0, a = 1;
size_t componentsCount = CGColorGetNumberOfComponents(cgColor.get());
if(componentsCount == 4)
{
r = 1 - factor*(1 - r);
g = 1 - factor*(1 - g);
b = 1 - factor*(1 - b);
CGFloat const* components = CGColorGetComponents(cgColor.get());
r = components[0];
g = components[1];
b = components[2];
a = components[3];
if(cf::color_is_dark(cgColor.get()))
{
r = 1 - factor*(1 - r);
g = 1 - factor*(1 - g);
b = 1 - factor*(1 - b);
}
else
{
r *= factor;
g *= factor;
b *= factor;
}
}
else
{
r *= factor;
g *= factor;
b *= factor;
}
return cf::color_t(r, g, b, a);
}
theme_t::shared_styles_t::shared_styles_t (bundles::item_ptr const& themeItem): _item(themeItem), _callback(*this)
{
_color_space = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
setup_styles();
bundles::add_callback(&_callback);
}
@@ -171,7 +186,9 @@ theme_t::shared_styles_t::shared_styles_t (bundles::item_ptr const& themeItem):
theme_t::shared_styles_t::~shared_styles_t ()
{
bundles::remove_callback(&_callback);
CGColorSpaceRelease(_color_space);
}
void theme_t::shared_styles_t::setup_styles ()
{
_styles.clear();
@@ -205,10 +222,11 @@ void theme_t::shared_styles_t::setup_styles ()
// =======================================
// We assume that the first style is the unscoped root style
_foreground = _styles.empty() ? cf::color_t("#FFFFFF") : _styles[0].foreground;
_background = _styles.empty() ? cf::color_t("#000000") : _styles[0].background;
_is_dark = color_is_dark(_background);
_is_transparent = _background.alpha() < 1;
_foreground = _styles.empty() ? CGColorPtr(CGColorCreate(_color_space, (CGFloat[4]){ 1, 1, 1, 1 }), CGColorRelease) : OakColorCreateFromThemeColor(_styles[0].foreground, _color_space);
_background = _styles.empty() ? CGColorPtr(CGColorCreate(_color_space, (CGFloat[4]){ 0, 0, 0, 1 }), CGColorRelease) : OakColorCreateFromThemeColor(_styles[0].background, _color_space);
_is_dark = cf::color_is_dark(_background.get());
_is_transparent = CGColorGetAlpha(_background.get()) < 1;
// =========================
// = Default Gutter Styles =
@@ -270,14 +288,14 @@ CGFloat theme_t::font_size () const
CGColorRef theme_t::foreground () const
{
return _styles->_foreground;
return _styles->_foreground.get();
}
CGColorRef theme_t::background (std::string const& fileType) const
{
if(fileType != NULL_STR)
return styles_for_scope(fileType).background();
return _styles->_background;
return _styles->_background.get();
}
bool theme_t::is_dark () const
@@ -328,10 +346,10 @@ styles_t const& theme_t::styles_for_scope (scope::scope_t const& scope) const
font.reset(newFont, CFRelease);
}
cf::color_t foreground = base.foreground.is_blank() ? cf::color_t("#000000") : base.foreground;
cf::color_t background = base.background.is_blank() ? cf::color_t("#FFFFFF") : base.background;
cf::color_t caret = base.caret.is_blank() ? cf::color_t("#000000") : base.caret;
cf::color_t selection = base.selection.is_blank() ? cf::color_t("#4D97FF54") : base.selection;
CGColorPtr foreground = OakColorCreateFromThemeColor(base.foreground, _styles->_color_space) ?: CGColorPtr(CGColorCreate(_styles->_color_space, (CGFloat[4]){ 0, 0, 0, 1 }), CGColorRelease);
CGColorPtr background = OakColorCreateFromThemeColor(base.background, _styles->_color_space) ?: CGColorPtr(CGColorCreate(_styles->_color_space, (CGFloat[4]){ 1, 1, 1, 1 }), CGColorRelease);
CGColorPtr caret = OakColorCreateFromThemeColor(base.caret, _styles->_color_space) ?: CGColorPtr(CGColorCreate(_styles->_color_space, (CGFloat[4]){ 0, 0, 0, 1 }), CGColorRelease);
CGColorPtr selection = OakColorCreateFromThemeColor(base.selection, _styles->_color_space) ?: CGColorPtr(CGColorCreate(_styles->_color_space, (CGFloat[4]){ 0.5, 0.5, 0.5, 1 }), CGColorRelease);
styles_t res(foreground, background, caret, selection, font, base.underlined == bool_true, base.misspelled == bool_true);
styles = _cache.insert(std::make_pair(scope, res)).first;

24
Frameworks/theme/src/theme.h
View File

@@ -6,24 +6,25 @@
#include <cf/color.h>
typedef std::shared_ptr<struct __CTFont const> CTFontPtr;
typedef std::shared_ptr<struct CGColor> CGColorPtr;
struct PUBLIC styles_t
{
styles_t (cf::color_t const& foreground, cf::color_t const& background, cf::color_t const& caret, cf::color_t const& selection, CTFontPtr font, bool underlined, bool misspelled) : _foreground(foreground), _background(background), _caret(caret), _selection(selection), _font(font), _underlined(underlined), _misspelled(misspelled) { }
styles_t (CGColorPtr foreground, CGColorPtr background, CGColorPtr caret, CGColorPtr selection, CTFontPtr font, bool underlined, bool misspelled) : _foreground(foreground), _background(background), _caret(caret), _selection(selection), _font(font), _underlined(underlined), _misspelled(misspelled) { }
CGColorRef foreground () const { return _foreground; }
CGColorRef background () const { return _background; }
CGColorRef caret () const { return _caret; }
CGColorRef selection () const { return _selection; }
CGColorRef foreground () const { return _foreground.get(); }
CGColorRef background () const { return _background.get(); }
CGColorRef caret () const { return _caret.get(); }
CGColorRef selection () const { return _selection.get(); }
CTFontRef font () const { return _font.get(); }
bool underlined () const { return _underlined; }
bool misspelled () const { return _misspelled; }
private:
cf::color_t _foreground;
cf::color_t _background;
cf::color_t _caret;
cf::color_t _selection;
CGColorPtr _foreground;
CGColorPtr _background;
CGColorPtr _caret;
CGColorPtr _selection;
CTFontPtr _font;
bool _underlined;
bool _misspelled;
@@ -117,10 +118,11 @@ private:
static decomposed_style_t parse_styles (plist::dictionary_t const& plist);
bundles::item_ptr _item;
CGColorSpaceRef _color_space;
std::vector<decomposed_style_t> _styles;
gutter_styles_t _gutter_styles;
cf::color_t _foreground;
cf::color_t _background;
CGColorPtr _foreground;
CGColorPtr _background;
bool _is_dark;
bool _is_transparent;
callback_t _callback;