X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=2db640681d4b219e9317affde2e85e7df59e9228;hb=cef341631b55526e4b2bad940064491922c07701;hp=b09442a588e6b1ff651ba89cc88df57542af5560;hpb=e19e05fc5949a6e5326fc0a1b2e80014dff5f28c;p=ardour.git diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index b09442a588..2db640681d 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -17,31 +17,45 @@ */ +#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/locale_guard.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 "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; @@ -50,9 +64,16 @@ using namespace ArdourCanvas; 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; + return s_instance; +} UIConfiguration::UIConfiguration () : @@ -65,41 +86,16 @@ UIConfiguration::UIConfiguration () #undef CANVAS_FONT_VARIABLE _dirty (false), - base_modified (false), aliases_modified (false), - derived_modified (false), + colors_modified (false), + modifiers_modified (false), block_save (0) { - _instance = this; - - /* pack all base colors into the configurable color map so that - derived colors can use them. - */ - -#undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,color) base_colors.insert (make_pair (name,color)); -#include "base_colors.h" -#undef CANVAS_BASE_COLOR - -#undef CANVAS_COLOR -#define CANVAS_COLOR(var,name,base,modifier) relative_colors.insert (make_pair (name, RelativeHSV (base,modifier))); -#include "colors.h" -#undef CANVAS_COLOR - -#undef COLOR_ALIAS -#define COLOR_ALIAS(var,name,alias) color_aliases.insert (make_pair (name,alias)); -#include "color_aliases.h" -#undef CANVAS_COLOR - 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 () @@ -127,14 +123,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 (); - } else if (param == "base-color") { /* one of many */ - base_modified = true; - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + load_color_theme (true); } save_state (); @@ -143,14 +136,14 @@ UIConfiguration::parameter_changed (string param) void UIConfiguration::reset_gtk_theme () { + LocaleGuard lg; stringstream ss; 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) << ';'; } @@ -162,90 +155,35 @@ UIConfiguration::reset_gtk_theme () Gtk::Settings::get_default()->property_gtk_color_scheme() = ss.str(); } - -UIConfiguration::RelativeHSV -UIConfiguration::color_as_relative_hsv (Color c) + +void +UIConfiguration::reset_dpi () { - HSV variable (c); - HSV closest; - double shortest_distance = DBL_MAX; - string closest_name; + long val = get_font_scale(); - BaseColors::iterator f; - std::map palette; + /* FT2 rendering - used by GnomeCanvas, sigh */ - for (f = base_colors.begin(); f != base_colors.end(); ++f) { - /* Do not include any specialized base colors in the palette - we use to do comparisons (e.g. meter colors) - */ +#ifndef PLATFORM_WINDOWS + pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024); +#endif - if (f->first.find ("color") == 0) { - palette.insert (make_pair (f->first, HSV (f->second))); - } - } + /* Cairo rendering, in case there is any */ - for (map::iterator f = palette.begin(); f != palette.end(); ++f) { - - double d; - HSV fixed (f->second); - - if (fixed.is_gray() || variable.is_gray()) { - /* at least one is achromatic; HSV::distance() will do - * the right thing - */ - d = fixed.distance (variable); - } else { - /* chromatic: compare ONLY hue because our task is - to pick the HUE closest and then compute - a modifier. We want to keep the number of - hues low, and by computing perceptual distance - we end up finding colors that are to each - other without necessarily be close in hue. - */ - d = fabs (variable.h - fixed.h); - } + pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024); - if (d < shortest_distance) { - closest = fixed; - closest_name = f->first; - shortest_distance = d; - } - } - - /* we now know the closest color of the fixed colors to - this variable color. Compute the HSV diff and - use it to redefine the variable color in terms of the - fixed one. - */ - - HSV delta = variable.delta (closest); + /* Xft rendering */ - /* quantize hue delta so we don't end up with many subtle hues caused - * by original color choices - */ - - delta.h = hue_width * (round (delta.h/hue_width)); - - return RelativeHSV (closest_name, delta); + gtk_settings_set_long_property (gtk_settings_get_default(), + "gtk-xft-dpi", val, "ardour"); + DPIReset(); //Emit Signal } -string -UIConfiguration::color_as_alias (Color c) +float +UIConfiguration::get_ui_scale () { - string closest; - double shortest_distance = DBL_MAX; - HSV target (c); - - for (RelativeColors::const_iterator a = relative_colors.begin(); a != relative_colors.end(); ++a) { - HSV hsv (a->second.get()); - double d = hsv.distance (target); - if (d < shortest_distance) { - shortest_distance = d; - closest = a->first; - } - } - return closest; -} + return get_font_scale () / 102400.; +} + void UIConfiguration::map_parameters (boost::function& functor) { @@ -255,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; int ret = -1; - + if (find_file (ardour_config_search_path(), default_ui_config_file_name, rcfile) ) { XMLTree tree; @@ -281,10 +242,54 @@ 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); - 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-"; + } + + //this is the overall theme file, e.g. "dark" plus "-downcase(PROGRAM_NAME)" + basename += color_file.get(); + + 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; @@ -294,49 +299,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; } @@ -344,21 +355,21 @@ int UIConfiguration::store_color_theme () { XMLNode* root; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg; root = new XMLNode("Ardour"); - XMLNode* parent = new XMLNode (X_("RelativeColors")); - for (RelativeColors::const_iterator i = relative_colors.begin(); i != relative_colors.end(); ++i) { - XMLNode* node = new XMLNode (X_("RelativeColor")); + 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); - node->add_property (X_("base"), i->second.base_color); - node->add_property (X_("modifier"), i->second.modifier.to_string()); + stringstream ss; + ss << "0x" << setw (8) << setfill ('0') << hex << i->second; + node->add_property (X_("value"), ss.str()); 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")); @@ -367,10 +378,19 @@ UIConfiguration::store_color_theme () parent->add_child_nocopy (*node); } root->add_child_nocopy (*parent); - + + 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()); + 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())){ @@ -384,6 +404,7 @@ UIConfiguration::store_color_theme () int UIConfiguration::load_state () { + LocaleGuard lg; // a single guard for all 3 configs bool found = false; std::string rcfile; @@ -434,10 +455,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()); @@ -450,18 +474,18 @@ UIConfiguration::save_state() _dirty = false; } - if (base_modified || aliases_modified || derived_modified) { + if (aliases_modified || colors_modified || modifiers_modified) { if (store_color_theme ()) { error << string_compose (_("Color file %1 not saved"), color_file.get()) << endmsg; return -1; } - base_modified = false; aliases_modified = false; - derived_modified = false; + colors_modified = false; + modifiers_modified = false; } - + return 0; } @@ -470,7 +494,7 @@ XMLNode& UIConfiguration::get_state () { XMLNode* root; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg; root = new XMLNode("Ardour"); @@ -488,7 +512,7 @@ XMLNode& UIConfiguration::get_variables (std::string which_node) { XMLNode* node; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg; node = new XMLNode (which_node); @@ -507,6 +531,7 @@ 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") { @@ -529,33 +554,25 @@ UIConfiguration::set_state (const XMLNode& root, int /*version*/) } } - XMLNode* base = find_named_node (root, X_("BaseColors")); - - if (base) { - load_base_colors (*base); - } + XMLNode* colors = find_named_node (root, X_("Colors")); - - XMLNode* relative = find_named_node (root, X_("RelativeColors")); - - if (relative) { - load_relative_colors (*relative); + if (colors) { + load_colors (*colors); } - XMLNode* aliases = find_named_node (root, X_("ColorAliases")); if (aliases) { load_color_aliases (*aliases); } - return 0; -} + XMLNode* modifiers = find_named_node (root, X_("Modifiers")); -void -UIConfiguration::load_base_colors (XMLNode const &) -{ + if (modifiers) { + load_modifiers (*modifiers); + } + return 0; } void @@ -565,47 +582,73 @@ 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(); } } } void -UIConfiguration::load_relative_colors (XMLNode const & node) +UIConfiguration::load_colors (XMLNode const & node) { XMLNodeList const nlist = node.children(); XMLNodeConstIterator niter; XMLProperty const *name; - XMLProperty const *base; - XMLProperty const *modifier; - - relative_colors.clear (); + XMLProperty const *color; + + /* 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_("RelativeColor")) { + XMLNode const * child = *niter; + if (child->name() != X_("Color")) { continue; } - name = (*niter)->property (X_("name")); - base = (*niter)->property (X_("base")); - modifier = (*niter)->property (X_("modifier")); - - if (name && base && modifier) { - RelativeHSV rhsv (base->value(), HSV (modifier->value())); - relative_colors.insert (make_pair (name->value(), rhsv)); + name = child->property (X_("name")); + color = child->property (X_("value")); + + if (name && color) { + ArdourCanvas::Color c; + c = strtoul (color->value().c_str(), 0, 16); + /* insert or replace color name definition */ + colors[name->value()] = c; } } +} + +void +UIConfiguration::load_modifiers (XMLNode const & node) +{ + PBD::LocaleGuard lg; + XMLNodeList const nlist = node.children(); + XMLNodeConstIterator niter; + XMLProperty const *name; + XMLProperty const *mod; + + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { + XMLNode const * child = *niter; + if (child->name() != X_("Modifier")) { + continue; + } + + name = child->property (X_("name")); + mod = child->property (X_("modifier")); + if (name && mod) { + SVAModifier svam (mod->value()); + modifiers[name->value()] = svam; + } + } } void @@ -620,41 +663,50 @@ UIConfiguration::set_variables (const XMLNode& node) #undef CANVAS_FONT_VARIABLE } -ArdourCanvas::Color -UIConfiguration::base_color_by_name (const std::string& name) const +ArdourCanvas::SVAModifier +UIConfiguration::modifier (string const & name) const { - BaseColors::const_iterator i = base_colors.find (name); - - if (i != base_colors.end()) { - return i->second; + Modifiers::const_iterator m = modifiers.find (name); + if (m != modifiers.end()) { + return m->second; } + return SVAModifier (); +} - cerr << string_compose (_("Base Color %1 not found"), name) << endl; - return RGBA_TO_UINT (g_random_int()%256,g_random_int()%256,g_random_int()%256,0xff); +ArdourCanvas::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 +{ + return HSV (color).mod (modifier (modifiername)).color (); } ArdourCanvas::Color UIConfiguration::color (const std::string& name, bool* failed) const { - map::const_iterator e = color_aliases.find (name); + ColorAliases::const_iterator e = color_aliases.find (name); if (failed) { *failed = false; } - + if (e != color_aliases.end ()) { - map::const_iterator rc = relative_colors.find (e->second); - if (rc != relative_colors.end()) { - return rc->second.get(); + Colors::const_iterator rc = colors.find (e->second); + if (rc != colors.end()) { + return rc->second; } } else { /* not an alias, try directly */ - map::const_iterator rc = relative_colors.find (name); - if (rc != relative_colors.end()) { - return rc->second.get(); + Colors::const_iterator rc = colors.find (name); + if (rc != colors.end()) { + return rc->second; } } - + if (!failed) { /* only show this message if the caller wasn't interested in the fail status. @@ -665,32 +717,13 @@ 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, 0xff); } -ArdourCanvas::HSV -UIConfiguration::RelativeHSV::get() const -{ - HSV base (UIConfiguration::instance()->base_color_by_name (base_color)); - - /* this operation is a little wierd. because of the way we originally - * computed the alpha specification for the modifiers used here - * we need to reset base's alpha to zero before adding the modifier. - */ - - HSV self (base + modifier); - - if (quantized_hue >= 0.0) { - self.h = quantized_hue; - } - - return self; -} - Color UIConfiguration::quantized (Color c) const { @@ -700,45 +733,45 @@ UIConfiguration::quantized (Color c) const } void -UIConfiguration::set_base (string const& name, ArdourCanvas::Color color) +UIConfiguration::set_color (string const& name, ArdourCanvas::Color color) { - BaseColors::iterator i = base_colors.find (name); - if (i == base_colors.end()) { + Colors::iterator i = colors.find (name); + if (i == colors.end()) { return; } i->second = color; - base_modified = true; + colors_modified = true; - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + ColorsChanged (); /* EMIT SIGNAL */ } void -UIConfiguration::set_relative (const string& name, const RelativeHSV& rhsv) +UIConfiguration::set_alias (string const & name, string const & alias) { - RelativeColors::iterator i = relative_colors.find (name); - - if (i == relative_colors.end()) { + ColorAliases::iterator i = color_aliases.find (name); + if (i == color_aliases.end()) { return; } - i->second = rhsv; - derived_modified = true; + i->second = alias; + aliases_modified = true; - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + ColorsChanged (); /* EMIT SIGNAL */ } void -UIConfiguration::set_alias (string const & name, string const & alias) +UIConfiguration::set_modifier (string const & name, SVAModifier svam) { - ColorAliases::iterator i = color_aliases.find (name); - if (i == color_aliases.end()) { + Modifiers::iterator m = modifiers.find (name); + + if (m == modifiers.end()) { return; } - i->second = alias; - aliases_modified = true; + m->second = svam; + modifiers_modified = true; - ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ + ColorsChanged (); /* EMIT SIGNAL */ } void @@ -758,9 +791,3 @@ UIConfiguration::load_rc_file (bool themechange, bool allow_own) Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange); } - -std::ostream& operator<< (std::ostream& o, const UIConfiguration::RelativeHSV& rhsv) -{ - return o << rhsv.base_color << " + HSV(" << rhsv.modifier << ")"; -} -