Fix ExportFormatSpecification copy-c'tor
[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc
index f23e91069e85b59b300e97f0a20ce6a4481e1b6a..287c9128b47e3467585839eaffc45eae67ba8f2d 100644 (file)
    This is to cut down on the compile times.  It also helps with my sanity.
 */
 
+#include <vector>
+
+#include <gtkmm/treemodelfilter.h>
+
+#include "pbd/convert.h"
+
 #include "ardour/audioengine.h"
 #include "ardour/automation_watch.h"
+#include "ardour/control_protocol_manager.h"
 #include "ardour/profile.h"
 #include "ardour/session.h"
 
+#include "control_protocol/control_protocol.h"
+
+#include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/utils.h"
+
 #include "actions.h"
 #include "add_route_dialog.h"
 #include "add_video_dialog.h"
 #include "ardour_ui.h"
 #include "big_clock_window.h"
+#include "big_transport_window.h"
 #include "bundle_manager.h"
 #include "global_port_matrix.h"
 #include "gui_object.h"
 #include "gui_thread.h"
 #include "keyeditor.h"
 #include "location_ui.h"
+#include "lua_script_manager.h"
+#include "luawindow.h"
 #include "main_clock.h"
+#include "meterbridge.h"
 #include "meter_patterns.h"
+#include "monitor_section.h"
 #include "midi_tracer.h"
+#include "mini_timeline.h"
 #include "mixer_ui.h"
+#include "plugin_dspload_window.h"
 #include "public_editor.h"
+#include "processor_box.h"
 #include "rc_option_editor.h"
 #include "route_params_ui.h"
 #include "shuttle_control.h"
 #include "speaker_dialog.h"
 #include "splash.h"
 #include "sfdb_ui.h"
-#include "theme_manager.h"
 #include "time_info_box.h"
+#include "timers.h"
+#include "transport_masters_dialog.h"
 
-#include <gtkmm2ext/keyboard.h>
-
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Glib;
 using namespace Gtk;
 using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
 
 void
 ARDOUR_UI::set_session (Session *s)
 {
        SessionHandlePtr::set_session (s);
 
+       transport_ctrl.set_session (s);
+
+       if (big_transport_window) {
+               big_transport_window->set_session (s);
+       }
+
        if (!_session) {
                WM::Manager::instance().set_session (s);
                /* Session option editor cannot exist across change-of-session */
@@ -94,15 +120,18 @@ ARDOUR_UI::set_session (Session *s)
 
        AutomationWatch::instance().set_session (s);
 
-       if (shuttle_box) {
-               shuttle_box->set_session (s);
-       }
+       shuttle_box.set_session (s);
+       mini_timeline.set_session (s);
+       time_info_box->set_session (s);
 
        primary_clock->set_session (s);
        secondary_clock->set_session (s);
        big_clock->set_session (s);
-       time_info_box->set_session (s);
        video_timeline->set_session (s);
+       lua_script_window->set_session (s);
+       plugin_dsp_load_window->set_session (s);
+       transport_masters_window->set_session (s);
+       rc_option_editor->set_session (s);
 
        /* sensitize menu bar options that are now valid */
 
@@ -115,13 +144,6 @@ ARDOUR_UI::set_session (Session *s)
                ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
        }
 
-       if (!_session->monitor_out()) {
-               Glib::RefPtr<Action> act = ActionManager::get_action (X_("options"), X_("SoloViaBus"));
-               if (act) {
-                       act->set_sensitive (false);
-               }
-       }
-
        /* allow wastebasket flush again */
 
        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
@@ -133,26 +155,25 @@ ARDOUR_UI::set_session (Session *s)
 
        ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::route_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::bus_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::vca_selection_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::stripable_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::line_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::point_selection_sensitive_actions, false);
        ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false);
 
-       rec_button.set_sensitive (true);
-
        solo_alert_button.set_active (_session->soloing());
 
        setup_session_options ();
 
