X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fui_config.cc;h=354539b57b07cadfe446a7299bea55171b5b617e;hb=3dc7728038860bda6eb4b0de1f4a3e14ec9e86cc;hp=a22e79801c710a8edcab807b44538948c27516c9;hpb=59f32dc80f7ba299534e4fefa2bf02e9fff4b8b2;p=ardour.git diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index a22e79801c..354539b57b 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -17,19 +17,31 @@ */ +#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 "pbd/gstdio_compat.h" #include -#include + +#include #include "pbd/convert.h" #include "pbd/failed_constructor.h" #include "pbd/xml++.h" #include "pbd/file_utils.h" +#include "pbd/locale_guard.h" #include "pbd/error.h" #include "pbd/stacktrace.h" @@ -37,9 +49,8 @@ #include "gtkmm2ext/gtk_ui.h" #include "ardour/filesystem_paths.h" +#include "ardour/utils.h" -#include "ardour_ui.h" -#include "global_signals.h" #include "ui_config.h" #include "i18n.h" @@ -51,10 +62,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; +UIConfiguration& +UIConfiguration::instance () +{ + static UIConfiguration s_instance; + return s_instance; +} + UIConfiguration::UIConfiguration () : #undef UI_CONFIG_VARIABLE @@ -68,19 +85,14 @@ UIConfiguration::UIConfiguration () _dirty (false), aliases_modified (false), colors_modified (false), + 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 () @@ -108,7 +120,7 @@ void UIConfiguration::parameter_changed (string param) { _dirty = true; - + if (param == "ui-rc-file") { load_rc_file (true); } else if (param == "color-file") { @@ -124,11 +136,10 @@ UIConfiguration::reset_gtk_theme () 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) << ';'; } @@ -140,7 +151,41 @@ UIConfiguration::reset_gtk_theme () Gtk::Settings::get_default()->property_gtk_color_scheme() = ss.str(); } - + +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); +#endif + + /* Cairo rendering, in case there is any */ + + pango_cairo_font_map_set_resolution ((PangoCairoFontMap*) pango_cairo_font_map_get_default(), val/1024); +} + +float +UIConfiguration::get_ui_scale () +{ + return get_font_scale () / 102400.; +} + void UIConfiguration::map_parameters (boost::function& functor) { @@ -150,12 +195,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 (); + 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; @@ -176,13 +244,14 @@ 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 */ + ColorsChanged (); /* EMIT SIGNAL */ } - return 0; + return ret; } int @@ -205,7 +274,7 @@ UIConfiguration::load_color_theme (bool allow_own) if (!found) { basename = color_file.get(); basename += ".colors"; - + if (find_file (ardour_config_search_path(), basename, cfile)) { found = true; } @@ -214,7 +283,7 @@ UIConfiguration::load_color_theme (bool allow_own) if (found) { XMLTree tree; - + info << string_compose (_("Loading color file %1"), cfile) << endmsg; if (!tree.read (cfile.c_str())) { @@ -227,7 +296,7 @@ UIConfiguration::load_color_theme (bool allow_own) return -1; } - ARDOUR_UI_UTILS::ColorsChanged (); + ColorsChanged (); } else { warning << string_compose (_("Color file %1 not found"), basename) << endmsg; } @@ -239,7 +308,7 @@ int UIConfiguration::store_color_theme () { XMLNode* root; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (); root = new XMLNode("Ardour"); @@ -253,7 +322,7 @@ UIConfiguration::store_color_theme () 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")); @@ -262,10 +331,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")); - + tree.set_root (root); if (!tree.write (colorfile.c_str())){ @@ -332,7 +410,7 @@ UIConfiguration::save_state() if (_dirty) { std::string rcfile = Glib::build_filename (user_config_directory(), ui_config_file_name); - + XMLTree tree; tree.set_root (&get_state()); @@ -345,7 +423,7 @@ UIConfiguration::save_state() _dirty = false; } - if (aliases_modified || colors_modified) { + if (aliases_modified || colors_modified || modifiers_modified) { if (store_color_theme ()) { error << string_compose (_("Color file %1 not saved"), color_file.get()) << endmsg; @@ -354,8 +432,9 @@ UIConfiguration::save_state() aliases_modified = false; colors_modified = false; + modifiers_modified = false; } - + return 0; } @@ -364,7 +443,7 @@ XMLNode& UIConfiguration::get_state () { XMLNode* root; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (); root = new XMLNode("Ardour"); @@ -382,7 +461,7 @@ XMLNode& UIConfiguration::get_variables (std::string which_node) { XMLNode* node; - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (); node = new XMLNode (which_node); @@ -435,6 +514,12 @@ UIConfiguration::set_state (const XMLNode& root, int /*version*/) load_color_aliases (*aliases); } + XMLNode* modifiers = find_named_node (root, X_("Modifiers")); + + if (modifiers) { + load_modifiers (*modifiers); + } + return 0; } @@ -445,15 +530,16 @@ 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())); @@ -468,24 +554,52 @@ UIConfiguration::load_colors (XMLNode const & node) XMLNodeConstIterator niter; XMLProperty const *name; XMLProperty const *color; - + colors.clear (); 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; - c = strtol (color->value().c_str(), 0, 16); + c = strtoul (color->value().c_str(), 0, 16); colors.insert (make_pair (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; + + modifiers.clear (); + + 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.insert (make_pair (name->value(), svam)); + } + } +} + void UIConfiguration::set_variables (const XMLNode& node) { @@ -498,6 +612,28 @@ UIConfiguration::set_variables (const XMLNode& node) #undef CANVAS_FONT_VARIABLE } +ArdourCanvas::SVAModifier +UIConfiguration::modifier (string const & name) const +{ + Modifiers::const_iterator m = modifiers.find (name); + if (m != modifiers.end()) { + return m->second; + } + return SVAModifier (); +} + +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 { @@ -506,7 +642,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()) { @@ -519,7 +655,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. @@ -530,7 +666,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, @@ -555,7 +691,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 @@ -569,7 +705,22 @@ 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 +UIConfiguration::set_modifier (string const & name, SVAModifier svam) +{ + Modifiers::iterator m = modifiers.find (name); + + if (m == modifiers.end()) { + return; + } + + m->second = svam; + modifiers_modified = true; + + ColorsChanged (); /* EMIT SIGNAL */ } void