smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 20:56:28 +01:00
Code Issues Projects Releases Wiki Activity

merge with master

Browse source
This commit is contained in:
Paul Davis 2013-05-08 14:48:28 -04:00
commit bebe2af95a
36 changed files with 563 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/actions.cc
View file

@ -63,13 +63,18 @@ vector<RefPtr<Gtk::Action> > ActionManager::jack_opposite_sensitive_actions;
vector<RefPtr<Gtk::Action> > ActionManager::transport_sensitive_actions; vector<RefPtr<Gtk::Action> > ActionManager::transport_sensitive_actions;
vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actions; vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actions;
static Glib::RefPtr<UIManager> ui_manager;
void void
ActionManager::init () ActionManager::init ()
{ {
std::string ui_file;
ui_manager = UIManager::create (); ui_manager = UIManager::create ();
}
void
ActionManager::load_menus ()
{
std::string ui_file;
find_file_in_search_path (ardour_config_search_path(), "ardour.menus", ui_file); find_file_in_search_path (ardour_config_search_path(), "ardour.menus", ui_file);

1
gtk2_ardour/actions.h
View file

@ -30,6 +30,7 @@ namespace ActionManager {
/* Ardour specific */ /* Ardour specific */
extern void init (); extern void init ();
extern void load_menus ();
extern std::vector<Glib::RefPtr<Gtk::Action> > session_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > session_sensitive_actions;
extern std::vector<Glib::RefPtr<Gtk::Action> > write_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > write_sensitive_actions;

17
gtk2_ardour/ardour.menus.in
View file

@ -35,9 +35,10 @@
<menuitem action='addExistingAudioFiles'/> <menuitem action='addExistingAudioFiles'/>
<!--menuitem action='importFromSession'/--> <!--menuitem action='importFromSession'/-->
#ifndef GTKOSX
<menuitem action='OpenVideo'/> <menuitem action='OpenVideo'/>
<menuitem action='CloseVideo'/> <menuitem action='CloseVideo'/>
#endif
<menu name='Export' action='Export'> <menu name='Export' action='Export'>
<menuitem action='ExportAudio'/> <menuitem action='ExportAudio'/>
<menuitem action='StemExport'/> <menuitem action='StemExport'/>
@ -47,16 +48,16 @@
<menuitem action='CleanupUnused'/> <menuitem action='CleanupUnused'/>
<menuitem action='FlushWastebasket'/> <menuitem action='FlushWastebasket'/>
</menu> </menu>
#ifndef GTKOSX
<separator/> <separator/>
#endif
<menuitem action='toggle-session-options-editor'/> <menuitem action='toggle-session-options-editor'/>
#ifdef GTKOSX #ifdef GTKOSX
<menuitem action='toggle-rc-options-editor'/>
<menuitem action='toggle-about'/> <menuitem action='toggle-about'/>
<menuitem action='toggle-rc-options-editor'/>
#endif #endif
#ifndef GTKOSX
<separator/> <separator/>
<menuitem action='Quit'/> <menuitem action='Quit'/>
#endif
</menu> </menu>
<menu name='Transport' action='Transport'> <menu name='Transport' action='Transport'>
@ -281,7 +282,9 @@
<menuitem action='snap-regions-to-grid'/> <menuitem action='snap-regions-to-grid'/>
<menuitem action='toggle-region-lock'/> <menuitem action='toggle-region-lock'/>
<menuitem action='toggle-region-lock-style'/> <menuitem action='toggle-region-lock-style'/>
#ifndef GTKOSX
<menuitem action='toggle-region-video-lock'/> <menuitem action='toggle-region-video-lock'/>
#endif
<menuitem action='set-region-sync-position'/> <menuitem action='set-region-sync-position'/>
<menuitem action='remove-region-sync'/> <menuitem action='remove-region-sync'/>
<menuitem action='nudge-forward'/> <menuitem action='nudge-forward'/>
@ -434,7 +437,9 @@
<menuitem action="toggle-cd-marker-ruler"/> <menuitem action="toggle-cd-marker-ruler"/>
<menuitem action="toggle-marker-ruler"/> <menuitem action="toggle-marker-ruler"/>
<separator/> <separator/>
#ifndef GTKOSX
<menuitem action="toggle-video-ruler"/> <menuitem action="toggle-video-ruler"/>
#endif
</menu> </menu>
<menu action="VideoMonitorMenu"> <menu action="VideoMonitorMenu">
<menuitem action="zoom-vmon-100"/> <menuitem action="zoom-vmon-100"/>
@ -552,8 +557,10 @@
<menuitem action="toggle-marker-ruler"/> <menuitem action="toggle-marker-ruler"/>
<menuitem action="toggle-cd-marker-ruler"/> <menuitem action="toggle-cd-marker-ruler"/>
<menuitem action="toggle-loop-punch-ruler"/> <menuitem action="toggle-loop-punch-ruler"/>
#ifndef GTKOSX
<separator/> <separator/>
<menuitem action="toggle-video-ruler"/> <menuitem action="toggle-video-ruler"/>
#endif
</popup> </popup>
<popup name='ProcessorMenu'> <popup name='ProcessorMenu'>
@ -649,7 +656,9 @@
<menuitem action='naturalize-region'/> <menuitem action='naturalize-region'/>
<menuitem action='toggle-region-lock'/> <menuitem action='toggle-region-lock'/>
<menuitem action='toggle-region-lock-style'/> <menuitem action='toggle-region-lock-style'/>
#ifndef GTKOSX
<menuitem action='toggle-region-video-lock'/> <menuitem action='toggle-region-video-lock'/>
#endif
<menuitem action='snap-regions-to-grid'/> <menuitem action='snap-regions-to-grid'/>
<menuitem action='set-region-sync-position'/> <menuitem action='set-region-sync-position'/>
<menuitem action='remove-region-sync'/> <menuitem action='remove-region-sync'/>

30
gtk2_ardour/ardour_dialog.cc
View file

@ -26,6 +26,8 @@
#include "ardour_ui.h" #include "ardour_ui.h"
#include "keyboard.h" #include "keyboard.h"
#include "splash.h" #include "splash.h"
#include "utils.h"
#include "window_manager.h"
using namespace std; using namespace std;
using namespace Gtk; using namespace Gtk;
@ -33,6 +35,7 @@ using namespace Gtkmm2ext;
ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator) ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
: Dialog (title, modal, use_seperator) : Dialog (title, modal, use_seperator)
, proxy (0)
, _splash_pushed (false) , _splash_pushed (false)
{ {
init (); init ();
@ -56,6 +59,13 @@ ArdourDialog::~ArdourDialog ()
spl->pop_front(); spl->pop_front();
} }
} }
WM::Manager::instance().remove (proxy);
}
bool
ArdourDialog::on_key_press_event (GdkEventKey* ev)
{
return relay_key_press (ev, this);
} }
bool bool
@ -94,10 +104,28 @@ ArdourDialog::on_show ()
} }
} }
bool
ArdourDialog::on_delete_event (GdkEventAny*)
{
hide ();
return false;
}
void void
ArdourDialog::init () ArdourDialog::init ()
{ {
set_border_width (10); set_border_width (10);
// set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
Gtk::Window* parent = WM::Manager::instance().transient_parent();
if (parent) {
set_transient_for (*parent);
}
ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL)); ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
proxy = new WM::ProxyTemporary (get_title(), this);
WM::Manager::instance().register_window (proxy);
} }