-       Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
-       Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::solo_blink));
-       Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::sync_blink));
-       Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::audition_blink));
-       Blink.connect (sigc::mem_fun(*this, &ARDOUR_UI::feedback_blink));
+       blink_connection = Timers::blink_connect (sigc::mem_fun(*this, &ARDOUR_UI::blink_handler));
 
+       _session->SaveSessionRequested.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::save_session_at_its_request, this, _1), gui_context());
+       _session->StateSaved.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_title, this), gui_context());
        _session->RecordStateChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::record_state_changed, this), gui_context());
-       _session->StepEditStatusChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::step_edit_status_change, this, _1), gui_context());
        _session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::map_transport_state, this), gui_context());
-       _session->DirtyChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_autosave, this), gui_context());
+       _session->DirtyChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_dirty_changed, this), gui_context());
 
        _session->Xrun.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::xrun_handler, this, _1), gui_context());
        _session->SoloActive.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::soloing_changed, this, _1), gui_context());
@@ -176,45 +197,50 @@ ARDOUR_UI::set_session (Session *s)
        Glib::signal_idle().connect (sigc::mem_fun (*this, &ARDOUR_UI::first_idle));
 
        start_clocking ();
-       start_blinking ();
 
        map_transport_state ();
 
-       second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_second), 1000);
-       point_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
-       point_zero_something_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_something_seconds), 40);
+       second_connection = Timers::second_connect (sigc::mem_fun(*this, &ARDOUR_UI::every_second));
+       point_one_second_connection = Timers::rapid_connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_one_seconds));
+       point_zero_something_second_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_something_seconds));
+       set_fps_timeout_connection();
 
        update_format ();
 
-       if (meter_box.get_parent()) {
-               transport_tearoff_hbox.remove (meter_box);
-               transport_tearoff_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
        }
 
-       if (meter_box.get_parent()) {
-               transport_tearoff_hbox.remove (meter_box);
-               transport_tearoff_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
-       if (_session && 
-           _session->master_out() && 
+       if (_session &&
+           _session->master_out() &&
            _session->master_out()->n_outputs().n(DataType::AUDIO) > 0) {
 
                if (!ARDOUR::Profile->get_trx()) {
                        editor_meter = new LevelMeterHBox(_session);
                        editor_meter->set_meter (_session->master_out()->shared_peak_meter().get());
                        editor_meter->clear_meters();
-                       editor_meter->set_type (_session->master_out()->meter_type());
-                       editor_meter->setup_meters (30, 12, 6);
+                       editor_meter->set_meter_type (_session->master_out()->meter_type());
+                       editor_meter->setup_meters (30, 10, 6);
                        editor_meter->show();
-                       meter_box.pack_start(*editor_meter);
+                       editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1));
+
+                       editor_meter_table.set_spacings(3);
+                       editor_meter_table.attach(*editor_meter,             0,1, 0,1, FILL, FILL);
+                       editor_meter_table.attach(editor_meter_peak_display, 0,1, 1,2, FILL, EXPAND|FILL);
+
+                       editor_meter->show();
+                       editor_meter_peak_display.show();
                }
 
                ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
@@ -223,19 +249,16 @@ ARDOUR_UI::set_session (Session *s)
 
                editor_meter_peak_display.set_name ("meterbridge peakindicator");
                editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
-               editor_meter_peak_display.set_size_request(10, -1);
-               editor_meter_peak_display.set_corner_radius(1);
+               editor_meter_peak_display.set_size_request (-1, std::max(6.f, rintf(5.f * UIConfiguration::instance().get_ui_scale())) );
+               editor_meter_peak_display.set_corner_radius (3.0);
 
                editor_meter_max_peak = -INFINITY;
                editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false);
 
