X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=b6531e91d64afaa8f2add05e5a239c1b6afb8f01;hb=95a61717faa4b427be0e7821ee91f7df81065815;hp=301ed5740dd6ad0fb83e354284840cbbd74e1822;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 301ed5740d..b6531e91d6 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -41,7 +41,6 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
 #include "pbd/gstdio_compat.h"
-#include "pbd/locale_guard.h"
 #include "pbd/unwind.h"
 #include "pbd/xml++.h"
 
@@ -49,6 +48,7 @@
 #include "ardour/search_paths.h"
 #include "ardour/revision.h"
 #include "ardour/utils.h"
+#include "ardour/types_convert.h"
 
 #include "gtkmm2ext/rgb_macros.h"
 #include "gtkmm2ext/gtk_ui.h"
@@ -60,7 +60,7 @@
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
-using namespace ArdourCanvas;
+using namespace Gtkmm2ext;
 
 static const char* ui_config_file_name = "ui_config";
 static const char* default_ui_config_file_name = "default_ui_config";
@@ -72,6 +72,7 @@ UIConfiguration&
 UIConfiguration::instance ()
 {
 	static UIConfiguration s_instance;
+	_instance = &s_instance;
 	return s_instance;
 }
 
@@ -127,7 +128,7 @@ UIConfiguration::parameter_changed (string param)
 	if (param == "ui-rc-file") {
 		load_rc_file (true);
 	} else if (param == "color-file") {
-		load_color_theme ();
+		load_color_theme (true);
 	}
 
 	save_state ();
@@ -136,52 +137,45 @@ UIConfiguration::parameter_changed (string param)
 void
 UIConfiguration::reset_gtk_theme ()
 {
-	LocaleGuard lg;
-	stringstream ss;
-
-	ss << "gtk_color_scheme = \"" << hex;
+	std::string color_scheme_string("gtk_color_scheme = \"");
 
 	for (ColorAliases::iterator g = color_aliases.begin(); g != color_aliases.end(); ++g) {
 
 		if (g->first.find ("gtk_") == 0) {
 			const string gtk_name = g->first.substr (4);
-			ss << gtk_name << ":#" << std::setw (6) << setfill ('0') << (color (g->second) >> 8) << ';';
+			Gtkmm2ext::Color a_color = color (g->second);
+
+			color_scheme_string += gtk_name + ":#" + color_to_hex_string_no_alpha (a_color) + ';';
 		}
 	}
 
-	ss << '"' << dec << endl;
+	color_scheme_string += '"';
 
 	/* reset GTK color scheme */
 
-	Gtk::Settings::get_default()->property_gtk_color_scheme() = ss.str();
+	Gtk::Settings::get_default()->property_gtk_color_scheme() = color_scheme_string;
 }
 
 void
 UIConfiguration::reset_dpi ()
-{
-	long val = get_font_scale();
-	set_pango_fontsize ();
-	/* Xft rendering */
-
-	gtk_settings_set_long_property (gtk_settings_get_default(),
-					"gtk-xft-dpi", val, "ardour");
-	DPIReset(); //Emit Signal
-}
-
-void
-UIConfiguration::set_pango_fontsize ()
 {
 	long val = get_font_scale();
 
 	/* FT2 rendering - used by GnomeCanvas, sigh */
 
 #ifndef PLATFORM_WINDOWS
-	pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024);
+	pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024); // XXX pango_ft2_font_map_new leaks
 #endif
 
 	/* Cairo rendering, in case there is any */
 
 	pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024);
+
+	/* Xft rendering */
+
+	gtk_settings_set_long_property (gtk_settings_get_default(),
+					"gtk-xft-dpi", val, "ardour");
+	DPIReset(); //Emit Signal
 }
 
 float
