X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=b6531e91d64afaa8f2add05e5a239c1b6afb8f01;hb=95a61717faa4b427be0e7821ee91f7df81065815;hp=1040c546ed89095495c15997295b791cbd26fc00;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 1040c546ed..b6531e91d6 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -17,43 +17,64 @@ */ +#if !defined USE_CAIRO_IMAGE_SURFACE && !defined NDEBUG +#define OPTIONAL_CAIRO_IMAGE_SURFACE +#endif + #include #include #include #include #include /* for snprintf, grrr */ +#include + +#include // for fontmap resolution control for GnomeCanvas +#include // for fontmap resolution control for GnomeCanvas + #include -#include + +#include #include "pbd/convert.h" +#include "pbd/error.h" #include "pbd/failed_constructor.h" -#include "pbd/xml++.h" #include "pbd/file_utils.h" -#include "pbd/error.h" -#include "pbd/stacktrace.h" +#include "pbd/gstdio_compat.h" +#include "pbd/unwind.h" +#include "pbd/xml++.h" + +#include "ardour/filesystem_paths.h" +#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" -#include "ardour/filesystem_paths.h" - -#include "ardour_ui.h" -#include "global_signals.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" 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"; -UIConfiguration* UIConfiguration::_instance = 0; static const double hue_width = 18.0; +std::string UIConfiguration::color_file_suffix = X_(".colors"); + +UIConfiguration& +UIConfiguration::instance () +{ + static UIConfiguration s_instance; + _instance = &s_instance; + return s_instance; +} UIConfiguration::UIConfiguration () : @@ -71,17 +92,11 @@ UIConfiguration::UIConfiguration () modifiers_modified (false), block_save (0) { - _instance = this; - load_state(); - ARDOUR_UI_UTILS::ColorsChanged.connect (boost::bind (&UIConfiguration::colors_changed, this)); + ColorsChanged.connect (boost::bind (&UIConfiguration::colors_changed, this)); ParameterChanged.connect (sigc::mem_fun (*this, &UIConfiguration::parameter_changed)); - - /* force GTK theme setting, so that loading an RC file will work */ - - load_color_theme (); } UIConfiguration::~UIConfiguration () @@ -109,11 +124,11 @@ void UIConfiguration::parameter_changed (string param) { _dirty = true; - + if (param == "ui-rc-file") { load_rc_file (true); } else if (param == "color-file") { - load_color_theme (); + load_color_theme (true); } save_state (); @@ -122,26 +137,53 @@ UIConfiguration::parameter_changed (string param) void UIConfiguration::reset_gtk_theme () { - stringstream ss; + std::string color_scheme_string("gtk_color_scheme = \""); - ss << "gtk_color_scheme = \"" << hex; - for (ColorAliases::iterator g = color_aliases.begin(); g != color_aliases.end(); ++g) { - + if (g->first.find ("gtk_") == 0) { - ColorAliases::const_iterator a = color_aliases.find (g->first); 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(); + + /* 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); // 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 +UIConfiguration::get_ui_scale () +{ + return get_font_scale () / 102400.; +} + void UIConfiguration::map_parameters (boost::function& functor) { @@ -151,12 +193,35 @@ UIConfiguration::map_parameters (boost::function& functor) #undef UI_CONFIG_VARIABLE } +int +UIConfiguration::pre_gui_init () +{ +#ifdef CAIRO_SUPPORTS_FORCE_BUGGY_GRADIENTS_ENVIRONMENT_VARIABLE + if (get_buggy_gradients()) { + g_setenv ("FORCE_BUGGY_GRADIENTS", "1", 1); + } +#endif +#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE + if (get_cairo_image_surface()) { + g_setenv ("ARDOUR_IMAGE_SURFACE", "1", 1); + } +#endif + return 0; +} + +UIConfiguration* +UIConfiguration::post_gui_init () +{ + 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) ) { XMLTree tree; @@ -180,7 +245,57 @@ UIConfiguration::load_defaults () if (ret == 0) { /* reload color theme */ load_color_theme (false); - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + } + + return ret; +} + +std::string +UIConfiguration::color_file_name (bool use_my, bool with_version) const +{ + string basename; + + if (use_my) { + basename += "my-"; + } + + 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("-"); + + if (with_version && pos != string::npos && pos > 0) { + basename += "-"; + basename += rev.substr (0, pos); // COLORFILE_VERSION - program major.minor + } + + 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; @@ -190,49 +305,55 @@ int UIConfiguration::load_color_theme (bool allow_own) { std::string cfile; - string basename; bool found = false; + /* ColorsChanged() will trigger a parameter_changed () which + * in turn calls save_state() + */ + PBD::Unwinder uw (block_save, block_save + 1); - if (allow_own) { - basename = "my-"; - basename += color_file.get(); - basename += ".colors"; + if (find_file (theme_search_path(), color_file_name (false, true), cfile)) { + found = true; + } - if (find_file (ardour_config_search_path(), basename, cfile)) { + if (!found) { + if (find_file (theme_search_path(), color_file_name (false, false), cfile)) { found = true; } } if (!found) { - basename = color_file.get(); - basename += ".colors"; - - if (find_file (ardour_config_search_path(), basename, cfile)) { - found = true; - } + warning << string_compose (_("Color file for %1 not found along %2"), color_file.get(), theme_search_path().to_string()) << endmsg; + return -1; } - if (found) { + (void) load_color_file (cfile); - XMLTree tree; - - info << string_compose (_("Loading color file %1"), cfile) << endmsg; + if (allow_own) { - if (!tree.read (cfile.c_str())) { - error << string_compose(_("cannot read color file \"%1\""), cfile) << endmsg; - return -1; + found = false; + + 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, true), cfile)) { + found = true; } - if (set_state (*tree.root(), Stateful::loading_state_version)) { - error << string_compose(_("color file \"%1\" not loaded successfully."), cfile) << endmsg; - return -1; + if (!found) { + if (find_file (sp, color_file_name (true, false), cfile)) { + found = true; + } + } + + if (found) { + (void) load_color_file (cfile); } - ARDOUR_UI_UTILS::ColorsChanged (); - } else { - warning << string_compose (_("Color file %1 not found"), basename) << endmsg; } + ColorsChanged (); + return 0; } @@ -240,26 +361,23 @@ int UIConfiguration::store_color_theme () { XMLNode* root; - LocaleGuard lg (X_("C")); 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); - + 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); @@ -267,15 +385,15 @@ 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(), (string ("my-") + color_file.get() + ".colors")); - + std::string colorfile = Glib::build_filename (user_config_directory(), color_file_name (true, true));; + tree.set_root (root); if (!tree.write (colorfile.c_str())){ @@ -339,10 +457,13 @@ UIConfiguration::load_state () int UIConfiguration::save_state() { + if (block_save != 0) { + return -1; + } if (_dirty) { std::string rcfile = Glib::build_filename (user_config_directory(), ui_config_file_name); - + XMLTree tree; tree.set_root (&get_state()); @@ -366,7 +487,7 @@ UIConfiguration::save_state() colors_modified = false; modifiers_modified = false; } - + return 0; } @@ -375,7 +496,6 @@ XMLNode& UIConfiguration::get_state () { XMLNode* root; - LocaleGuard lg (X_("C")); root = new XMLNode("Ardour"); @@ -393,7 +513,6 @@ XMLNode& UIConfiguration::get_variables (std::string which_node) { XMLNode* node; - LocaleGuard lg (X_("C")); node = new XMLNode (which_node); @@ -462,18 +581,17 @@ UIConfiguration::load_color_aliases (XMLNode const & node) XMLNodeConstIterator niter; XMLProperty const *name; XMLProperty const *alias; - - color_aliases.clear (); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() != X_("ColorAlias")) { + XMLNode const * child = *niter; + if (child->name() != X_("ColorAlias")) { continue; } - name = (*niter)->property (X_("name")); - alias = (*niter)->property (X_("alias")); + name = child->property (X_("name")); + alias = child->property (X_("alias")); if (name && alias) { - color_aliases.insert (make_pair (name->value(), alias->value())); + color_aliases[name->value()] = alias->value(); } } } @@ -485,20 +603,24 @@ UIConfiguration::load_colors (XMLNode const & node) XMLNodeConstIterator niter; 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) { - if ((*niter)->name() != X_("Color")) { + XMLNode const * child = *niter; + if (child->name() != X_("Color")) { continue; } - name = (*niter)->property (X_("name")); - color = (*niter)->property (X_("value")); + name = child->property (X_("name")); + 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; } } } @@ -506,25 +628,23 @@ UIConfiguration::load_colors (XMLNode const & node) void UIConfiguration::load_modifiers (XMLNode const & node) { - PBD::LocaleGuard lg ("C"); XMLNodeList const nlist = node.children(); XMLNodeConstIterator niter; XMLProperty const *name; XMLProperty const *mod; - - modifiers.clear (); - + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - if ((*niter)->name() != X_("Modifier")) { + XMLNode const * child = *niter; + if (child->name() != X_("Modifier")) { continue; } - name = (*niter)->property (X_("name")); - mod = (*niter)->property (X_("modifier")); + name = child->property (X_("name")); + mod = child->property (X_("modifier")); if (name && mod) { SVAModifier svam (mod->value()); - modifiers.insert (make_pair (name->value(), svam)); + modifiers[name->value()] = svam; } } } @@ -541,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); @@ -551,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); @@ -571,7 +691,7 @@ UIConfiguration::color (const std::string& name, bool* failed) const if (failed) { *failed = false; } - + if (e != color_aliases.end ()) { Colors::const_iterator rc = colors.find (e->second); if (rc != colors.end()) { @@ -584,7 +704,7 @@ UIConfiguration::color (const std::string& name, bool* failed) const return rc->second; } } - + if (!failed) { /* only show this message if the caller wasn't interested in the fail status. @@ -595,7 +715,7 @@ UIConfiguration::color (const std::string& name, bool* failed) const if (failed) { *failed = true; } - + return rgba_to_color ((g_random_int()%256)/255.0, (g_random_int()%256)/255.0, (g_random_int()%256)/255.0, @@ -611,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()) { @@ -620,7 +740,7 @@ UIConfiguration::set_color (string const& name, ArdourCanvas::Color color) i->second = color; colors_modified = true; - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + ColorsChanged (); /* EMIT SIGNAL */ } void @@ -634,7 +754,7 @@ UIConfiguration::set_alias (string const & name, string const & alias) i->second = alias; aliases_modified = true; - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + ColorsChanged (); /* EMIT SIGNAL */ } void @@ -649,7 +769,7 @@ UIConfiguration::set_modifier (string const & name, SVAModifier svam) m->second = svam; modifiers_modified = true; - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + ColorsChanged (); /* EMIT SIGNAL */ } void @@ -665,9 +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; +}