7
gtk2_ardour/ardour_dialog.h
View file

@ -25,6 +25,10 @@
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
namespace WM {
class ProxyTemporary;
}
/* /*
* This virtual parent class is so that each dialog box uses the * This virtual parent class is so that each dialog box uses the
* same mechanism to declare its closing. It shares a common * same mechanism to declare its closing. It shares a common
@ -40,10 +44,13 @@ class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
bool on_enter_notify_event (GdkEventCrossing*); bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*); bool on_leave_notify_event (GdkEventCrossing*);
bool on_delete_event (GdkEventAny*);
bool on_key_press_event (GdkEventKey*);
void on_unmap (); void on_unmap ();
void on_show (); void on_show ();
private: private:
WM::ProxyTemporary* proxy;
bool _splash_pushed; bool _splash_pushed;
void init (); void init ();

47
gtk2_ardour/ardour_ui.cc
View file

@ -148,6 +148,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
: Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp) : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
, gui_object_state (new GUIObjectState) , gui_object_state (new GUIObjectState)
, primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true)) , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true))
, secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true)) , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true))
@ -155,6 +156,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false)) , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
/* start of private members */
, _startup (0)
, engine (0)
, nsm (0)
, _was_dirty (false)
, _mixer_on_top (false)
/* transport */ /* transport */
, roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)) , roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll))
@ -197,7 +206,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
Gtkmm2ext::init(localedir); Gtkmm2ext::init(localedir);
splash = 0; splash = 0;
_startup = 0;
if (theArdourUI == 0) { if (theArdourUI == 0) {
theArdourUI = this; theArdourUI = this;
@ -311,7 +319,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
TimeAxisViewItem::set_constant_heights (); TimeAxisViewItem::set_constant_heights ();
/* load up the UI manager */ /* Set this up so that our window proxies can register actions */
ActionManager::init (); ActionManager::init ();
@ -336,20 +344,20 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
midi_port_matrix.set_state (*ui_xml); midi_port_matrix.set_state (*ui_xml);
} }
WindowManager::instance().register_window (&theme_manager); WM::Manager::instance().register_window (&theme_manager);
WindowManager::instance().register_window (&key_editor); WM::Manager::instance().register_window (&key_editor);
WindowManager::instance().register_window (&rc_option_editor); WM::Manager::instance().register_window (&rc_option_editor);
WindowManager::instance().register_window (&session_option_editor); WM::Manager::instance().register_window (&session_option_editor);
WindowManager::instance().register_window (&speaker_config_window); WM::Manager::instance().register_window (&speaker_config_window);
WindowManager::instance().register_window (&about); WM::Manager::instance().register_window (&about);
WindowManager::instance().register_window (&add_route_dialog); WM::Manager::instance().register_window (&add_route_dialog);
WindowManager::instance().register_window (&add_video_dialog); WM::Manager::instance().register_window (&add_video_dialog);
WindowManager::instance().register_window (&route_params); WM::Manager::instance().register_window (&route_params);
WindowManager::instance().register_window (&bundle_manager); WM::Manager::instance().register_window (&bundle_manager);
WindowManager::instance().register_window (&location_ui); WM::Manager::instance().register_window (&location_ui);
WindowManager::instance().register_window (&big_clock_window); WM::Manager::instance().register_window (&big_clock_window);
WindowManager::instance().register_window (&audio_port_matrix); WM::Manager::instance().register_window (&audio_port_matrix);
WindowManager::instance().register_window (&midi_port_matrix); WM::Manager::instance().register_window (&midi_port_matrix);
/* We need to instantiate the theme manager because it loads our /* We need to instantiate the theme manager because it loads our
theme files. This should really change so that its window theme files. This should really change so that its window
@ -418,6 +426,8 @@ ARDOUR_UI::post_engine ()
_tooltips.enable(); _tooltips.enable();
ActionManager::load_menus ();
if (setup_windows ()) { if (setup_windows ()) {
throw failed_constructor (); throw failed_constructor ();
} }
@ -688,7 +698,6 @@ ARDOUR_UI::startup ()
app->ready (); app->ready ();
nsm_url = getenv ("NSM_URL"); nsm_url = getenv ("NSM_URL");
nsm = 0;
if (nsm_url) { if (nsm_url) {
nsm = new NSM_Client; nsm = new NSM_Client;
@ -746,7 +755,7 @@ ARDOUR_UI::startup ()
goto_editor_window (); goto_editor_window ();
WindowManager::instance().show_visible (); WM::Manager::instance().show_visible ();
/* We have to do this here since goto_editor_window() ends up calling show_all() on the /* We have to do this here since goto_editor_window() ends up calling show_all() on the
* editor window, and we may want stuff to be hidden. * editor window, and we may want stuff to be hidden.
@ -2329,7 +2338,7 @@ ARDOUR_UI::save_state (const string & name, bool switch_to_it)
{ {
XMLNode* node = new XMLNode (X_("UI")); XMLNode* node = new XMLNode (X_("UI"));
WindowManager::instance().add_state (*node); WM::Manager::instance().add_state (*node);
node->add_child_nocopy (gui_object_state->get_state()); node->add_child_nocopy (gui_object_state->get_state());

31
gtk2_ardour/ardour_ui.h
View file

@ -300,6 +300,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
Gtk::Tooltips _tooltips; Gtk::Tooltips _tooltips;
NSM_Client *nsm; NSM_Client *nsm;
bool _was_dirty; bool _was_dirty;
bool _mixer_on_top;
void goto_editor_window (); void goto_editor_window ();
void goto_mixer_window (); void goto_mixer_window ();
@ -347,8 +348,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void start_clocking (); void start_clocking ();
void stop_clocking (); void stop_clocking ();
void manage_window (Gtk::Window&);
bool main_window_state_event_handler (GdkEventWindowState*, bool window_was_editor); bool main_window_state_event_handler (GdkEventWindowState*, bool window_was_editor);
void update_transport_clocks (framepos_t pos); void update_transport_clocks (framepos_t pos);
@ -572,23 +571,23 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
/* Dialogs that can be created via new<T> */ /* Dialogs that can be created via new<T> */
WindowManager::Proxy<SpeakerDialog> speaker_config_window; WM::Proxy<SpeakerDialog> speaker_config_window;
WindowManager::Proxy<ThemeManager> theme_manager; WM::Proxy<ThemeManager> theme_manager;
WindowManager::Proxy<KeyEditor> key_editor; WM::Proxy<KeyEditor> key_editor;
WindowManager::Proxy<RCOptionEditor> rc_option_editor; WM::Proxy<RCOptionEditor> rc_option_editor;
WindowManager::Proxy<AddRouteDialog> add_route_dialog; WM::Proxy<AddRouteDialog> add_route_dialog;
WindowManager::Proxy<About> about; WM::Proxy<About> about;
WindowManager::Proxy<LocationUIWindow> location_ui; WM::Proxy<LocationUIWindow> location_ui;
WindowManager::Proxy<RouteParams_UI> route_params; WM::Proxy<RouteParams_UI> route_params;
/* Windows/Dialogs that require a creator method */ /* Windows/Dialogs that require a creator method */
WindowManager::ProxyWithConstructor<SessionOptionEditor> session_option_editor; WM::ProxyWithConstructor<SessionOptionEditor> session_option_editor;
WindowManager::ProxyWithConstructor<AddVideoDialog> add_video_dialog; WM::ProxyWithConstructor<AddVideoDialog> add_video_dialog;
WindowManager::ProxyWithConstructor<BundleManager> bundle_manager; WM::ProxyWithConstructor<BundleManager> bundle_manager;
WindowManager::ProxyWithConstructor<BigClockWindow> big_clock_window; WM::ProxyWithConstructor<BigClockWindow> big_clock_window;
WindowManager::ProxyWithConstructor<GlobalPortMatrixWindow> audio_port_matrix; WM::ProxyWithConstructor<GlobalPortMatrixWindow> audio_port_matrix;
WindowManager::ProxyWithConstructor<GlobalPortMatrixWindow> midi_port_matrix; WM::ProxyWithConstructor<GlobalPortMatrixWindow> midi_port_matrix;
/* creator methods */ /* creator methods */