-               if (Config->get_show_editor_meter() && !ARDOUR::Profile->get_trx()) {
-                       transport_tearoff_hbox.pack_start (meter_box, false, false);
-                       transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
-                       meter_box.show();
-                       editor_meter_peak_display.show();
-               }
+               repack_transport_hbox ();
        }
+
+       update_title ();
 }
 
 int
@@ -261,11 +284,21 @@ ARDOUR_UI::unload_session (bool hide_stuff)
                }
        }
 
+       {
+               // tear down session specific CPI (owned by rc_config_editor which can remain)
+               ControlProtocolManager& m = ControlProtocolManager::instance ();
+               for (std::list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) {
+                       if (*i && (*i)->protocol && (*i)->protocol->has_editor ()) {
+                               (*i)->protocol->tear_down_gui ();
+                       }
+               }
+       }
+
        if (hide_stuff) {
+               close_all_dialogs ();
                editor->hide ();
                mixer->hide ();
                meterbridge->hide ();
-               theme_manager->hide ();
                audio_port_matrix->hide();
                midi_port_matrix->hide();
                route_params->hide();
@@ -274,9 +307,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        second_connection.disconnect ();
        point_one_second_connection.disconnect ();
        point_zero_something_second_connection.disconnect();
+       fps_connection.disconnect();
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
@@ -284,195 +318,500 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
 
-       rec_button.set_sensitive (false);
-
        WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
 
        if (ARDOUR_UI::instance()->video_timeline) {
                ARDOUR_UI::instance()->video_timeline->close_session();
        }
 
-       stop_blinking ();
        stop_clocking ();
 
        /* drop everything attached to the blink signal */
 
-       Blink.clear ();
+       blink_connection.disconnect ();
 
-       delete _session;
+       ARDOUR::Session* session_to_delete = _session;
        _session = 0;
+       delete session_to_delete;
 
-       session_loaded = false;
-
-       update_buffer_load ();
+       update_title ();
 
        return 0;
 }
 
-static bool
-_hide_splash (gpointer arg)
+void
+ARDOUR_UI::toggle_editor_and_mixer ()
 {
-       ((ARDOUR_UI*)arg)->hide_splash();
-       return false;
+       if (editor->tabbed() && mixer->tabbed()) {
+               /* both in the same window */
+               if (_tabs.get_current_page() == _tabs.page_num (editor->contents())) {
+                       _tabs.set_current_page (_tabs.page_num (mixer->contents()));
+               } else if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) {
+                       _tabs.set_current_page (_tabs.page_num (editor->contents()));
+               } else {
+                       /* go to mixer */
+                       _tabs.set_current_page (_tabs.page_num (mixer->contents()));
+               }
+               return;
+       }
+
+
+       if (editor->tabbed() && !mixer->tabbed()) {
+               /* editor is tabbed, mixer is not */
+
+               Gtk::Window* mwin = mixer->current_toplevel ();
+
+               if (!mwin) {
+                       /* mixer's own window doesn't exist */
+                       mixer->make_visible ();
+               } else if (!mwin->is_mapped ()) {
+                       /* mixer's own window exists but isn't mapped */
+                       mixer->make_visible ();
+               } else {
+                       /* mixer window is mapped, editor is visible as tab */
+                       Gtk::Widget* f = mwin->get_focus();
+                       if (f && f->has_focus()) {
+                               /* mixer has focus, switch to editor */
+                               editor->make_visible ();
+                       } else {
+                               mixer->make_visible ();
+                       }
+               }
+               return;
+       }
+
+       if (!editor->tabbed() && mixer->tabbed()) {
+               /* mixer is tabbed, editor is not */
+
+               Gtk::Window* ewin = editor->current_toplevel ();
+
+               if (!ewin) {
+                       /* mixer's own window doesn't exist */
+                       editor->make_visible ();
+               } else if (!ewin->is_mapped ()) {
+                       /* editor's own window exists but isn't mapped */
+                       editor->make_visible ();
+               } else {
+                       /* editor window is mapped, mixer is visible as tab */
+                       Gtk::Widget* f = ewin->get_focus();
+                       if (f && f->has_focus()) {
+                               /* editor has focus, switch to mixer */
+                               mixer->make_visible ();
+                       } else {
+                               editor->make_visible ();
+                       }
+               }
+               return;
+       }
 }
 
 void
