X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ffloating_text_entry.cc;h=571969d2dcc12559676d848f9679cae21e04cf97;hb=54fd56de755a44420d906ad660b18c2d671f1057;hp=22ad7b6441b51471260d504c50019fb9bcccc802;hpb=5101916a17cd803863ee02c8d287535701355eaf;p=ardour.git diff --git a/gtk2_ardour/floating_text_entry.cc b/gtk2_ardour/floating_text_entry.cc index 22ad7b6441..571969d2dc 100644 --- a/gtk2_ardour/floating_text_entry.cc +++ b/gtk2_ardour/floating_text_entry.cc @@ -1,19 +1,19 @@ /* - Copyright (C) 2014 Paul Davis + Copyright (C) 2014 Paul Davis - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -25,109 +25,158 @@ #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); + set_border_width (0); - if (!initial_contents.empty()) { - entry.set_text (initial_contents); - } + if (!initial_contents.empty()) { + entry.set_text (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_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.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), 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)); + entry.signal_populate_popup().connect (sigc::mem_fun (*this, &FloatingTextEntry::populate_popup)); - add (entry); + 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 () { - entry_changed = true; + entry_changed = true; } void FloatingTextEntry::on_realize () { - Gtk::Window::on_realize (); - get_window()->set_decorations (Gdk::WMDecoration (0)); - entry.add_modal_grab (); + Gtk::Window::on_realize (); + get_window()->set_decorations (Gdk::WMDecoration (0)); + entry.add_modal_grab (); } bool FloatingTextEntry::entry_focus_out (GdkEventFocus* ev) { - entry.remove_modal_grab (); - if (entry_changed) { - use_text (entry.get_text ()); - } - - delete_when_idle ( this); - return false; + if (by_popup_menu) { + by_popup_menu = false; + return false; + } + + entry.remove_modal_grab (); + if (entry_changed) { + use_text (entry.get_text (), 0); + } + + delete_when_idle ( this); + return false; } bool FloatingTextEntry::button_press (GdkEventButton* ev) { - if (Gtkmm2ext::event_inside_widget_window (*this, (GdkEvent*) ev)) { - return true; - } + if (Gtkmm2ext::event_inside_widget_window (*this, (GdkEvent*) ev)) { + return true; + } - /* Clicked outside widget window - edit is done */ - entry.remove_modal_grab (); + /* Clicked outside widget window - edit is done */ + entry.remove_modal_grab (); - /* arrange re-propagation of the event once we go idle */ - Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::ptr_fun (gtk_main_do_event), gdk_event_copy ((GdkEvent*) ev)), false)); + /* arrange re-propagation of the event once we go idle */ + 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 ()); - } - - delete_when_idle ( this); + if (entry_changed) { + use_text (entry.get_text (), 0); + } - return false; + delete_when_idle ( this); + + return false; } void FloatingTextEntry::activated () { - use_text (entry.get_text()); // EMIT SIGNAL - delete_when_idle (this); + use_text (entry.get_text(), 0); // EMIT SIGNAL + delete_when_idle (this); } bool FloatingTextEntry::key_press (GdkEventKey* ev) { - switch (ev->keyval) { - case GDK_Escape: - delete_when_idle (this); - return true; - break; - default: - break; - } - return false; + /* 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; + default: + break; + } + + return false; } + void FloatingTextEntry::on_hide () { - entry.remove_modal_grab (); + entry.remove_modal_grab (); - /* No hide button is shown (no decoration on the window), - so being hidden is equivalent to the Escape key or any other - method of cancelling the edit. - */ + /* No hide button is shown (no decoration on the window), + so being hidden is equivalent to the Escape key or any other + method of cancelling the edit. + */ - delete_when_idle (this); - Gtk::Window::on_hide (); + delete_when_idle (this); + Gtk::Window::on_hide (); }