8
gtk2_ardour/ardour_ui2.cc
View file

@ -428,14 +428,6 @@ ARDOUR_UI::setup_transport ()
} }
} }
void
ARDOUR_UI::manage_window (Window& win)
{
win.signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), &win));
win.signal_enter_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::enter_window), &win));
win.signal_leave_notify_event().connect (sigc::bind (sigc::mem_fun (Keyboard::the_keyboard(), &Keyboard::leave_window), &win));
}
void void
ARDOUR_UI::detach_tearoff (Box* b, Widget* w) ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
{ {

71
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -95,7 +95,7 @@ ARDOUR_UI::set_session (Session *s)
} }
AutomationWatch::instance().set_session (s); AutomationWatch::instance().set_session (s);
WindowManager::instance().set_session (s); WM::Manager::instance().set_session (s);
if (shuttle_box) { if (shuttle_box) {
shuttle_box->set_session (s); shuttle_box->set_session (s);
@ -268,19 +268,21 @@ ARDOUR_UI::goto_editor_window ()
editor->show_window (); editor->show_window ();
editor->present (); editor->present ();
flush_pending (); /* mixer should now be on top */
WM::Manager::instance().set_transient_for (editor);
_mixer_on_top = false;
} }
void void
ARDOUR_UI::goto_mixer_window () ARDOUR_UI::goto_mixer_window ()
{ {
if (!editor) { Glib::RefPtr<Gdk::Window> win;
return;
}
Glib::RefPtr<Gdk::Window> win = editor->get_window ();
Glib::RefPtr<Gdk::Screen> screen; Glib::RefPtr<Gdk::Screen> screen;
if (editor) {
win = editor->get_window ();
}
if (win) { if (win) {
screen = win->get_screen(); screen = win->get_screen();
} else { } else {
@ -295,10 +297,11 @@ ARDOUR_UI::goto_mixer_window ()
mixer->show_window (); mixer->show_window ();
mixer->present (); mixer->present ();
flush_pending (); /* mixer should now be on top */
WM::Manager::instance().set_transient_for (mixer);
_mixer_on_top = true;
} }
void void
ARDOUR_UI::toggle_mixer_window () ARDOUR_UI::toggle_mixer_window ()
{ {
@ -319,14 +322,26 @@ ARDOUR_UI::toggle_mixer_window ()
void void
ARDOUR_UI::toggle_editor_mixer () ARDOUR_UI::toggle_editor_mixer ()
{ {
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) { if (editor && mixer) {
if (editor->get_screen() != mixer->get_screen()) { /* remeber: Screen != Monitor (Screen is a separately rendered
// different screens, so don't do anything * continuous geometry that make include 1 or more monitors.
return; */
}
/* See if they are obscuring each other */ 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 ex, ey, ew, eh;
gint mx, my, mw, mh; gint mx, my, mw, mh;
@ -351,17 +366,36 @@ ARDOUR_UI::toggle_editor_mixer ()
m.width = mw; m.width = mw;
m.height = mh; m.height = mh;
if (!gdk_rectangle_intersect (&e, &m, &r)) { if (gdk_rectangle_intersect (&e, &m, &r)) {
/* they do not intersect so do not toggle */ obscuring = true;
return; }
} }
} }
if (mixer && mixer->fully_visible()) { 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 (); goto_editor_window ();
} else { } else {
goto_mixer_window (); goto_mixer_window ();
} }
}
} }
void void
@ -380,7 +414,6 @@ ARDOUR_UI::new_midi_tracer_window ()
if (i == _midi_tracer_windows.end()) { if (i == _midi_tracer_windows.end()) {
/* all our MIDITracer windows are visible; make a new one */ /* all our MIDITracer windows are visible; make a new one */
MidiTracer* t = new MidiTracer (); MidiTracer* t = new MidiTracer ();
manage_window (*t);
t->show_all (); t->show_all ();
_midi_tracer_windows.push_back (t); _midi_tracer_windows.push_back (t);
} else { } else {

15
gtk2_ardour/ardour_ui_ed.cc
View file

@ -573,19 +573,26 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
Gtk::Widget* widget; Gtk::Widget* widget;
Application* app = Application::instance (); Application* app = Application::instance ();
/* Quit will be taken of separately */ /* the addresses ("/ui/Main...") used below are based on the menu definitions in the menus file
*/
/* Quit will be taken care of separately */
if ((widget = ActionManager::get_widget ("/ui/Main/Session/Quit"))) { if ((widget = ActionManager::get_widget ("/ui/Main/Session/Quit"))) {
widget->hide (); widget->hide ();
} }
/* Put items for About and Preferences into App menu (the
* ardour.menus.in file does not list them for OS X)
*/
GtkApplicationMenuGroup* group = app->add_app_menu_group (); GtkApplicationMenuGroup* group = app->add_app_menu_group ();
if ((widget = ActionManager::get_widget ("/ui/Main/Session/About"))) { if ((widget = ActionManager::get_widget ("/ui/Main/Session/toggle-about"))) {
app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget)); app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget));
} }
if ((widget = ActionManager::get_widget ("/ui/Main/Session/ToggleRCOptionsEditor"))) { if ((widget = ActionManager::get_widget ("/ui/Main/Session/toggle-rc-options-editor"))) {
app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget)); app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget));
} }
@ -612,7 +619,7 @@ ARDOUR_UI::save_ardour_state ()
/* Windows */ /* Windows */
WindowManager::instance().add_state (*window_node); WM::Manager::instance().add_state (*window_node);
/* tearoffs */ /* tearoffs */

28
gtk2_ardour/ardour_window.cc
View file

@ -25,6 +25,7 @@
#include "ardour_window.h" #include "ardour_window.h"
#include "ardour_ui.h" #include "ardour_ui.h"
#include "keyboard.h" #include "keyboard.h"
#include "utils.h"
using namespace std; using namespace std;
using namespace Gtk; using namespace Gtk;
@ -50,6 +51,13 @@ ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
ArdourWindow::~ArdourWindow () ArdourWindow::~ArdourWindow ()
{ {
WM::Manager::instance().remove (proxy);
}
bool
ArdourWindow::on_key_press_event (GdkEventKey* ev)
{
return relay_key_press (ev, this);
} }
bool bool
@ -73,6 +81,13 @@ ArdourWindow::on_unmap ()
Window::on_unmap (); Window::on_unmap ();
} }
bool
ArdourWindow::on_delete_event (GdkEventAny*)
{
hide ();
return false;
}
void void
ArdourWindow::init () ArdourWindow::init ()
{ {
@ -88,8 +103,21 @@ ArdourWindow::init ()
vice versa. vice versa.
*/ */
if (ARDOUR_UI::instance()->config()->get_all_floating_windows_are_dialogs()) {
set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
} else {
set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY); set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
}
Gtk::Window* parent = WM::Manager::instance().transient_parent();
if (parent) {
set_transient_for (*parent);
}
ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide)); ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide));
proxy = new WM::ProxyTemporary (get_title(), this);
WM::Manager::instance().register_window (proxy);
} }