-ARDOUR_UI::goto_editor_window ()
+ARDOUR_UI::step_up_through_tabs ()
 {
-       if (splash && splash->is_visible()) {
-               // in 2 seconds, hide the splash screen
-               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 2000);
+       std::vector<Tabbable*> candidates;
+
+       /* this list must match the order of visibility buttons */
+
+       if (!editor->window_visible()) {
+               candidates.push_back (editor);
+       }
+
+       if (!mixer->window_visible()) {
+               candidates.push_back (mixer);
+       }
+
+       if (!rc_option_editor->window_visible()) {
+               candidates.push_back (rc_option_editor);
+       }
+
+       if (candidates.size() < 2) {
+               /* nothing to be done with zero or one visible in tabs */
+               return;
+       }
+
+       std::vector<Tabbable*>::iterator prev = candidates.end();
+       std::vector<Tabbable*>::iterator i;
+       Gtk::Widget* w = _tabs.get_nth_page (_tabs.get_current_page ());
+
+       for (i = candidates.begin(); i != candidates.end(); ++i) {
+               if (w == &(*i)->contents()) {
+                       if (prev != candidates.end()) {
+                               _tabs.set_current_page (_tabs.page_num ((*prev)->contents()));
+                       } else {
+                               _tabs.set_current_page (_tabs.page_num (candidates.back()->contents()));
+                       }
+                       return;
+               }
+               prev = i;
+       }
+}
+
+void
+ARDOUR_UI::step_down_through_tabs ()
+{
+       std::vector<Tabbable*> candidates;
+
+       /* this list must match the order of visibility buttons */
+
+       if (!editor->window_visible()) {
+               candidates.push_back (editor);
+       }
+
+       if (!mixer->window_visible()) {
+               candidates.push_back (mixer);
+       }
+
+       if (!rc_option_editor->window_visible()) {
+               candidates.push_back (rc_option_editor);
+       }
+
+       if (candidates.size() < 2) {
+               /* nothing to be done with zero or one visible in tabs */
+               return;
        }
 
-       editor->show_window ();
-       editor->present ();
-       /* mixer should now be on top */
-       WM::Manager::instance().set_transient_for (editor);
-       _mixer_on_top = false;
+       std::vector<Tabbable*>::reverse_iterator next = candidates.rend();
+       std::vector<Tabbable*>::reverse_iterator i;
+       Gtk::Widget* w = _tabs.get_nth_page (_tabs.get_current_page ());
+
+       for (i = candidates.rbegin(); i != candidates.rend(); ++i) {
+               if (w == &(*i)->contents()) {
+                       if (next != candidates.rend()) {
+                               _tabs.set_current_page (_tabs.page_num ((*next)->contents()));
+                       } else {
+                               _tabs.set_current_page (_tabs.page_num (candidates.front()->contents()));
+                       }
+                       break;
+               }
+               next = i;
+       }
 }
 
 void