@@ -218,14 +212,14 @@ UIConfiguration::pre_gui_init ()
 UIConfiguration*
 UIConfiguration::post_gui_init ()
 {
-	load_color_theme ();
+	load_color_theme (true);
 	return this;
 }
 
 int
 UIConfiguration::load_defaults ()
 {
-        std::string rcfile;
+	std::string rcfile;
 	int ret = -1;
 
 	if (find_file (ardour_config_search_path(), default_ui_config_file_name, rcfile) ) {
@@ -248,7 +242,6 @@ UIConfiguration::load_defaults ()
 		warning << string_compose (_("Could not find default UI configuration file %1"), default_ui_config_file_name) << endmsg;
 	}
 
-
 	if (ret == 0) {
 		/* reload color theme */
 		load_color_theme (false);
@@ -258,7 +251,7 @@ UIConfiguration::load_defaults ()
 }
 
 std::string
-UIConfiguration::color_file_name (bool use_my, bool with_program_name, bool with_version) const
+UIConfiguration::color_file_name (bool use_my, bool with_version) const
 {
 	string basename;
 
@@ -266,13 +259,16 @@ UIConfiguration::color_file_name (bool use_my, bool with_program_name, bool with
 		basename += "my-";
 	}
 
-	basename += color_file.get();  //this is the overall theme file, e.g. "dark"
-
-	if (with_program_name) {
-		basename += '-';
-		basename += downcase (PROGRAM_NAME);
+	std::string color_name = color_file.get();
+	size_t sep = color_name.find_first_of("-");
+	if (sep != string::npos) {
+		color_name = color_name.substr (0, sep);
 	}
 
+	basename += color_name;
+	basename += "-";
+	basename += downcase(std::string(PROGRAM_NAME));
+
 	std::string rev (revision);
 	std::size_t pos = rev.find_first_of("-");
 
@@ -282,10 +278,29 @@ UIConfiguration::color_file_name (bool use_my, bool with_program_name, bool with
 	}
 
 	basename += color_file_suffix;
-
 	return basename;
 }
 
+int
+UIConfiguration::load_color_file (string const & path)
+{
+	XMLTree tree;
+
+	info << string_compose (_("Loading color file %1"), path) << endmsg;
+
+	if (!tree.read (path.c_str())) {
+		error << string_compose(_("cannot read color file \"%1\""), path) << endmsg;
+		return -1;
+	}
+
+	if (set_state (*tree.root(), Stateful::loading_state_version)) {
+		error << string_compose(_("color file \"%1\" not loaded successfully."), path) << endmsg;
+		return -1;
+	}
+
+	return 0;
+}
+
 int
 UIConfiguration::load_color_theme (bool allow_own)
 {
@@ -295,36 +310,15 @@ UIConfiguration::load_color_theme (bool allow_own)
 	 * in turn calls save_state()
 	 */
 	PBD::Unwinder<uint32_t> uw (block_save, block_save + 1);
-	const bool running_from_source = ARDOUR_UI_UTILS::running_from_source_tree ();
-
-	if (allow_own) {
-
-		PBD::Searchpath sp (user_config_directory());
-
-		/* user's own color files never have the program name in them */
-
-		if (find_file (sp, color_file_name (true, false, true), cfile)) {
-			found = true;
-		}
-
-		if (!found) {
-			if (find_file (sp, color_file_name (true, false, false), cfile)) {
-				found = true;
-			}
-		}
 
+	if (find_file (theme_search_path(), color_file_name (false, true), cfile)) {
+		found = true;
 	}
 
 	if (!found) {
-		if (find_file (theme_search_path(), color_file_name (false, running_from_source, true), cfile)) {
+		if (find_file (theme_search_path(), color_file_name (false, false), cfile)) {
 			found = true;
 		}
-
-		if (!found) {
-			if (find_file (theme_search_path(), color_file_name (false, running_from_source, false), cfile)) {
-				found = true;
-			}
-		}
 	}
 
 	if (!found) {
@@ -332,21 +326,32 @@ UIConfiguration::load_color_theme (bool allow_own)
 		return -1;
 	}
 
+	(void) load_color_file (cfile);
 
-	XMLTree tree;
+	if (allow_own) {
 
-	info << string_compose (_("Loading color file %1"), cfile) << endmsg;
+		found = false;
 
-	if (!tree.read (cfile.c_str())) {
-		error << string_compose(_("cannot read color file \"%1\""), cfile) << endmsg;
-		return -1;
-	}
+		PBD::Searchpath sp (user_config_directory());
 
-	if (set_state (*tree.root(), Stateful::loading_state_version)) {
-		error << string_compose(_("color file \"%1\" not loaded successfully."), cfile) << endmsg;
-		return -1;
+		/* user's own color files never have the program name in them */
+
+		if (find_file (sp, color_file_name (true, true), cfile)) {
+			found = true;
+		}
+
+		if (!found) {
+			if (find_file (sp, color_file_name (true, false), cfile)) {
+				found = true;
+			}
+		}
+
+		if (found) {
+			(void) load_color_file (cfile);
 		}
 
+	}
+
 	ColorsChanged ();
 
 	return 0;
@@ -356,17 +361,14 @@ int
 UIConfiguration::store_color_theme ()
 {
 	XMLNode* root;
-	LocaleGuard lg;
 
 	root = new XMLNode("Ardour");
 
 	XMLNode* parent = new XMLNode (X_("Colors"));
 	for (Colors::const_iterator i = colors.begin(); i != colors.end(); ++i) {
 		XMLNode* node = new XMLNode (X_("Color"));
-		node->add_property (X_("name"), i->first);
-		stringstream ss;
-		ss << "0x" << setw (8) << setfill ('0') << hex << i->second;
-		node->add_property (X_("value"), ss.str());
+		node->set_property (X_("name"), i->first);
+		node->set_property (X_("value"), color_to_hex_string (i->second));
 		parent->add_child_nocopy (*node);
 	}
 	root->add_child_nocopy (*parent);
@@ -374,8 +376,8 @@ UIConfiguration::store_color_theme ()
 	parent = new XMLNode (X_("ColorAliases"));
 	for (ColorAliases::const_iterator i = color_aliases.begin(); i != color_aliases.end(); ++i) {
 		XMLNode* node = new XMLNode (X_("ColorAlias"));
-		node->add_property (X_("name"), i->first);
-		node->add_property (X_("alias"), i->second);
+		node->set_property (X_("name"), i->first);
+		node->set_property (X_("alias"), i->second);
 		parent->add_child_nocopy (*node);
 	}
 	root->add_child_nocopy (*parent);
@@ -383,14 +385,14 @@ UIConfiguration::store_color_theme ()
 	parent = new XMLNode (X_("Modifiers"));
 	for (Modifiers::const_iterator i = modifiers.begin(); i != modifiers.end(); ++i) {
 		XMLNode* node = new XMLNode (X_("Modifier"));
-		node->add_property (X_("name"), i->first);
-		node->add_property (X_("modifier"), i->second.to_string());
+		node->set_property (X_("name"), i->first);
+		node->set_property (X_("modifier"), i->second.to_string());
 		parent->add_child_nocopy (*node);
 	}
 	root->add_child_nocopy (*parent);
 
 	XMLTree tree;
-	std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, false, true));;
+	std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, true));;
 
 	tree.set_root (root);
 
@@ -405,7 +407,6 @@ UIConfiguration::store_color_theme ()
 int
 UIConfiguration::load_state ()
 {
-	LocaleGuard lg; // a single guard for all 3 configs
 	bool found = false;
 
 	std::string rcfile;
@@ -495,7 +496,6 @@ XMLNode&
 UIConfiguration::get_state ()
 {
 	XMLNode* root;
-	LocaleGuard lg;
 
 	root = new XMLNode("Ardour");
 
@@ -513,7 +513,6 @@ XMLNode&
 UIConfiguration::get_variables (std::string which_node)
 {
 	XMLNode* node;
-	LocaleGuard lg;
 
 	node = new XMLNode (which_node);
 
@@ -532,7 +531,6 @@ UIConfiguration::get_variables (std::string which_node)
 int
 UIConfiguration::set_state (const XMLNode& root, int /*version*/)
 {
-	LocaleGuard lg;
 	/* this can load a generic UI configuration file or a colors file */
 
 	if (root.name() != "Ardour") {
@@ -584,8 +582,6 @@ UIConfiguration::load_color_aliases (XMLNode const & node)
 	XMLProperty const *name;
 	XMLProperty const *alias;
 
-	color_aliases.clear ();
-
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 		XMLNode const * child = *niter;
 		if (child->name() != X_("ColorAlias")) {
@@ -595,7 +591,7 @@ UIConfiguration::load_color_aliases (XMLNode const & node)
 		alias = child->property (X_("alias"));
 
 		if (name && alias) {
-			color_aliases.insert (make_pair (name->value(), alias->value()));
+			color_aliases[name->value()] = alias->value();
 		}
 	}
 }
@@ -608,7 +604,9 @@ UIConfiguration::load_colors (XMLNode const & node)
 	XMLProperty const *name;
 	XMLProperty const *color;
 
-	colors.clear ();
+	/* don't clear colors, so that we can load > 1 color file and have
+	   the subsequent ones overwrite the later ones.
+	*/
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 		XMLNode const * child = *niter;
@@ -619,9 +617,10 @@ UIConfiguration::load_colors (XMLNode const & node)
 		color = child->property (X_("value"));
 
 		if (name && color) {
-			ArdourCanvas::Color c;
+			Gtkmm2ext::Color c;
 			c = strtoul (color->value().c_str(), 0, 16);
-			colors.insert (make_pair (name->value(), c));
+			/* insert or replace color name definition */
+			colors[name->value()] =  c;
 		}
 	}
 }
@@ -629,14 +628,11 @@ UIConfiguration::load_colors (XMLNode const & node)
 void
 UIConfiguration::load_modifiers (XMLNode const & node)
 {
-	PBD::LocaleGuard lg;
 	XMLNodeList const nlist = node.children();
 	XMLNodeConstIterator niter;
 	XMLProperty const *name;
 	XMLProperty const *mod;
 
-	modifiers.clear ();
-
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 		XMLNode const * child = *niter;
 		if (child->name() != X_("Modifier")) {
@@ -648,7 +644,7 @@ UIConfiguration::load_modifiers (XMLNode const & node)
 
 		if (name && mod) {
 			SVAModifier svam (mod->value());
-			modifiers.insert (make_pair (name->value(), svam));
+			modifiers[name->value()] = svam;
 		}
 	}
 }
@@ -665,7 +661,7 @@ UIConfiguration::set_variables (const XMLNode& node)
 #undef  CANVAS_FONT_VARIABLE
 }
 
-ArdourCanvas::SVAModifier
+Gtkmm2ext::SVAModifier
 UIConfiguration::modifier (string const & name) const
 {
 	Modifiers::const_iterator m = modifiers.find (name);
@@ -675,19 +671,19 @@ UIConfiguration::modifier (string const & name) const
 	return SVAModifier ();
 }
 
-ArdourCanvas::Color
+Gtkmm2ext::Color
 UIConfiguration::color_mod (std::string const & colorname, std::string const & modifiername) const
 {
 	return HSV (color (colorname)).mod (modifier (modifiername)).color ();
 }
 
-ArdourCanvas::Color
-UIConfiguration::color_mod (const ArdourCanvas::Color& color, std::string const & modifiername) const
+Gtkmm2ext::Color
+UIConfiguration::color_mod (const Gtkmm2ext::Color& color, std::string const & modifiername) const
 {
 	return HSV (color).mod (modifier (modifiername)).color ();
 }
 
-ArdourCanvas::Color
+Gtkmm2ext::Color
 UIConfiguration::color (const std::string& name, bool* failed) const
 {
 	ColorAliases::const_iterator e = color_aliases.find (name);
@@ -735,7 +731,7 @@ UIConfiguration::quantized (Color c) const
 }
 
 void
-UIConfiguration::set_color (string const& name, ArdourCanvas::Color color)
+UIConfiguration::set_color (string const& name, Gtkmm2ext::Color color)
 {
 	Colors::iterator i = colors.find (name);
 	if (i == colors.end()) {
@@ -789,7 +785,32 @@ UIConfiguration::load_rc_file (bool themechange, bool allow_own)
 		return;
 	}
 
-	info << "Loading ui configuration file " << rc_file_path << endmsg;
+	info << string_compose (_("Loading ui configuration file %1"), rc_file_path) << endmsg;
 
 	Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange);
 }
+
+std::string
+UIConfiguration::color_to_hex_string (Gtkmm2ext::Color c)
+{
+	char buf[16];
+	int retval = g_snprintf (buf, sizeof(buf), "%08x", c);
+
+	if (retval < 0 || retval >= (int)sizeof(buf)) {
+		assert(false);
+	}
+	return buf;
+}
+
+std::string
+UIConfiguration::color_to_hex_string_no_alpha (Gtkmm2ext::Color c)
+{
+	c >>= 8; // shift/remove alpha
+	char buf[16];
+	int retval = g_snprintf (buf, sizeof(buf), "%06x", c);
+
+	if (retval < 0 || retval >= (int)sizeof(buf)) {
+		assert(false);
+	}
+	return buf;
+}