7
gtk2_ardour/ardour_window.h
View file

@ -27,6 +27,10 @@
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
namespace WM {
class ProxyTemporary;
}
/** /**
* This virtual parent class is so that each window uses the * This virtual parent class is so that each window uses the
* same mechanism to declare its closing. It shares a common * same mechanism to declare its closing. It shares a common
@ -42,9 +46,12 @@ class ArdourWindow : public Gtk::Window, public ARDOUR::SessionHandlePtr, public
bool on_enter_notify_event (GdkEventCrossing*); bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*); bool on_leave_notify_event (GdkEventCrossing*);
bool on_delete_event (GdkEventAny *);
bool on_key_press_event (GdkEventKey*);
void on_unmap (); void on_unmap ();
private: private:
WM::ProxyTemporary* proxy;
void init (); void init ();
}; };

2
gtk2_ardour/big_clock_window.cc
View file

@ -53,6 +53,8 @@ BigClockWindow::BigClockWindow (AudioClock& c)
void void
BigClockWindow::on_unmap () BigClockWindow::on_unmap ()
{ {
ArdourWindow::on_unmap ();
PublicEditor::instance().reset_focus (); PublicEditor::instance().reset_focus ();
} }

3
gtk2_ardour/editor.cc
View file

@ -229,8 +229,7 @@ pane_size_watcher (Paned* pane)
} }
Editor::Editor () Editor::Editor ()
: VisibilityTracker (*((Gtk::Window*) this)) : _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
, _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
/* time display buttons */ /* time display buttons */
, minsec_label (_("Mins:Secs")) , minsec_label (_("Mins:Secs"))

3
gtk2_ardour/editor.h
View file

@ -37,7 +37,6 @@
#include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndtreeview.h"
#include "gtkmm2ext/stateful_button.h" #include "gtkmm2ext/stateful_button.h"
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/visibility_tracker.h"
#include "pbd/stateful.h" #include "pbd/stateful.h"
#include "pbd/signals.h" #include "pbd/signals.h"
@ -126,7 +125,7 @@ class TimeSelection;
class RegionLayeringOrderEditor; class RegionLayeringOrderEditor;
class VerboseCursor; class VerboseCursor;
class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr, public Gtkmm2ext::VisibilityTracker class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
{ {
public: public:
Editor (); Editor ();

2
gtk2_ardour/export_channel_selector.cc
View file

@ -110,8 +110,10 @@ PortExportChannelSelector::fill_route_list ()
/* Add master bus and then everything else */ /* Add master bus and then everything else */
if (_session->master_out()) {
ARDOUR::IO* master = _session->master_out()->output().get(); ARDOUR::IO* master = _session->master_out()->output().get();
channel_view.add_route (master); channel_view.add_route (master);
}
for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) { for (RouteList::iterator it = routes.begin(); it != routes.end(); ++it) {
if ((*it)->is_master () || (*it)->is_monitor ()) { if ((*it)->is_master () || (*it)->is_monitor ()) {

8
gtk2_ardour/processor_box.cc
View file

@ -1378,7 +1378,7 @@ ProcessorBox::redisplay_processors ()
++j; ++j;
if (!(*i)->marked) { if (!(*i)->marked) {
WindowManager::instance().remove (*i); WM::Manager::instance().remove (*i);
delete *i; delete *i;
_processor_window_info.erase (i); _processor_window_info.erase (i);
} }
@ -1451,7 +1451,7 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr<Processor> w)
} }
_processor_window_info.push_back (wp); _processor_window_info.push_back (wp);
WindowManager::instance().register_window (wp); WM::Manager::instance().register_window (wp);
} }
void void
@ -2624,7 +2624,7 @@ ProcessorBox::update_gui_object_state (ProcessorEntry* entry)
} }
ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr<Processor> processor) ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr<Processor> processor)
: WindowManager::ProxyBase (name, string()) : WM::ProxyBase (name, string())
, marked (false) , marked (false)
, _processor_box (box) , _processor_box (box)
, _processor (processor) , _processor (processor)
@ -2678,5 +2678,5 @@ ProcessorWindowProxy::toggle ()
drop_window (); drop_window ();
} }
WindowManager::ProxyBase::toggle (); WM::ProxyBase::toggle ();
} }

2
gtk2_ardour/processor_box.h
View file

