new trim cursors from chrisg, fix up hotspots for said cursors, make Editor cursors...

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7977eddece89b534845afcad5f29266071f07db3..98287553bae85ad3e09d20c94d650dc08df15b50 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -209,6 +209,8 @@ static const gchar *_rb_opt_strings[] = {
 Gdk::Cursor* Editor::cross_hair_cursor = 0;
 Gdk::Cursor* Editor::selector_cursor = 0;
 Gdk::Cursor* Editor::trimmer_cursor = 0;
+Gdk::Cursor* Editor::left_side_trim_cursor = 0;
+Gdk::Cursor* Editor::right_side_trim_cursor = 0;
 Gdk::Cursor* Editor::grabber_cursor = 0;
 Gdk::Cursor* Editor::grabber_edit_point_cursor = 0;
 Gdk::Cursor* Editor::zoom_cursor = 0;
@@ -399,6 +401,8 @@ Editor::Editor ()
 
        frames_per_unit = 2048; /* too early to use reset_zoom () */
 
+       _scroll_callbacks = 0;
+
        zoom_focus = ZoomFocusLeft;
        set_zoom_focus (ZoomFocusLeft);
        zoom_range_clock.ValueChanged.connect (sigc::mem_fun(*this, &Editor::zoom_adjustment_changed));
@@ -582,20 +586,24 @@ Editor::Editor ()
 
        Button* summary_arrows_left_left = manage (new Button);
        summary_arrows_left_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE)));
-       summary_arrows_left_left->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left));
+       summary_arrows_left_left->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press)));
+       summary_arrows_left_left->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_release));
        Button* summary_arrows_left_right = manage (new Button);
        summary_arrows_left_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE)));
-       summary_arrows_left_right->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right));
+       summary_arrows_left_right->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press)));
+       summary_arrows_left_right->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_release));
        VBox* summary_arrows_left = manage (new VBox);
        summary_arrows_left->pack_start (*summary_arrows_left_left);
        summary_arrows_left->pack_start (*summary_arrows_left_right);
 
        Button* summary_arrows_right_left = manage (new Button);
        summary_arrows_right_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE)));
-       summary_arrows_right_left->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left));
+       summary_arrows_right_left->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press)));
+       summary_arrows_right_left->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_release));
        Button* summary_arrows_right_right = manage (new Button);
        summary_arrows_right_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE)));
-       summary_arrows_right_right->signal_clicked().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right));
+       summary_arrows_right_right->signal_pressed().connect (sigc::hide_return (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press)));
+       summary_arrows_right_right->signal_released().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_release));
        VBox* summary_arrows_right = manage (new VBox);
        summary_arrows_right->pack_start (*summary_arrows_right_left);
        summary_arrows_right->pack_start (*summary_arrows_right_right);
@@ -1234,6 +1242,17 @@ Editor::build_cursors ()
 
        cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
        trimmer_cursor =  new Gdk::Cursor (SB_H_DOUBLE_ARROW);
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> apixbuf (::get_icon ("trim_left_cursor"));
+               left_side_trim_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 5, 11);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> apixbuf (::get_icon ("trim_right_cursor"));
+               right_side_trim_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 23, 11);
+       }
+
        selector_cursor = new Gdk::Cursor (XTERM);
        time_fx_cursor = new Gdk::Cursor (SIZING);
        wait_cursor = new Gdk::Cursor  (WATCH);
@@ -1328,6 +1347,8 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type,
        case RegionItem:
        case RegionViewName:
        case RegionViewNameHighlight:
+       case LeftFrameHandle:
+       case RightFrameHandle:
                if (with_selection) {
                        build_menu_function = &Editor::build_track_selection_context_menu;
                } else {
@@ -1369,6 +1390,8 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type,
        case RegionItem:
        case RegionViewName:
        case RegionViewNameHighlight:
+        case LeftFrameHandle:
+        case RightFrameHandle:
                if (!with_selection) {
                        if (region_edit_menu_split_item) {
                                if (clicked_regionview && clicked_regionview->region()->covers (get_preferred_edit_position())) {
@@ -5149,21 +5172,63 @@ Editor::check_step_edit ()
        return true; // do it again, till we stop
 }
 
-void
-Editor::horizontal_scroll_left ()
+bool
+Editor::horizontal_scroll_left_press ()
 {
+       ++_scroll_callbacks;
+       
+       if (_scroll_connection.connected() && _scroll_callbacks < 5) {
+               /* delay the first auto-repeat */
+               return true;
+       }
+               
        double x = leftmost_position() - current_page_frames() / 5;
        if (x < 0) {
                x = 0;
        }
        
        reset_x_origin (x);
+
+       /* do hacky auto-repeat */
+       if (!_scroll_connection.connected ()) {
+               _scroll_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_left_press), 100);
+               _scroll_callbacks = 0;
+       }
+
+       return true;
 }
 
 void
-Editor::horizontal_scroll_right ()
+Editor::horizontal_scroll_left_release ()
+{
+       _scroll_connection.disconnect ();
+}
+
+bool
+Editor::horizontal_scroll_right_press ()
 {
+       ++_scroll_callbacks;
+       
+       if (_scroll_connection.connected() && _scroll_callbacks < 5) {
+               /* delay the first auto-repeat */
+               return true;
+       }
+
        reset_x_origin (leftmost_position() + current_page_frames() / 5);
+
+       /* do hacky auto-repeat */
+       if (!_scroll_connection.connected ()) {
+               _scroll_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::horizontal_scroll_right_press), 100);
+               _scroll_callbacks = 0;
+       }
+
+       return true;
+}
+
+void
+Editor::horizontal_scroll_right_release ()
+{
+       _scroll_connection.disconnect ();
 }
 
 /** Queue a change for the Editor viewport x origin to follow the playhead */