Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / floating_text_entry.cc

diff --git a/gtk2_ardour/floating_text_entry.cc b/gtk2_ardour/floating_text_entry.cc
index 9907360c014d2b9c3af777639cf731fbe77ac085..571969d2dcc12559676d848f9679cae21e04cf97 100644 (file)
--- a/gtk2_ardour/floating_text_entry.cc
+++ b/gtk2_ardour/floating_text_entry.cc
@@ -25,16 +25,17 @@
 #include "gtkmm2ext/doi.h"
 #include "gtkmm2ext/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
-FloatingTextEntry::FloatingTextEntry (const std::string& initial_contents)
+FloatingTextEntry::FloatingTextEntry (Gtk::Window* parent, const std::string& initial_contents)
        : Gtk::Window (Gtk::WINDOW_POPUP)
         , entry_changed (false)
+       , by_popup_menu (false)
 {
-       set_name (X_("FloatingTextEntry"));
+       //set_name (X_("FloatingTextEntry"));
        set_position (Gtk::WIN_POS_MOUSE);
        set_border_width (0);
-       
+
        if (!initial_contents.empty()) {
                entry.set_text (initial_contents);
        }
@@ -42,13 +43,26 @@ FloatingTextEntry::FloatingTextEntry (const std::string& initial_contents)
        entry.show ();
        entry.signal_changed().connect (sigc::mem_fun (*this, &FloatingTextEntry::changed));
        entry.signal_activate().connect (sigc::mem_fun (*this, &FloatingTextEntry::activated));
-       entry.signal_key_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_press));
+       entry.signal_key_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_press), false);
+       entry.signal_key_release_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_release), false);
        entry.signal_button_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::button_press));
-       PublicEditor::instance ().signal_focus_out_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::entry_focus_out));
+       entry.signal_populate_popup().connect (sigc::mem_fun (*this, &FloatingTextEntry::populate_popup));
+
+       entry.select_region (0, -1);
+
+       if (parent) {
+               parent->signal_focus_out_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::entry_focus_out));
+       }
 
        add (entry);
 }
 
+void
+FloatingTextEntry::populate_popup (Gtk::Menu *)
+{
+       by_popup_menu = true;
+}
+
 void
 FloatingTextEntry::changed ()
 {
@@ -66,9 +80,14 @@ FloatingTextEntry::on_realize ()
 bool
 FloatingTextEntry::entry_focus_out (GdkEventFocus* ev)
 {
+       if (by_popup_menu) {
+               by_popup_menu = false;
+               return false;
+       }
+
        entry.remove_modal_grab ();
        if (entry_changed) {
-               use_text (entry.get_text ());
+               use_text (entry.get_text (), 0);
        }
 
        delete_when_idle ( this);
@@ -89,7 +108,7 @@ FloatingTextEntry::button_press (GdkEventButton* ev)
        Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::ptr_fun (gtk_main_do_event), gdk_event_copy ((GdkEvent*) ev)), false));
 
        if (entry_changed) {
-               use_text (entry.get_text ());
+               use_text (entry.get_text (), 0);
        }
 
        delete_when_idle ( this);
@@ -100,24 +119,54 @@ FloatingTextEntry::button_press (GdkEventButton* ev)
 void
 FloatingTextEntry::activated ()
 {
-       use_text (entry.get_text()); // EMIT SIGNAL
+       use_text (entry.get_text(), 0); // EMIT SIGNAL
        delete_when_idle (this);
 }
 
 bool
 FloatingTextEntry::key_press (GdkEventKey* ev)
 {
+       /* steal escape, tabs from GTK */
+
        switch (ev->keyval) {
        case GDK_Escape:
+       case GDK_ISO_Left_Tab:
+       case GDK_Tab:
+               return true;
+       }
+       return false;
+}
+
+bool
+FloatingTextEntry::key_release (GdkEventKey* ev)
+{
+       switch (ev->keyval) {
+       case GDK_Escape:
+               /* cancel edit */
+               delete_when_idle (this);
+               return true;
+
+       case GDK_ISO_Left_Tab:
+               /* Shift+Tab Keys Pressed. Note that for Shift+Tab, GDK actually
+                * generates a different ev->keyval, rather than setting
+                * ev->state.
+                */
+               use_text (entry.get_text(), -1); // EMIT SIGNAL, move to prev
+               delete_when_idle (this);
+               return true;
+
+       case GDK_Tab:
+               use_text (entry.get_text(), 1); // EMIT SIGNAL, move to next
                delete_when_idle (this);
                return true;
-               break;
        default:
                break;
        }
+
        return false;
 }
 
+
 void
 FloatingTextEntry::on_hide ()
 {