@ -75,7 +75,7 @@ namespace ARDOUR {
class ProcessorBox; class ProcessorBox;
class ProcessorWindowProxy : public WindowManager::ProxyBase class ProcessorWindowProxy : public WM::ProxyBase
{ {
public: public:
ProcessorWindowProxy (std::string const &, ProcessorBox *, boost::weak_ptr<ARDOUR::Processor>); ProcessorWindowProxy (std::string const &, ProcessorBox *, boost::weak_ptr<ARDOUR::Processor>);

1
gtk2_ardour/public_editor.cc
View file

@ -30,6 +30,7 @@ sigc::signal<void> PublicEditor::DropDownKeys;
PublicEditor::PublicEditor () PublicEditor::PublicEditor ()
: Window (Gtk::WINDOW_TOPLEVEL) : Window (Gtk::WINDOW_TOPLEVEL)
, VisibilityTracker (*((Gtk::Window*)this))
{ {
} }

3
gtk2_ardour/public_editor.h
View file

@ -40,6 +40,7 @@
#include "pbd/statefuldestructible.h" #include "pbd/statefuldestructible.h"
#include "canvas/fwd.h" #include "canvas/fwd.h"
#include "gtkmm2ext/visibility_tracker.h"
#include "editing.h" #include "editing.h"
#include "selection.h" #include "selection.h"
@ -98,7 +99,7 @@ using ARDOUR::framecnt_t;
* of PublicEditor need not be recompiled if private methods or member variables * of PublicEditor need not be recompiled if private methods or member variables
* change. * change.
*/ */
class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible { class PublicEditor : public Gtk::Window, public PBD::StatefulDestructible, public Gtkmm2ext::VisibilityTracker {
public: public:
PublicEditor (); PublicEditor ();
virtual ~PublicEditor (); virtual ~PublicEditor ();

23
gtk2_ardour/theme_manager.cc
View file

@ -31,6 +31,7 @@
#include "gtkmm2ext/cell_renderer_color_selector.h" #include "gtkmm2ext/cell_renderer_color_selector.h"
#include "pbd/file_utils.h" #include "pbd/file_utils.h"
#include "pbd/compose.h"
#include "ardour/filesystem_paths.h" #include "ardour/filesystem_paths.h"
@ -62,7 +63,7 @@ ThemeManager::ThemeManager()
, waveform_gradient_depth_label (_("Waveforms color gradient depth")) , waveform_gradient_depth_label (_("Waveforms color gradient depth"))
, timeline_item_gradient_depth (0, 2.0, 0.1) , timeline_item_gradient_depth (0, 2.0, 0.1)
, timeline_item_gradient_depth_label (_("Timeline item gradient depth")) , timeline_item_gradient_depth_label (_("Timeline item gradient depth"))
, all_dialogs (_("All floating windows are dialogs"))
{ {
set_title (_("Theme Manager")); set_title (_("Theme Manager"));
@ -97,6 +98,9 @@ ThemeManager::ThemeManager()
vbox->set_homogeneous (false); vbox->set_homogeneous (false);
vbox->pack_start (theme_selection_hbox, PACK_SHRINK); vbox->pack_start (theme_selection_hbox, PACK_SHRINK);
vbox->pack_start (reset_button, PACK_SHRINK); vbox->pack_start (reset_button, PACK_SHRINK);
#ifndef __APPLE__
vbox->pack_start (all_dialogs, PACK_SHRINK);
#endif
vbox->pack_start (flat_buttons, PACK_SHRINK); vbox->pack_start (flat_buttons, PACK_SHRINK);
Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox()); Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox());
@ -112,6 +116,9 @@ ThemeManager::ThemeManager()
vbox->pack_start (*hbox, PACK_SHRINK); vbox->pack_start (*hbox, PACK_SHRINK);
vbox->pack_start (scroller); vbox->pack_start (scroller);
vbox->show_all ();
add (*vbox); add (*vbox);
waveform_gradient_depth.set_update_policy (Gtk::UPDATE_DELAYED); waveform_gradient_depth.set_update_policy (Gtk::UPDATE_DELAYED);
@ -130,6 +137,12 @@ ThemeManager::ThemeManager()
flat_buttons.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_flat_buttons_toggled)); flat_buttons.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_flat_buttons_toggled));
waveform_gradient_depth.signal_value_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_waveform_gradient_depth_change)); waveform_gradient_depth.signal_value_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_waveform_gradient_depth_change));
timeline_item_gradient_depth.signal_value_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_timeline_item_gradient_depth_change)); timeline_item_gradient_depth.signal_value_changed().connect (sigc::mem_fun (*this, &ThemeManager::on_timeline_item_gradient_depth_change));
all_dialogs.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_all_dialogs_toggled));
Gtkmm2ext::UI::instance()->set_tip (all_dialogs,
string_compose (_("Mark all floating windows to be type \"Dialog\" rather than using \"Utility\" for some.\n"
"This may help with some window managers. This requires a restart of %1 to take effect"),
PROGRAM_NAME));
set_size_request (-1, 400); set_size_request (-1, 400);
setup_theme (); setup_theme ();
@ -266,6 +279,13 @@ ThemeManager::on_flat_buttons_toggled ()
gtk_rc_reset_styles (gtk_settings_get_default()); gtk_rc_reset_styles (gtk_settings_get_default());
} }
void
ThemeManager::on_all_dialogs_toggled ()
{
ARDOUR_UI::config()->set_all_floating_windows_are_dialogs (all_dialogs.get_active());
ARDOUR_UI::config()->set_dirty ();
}
void void
ThemeManager::on_waveform_gradient_depth_change () ThemeManager::on_waveform_gradient_depth_change ()
{ {
@ -397,6 +417,7 @@ ThemeManager::setup_theme ()
flat_buttons.set_active (ARDOUR_UI::config()->get_flat_buttons()); flat_buttons.set_active (ARDOUR_UI::config()->get_flat_buttons());
waveform_gradient_depth.set_value (ARDOUR_UI::config()->get_waveform_gradient_depth()); waveform_gradient_depth.set_value (ARDOUR_UI::config()->get_waveform_gradient_depth());
timeline_item_gradient_depth.set_value (ARDOUR_UI::config()->get_timeline_item_gradient_depth()); timeline_item_gradient_depth.set_value (ARDOUR_UI::config()->get_timeline_item_gradient_depth());
all_dialogs.set_active (ARDOUR_UI::config()->get_all_floating_windows_are_dialogs());
load_rc_file(rcfile, false); load_rc_file(rcfile, false);
} }

3
gtk2_ardour/theme_manager.h
View file

@ -46,6 +46,7 @@ class ThemeManager : public ArdourWindow
void on_flat_buttons_toggled (); void on_flat_buttons_toggled ();
void on_waveform_gradient_depth_change (); void on_waveform_gradient_depth_change ();
void on_timeline_item_gradient_depth_change (); void on_timeline_item_gradient_depth_change ();
void on_all_dialogs_toggled ();
private: private:
struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
@ -76,6 +77,8 @@ class ThemeManager : public ArdourWindow
Gtk::Label waveform_gradient_depth_label; Gtk::Label waveform_gradient_depth_label;
Gtk::HScale timeline_item_gradient_depth; Gtk::HScale timeline_item_gradient_depth;
Gtk::Label timeline_item_gradient_depth_label; Gtk::Label timeline_item_gradient_depth_label;
Gtk::CheckButton all_dialogs;
Gtk::CheckButton gradient_waveforms;
bool button_press_event (GdkEventButton*); bool button_press_event (GdkEventButton*);
}; };

2
gtk2_ardour/time_axis_view_item.cc
View file

@ -265,7 +265,7 @@ TimeAxisViewItem::~TimeAxisViewItem()
} }
bool bool
TimeAxisViewItem::canvas_group_event (GdkEvent* ev) TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/)
{ {
return false; return false;
} }

1
gtk2_ardour/ui_config_vars.h
View file

@ -21,4 +21,5 @@ UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ardour3_ui_dark.rc")
UI_CONFIG_VARIABLE(bool, flat_buttons, "flat-buttons", false) UI_CONFIG_VARIABLE(bool, flat_buttons, "flat-buttons", false)
UI_CONFIG_VARIABLE(float, waveform_gradient_depth, "waveform-gradient-depth", 0.6) UI_CONFIG_VARIABLE(float, waveform_gradient_depth, "waveform-gradient-depth", 0.6)
UI_CONFIG_VARIABLE(float, timeline_item_gradient_depth, "timeline-item-gradient-depth", 1.3) UI_CONFIG_VARIABLE(float, timeline_item_gradient_depth, "timeline-item-gradient-depth", 1.3)
UI_CONFIG_VARIABLE(bool, all_floating_windows_are_dialogs, "all-floating-windows-are-dialogs", false)

122
gtk2_ardour/window_manager.cc
View file

