Expand just entry fields when the dialog is expanded
[ardour.git] / gtk2_ardour / utils.cc
index 7c711703079a752e83fc8c1ce09c06bf6fbb73bc..d061fce35f3963bbd6dbbcdd0e37312a97cb00ef 100644 (file)
@@ -63,99 +63,6 @@ using Gtkmm2ext::Keyboard;
 
 sigc::signal<void>  DPIReset;
 
-int
-pixel_width (const string& str, Pango::FontDescription& font)
-{
-       Label foo;
-       Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
-
-       layout->set_font_description (font);
-       layout->set_text (str);
-
-       int width, height;
-       Gtkmm2ext::get_ink_pixel_size (layout, width, height);
-       return width;
-}
-
-string
-fit_to_pixels (const string& str, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses)
-{
-       Label foo;
-       Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
-       string::size_type shorter_by = 0;
-       string txt;
-
-       layout->set_font_description (font);
-
-       actual_width = 0;
-
-       string ustr = str;
-       string::iterator last = ustr.end();
-       --last; /* now points at final entry */
-
-       txt = ustr;
-
-       while (!ustr.empty()) {
-
-               layout->set_text (txt);
-
-               int width, height;
-               Gtkmm2ext::get_ink_pixel_size (layout, width, height);
-
-               if (width < pixel_width) {
-                       actual_width = width;
-                       break;
-               }
-
-               ustr.erase (last--);
-               shorter_by++;
-
-               if (with_ellipses && shorter_by > 3) {
-                       txt = ustr;
-                       txt += "...";
-               } else {
-                       txt = ustr;
-               }
-       }
-
-       return txt;
-}
-
-/** Try to fit a string into a given horizontal space by ellipsizing it.
- *  @param cr Cairo context in which the text will be plotted.
- *  @param name Text.
- *  @param avail Available horizontal space.
- *  @return (Text, possibly ellipsized) and (horizontal size of text)
- */
-
-std::pair<std::string, double>
-fit_to_pixels (cairo_t* cr, std::string name, double avail)
-{
-       /* XXX hopefully there exists a more efficient way of doing this */
-
-       bool abbreviated = false;
-       uint32_t width = 0;
-
-       while (1) {
-               cairo_text_extents_t ext;
-               cairo_text_extents (cr, name.c_str(), &ext);
-
-               if (ext.width < avail || name.length() <= 4) {
-                       width = ext.width;
-                       break;
-               }
-
-               if (abbreviated) {
-                       name = name.substr (0, name.length() - 4) + "...";
-               } else {
-                       name = name.substr (0, name.length() - 3) + "...";
-                       abbreviated = true;
-               }
-       }
-
-       return std::make_pair (name, width);
-}
-
 
 /** Add an element to a menu, settings its sensitivity.
  * @param m Menu to add to.
@@ -392,112 +299,6 @@ rgba_from_style (string style, uint32_t r, uint32_t g, uint32_t b, uint32_t a, s
        }
 }
 
-
-Gdk::Color
-color_from_style (string widget_style_name, int state, string attr)
-{
-       GtkStyle* style;
-
-       style = gtk_rc_get_style_by_paths (gtk_settings_get_default(),
-                                          widget_style_name.c_str(),
-                                          0, G_TYPE_NONE);
-
-       if (!style) {
-               error << string_compose (_("no style found for %1, using red"), style) << endmsg;
-               return Gdk::Color ("red");
-       }
-
-       if (attr == "fg") {
-               return Gdk::Color (&style->fg[state]);
-       }
-
-       if (attr == "bg") {
-               return Gdk::Color (&style->bg[state]);
-       }
-
-       if (attr == "light") {
-               return Gdk::Color (&style->light[state]);
-       }
-
-       if (attr == "dark") {
-               return Gdk::Color (&style->dark[state]);
-       }
-
-       if (attr == "mid") {
-               return Gdk::Color (&style->mid[state]);
-       }
-
-       if (attr == "text") {
-               return Gdk::Color (&style->text[state]);
-       }
-
-       if (attr == "base") {
-               return Gdk::Color (&style->base[state]);
-       }
-
-       if (attr == "text_aa") {
-               return Gdk::Color (&style->text_aa[state]);
-       }
-
-       error << string_compose (_("unknown style attribute %1 requested for color; using \"red\""), attr) << endmsg;
-       return Gdk::Color ("red");
-}
-
-Glib::RefPtr<Gdk::GC>
-gc_from_style (string widget_style_name, int state, string attr)
-{
-        GtkStyle* style;
-
-        style = gtk_rc_get_style_by_paths (gtk_settings_get_default(),
-                                           widget_style_name.c_str(),
-                                           0, G_TYPE_NONE);
-
-        if (!style) {
-                error << string_compose (_("no style found for %1, using red"), style) << endmsg;
-               Glib::RefPtr<Gdk::GC> ret = Gdk::GC::create();
-               ret->set_rgb_fg_color(Gdk::Color("red"));
-                return ret;
-        }
-
-        if (attr == "fg") {
-                return Glib::wrap(style->fg_gc[state]);
-        }
-
-        if (attr == "bg") {
-                return Glib::wrap(style->bg_gc[state]);
-        }
-
-        if (attr == "light") {
-                return Glib::wrap(style->light_gc[state]);
-        }
-
-        if (attr == "dark") {
-                return Glib::wrap(style->dark_gc[state]);
-        }
-
-        if (attr == "mid") {
-                return Glib::wrap(style->mid_gc[state]);
-        }
-
-        if (attr == "text") {
-                return Glib::wrap(style->text_gc[state]);
-        }
-
-        if (attr == "base") {
-                return Glib::wrap(style->base_gc[state]);
-        }
-
-        if (attr == "text_aa") {
-                return Glib::wrap(style->text_aa_gc[state]);
-        }
-
-        error << string_compose (_("unknown style attribute %1 requested for color; using \"red\""), attr) << endmsg;
-       Glib::RefPtr<Gdk::GC> ret = Gdk::GC::create();
-       ret->set_rgb_fg_color(Gdk::Color("red"));
-        return ret;
-}
-
-
 bool
 canvas_item_visible (ArdourCanvas::Item* item)
 {
@@ -526,73 +327,6 @@ forward_key_press (GdkEventKey* ev)
         return PublicEditor::instance().on_key_press_event(ev);
 }
 
-#ifdef GTKOSX
-static guint
-osx_keyval_without_alt (guint accent_keyval)
-{
-       switch (accent_keyval) {
-       case GDK_oe:
-               return GDK_q;
-       case GDK_registered:
-               return GDK_r;
-       case GDK_dagger:
-               return GDK_t;
-       case GDK_yen:
-               return GDK_y;
-       case GDK_diaeresis:
-               return GDK_u;
-       case GDK_oslash:
-               return GDK_o;
-       case GDK_Greek_pi:
-               return GDK_p;
-       case GDK_leftdoublequotemark:
-               return GDK_bracketleft;
-       case GDK_leftsinglequotemark:
-               return GDK_bracketright;
-       case GDK_guillemotleft:
-               return GDK_backslash;
-       case GDK_aring:
-               return GDK_a;
-       case GDK_ssharp:
-               return GDK_s;
-       case GDK_partialderivative:
-               return GDK_d;
-       case GDK_function:
-               return GDK_f;
-       case GDK_copyright:
-               return GDK_g;
-       case GDK_abovedot:
-               return GDK_h;
-       case GDK_notsign:
-               return GDK_l;
-       case GDK_ellipsis:
-               return GDK_semicolon;
-       case GDK_ae:
-               return GDK_apostrophe;
-       case GDK_Greek_OMEGA:
-               return GDK_z;
-       case GDK_ccedilla:
-               return GDK_c;
-       case GDK_radical:
-               return GDK_v;
-       case GDK_integral:
-               return GDK_b;
-       case GDK_mu:
-               return GDK_m;
-       case GDK_lessthanequal:
-               return GDK_comma;
-       case GDK_greaterthanequal:
-               return GDK_period;
-       case GDK_division:
-               return GDK_slash;
-       default:
-               break;
-       }
-
-       return GDK_VoidSymbol;
-}
-#endif
-
 bool
 key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
 {
@@ -617,13 +351,14 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
 #endif
 
 
-        DEBUG_TRACE (DEBUG::Accelerators, string_compose ("Win = %1 Key event: code = %2  state = %3 special handling ? %4 magic widget focus ? %5 allow_activation ? %6\n",
+        DEBUG_TRACE (DEBUG::Accelerators, string_compose ("Win = %1 focus = %7 Key event: code = %2  state = %3 special handling ? %4 magic widget focus ? %5 allow_activation ? %6\n",
                                                           win,
                                                           ev->keyval,
                                                           ev->state,
                                                           special_handling_of_unmodified_accelerators,
                                                           Keyboard::some_magic_widget_has_focus(),
-                                                          allow_activating));
+                                                          allow_activating,
+                                                         focus));
 
        /* This exists to allow us to override the way GTK handles
           key events. The normal sequence is:
@@ -656,22 +391,6 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
           all "normal text" accelerators.
        */
 
