Commit: 18eecca2ab8de6b12ae1c797527abbbb9163dcc1 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: 18eecca2ab8de6b12ae1c797527abbbb9163dcc1 (tree)
• Zeit: 2012-08-18 23:28:47
• Autor: Joachim Mårtensson <joachimmartensson@gmai...>
• Commiter: Allan Odgaard

Log Message

Represent font size using a CGFloat

This applies to scoped font size settings and should be faster than the previous std::string based approach.

Ändern Zusammenfassung

• modified: Frameworks/theme/src/theme.cc
• modified: Frameworks/theme/src/theme.h

Diff

--- a/Frameworks/theme/src/theme.cc
+++ b/Frameworks/theme/src/theme.cc
@@ -2,6 +2,7 @@
 #include <cf/cf.h>
 
 static theme_t::color_info_t read_color (std::string const& str_color);
+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)
 {
@@ -10,6 +11,13 @@ static void get_key_path (plist::dictionary_t const& plist, std::string const& s
 	color = read_color(temp_str);
 }
 
+static void get_key_path(plist::dictionary_t const& plist, std::string const& setting, CGFloat &font_size)
+{
+	std::string temp_str = NULL_STR;
+	plist::get_key_path(plist, setting, temp_str);
+	font_size = read_font_size(temp_str);
+}
+
 theme_t::decomposed_style_t theme_t::parse_styles (plist::dictionary_t const& plist)
 {
 	decomposed_style_t res;
@@ -19,7 +27,7 @@ theme_t::decomposed_style_t theme_t::parse_styles (plist::dictionary_t const& pl
 		res.scope_selector = scopeSelector;
 
 	plist::get_key_path(plist, "settings.fontName",   res.font_name);
-	plist::get_key_path(plist, "settings.fontSize",   res.font_size);
+	get_key_path(plist, "settings.fontSize",          res.absolute_font_size);
 	get_key_path(plist, "settings.foreground",        res.foreground);
 	get_key_path(plist, "settings.background",        res.background);
 	get_key_path(plist, "settings.caret",             res.caret);
@@ -61,8 +69,12 @@ std::vector<theme_t::decomposed_style_t> theme_t::global_styles (scope::context_
 
 	static struct { std::string name; std::string decomposed_style_t::*field; } const stringKeys[] =
 	{
-		{ "fontName",   &decomposed_style_t::font_name  },
-		{ "fontSize",   &decomposed_style_t::font_size  },
+		{ "fontName",   &decomposed_style_t::font_name },
+	};
+
+	static struct { std::string name; CGFloat decomposed_style_t::*field; } const doubleKeys[] =
+	{
+		{ "fontSize",   &decomposed_style_t::absolute_font_size },
 	};
 
 	static struct { std::string name; bool_t decomposed_style_t::*field; } const booleanKeys[] =
@@ -97,6 +109,17 @@ std::vector<theme_t::decomposed_style_t> theme_t::global_styles (scope::context_
 		}
 	}
 
+	for(size_t i = 0; i < sizeofA(doubleKeys); ++i)
+	{
+		bundles::item_ptr item;
+		plist::any_t const& value = bundles::value_for_setting(doubleKeys[i].name, scope, &item);
+		if(item)
+		{
+			res.push_back(decomposed_style_t(item->scope_selector()));
+			res.back().*(doubleKeys[i].field) = read_font_size(plist::get<std::string>(value));
+		}
+	}
+
 	for(size_t i = 0; i < sizeofA(booleanKeys); ++i)
 	{
 		bundles::item_ptr item;
@@ -237,6 +260,13 @@ static void alpha_blend (theme_t::color_info_t& lhs, theme_t::color_info_t const
 	}
 }
 
+static void calculate_font_size (CGFloat& absolute_font_size, CGFloat font_size)
+{
+	if(font_size > 0)
+			absolute_font_size = font_size;
+	else	absolute_font_size = absolute_font_size * fabs(font_size);
+}
+
 static double my_strtod (char const* str, char const** last) // problem with strtod() is that it uses LC_NUMERIC for point separator.
 {
 	double res = atof(str);
@@ -249,13 +279,13 @@ static double my_strtod (char const* str, char const** last) // problem with str
 	return res;
 }
 
-theme_t::decomposed_style_t& theme_t::decomposed_style_t::operator+= (theme_t::decomposed_style_t const& rhs)
+static CGFloat read_font_size (std::string const& str_font_size)
 {
-	font_name = rhs.font_name == NULL_STR ? font_name : rhs.font_name;
-
-	if(rhs.font_size != NULL_STR)
+	// Treat positive values as absolute font
+	// and negative as relative, that way we don't have to use a bool as a flag :)
+	if(str_font_size != NULL_STR)
 	{
-		char const* first = rhs.font_size.c_str();
+		char const* first = str_font_size.c_str();
 		char const* last;
 		double size = my_strtod(first, &last);
 		if(first != last)
@@ -264,19 +294,27 @@ theme_t::decomposed_style_t& theme_t::decomposed_style_t::operator+= (theme_t::d
 				++last;
 
 			if(strcmp(last, "pt") == 0 || *last == '\0')
-				absolute_font_size = size;
+				return size;
 			else if(strcmp(last, "em") == 0)
-				absolute_font_size = absolute_font_size * size;
+				return -size;
 			else if(strcmp(last, "%") == 0)
-				absolute_font_size = absolute_font_size * size / 100;
+				 return -size / 100;
 			else
-				fprintf(stderr, "*** unsupported font size unit: %s (%s)\n", last, rhs.font_size.c_str());
+				fprintf(stderr, "*** unsupported font size unit: %s (%s)\n", last, str_font_size.c_str());
 		}
 		else
 		{
-			fprintf(stderr, "*** unsupported font size format: %s\n", rhs.font_size.c_str());
+			fprintf(stderr, "*** unsupported font size format: %s\n", str_font_size.c_str());
 		}
 	}
+	return -1;
+}
+
+theme_t::decomposed_style_t& theme_t::decomposed_style_t::operator+= (theme_t::decomposed_style_t const& rhs)
+{
+	font_name = rhs.font_name == NULL_STR ? font_name : rhs.font_name;
+
+	calculate_font_size(absolute_font_size, rhs.absolute_font_size);
 
 	alpha_blend(foreground, rhs.foreground);
 	alpha_blend(background, rhs.background);

--- a/Frameworks/theme/src/theme.h
+++ b/Frameworks/theme/src/theme.h
@@ -55,13 +55,12 @@ private:
 
 	struct decomposed_style_t
 	{
-		decomposed_style_t (scope::selector_t const& scopeSelector = scope::selector_t(), std::string const& fontName = NULL_STR, CGFloat fontSize = 0) : scope_selector(scopeSelector), font_name(fontName), font_size(NULL_STR), bold(bool_unset), italic(bool_unset), underlined(bool_unset), misspelled(bool_unset), absolute_font_size(fontSize) { }
+		decomposed_style_t (scope::selector_t const& scopeSelector = scope::selector_t(), std::string const& fontName = NULL_STR, CGFloat fontSize = 0) : scope_selector(scopeSelector), font_name(fontName), bold(bool_unset), italic(bool_unset), underlined(bool_unset), misspelled(bool_unset), absolute_font_size(fontSize) { }
 		decomposed_style_t& operator+= (decomposed_style_t const& rhs);
 
 		scope::selector_t scope_selector;
 
 		std::string font_name;
-		std::string font_size;
 		color_info_t foreground;
 		color_info_t background;
 		color_info_t caret;