@ -25,29 +25,33 @@
#include "gtkmm2ext/visibility_tracker.h" #include "gtkmm2ext/visibility_tracker.h"
#include "actions.h" #include "actions.h"
#include "ardour_dialog.h"
#include "ardour_window.h"
#include "window_manager.h" #include "window_manager.h"
#include "i18n.h" #include "i18n.h"
using std::string; using std::string;
using namespace WM;
WindowManager* WindowManager::_instance = 0; Manager* Manager::_instance = 0;
WindowManager& Manager&
WindowManager::instance () Manager::instance ()
{ {
if (!_instance) { if (!_instance) {
_instance = new WindowManager; _instance = new Manager;
} }
return *_instance; return *_instance;
} }
WindowManager::WindowManager () Manager::Manager ()
: current_transient_parent (0)
{ {
} }
void void
WindowManager::register_window (ProxyBase* info) Manager::register_window (ProxyBase* info)
{ {
_windows.push_back (info); _windows.push_back (info);
@ -59,12 +63,12 @@ WindowManager::register_window (ProxyBase* info)
} }
info->set_action (ActionManager::register_action (window_actions, info->action_name().c_str(), info->menu_name().c_str(), info->set_action (ActionManager::register_action (window_actions, info->action_name().c_str(), info->menu_name().c_str(),
sigc::bind (sigc::mem_fun (*this, &WindowManager::toggle_window), info))); sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
} }
} }
void void
WindowManager::remove (const ProxyBase* info) Manager::remove (const ProxyBase* info)
{ {
for (Windows::iterator i = _windows.begin(); i != _windows.end(); ++i) { for (Windows::iterator i = _windows.begin(); i != _windows.end(); ++i) {
if ((*i) == info) { if ((*i) == info) {
@ -75,7 +79,7 @@ WindowManager::remove (const ProxyBase* info)
} }
void void
WindowManager::toggle_window (ProxyBase* proxy) Manager::toggle_window (ProxyBase* proxy)
{ {
if (proxy) { if (proxy) {
proxy->toggle (); proxy->toggle ();
@ -83,7 +87,7 @@ WindowManager::toggle_window (ProxyBase* proxy)
} }
void void
WindowManager::show_visible() const Manager::show_visible() const
{ {
for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) { for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) {
if ((*i)->visible()) { if ((*i)->visible()) {
@ -94,15 +98,20 @@ WindowManager::show_visible() const
} }
void void
WindowManager::add_state (XMLNode& root) const Manager::add_state (XMLNode& root) const
{ {
for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) { for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) {
/* don't save state for temporary proxy windows
*/
if (dynamic_cast<ProxyTemporary*> (*i)) {
continue;
}
root.add_child_nocopy ((*i)->get_state()); root.add_child_nocopy ((*i)->get_state());
} }
} }
void void
WindowManager::set_session (ARDOUR::Session* s) Manager::set_session (ARDOUR::Session* s)
{ {
for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) { for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) {
ARDOUR::SessionHandlePtr* sp = (*i)->session_handle (); ARDOUR::SessionHandlePtr* sp = (*i)->session_handle ();
@ -112,9 +121,34 @@ WindowManager::set_session (ARDOUR::Session* s)
} }
} }
/*-----------------------*/ void
Manager::set_transient_for (Gtk::Window* parent)
{
#ifndef __APPLE__
if (parent) {
for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) {
Gtk::Window* win = (*i)->get();
if (win) {
std::cerr << "marked " << win->get_title() << " as transient of " << parent->get_title() << std::endl;
win->set_transient_for (*parent);
}
}
} else {
for (Windows::const_iterator i = _windows.begin(); i != _windows.end(); ++i) {
Gtk::Window* win = (*i)->get();
if (win) {
gtk_window_set_transient_for (win->gobj(), 0);
}
}
}
WindowManager::ProxyBase::ProxyBase (const string& name, const std::string& menu_name) current_transient_parent = parent;
#endif
}
/*-------------------------*/
ProxyBase::ProxyBase (const string& name, const std::string& menu_name)
: _name (name) : _name (name)
, _menu_name (menu_name) , _menu_name (menu_name)
, _window (0) , _window (0)
@ -127,7 +161,7 @@ WindowManager::ProxyBase::ProxyBase (const string& name, const std::string& menu
{ {
} }
WindowManager::ProxyBase::ProxyBase (const string& name, const std::string& menu_name, const XMLNode& node) ProxyBase::ProxyBase (const string& name, const std::string& menu_name, const XMLNode& node)
: _name (name) : _name (name)
, _menu_name (menu_name) , _menu_name (menu_name)
, _window (0) , _window (0)
@ -141,13 +175,13 @@ WindowManager::ProxyBase::ProxyBase (const string& name, const std::string& menu
set_state (node); set_state (node);
} }
WindowManager::ProxyBase::~ProxyBase () ProxyBase::~ProxyBase ()
{ {
delete vistracker; delete vistracker;
} }
void void
WindowManager::ProxyBase::set_state (const XMLNode& node) ProxyBase::set_state (const XMLNode& node)
{ {
XMLNodeList children = node.children (); XMLNodeList children = node.children ();
@ -192,19 +226,19 @@ WindowManager::ProxyBase::set_state (const XMLNode& node)
} }
void void
WindowManager::ProxyBase::set_action (Glib::RefPtr<Gtk::Action> act) ProxyBase::set_action (Glib::RefPtr<Gtk::Action> act)
{ {
_action = act; _action = act;
} }
std::string std::string
WindowManager::ProxyBase::action_name() const ProxyBase::action_name() const
{ {
return string_compose (X_("toggle-%1"), _name); return string_compose (X_("toggle-%1"), _name);
} }
void void
WindowManager::ProxyBase::toggle() ProxyBase::toggle()
{ {
if (!_window) { if (!_window) {
(void) get (true); (void) get (true);
@ -221,7 +255,7 @@ WindowManager::ProxyBase::toggle()
} }
XMLNode& XMLNode&
WindowManager::ProxyBase::get_state () const ProxyBase::get_state () const
{ {
XMLNode* node = new XMLNode (X_("Window")); XMLNode* node = new XMLNode (X_("Window"));
char buf[32]; char buf[32];
@ -252,7 +286,7 @@ WindowManager::ProxyBase::get_state () const
} }
void void
WindowManager::ProxyBase::drop_window () ProxyBase::drop_window ()
{ {
if (_window) { if (_window) {
_window->hide (); _window->hide ();
@ -264,7 +298,7 @@ WindowManager::ProxyBase::drop_window ()
} }
void void
WindowManager::ProxyBase::use_window (Gtk::Window& win) ProxyBase::use_window (Gtk::Window& win)
{ {
drop_window (); drop_window ();
_window = &win; _window = &win;
@ -272,12 +306,17 @@ WindowManager::ProxyBase::use_window (Gtk::Window& win)
} }
void void
WindowManager::ProxyBase::setup () ProxyBase::setup ()
{ {
assert (_window); assert (_window);
vistracker = new Gtkmm2ext::VisibilityTracker (*_window); vistracker = new Gtkmm2ext::VisibilityTracker (*_window);
if (_width != -1 || _height != -1 || _x_off != -1 || _y_off != -1) {
/* cancel any mouse-based positioning */
_window->set_position (Gtk::WIN_POS_NONE);
}
if (_width != -1 && _height != -1) { if (_width != -1 && _height != -1) {
_window->set_default_size (_width, _height); _window->set_default_size (_width, _height);
} }
@ -288,14 +327,14 @@ WindowManager::ProxyBase::setup ()
} }
void void
WindowManager::ProxyBase::show () ProxyBase::show ()
{ {
Gtk::Window* win = get (true); Gtk::Window* win = get (true);
win->show (); win->show ();
} }
void void
WindowManager::ProxyBase::maybe_show () ProxyBase::maybe_show ()
{ {
if (_visible) { if (_visible) {
show (); show ();
@ -303,7 +342,7 @@ WindowManager::ProxyBase::maybe_show ()
} }
void void
WindowManager::ProxyBase::show_all () ProxyBase::show_all ()
{ {
Gtk::Window* win = get (true); Gtk::Window* win = get (true);
win->show_all (); win->show_all ();
@ -311,15 +350,18 @@ WindowManager::ProxyBase::show_all ()
void void
WindowManager::ProxyBase::present () ProxyBase::present ()
{ {
Gtk::Window* win = get (true); Gtk::Window* win = get (true);
win->show_all (); win->show_all ();
win->present (); win->present ();
/* turn off any mouse-based positioning */
_window->set_position (Gtk::WIN_POS_NONE);
} }
void void
WindowManager::ProxyBase::hide () ProxyBase::hide ()
{ {
Gtk::Window* win = get (false); Gtk::Window* win = get (false);
if (win) { if (win) {
@ -327,3 +369,25 @@ WindowManager::ProxyBase::hide ()
} }
} }
/*-----------------------*/
ProxyTemporary::ProxyTemporary (const string& name, Gtk::Window* win)
: ProxyBase (name, string())
{
_window = win;
}
ProxyTemporary::~ProxyTemporary ()
{
}
ARDOUR::SessionHandlePtr*
ProxyTemporary::session_handle()
{
/* may return null */
ArdourWindow* aw = dynamic_cast<ArdourWindow*> (_window);
if (aw) { return aw; }
ArdourDialog* ad = dynamic_cast<ArdourDialog*> (_window);
if (ad) { return ad; }
return 0;
}

88
gtk2_ardour/window_manager.h
View file

@ -43,12 +43,39 @@ namespace ARDOUR {
class SessionHandlePtr; class SessionHandlePtr;
} }
class WindowManager namespace WM {
class ProxyBase;
class Manager
{ {
public: public:
static WindowManager& instance(); static Manager& instance();
class ProxyBase : public sigc::trackable { void register_window (ProxyBase*);
void remove (const ProxyBase*);
void toggle_window (ProxyBase*);
void show_visible () const;
void set_session (ARDOUR::Session*);
void add_state (XMLNode&) const;
/* HACK HACK HACK */
void set_transient_for (Gtk::Window*);
Gtk::Window* transient_parent() const { return current_transient_parent; }
private:
typedef std::list<ProxyBase*> Windows;
Windows _windows;
Glib::RefPtr<Gtk::ActionGroup> window_actions;
Gtk::Window* current_transient_parent;
Manager();
~Manager();
static Manager* _instance;
};
class ProxyBase : public sigc::trackable {
public: public:
ProxyBase (const std::string& name, const std::string& menu_name); ProxyBase (const std::string& name, const std::string& menu_name);
ProxyBase (const std::string& name, const std::string& menu_name, const XMLNode&); ProxyBase (const std::string& name, const std::string& menu_name, const XMLNode&);
@ -95,10 +122,27 @@ class WindowManager
Gtkmm2ext::VisibilityTracker* vistracker; Gtkmm2ext::VisibilityTracker* vistracker;
void setup (); void setup ();
}; };
template<typename T> class ProxyTemporary: public ProxyBase {
class ProxyWithConstructor: public ProxyBase { public:
ProxyTemporary (const std::string& name, Gtk::Window* win);
~ProxyTemporary();
Gtk::Window* get (bool create = false) {
(void) create;
return _window;
}
Gtk::Window* operator->() {
return _window;
}
ARDOUR::SessionHandlePtr* session_handle ();
};
template<typename T>
class ProxyWithConstructor: public ProxyBase {
public: public:
ProxyWithConstructor (const std::string& name, const std::string& menu_name, const boost::function<T*()>& c) ProxyWithConstructor (const std::string& name, const std::string& menu_name, const boost::function<T*()>& c)
: ProxyBase (name, menu_name) , creator (c) {} : ProxyBase (name, menu_name) , creator (c) {}
@ -133,10 +177,10 @@ class WindowManager
private: private:
boost::function<T*()> creator; boost::function<T*()> creator;
}; };
template<typename T> template<typename T>
class Proxy : public ProxyBase { class Proxy : public ProxyBase {
public: public:
Proxy (const std::string& name, const std::string& menu_name) Proxy (const std::string& name, const std::string& menu_name)
: ProxyBase (name, menu_name) {} : ProxyBase (name, menu_name) {}
@ -161,34 +205,18 @@ class WindowManager
} }
T* operator->() { T* operator->() {
/* make return null */ return dynamic_cast<T*> (get(true));
return dynamic_cast<T*> (_window);
} }
ARDOUR::SessionHandlePtr* session_handle () { ARDOUR::SessionHandlePtr* session_handle () {
return dynamic_cast<T*> (get()); /* may return null */
return dynamic_cast<T*> (_window);
} }
private: private:
boost::function<T*()> creator; boost::function<T*()> creator;
};
void register_window (ProxyBase*);
void remove (const ProxyBase*);
void toggle_window (ProxyBase*);
void show_visible () const;
void set_session (ARDOUR::Session*);
void add_state (XMLNode&) const;
private:
typedef std::list<ProxyBase*> Windows;
Windows _windows;
Glib::RefPtr<Gtk::ActionGroup> window_actions;
WindowManager();
~WindowManager();
static WindowManager* _instance;
}; };
} /* namespace */
#endif /* __gtk2_ardour_window_manager_h__ */ #endif /* __gtk2_ardour_window_manager_h__ */

8
gtk2_ardour/wscript
View file

@ -375,7 +375,7 @@ def build(bld):
'libtaglib', 'libtaglib',
'libcanvas' 'libcanvas'
] ]
obj.target = 'ardour-3.0-vst.exe.so' obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so'
obj.includes = [ '../libs/fst', '.' ] obj.includes = [ '../libs/fst', '.' ]
obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
@ -392,7 +392,7 @@ def build(bld):
# just the normal executable version of the GTK GUI # just the normal executable version of the GTK GUI
obj = bld(features = 'cxx c cxxprogram') obj = bld(features = 'cxx c cxxprogram')
obj.source = gtk2_ardour_sources obj.source = gtk2_ardour_sources
obj.target = 'ardour-3.0' obj.target = 'ardour-' + bld.env['VERSION']
obj.includes = ['.'] obj.includes = ['.']
# continue with setup of obj, which could be a shared library # continue with setup of obj, which could be a shared library
@ -466,8 +466,8 @@ def build(bld):
'DATADIR' : os.path.normpath(bld.env['DATADIR']), 'DATADIR' : os.path.normpath(bld.env['DATADIR']),
'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']), 'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']),
'LIBS' : 'build/libs', 'LIBS' : 'build/libs',
'VERSION' : '3.0', 'VERSION' : bld.env['VERSION'],
'EXECUTABLE' : 'build/gtk2_ardour/ardour-3.0' 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
} }
def set_subst_dict(obj, dict): def set_subst_dict(obj, dict):