-#ifdef GTKOSX
-       if (!special_handling_of_unmodified_accelerators && (ev->state & Keyboard::SecondaryModifier)) {
-               /* we're not in a text entry or "magic focus" widget so we don't want OS X "special-character"
-                  text-style handling of alt-<key>. change the keyval back to what it would be without
-                  the alt key. this way, we see <alt>-v rather than <alt>-radical and so on.
-               */
-               guint keyval_without_alt = osx_keyval_without_alt (ev->keyval);
-               
-               if (keyval_without_alt != GDK_VoidSymbol) {
-                       DEBUG_TRACE (DEBUG::Accelerators, string_compose ("Remapped %1 to %2\n", gdk_keyval_name (ev->keyval), gdk_keyval_name (keyval_without_alt)));
-                       ev->keyval = keyval_without_alt;
-               }
-       }
-       
-#endif
-       
        if (!special_handling_of_unmodified_accelerators) {
 
                /* XXX note that for a brief moment, the conditional above
@@ -698,7 +417,32 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
                uint32_t fakekey = ev->keyval;
 
                if (Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (fakekey)) {
-                       if (allow_activating && gtk_accel_groups_activate(G_OBJECT(win), fakekey, GdkModifierType(ev->state))) {
+                       DEBUG_TRACE (DEBUG::Accelerators, string_compose ("\tactivate (was %1 now %2) without special hanlding of unmodified accels\n",
+                                                                         ev->keyval, fakekey));
+
+                       GdkModifierType mod = GdkModifierType (ev->state);
+
+                       mod = GdkModifierType (mod & gtk_accelerator_get_default_mod_mask());
+#ifdef GTKOSX
+                       /* GTK on OS X is currently (February 2012) setting both
+                          the Meta and Mod2 bits in the event modifier state if 
+                          the Command key is down.
+
+                          gtk_accel_groups_activate() does not invoke any of the logic
+                          that gtk_window_activate_key() will that sorts out that stupid
+                          state of affairs, and as a result it fails to find a match
+                          for the key event and the current set of accelerators.
+
+                          to fix this, if the meta bit is set, remove the mod2 bit
+                          from the modifier. this assumes that our bindings use Primary
+                          which will have set the meta bit in the accelerator entry.
+                       */
+                       if (mod & GDK_META_MASK) {
+                               mod = GdkModifierType (mod & ~GDK_MOD2_MASK);
+                       }
+#endif
+
+                       if (allow_activating && gtk_accel_groups_activate(G_OBJECT(win), fakekey, mod)) {
                                DEBUG_TRACE (DEBUG::Accelerators, "\taccel group activated by fakekey\n");
                                return true;
                        }