-ARDOUR_UI::goto_mixer_window ()
+ARDOUR_UI::key_change_tabbable_visibility (Tabbable* t)
 {
-       Glib::RefPtr<Gdk::Window> win;
-       Glib::RefPtr<Gdk::Screen> screen;
-       
-       if (editor) {
-               win = editor->get_window ();
+       if (!t) {
+               return;
        }
 
-       if (win) {
-               screen = win->get_screen();
+       if (t->tabbed()) {
+               _tabs.set_current_page (_tabs.page_num (t->contents()));
+       } else if (!t->fully_visible()) {
+               t->make_visible ();
        } else {
-               screen = Gdk::Screen::get_default();
+               _main_window.present ();
        }
-       
-       if (g_getenv ("ARDOUR_LOVES_STUPID_TINY_SCREENS") == 0 && screen && screen->get_height() < 700) {
-               Gtk::MessageDialog msg (_("This screen is not tall enough to display the mixer window"));
-               msg.run ();
+}
+
+void
+ARDOUR_UI::button_change_tabbable_visibility (Tabbable* t)
+{
+       /* For many/most users, clicking a button in the main window will make it
+          the main/front/key window, which will change any stacking relationship they
+          were trying to modify by clicking on the button in the first
+          place. This button-aware method knows that click on
+          a button designed to show/hide a Tabbable that has its own window
+          will have made that window be obscured (as the main window comes to
+          the front). We therefore *hide* the Tabbable's window if it is even
+          partially visible, believing that this is likely because the
+          Tabbable window used to be front, the user clicked to change that,
+          and before we even get here, the main window has become front.
+       */
+
+       if (!t) {
                return;
        }
 
-       mixer->show_window ();
-       mixer->present ();
-       /* mixer should now be on top */
-       WM::Manager::instance().set_transient_for (mixer);
-       _mixer_on_top = true;
+       if (t->tabbed()) {
+               _tabs.set_current_page (_tabs.page_num (t->contents()));
+       } else if (t->visible()) {
+               t->hide();
+       } else {
+               t->make_visible ();
+       }
 }
 
 void
-ARDOUR_UI::toggle_mixer_window ()
+ARDOUR_UI::show_tabbable (Tabbable* t)
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
-       if (!act) {
+       if (!t) {
                return;
        }
 
-       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       t->make_visible ();
+}
+
+void
+ARDOUR_UI::hide_tabbable (Tabbable* t)
+{
+       if (!t) {
+               return;
+       }
+       t->make_invisible ();
+}
+
+void
+ARDOUR_UI::attach_tabbable (Tabbable* t)
+{
+       if (!t) {
+               return;
+       }
+
+       t->attach ();
+}
+
+void
+ARDOUR_UI::detach_tabbable (Tabbable* t)
+{
+       if (!t) {
+               return;
+       }
+       t->detach ();
+}
+
+void
+ARDOUR_UI::tabs_page_added (Widget*,guint)
+{
+       if (_tabs.get_n_pages() > 1) {
+
+               std::vector<TargetEntry> drag_target_entries;
+               drag_target_entries.push_back (TargetEntry ("tabbable"));
+
+               editor_visibility_button.drag_source_set (drag_target_entries);
+               mixer_visibility_button.drag_source_set (drag_target_entries);
+               prefs_visibility_button.drag_source_set (drag_target_entries);
+
+               editor_visibility_button.drag_source_set_icon (Gtkmm2ext::pixbuf_from_string (editor->name(),
+                                                                                             Pango::FontDescription ("Sans 24"),
+                                                                                             0, 0,
+                                                                                             Gdk::Color ("red")));
+               mixer_visibility_button.drag_source_set_icon (Gtkmm2ext::pixbuf_from_string (mixer->name(),
+                                                                                            Pango::FontDescription ("Sans 24"),
+                                                                                            0, 0,
+                                                                                            Gdk::Color ("red")));
+               prefs_visibility_button.drag_source_set_icon (Gtkmm2ext::pixbuf_from_string (rc_option_editor->name(),
+                                                                                            Pango::FontDescription ("Sans 24"),
+                                                                                            0, 0,
+                                                                                            Gdk::Color ("red")));
+       }
+}
+
+void
+ARDOUR_UI::tabs_page_removed (Widget*, guint)
+{
+       if (_tabs.get_n_pages() < 2) {
+               editor_visibility_button.drag_source_unset ();
+               mixer_visibility_button.drag_source_unset ();
+               prefs_visibility_button.drag_source_unset ();
+       }
+}
+
+void
+ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page)
+{
+       if (editor && (page == (guint) _tabs.page_num (editor->contents()))) {
+               editor_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive);
+
+               if (mixer && (mixer->tabbed() || mixer->tabbed_by_default())) {
+                       mixer_visibility_button.set_active_state (Gtkmm2ext::Off);
+               }
+
+               if (rc_option_editor && (rc_option_editor->tabbed() || rc_option_editor->tabbed_by_default())) {
+                       prefs_visibility_button.set_active_state (Gtkmm2ext::Off);
+               }
+       } else if (mixer && (page == (guint) _tabs.page_num (mixer->contents()))) {
+
+               if (editor && (editor->tabbed() || editor->tabbed_by_default())) {
+                       editor_visibility_button.set_active_state (Gtkmm2ext::Off);
+               }
+
+               mixer_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive);
+
+               if (rc_option_editor && (rc_option_editor->tabbed() || rc_option_editor->tabbed_by_default())) {
+                       prefs_visibility_button.set_active_state (Gtkmm2ext::Off);
+               }
+
+       } else if (page == (guint) _tabs.page_num (rc_option_editor->contents())) {
+
+               if (editor && (editor->tabbed() || editor->tabbed_by_default())) {
+                       editor_visibility_button.set_active_state (Gtkmm2ext::Off);
+               }
+
+               if (mixer && (mixer->tabbed() || mixer->tabbed_by_default())) {
+                       mixer_visibility_button.set_active_state (Gtkmm2ext::Off);
+               }
+
+               prefs_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive);
+       }
+
+}
+
+void
+ARDOUR_UI::tabbable_state_change (Tabbable& t)
+{
+       std::vector<std::string> insensitive_action_names;
+       std::vector<std::string> sensitive_action_names;
+       std::vector<std::string> active_action_names;
+       std::vector<std::string> inactive_action_names;
+       Glib::RefPtr<Action> action;
+       std::string downcased_name = downcase (t.name());
+       enum ViewState {
+               Tabbed,
+               Windowed,
+               Hidden
+       };
+       ViewState vs;
+
+       if (t.tabbed()) {
+
+               insensitive_action_names.push_back (string_compose ("attach-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("show-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("detach-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("hide-%1", downcased_name));
+
+               vs = Tabbed;
+
+       } else if (t.tabbed_by_default ()) {
+
+               insensitive_action_names.push_back (string_compose ("attach-%1", downcased_name));
+               insensitive_action_names.push_back (string_compose ("hide-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("show-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("detach-%1", downcased_name));
+
+               vs = Hidden;
+
+       } else if (t.window_visible()) {
+
+               insensitive_action_names.push_back (string_compose ("detach-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("show-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("attach-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("hide-%1", downcased_name));
+
+               active_action_names.push_back (string_compose ("show-%1", downcased_name));
+               inactive_action_names.push_back (string_compose ("hide-%1", downcased_name));
+
+               vs = Windowed;
 
-       if (tact->get_active()) {
-               goto_mixer_window ();
        } else {
-               mixer->hide ();
+
+               /* not currently visible. allow user to retab it or just make
+                * it visible.
+                */
+
+               insensitive_action_names.push_back (string_compose ("detach-%1", downcased_name));
+               insensitive_action_names.push_back (string_compose ("hide-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("show-%1", downcased_name));
+               sensitive_action_names.push_back (string_compose ("attach-%1", downcased_name));
+
+               active_action_names.push_back (string_compose ("hide-%1", downcased_name));
+               inactive_action_names.push_back (string_compose ("show-%1", downcased_name));
+
+               vs = Hidden;
+       }
+
+       for (std::vector<std::string>::iterator s = insensitive_action_names.begin(); s != insensitive_action_names.end(); ++s) {
+               action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
+               if (action) {
+                       action->set_sensitive (false);
+               }
+       }
+
+       for (std::vector<std::string>::iterator s = sensitive_action_names.begin(); s != sensitive_action_names.end(); ++s) {
+               action = ActionManager::get_action (X_("Common"), (*s).c_str(), false);
+               if (action) {
+                       action->set_sensitive (true);
+               }
+       }
+
+       ArdourButton* vis_button = 0;
+       std::vector<ArdourButton*> other_vis_buttons;
+
+       if (&t == editor) {
+               vis_button = &editor_visibility_button;
+               other_vis_buttons.push_back (&mixer_visibility_button);
+               other_vis_buttons.push_back (&prefs_visibility_button);
+       } else if (&t == mixer) {
+               vis_button = &mixer_visibility_button;
+               other_vis_buttons.push_back (&editor_visibility_button);
+               other_vis_buttons.push_back (&prefs_visibility_button);
+       } else if (&t == rc_option_editor) {
+               vis_button = &prefs_visibility_button;
+               other_vis_buttons.push_back (&editor_visibility_button);
+               other_vis_buttons.push_back (&mixer_visibility_button);
+       }
+
+       if (!vis_button) {
+               return;
+       }
+
+       switch (vs) {
+       case Tabbed:
+               vis_button->set_active_state (Gtkmm2ext::ImplicitActive);
+               break;
+       case Windowed:
+               vis_button->set_active_state (Gtkmm2ext::ExplicitActive);
+               break;
+       case Hidden:
+               vis_button->set_active_state (Gtkmm2ext::Off);
+               break;
+       }
+
+       for (std::vector<ArdourButton*>::iterator b = other_vis_buttons.begin(); b != other_vis_buttons.end(); ++b) {
+               (*b)->set_active_state (Gtkmm2ext::Off);
        }
 }
 
 void
 ARDOUR_UI::toggle_meterbridge ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-meterbridge"));
-       if (!act) {
-               return;
+       assert (editor && mixer && meterbridge);
+
+       bool show = false;
+       bool obscuring = false;
+
+       if (meterbridge->not_visible ()) {
+               show = true;
+       } else if ((editor->window_visible() && ARDOUR_UI_UTILS::windows_overlap (editor->own_window(), meterbridge)) ||
+                  (mixer->window_visible () && ARDOUR_UI_UTILS::windows_overlap (mixer->own_window(), meterbridge))) {
+               obscuring = true;
        }
 
-       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (obscuring && ((editor->own_window() && editor->own_window()->property_has_toplevel_focus()) ||
+                         (mixer->own_window() && mixer->own_window()->property_has_toplevel_focus()))) {
+               show = true;
+       }
 
-       if (tact->get_active()) {
+       if (show) {
                meterbridge->show_window ();
+               meterbridge->present ();
+               meterbridge->raise ();
        } else {
                meterbridge->hide_window (NULL);
        }
 }
 
 void
-ARDOUR_UI::toggle_editor_mixer ()
+ARDOUR_UI::toggle_luawindow ()
 {
-       bool obscuring = false;
-       /* currently, if windows are on different
-          screens then we do nothing; but in the
-          future we may want to bring the window 
-          to the front or something, so I'm leaving this 
-          variable for future use
-       */
-        bool same_screen = true; 
-       
-        if (editor && mixer) {
+       assert (editor && luawindow);
 
-               /* remeber: Screen != Monitor (Screen is a separately rendered
-                * continuous geometry that make include 1 or more monitors.
-                */
-               
-                if (editor->get_screen() != mixer->get_screen() && (mixer->get_screen() != 0) && (editor->get_screen() != 0)) {
-                        // different screens, so don't do anything
-                        same_screen = false;
-                } else {
-                        // they are on the same screen, see if they are obscuring each other
-
-                        gint ex, ey, ew, eh;
-                        gint mx, my, mw, mh;
-
-                        editor->get_position (ex, ey);
-                        editor->get_size (ew, eh);
-
-                        mixer->get_position (mx, my);
-                        mixer->get_size (mw, mh);
-
-                        GdkRectangle e;
-                        GdkRectangle m;
-                        GdkRectangle r;
-
-                        e.x = ex;
-                        e.y = ey;
-                        e.width = ew;
-                        e.height = eh;
-
-                        m.x = mx;
-                        m.y = my;
-                        m.width = mw;
-                        m.height = mh;
-
-                       if (gdk_rectangle_intersect (&e, &m, &r)) {
-                                obscuring = true;
-                        }
-                }
-        }
-
-        if (mixer && !mixer->not_visible() && mixer->property_has_toplevel_focus()) {
-                if (obscuring && same_screen) {
-                        goto_editor_window();
-                }
-        } else if (editor && !editor->not_visible() && editor->property_has_toplevel_focus()) {
-                if (obscuring && same_screen) {
-                        goto_mixer_window();
-                }
-        } else if (mixer && mixer->not_visible()) {
-                if (obscuring && same_screen) {
-                        goto_mixer_window ();
-                }
-        } else if (editor && editor->not_visible()) {
-                if (obscuring && same_screen) {
-                        goto_editor_window ();
-                }
-        } else if (obscuring && same_screen) {
-                //it's unclear what to do here, so just do the opposite of what we did last time  (old behavior)
-                if (_mixer_on_top) {
-                       goto_editor_window ();
-               } else {
-                       goto_mixer_window ();
-               }
-        }
+       bool show = false;
+
+       if (luawindow->not_visible ()) {
+               show = true;
+       }
+       // TODO check overlap
+
+       if (show) {
+               luawindow->show_window ();
+               luawindow->present ();
+               luawindow->raise ();
+       } else {
+               luawindow->hide_window (NULL);
+       }
 }
 
+
 void
 ARDOUR_UI::new_midi_tracer_window ()
 {
@@ -497,6 +836,18 @@ ARDOUR_UI::new_midi_tracer_window ()
        }
 }
 
+KeyEditor*
+ARDOUR_UI::create_key_editor ()
+{
+       KeyEditor* kedit = new KeyEditor;
+
+       for (std::list<Bindings*>::iterator b = Bindings::bindings.begin(); b != Bindings::bindings.end(); ++b) {
+               kedit->add_tab ((*b)->name(), **b);
+       }
+
+       return kedit;
+}
+
 BundleManager*
 ARDOUR_UI::create_bundle_manager ()
 {
@@ -521,6 +872,14 @@ ARDOUR_UI::create_big_clock_window ()
        return new BigClockWindow (*big_clock);
 }
 
+BigTransportWindow*
+ARDOUR_UI::create_big_transport_window ()
+{
+       BigTransportWindow* btw = new BigTransportWindow ();
+       btw->set_session (_session);
+       return btw;
+}
+
 void
 ARDOUR_UI::handle_locations_change (Location *)
 {
@@ -534,23 +893,29 @@ ARDOUR_UI::handle_locations_change (Location *)
 }
 
 bool
-ARDOUR_UI::main_window_state_event_handler (GdkEventWindowState* ev, bool window_was_editor)
+ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* object)
 {
-       if (window_was_editor) {
+       if (object == editor) {
 
                if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) &&
                    (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
                        if (big_clock_window) {
-                               big_clock_window->set_transient_for (*editor);
+                               big_clock_window->set_transient_for (*editor->own_window());
+                       }
+                       if (big_transport_window) {
+                               big_transport_window->set_transient_for (*editor->own_window());
                        }
                }
 
-       } else {
+       } else if (object == mixer) {
 
                if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) &&
                    (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) {
                        if (big_clock_window) {
-                               big_clock_window->set_transient_for (*mixer);
+                               big_clock_window->set_transient_for (*mixer->own_window());
+                       }
+                       if (big_transport_window) {
+                               big_transport_window->set_transient_for (*mixer->own_window());
                        }
                }
        }