2
libs/ardour/export_profile_manager.cc
View file

@ -501,6 +501,8 @@ ExportProfileManager::init_channel_configs (XMLNodeList nodes)
channel_configs.push_back (config); channel_configs.push_back (config);
// Add master outs as default // Add master outs as default
if (!session.master_out()) { return false; }
IO* master_out = session.master_out()->output().get(); IO* master_out = session.master_out()->output().get();
if (!master_out) { return false; } if (!master_out) { return false; }

4
libs/gtkmm2ext/utils.cc
View file

@ -23,7 +23,6 @@
#include <gtk/gtkpaned.h> #include <gtk/gtkpaned.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm/widget.h> #include <gtkmm/widget.h>
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include <gtkmm/window.h> #include <gtkmm/window.h>
@ -32,6 +31,8 @@
#include <gtkmm/comboboxtext.h> #include <gtkmm/comboboxtext.h>
#include <gtkmm/tooltip.h> #include <gtkmm/tooltip.h>
#include "gtkmm2ext/utils.h"
#include "i18n.h" #include "i18n.h"
using namespace std; using namespace std;
@ -659,3 +660,4 @@ Gtkmm2ext::disable_tooltips ()
{ {
gtk_rc_parse_string ("gtk-enable-tooltips = 0"); gtk_rc_parse_string ("gtk-enable-tooltips = 0");
} }

3
libs/gtkmm2ext/visibility_tracker.cc
View file

@ -16,7 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <iostream>
#include <gtkmm/window.h> #include <gtkmm/window.h>
#include "gtkmm2ext/visibility_tracker.h" #include "gtkmm2ext/visibility_tracker.h"
@ -35,6 +35,7 @@ bool
VisibilityTracker::handle_visibility_notify_event (GdkEventVisibility* ev) VisibilityTracker::handle_visibility_notify_event (GdkEventVisibility* ev)
{ {
_visibility = ev->state; _visibility = ev->state;
// std::cerr << "VT: " << _window.get_title() << " vis event, fv = " << fully_visible() << " pv = " << partially_visible() << " nv = " << not_visible() << std::endl;
return false; return false;
} }

2
libs/pbd/cpus.cc
View file

@ -40,7 +40,7 @@ hardware_concurrency()
#elif defined(__APPLE__) || defined(__FreeBSD__) #elif defined(__APPLE__) || defined(__FreeBSD__)
int count; int count;
size_t size=sizeof(count); size_t size=sizeof(count);
return sysctlbyname("hw.ncpu",&count,&size,NULL,0)?0:count; return sysctlbyname("hw.physicalcpu",&count,&size,NULL,0)?0:count;
#elif defined(HAVE_UNISTD) && defined(_SC_NPROCESSORS_ONLN) #elif defined(HAVE_UNISTD) && defined(_SC_NPROCESSORS_ONLN)
int const count=sysconf(_SC_NPROCESSORS_ONLN); int const count=sysconf(_SC_NPROCESSORS_ONLN);
return (count>0)?count:0; return (count>0)?count:0;

4
tools/linux_packaging/define_versions.sh → tools/define_versions.sh
View file

@ -1,8 +1,8 @@
# #
# this is sourced by build and package, and executed from within build/linux_packaging # this is sourced by build and package, and executed from within build/{osx,linux}_packaging
# #
release_version=`grep -m 1 '[^A-Za-z_]LINUX_VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"` release_version=`grep -m 1 '^VERSION = ' ../../wscript | awk '{print $3}' | sed "s/'//g"`
r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"` r=`cut -d'"' -f2 < ../../libs/ardour/revision.cc | sed -e 1d -e "s/$release_version-//"`
if echo $r | grep -q -e - ; then if echo $r | grep -q -e - ; then
revcount=`echo $r | cut -d- -f1` revcount=`echo $r | cut -d- -f1`

2
tools/linux_packaging/build
View file

@ -89,7 +89,7 @@ if test x$STRIP != xall -a x$STRIP != xnone -a x$STRIP != xsome ; then
exit 1 exit 1
fi fi
. ./define_versions.sh . ../define_versions.sh
echo "Version is $version / $commit" echo "Version is $version / $commit"
info_string="$version ($commit) built on `hostname` by `whoami` on `date`" info_string="$version ($commit) built on `hostname` by `whoami` on `date`"

2
tools/linux_packaging/package
View file

@ -50,7 +50,7 @@ while [ $# -gt 0 ] ; do
esac esac
done done
. ./define_versions.sh . ../define_versions.sh
if [ x$DEBUG = xT ]; then if [ x$DEBUG = xT ]; then
BUILDTYPE="dbg" BUILDTYPE="dbg"

19
tools/osx_packaging/osx_build
View file

@ -67,10 +67,9 @@ if test -z "$PRODUCT_PKG_DIR" -o -z "$APPNAME"; then
exit 1 exit 1
fi fi
release_version=`grep -m 1 '[^A-Za-z_]OSX_VERSION = ' ../../wscript | cut -d"'" -f2` . ../define_versions.sh
revision=`grep -m 1 'revision =' ../../libs/ardour/revision.cc | cut -d'"' -f 2 | sed 's/^.*-//g'`
echo "Version is $release_version / $revision" echo "Version is $release_version / $revision"
info_string="$release_version/$revision built on `hostname` by `whoami` on `date`" info_string="$version built on `hostname` by `whoami` on `date`"
echo "Info string is $info_string" echo "Info string is $info_string"
# setup directory structure # setup directory structure
@ -502,14 +501,18 @@ echo "Building DMG ..."
# UC_DMG=$APPNAME-${release_version}-${revision}-UC.dmg # UC_DMG=$APPNAME-${release_version}-${revision}-UC.dmg
# FINAL_DMG=$APPNAME-${release_version}-${revision}.dmg # FINAL_DMG=$APPNAME-${release_version}-${revision}.dmg
UC_DMG=$APPNAME-${release_version}-${revision}.dmg UC_DMG=$APPNAME-$version.dmg
VOLNAME=$APPNAME-$release_version VOLNAME=$APPNAME-$version
# TODO use mktemp # TODO use mktemp
MNTPATH=`mktemp -d -t ardourimg` export TMPDIR=`pwd`
MNTPATH=`mktemp -d -t /ardourimg`
TMPDMG=`mktemp -t ardour` TMPDMG=`mktemp -t ardour`
ICNSTMP=`mktemp -t ardouricon` ICNSTMP=`mktemp -t ardouricon`
DMGSIZE=$[ `du -sm "$PRODUCT_PKG_DIR" | cut -f 1` * 1049 / 1000 + 3 ] EXTRA_SPACE_MB=30
DMGMEGABYTES=$[ `du -sk "$PRODUCT_PKG_DIR" | cut -f 1` * 1024 / 1048576 + $EXTRA_SPACE_MB ]
echo "DMG MB = " $DMGMEGABYTES
rm -f $UC_DMG "$TMPDMG" "${TMPDMG}.dmg" "$ICNSTMP" rm -f $UC_DMG "$TMPDMG" "${TMPDMG}.dmg" "$ICNSTMP"
rm -rf "$MNTPATH" rm -rf "$MNTPATH"
@ -517,7 +520,7 @@ mkdir -p "$MNTPATH"
TMPDMG="${TMPDMG}.dmg" TMPDMG="${TMPDMG}.dmg"
hdiutil create -megabytes $DMGSIZE "$TMPDMG" hdiutil create -megabytes $DMGMEGABYTES "$TMPDMG"
DiskDevice=$(hdid -nomount "$TMPDMG" | grep Apple_HFS | cut -f 1 -d ' ') DiskDevice=$(hdid -nomount "$TMPDMG" | grep Apple_HFS | cut -f 1 -d ' ')
newfs_hfs -v "${VOLNAME}" "${DiskDevice}" newfs_hfs -v "${VOLNAME}" "${DiskDevice}"
mount -t hfs "${DiskDevice}" "${MNTPATH}" mount -t hfs "${DiskDevice}" "${MNTPATH}"

11
wscript
View file

@ -7,16 +7,7 @@ import string
import subprocess import subprocess
import sys import sys
# VERSION = '3.1'
# build scripts need to find the right platform specific version
#
if sys.platform == 'darwin':
OSX_VERSION = '3.0beta6'
VERSION = '3.0beta6'
else:
LINUX_VERSION = '3.1'
VERSION = '3.1'
APPNAME = 'Ardour3' APPNAME = 'Ardour3'