X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas.cc;h=47784626aa4cef4a890e53f6bd310498a08cc091;hb=6e91ee071c23440827541adb4c057f8c55d4a2f2;hp=72acbd402166579f18bf276ffd8eeb9cabf3bddc;hpb=b3fb73812cd7e22eed190b6f2c2c3b42d2a4029f;p=ardour.git diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc index 72acbd4021..47784626aa 100644 --- a/libs/canvas/canvas.cc +++ b/libs/canvas/canvas.cc @@ -18,6 +18,10 @@ */ +#if !defined USE_CAIRO_IMAGE_SURFACE && !defined NDEBUG +#define OPTIONAL_CAIRO_IMAGE_SURFACE +#endif + /** @file canvas/canvas.cc * @brief Implementation of the main canvas classes. */ @@ -28,6 +32,8 @@ #include #include +#include "gtkmm2ext/persistent_tooltip.h" + #include "pbd/compose.h" #include "pbd/stacktrace.h" @@ -38,6 +44,11 @@ #include "canvas/scroll_group.h" #include "canvas/utils.h" +#ifdef __APPLE__ +#include +#include "gtkmm2ext/nsglview.h" +#endif + using namespace std; using namespace ArdourCanvas; @@ -46,7 +57,8 @@ uint32_t Canvas::tooltip_timeout_msecs = 750; /** Construct a new Canvas */ Canvas::Canvas () : _root (this) - , _bg_color (rgba_to_color (0, 1.0, 0.0, 1.0)) + , _bg_color (rgba_to_color (0, 1.0, 0.0, 1.0)) + , _last_render_start_timestamp(0) { set_epoch (); } @@ -68,7 +80,7 @@ Canvas::scroll_to (Coord x, Coord y) (*i)->scroll_to (Duple (x, y)); } - pick_current_item (0); // no current mouse position + pick_current_item (0); // no current mouse position } void @@ -90,6 +102,10 @@ Canvas::zoomed () void Canvas::render (Rect const & area, Cairo::RefPtr const & context) const { + PreRender (); // emit signal + + _last_render_start_timestamp = g_get_monotonic_time(); + #ifdef CANVAS_DEBUG if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) { cerr << this << " RENDER: " << area << endl; @@ -100,21 +116,21 @@ Canvas::render (Rect const & area, Cairo::RefPtr const & context #endif render_count = 0; - - boost::optional root_bbox = _root.bounding_box(); + + Rect root_bbox = _root.bounding_box(); if (!root_bbox) { /* the root has no bounding box, so there's nothing to render */ return; } - boost::optional draw = root_bbox->intersection (area); + Rect draw = root_bbox.intersection (area); if (draw) { - + /* there's a common area between the root and the requested area, so render it. */ - _root.render (*draw, context); + _root.render (draw, context); #if defined CANVAS_DEBUG && !PLATFORM_WINDOWS if (getenv ("CANVAS_HARLEQUIN_DEBUGGING")) { @@ -122,7 +138,7 @@ Canvas::render (Rect const & area, Cairo::RefPtr const & context double r = (random() % 65536) /65536.0; double g = (random() % 65536) /65536.0; double b = (random() % 65536) /65536.0; - context->rectangle (draw->x0, draw->y0, draw->x1 - draw->x0, draw->y1 - draw->y0); + context->rectangle (draw.x0, draw.y0, draw.x1 - draw.x0, draw.y1 - draw.y0); context->set_source_rgba (r, g, b, 0.25); context->fill (); } @@ -131,6 +147,34 @@ Canvas::render (Rect const & area, Cairo::RefPtr const & context } +void +Canvas::prepare_for_render (Rect const & area) const +{ + Rect root_bbox = _root.bounding_box(); + if (!root_bbox) { + /* the root has no bounding box, so there's nothing to render */ + return; + } + + Rect draw = root_bbox.intersection (area); + + if (draw) { + _root.prepare_for_render (draw); + } +} + +gint64 +Canvas::get_microseconds_since_render_start () const +{ + gint64 timestamp = g_get_monotonic_time(); + + if (_last_render_start_timestamp == 0 || timestamp <= _last_render_start_timestamp) { + return 0; + } + + return timestamp - _last_render_start_timestamp; +} + ostream& operator<< (ostream& o, Canvas& c) { @@ -140,7 +184,7 @@ operator<< (ostream& o, Canvas& c) std::string Canvas::indent() const -{ +{ string s; for (int n = 0; n < ArdourCanvas::dump_depth; ++n) { @@ -152,7 +196,7 @@ Canvas::indent() const std::string Canvas::render_indent() const -{ +{ string s; for (int n = 0; n < ArdourCanvas::render_depth; ++n) { @@ -167,7 +211,7 @@ Canvas::dump (ostream& o) const { dump_depth = 0; _root.dump (o); -} +} /** Called when an item has been shown or hidden. * @param item Item that has been shown or hidden. @@ -175,10 +219,10 @@ Canvas::dump (ostream& o) const void Canvas::item_shown_or_hidden (Item* item) { - boost::optional bbox = item->bounding_box (); + Rect bbox = item->bounding_box (); if (bbox) { - if (item->item_to_window (*bbox).intersection (visible_area ())) { - queue_draw_item_area (item, bbox.get ()); + if (item->item_to_window (bbox).intersection (visible_area ())) { + queue_draw_item_area (item, bbox); } } } @@ -190,10 +234,10 @@ Canvas::item_shown_or_hidden (Item* item) void Canvas::item_visual_property_changed (Item* item) { - boost::optional bbox = item->bounding_box (); + Rect bbox = item->bounding_box (); if (bbox) { - if (item->item_to_window (*bbox).intersection (visible_area ())) { - queue_draw_item_area (item, bbox.get ()); + if (item->item_to_window (bbox).intersection (visible_area ())) { + queue_draw_item_area (item, bbox); } } } @@ -204,25 +248,31 @@ Canvas::item_visual_property_changed (Item* item) * in the item's coordinates. */ void -Canvas::item_changed (Item* item, boost::optional pre_change_bounding_box) +Canvas::item_changed (Item* item, Rect pre_change_bounding_box) { - Rect window_bbox = visible_area (); if (pre_change_bounding_box) { - - if (item->item_to_window (*pre_change_bounding_box).intersection (window_bbox)) { + if (item->item_to_window (pre_change_bounding_box).intersection (window_bbox)) { /* request a redraw of the item's old bounding box */ - queue_draw_item_area (item, pre_change_bounding_box.get ()); + queue_draw_item_area (item, pre_change_bounding_box); } } - boost::optional post_change_bounding_box = item->bounding_box (); + Rect post_change_bounding_box = item->bounding_box (); + if (post_change_bounding_box) { - - if (item->item_to_window (*post_change_bounding_box).intersection (window_bbox)) { + Rect const window_intersection = + item->item_to_window (post_change_bounding_box).intersection (window_bbox); + + if (window_intersection) { /* request a redraw of the item's new bounding box */ - queue_draw_item_area (item, post_change_bounding_box.get ()); + queue_draw_item_area (item, post_change_bounding_box); + + // Allow item to do any work necessary to prepare for being rendered. + item->prepare_for_render (window_intersection); + } else { + // No intersection with visible window area } } } @@ -254,12 +304,12 @@ Canvas::window_to_canvas (Duple const & d) const /* XXX January 22nd 2015: leaving this in place for now * but I think it fixes a bug that really should be * fixed in a different way (and will be) by my next - * commit. But it may still be relevant. + * commit. But it may still be relevant. */ /* If scroll groups overlap, choose the one with the highest sensitivity, that is, choose an HV scroll group over an H or V - only group. + only group. */ if (!best_group || sg->sensitivity() > best_group->sensitivity()) { best_group = sg; @@ -318,7 +368,7 @@ Canvas::canvas_to_window (Duple const & d, bool rounded) const * the move, in its parent's coordinates. */ void -Canvas::item_moved (Item* item, boost::optional pre_change_parent_bounding_box) +Canvas::item_moved (Item* item, Rect pre_change_parent_bounding_box) { if (pre_change_parent_bounding_box) { /* request a redraw of where the item used to be. The box has @@ -330,13 +380,13 @@ Canvas::item_moved (Item* item, boost::optional pre_change_parent_bounding * invalidation area. If we use the parent (which has not * moved, then this will work. */ - queue_draw_item_area (item->parent(), pre_change_parent_bounding_box.get ()); + queue_draw_item_area (item->parent(), pre_change_parent_bounding_box); } - boost::optional post_change_bounding_box = item->bounding_box (); + Rect post_change_bounding_box = item->bounding_box (); if (post_change_bounding_box) { /* request a redraw of where the item now is */ - queue_draw_item_area (item, post_change_bounding_box.get ()); + queue_draw_item_area (item, post_change_bounding_box); } } @@ -359,13 +409,13 @@ Canvas::set_tooltip_timeout (uint32_t msecs) void Canvas::set_background_color (Color c) { - _bg_color = c; + _bg_color = c; - boost::optional r = _root.bounding_box(); + Rect r = _root.bounding_box(); - if (r) { - request_redraw (_root.item_to_window (r.get())); - } + if (r) { + request_redraw (_root.item_to_window (r)); + } } void @@ -385,6 +435,8 @@ GtkCanvas::GtkCanvas () , _single_exposure (1) , current_tooltip_item (0) , tooltip_window (0) + , _in_dtor (false) + , _nsglview (0) { /* these are the events we want to know about */ add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK | @@ -392,6 +444,16 @@ GtkCanvas::GtkCanvas () Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK); } +void +GtkCanvas::use_nsglview () +{ + assert (!_nsglview); + assert (!is_realized()); +#ifdef ARDOUR_CANVAS_NSVIEW_TAG // patched gdkquartz.h + _nsglview = Gtkmm2ext::nsglview_create (this); +#endif +} + void GtkCanvas::pick_current_item (int state) { @@ -402,7 +464,7 @@ GtkCanvas::pick_current_item (int state) * added or removed, so we have no coordinates to work from as is the * case with a motion event. Find out where the mouse is and use that. */ - + Glib::RefPtr pointer_window = Gdk::Display::get_default()->get_window_at_pointer (x, y); if (pointer_window != get_window()) { @@ -449,7 +511,7 @@ GtkCanvas::pick_current_item (Duple const & point, int state) top, but we're going to reverse that for within_items so that its first item is the upper-most item that can be chosen as _current_item. */ - + vector::const_iterator i; list within_items; @@ -479,7 +541,7 @@ GtkCanvas::pick_current_item (Duple const & point, int state) DEBUG_TRACE (PBD::DEBUG::CanvasEnterLeave, string_compose ("CURRENT ITEM %1/%2\n", _new_current_item->whatami(), _current_item->name)); return; } - + _new_current_item = const_cast (within_items.front()); } @@ -521,7 +583,7 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) /* Events delivered to canvas items are expected to be in canvas * coordinates but @param point is in window coordinates. */ - + Duple c = window_to_canvas (point); enter_event.x = c.x; enter_event.y = c.y; @@ -555,7 +617,7 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) enter_detail = GDK_NOTIFY_UNKNOWN; /* no current item, so also send virtual enter events to the - * entire heirarchy for the new item + * entire heirarchy for the new item */ for (i = _new_current_item->parent(); i ; i = i->parent()) { @@ -565,12 +627,12 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) } else if (_current_item->is_descendant_of (*_new_current_item)) { /* move from descendant to ancestor (X: "_current_item is an - * inferior ("child") of _new_current_item") + * inferior ("child") of _new_current_item") * * Deliver "virtual" leave notifications to all items in the * heirarchy between current and new_current. */ - + for (i = _current_item->parent(); i && i != _new_current_item; i = i->parent()) { items_to_leave_virtual.push_back (i); } @@ -616,7 +678,7 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) enter_detail = GDK_NOTIFY_NONLINEAR; leave_detail = GDK_NOTIFY_NONLINEAR; } - + if (_current_item && !_current_item->ignore_events ()) { leave_event.detail = leave_detail; @@ -681,22 +743,22 @@ GtkCanvas::deliver_event (GdkEvent* event) /* run through the items from child to parent, until one claims the event */ Item* item = const_cast (event_item); - + while (item) { Item* parent = item->parent (); - if (!item->ignore_events () && + if (!item->ignore_events () && item->Event (event)) { /* this item has just handled the event */ DEBUG_TRACE ( PBD::DEBUG::CanvasEvents, string_compose ("canvas event handled by %1 %2\n", item->whatami(), item->name.empty() ? "[unknown]" : item->name) ); - + return true; } - + DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas event %3 left unhandled by %1 %2\n", item->whatami(), item->name.empty() ? "[unknown]" : item->name, event_type_string (event->type))); if ((item = parent) == 0) { @@ -708,17 +770,26 @@ GtkCanvas::deliver_event (GdkEvent* event) return false; } +void +GtkCanvas::item_shown_or_hidden (Item* item) +{ + if (item == current_tooltip_item) { + stop_tooltip_timeout (); + } + Canvas::item_shown_or_hidden (item); +} + /** Called when an item is being destroyed. * @param item Item being destroyed. * @param bounding_box Last known bounding box of the item. */ void -GtkCanvas::item_going_away (Item* item, boost::optional bounding_box) +GtkCanvas::item_going_away (Item* item, Rect bounding_box) { if (bounding_box) { - queue_draw_item_area (item, bounding_box.get ()); + queue_draw_item_area (item, bounding_box); } - + if (_new_current_item == item) { _new_current_item = 0; } @@ -742,24 +813,53 @@ GtkCanvas::item_going_away (Item* item, boost::optional bounding_box) } if (_current_item == item) { - /* no need to send a leave event to this item, since it is going away + /* no need to send a leave event to this item, since it is going away */ _current_item = 0; pick_current_item (0); // no mouse state } - + +} + +void +GtkCanvas::on_realize () +{ + Gtk::EventBox::on_realize(); +#ifdef __APPLE__ + if (_nsglview) { + Gtkmm2ext::nsglview_overlay (_nsglview, get_window()->gobj()); + } +#endif } void GtkCanvas::on_size_allocate (Gtk::Allocation& a) { EventBox::on_size_allocate (a); -#ifdef USE_CAIRO_IMAGE_SURFACE +#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE + if (getenv("ARDOUR_IMAGE_SURFACE")) { +#endif +#if defined USE_CAIRO_IMAGE_SURFACE || defined OPTIONAL_CAIRO_IMAGE_SURFACE /* allocate an image surface as large as the canvas itself */ canvas_image.clear (); canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, a.get_width(), a.get_height()); #endif +#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE + } +#endif + +#ifdef __APPLE__ + if (_nsglview) { + gint xx, yy; + gtk_widget_translate_coordinates( + GTK_WIDGET(gobj()), + GTK_WIDGET(get_toplevel()->gobj()), + 0, 0, &xx, &yy); + Gtkmm2ext::nsglview_resize (_nsglview, xx, yy, a.get_width(), a.get_height()); + } +#endif + } /** Handler for GDK expose events. @@ -769,53 +869,120 @@ GtkCanvas::on_size_allocate (Gtk::Allocation& a) bool GtkCanvas::on_expose_event (GdkEventExpose* ev) { -#ifdef USE_CAIRO_IMAGE_SURFACE + if (_in_dtor) { + return true; + } +#ifdef __APPLE__ + if (_nsglview) { + Gtkmm2ext::nsglview_queue_draw (_nsglview, ev->area.x, ev->area.y, ev->area.width, ev->area.height); + return true; + } +#endif + +#ifdef CANVAS_PROFILE + const int64_t start = g_get_monotonic_time (); +#endif + +#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE + Cairo::RefPtr draw_context; + Cairo::RefPtr window_context; + if (getenv("ARDOUR_IMAGE_SURFACE")) { + if (!canvas_image) { + canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, get_width(), get_height()); + } + draw_context = Cairo::Context::create (canvas_image); + window_context = get_window()->create_cairo_context (); + } else { + draw_context = get_window()->create_cairo_context (); + } +#elif defined USE_CAIRO_IMAGE_SURFACE if (!canvas_image) { canvas_image = Cairo::ImageSurface::create (Cairo::FORMAT_ARGB32, get_width(), get_height()); } - Cairo::RefPtr draw_context = Cairo::Context::create (canvas_image); + Cairo::RefPtr draw_context = Cairo::Context::create (canvas_image); Cairo::RefPtr window_context = get_window()->create_cairo_context (); -#else +#else Cairo::RefPtr draw_context = get_window()->create_cairo_context (); #endif - /* draw background color */ - - draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); - draw_context->clip_preserve (); - set_source_rgba (draw_context, _bg_color); - draw_context->fill (); - - /* render canvas */ - if ( _single_exposure ) { - - render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context); + draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + draw_context->clip(); - } else { - GdkRectangle* rects; - gint nrects; - - gdk_region_get_rectangles (ev->region, &rects, &nrects); - for (gint n = 0; n < nrects; ++n) { - draw_context->set_identity_matrix(); //reset the cairo matrix, just in case someone left it transformed after drawing ( cough ) - render (Rect (rects[n].x, rects[n].y, rects[n].x + rects[n].width, rects[n].y + rects[n].height), draw_context); - } - g_free (rects); +#ifdef __APPLE__ + /* group calls cairo_quartz_surface_create() which + * effectively uses a CGBitmapContext + image-surface + * + * This avoids expensive argb32_image_mark_image() during drawing. + * Although the final paint() operation still takes the slow path + * through image_mark_image instead of ColorMaskCopyARGB888_sse :( + * + * profiling indicates a speed up of factor 2. (~ 5-10ms render time, + * instead of 10-20ms, which is still slow compared to XCB and win32 surfaces (~0.2 ms) + * + * Fixing this for good likely involves changes to GdkQuartzWindow, GdkQuartzView + */ + draw_context->push_group (); +#endif + + /* draw background color */ + draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + set_source_rgba (draw_context, _bg_color); + draw_context->fill (); + + /* render canvas */ + if ( _single_exposure ) { + + Canvas::render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context); + + } else { + GdkRectangle* rects; + gint nrects; + + gdk_region_get_rectangles (ev->region, &rects, &nrects); + for (gint n = 0; n < nrects; ++n) { + draw_context->set_identity_matrix(); //reset the cairo matrix, just in case someone left it transformed after drawing ( cough ) + Canvas::render (Rect (rects[n].x, rects[n].y, rects[n].x + rects[n].width, rects[n].y + rects[n].height), draw_context); } - -#ifdef USE_CAIRO_IMAGE_SURFACE - /* now blit our private surface back to the GDK one */ - - window_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); - window_context->clip (); - window_context->set_source (canvas_image, 0, 0); - window_context->set_operator (Cairo::OPERATOR_SOURCE); - window_context->paint (); + g_free (rects); + } + +#ifdef __APPLE__ + draw_context->pop_group_to_source (); + draw_context->paint (); +#endif + +#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE + if (getenv("ARDOUR_IMAGE_SURFACE")) { +#endif +#if defined USE_CAIRO_IMAGE_SURFACE || defined OPTIONAL_CAIRO_IMAGE_SURFACE + /* now blit our private surface back to the GDK one */ + + window_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + window_context->clip (); + window_context->set_source (canvas_image, 0, 0); + window_context->set_operator (Cairo::OPERATOR_SOURCE); + window_context->paint (); +#endif +#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE + } +#endif + +#ifdef CANVAS_PROFILE + const int64_t end = g_get_monotonic_time (); + const int64_t elapsed = end - start; + printf ("GtkCanvas::on_expose_event %f ms\n", elapsed / 1000.f); #endif return true; } +void +GtkCanvas::prepare_for_render () const +{ + Rect window_bbox = visible_area (); + Canvas::prepare_for_render (window_bbox); +} + /** Handler for GDK scroll events. * @param ev Event. * @return true if the event was handled. @@ -828,12 +995,12 @@ GtkCanvas::on_scroll_event (GdkEventScroll* ev) GdkEvent copy = *((GdkEvent*)ev); Duple winpos = Duple (ev->x, ev->y); Duple where = window_to_canvas (winpos); - + pick_current_item (winpos, ev->state); copy.button.x = where.x; copy.button.y = where.y; - + /* Coordinates in the event will be canvas coordinates, correctly adjusted for scroll if this GtkCanvas is in a GtkCanvasViewport. */ @@ -876,17 +1043,17 @@ GtkCanvas::on_button_press_event (GdkEventButton* ev) GdkEvent copy = *((GdkEvent*)ev); Duple winpos = Duple (ev->x, ev->y); Duple where = window_to_canvas (winpos); - + pick_current_item (winpos, ev->state); copy.button.x = where.x; copy.button.y = where.y; - + /* Coordinates in the event will be canvas coordinates, correctly adjusted for scroll if this GtkCanvas is in a GtkCanvasViewport. */ - DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas button press @ %1, %2 => %3\n", ev->x, ev->y, where)); + DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas button press %1 @ %2, %3 => %4\n", ev->button, ev->x, ev->y, where)); return deliver_event (reinterpret_cast(©)); } @@ -896,13 +1063,13 @@ GtkCanvas::on_button_press_event (GdkEventButton* ev) */ bool GtkCanvas::on_button_release_event (GdkEventButton* ev) -{ +{ /* translate event coordinates from window to canvas */ GdkEvent copy = *((GdkEvent*)ev); Duple winpos = Duple (ev->x, ev->y); Duple where = window_to_canvas (winpos); - + pick_current_item (winpos, ev->state); copy.button.x = where.x; @@ -912,7 +1079,7 @@ GtkCanvas::on_button_release_event (GdkEventButton* ev) for scroll if this GtkCanvas is in a GtkCanvasViewport. */ - DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas button release @ %1, %2 => %3\n", ev->x, ev->y, where)); + DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas button release %1 @ %2, %3 => %4\n", ev->button, ev->x, ev->y, where)); return deliver_event (reinterpret_cast(©)); } @@ -956,7 +1123,7 @@ GtkCanvas::on_motion_notify_event (GdkEventMotion* ev) copy.motion.x = where.x; copy.motion.y = where.y; - /* Coordinates in "copy" will be canvas coordinates, + /* Coordinates in "copy" will be canvas coordinates, */ DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas motion @ %1, %2 canvas @ %3, %4\n", ev->x, ev->y, copy.motion.x, copy.motion.y)); @@ -1005,25 +1172,59 @@ GtkCanvas::on_leave_notify_event (GdkEventCrossing* ev) return true; } +void +GtkCanvas::on_map () +{ + Gtk::EventBox::on_map(); +#ifdef __APPLE__ + if (_nsglview) { + Gtkmm2ext::nsglview_set_visible (_nsglview, true); + Gtk::Allocation a = get_allocation(); + gint xx, yy; + gtk_widget_translate_coordinates( + GTK_WIDGET(gobj()), + GTK_WIDGET(get_toplevel()->gobj()), + 0, 0, &xx, &yy); + Gtkmm2ext::nsglview_resize (_nsglview, xx, yy, a.get_width(), a.get_height()); + } +#endif +} + +void +GtkCanvas::on_unmap () +{ + stop_tooltip_timeout (); + Gtk::EventBox::on_unmap(); +#ifdef __APPLE__ + if (_nsglview) { + Gtkmm2ext::nsglview_set_visible (_nsglview, false); + } +#endif +} + /** Called to request a redraw of our canvas. * @param area Area to redraw, in window coordinates. */ void GtkCanvas::request_redraw (Rect const & request) { - Rect real_area; - - Coord const w = width (); - Coord const h = height (); + if (_in_dtor) { + return; + } /* clamp area requested to actual visible window */ - real_area.x0 = max (0.0, min (w, request.x0)); - real_area.x1 = max (0.0, min (w, request.x1)); - real_area.y0 = max (0.0, min (h, request.y0)); - real_area.y1 = max (0.0, min (h, request.y1)); + Rect real_area = request.intersection (visible_area()); + + if (real_area) { + if (real_area.width () && real_area.height ()) { + // Item intersects with visible canvas area + queue_draw_area (real_area.x0, real_area.y0, real_area.width(), real_area.height()); + } - queue_draw_area (real_area.x0, real_area.y0, real_area.width(), real_area.height()); + } else { + // Item does not intersect with visible canvas area + } } /** Called to request that we try to get a particular size for ourselves. @@ -1085,7 +1286,7 @@ GtkCanvas::unfocus (Item* item) } /** @return The visible area of the canvas, in window coordinates */ -Rect +ArdourCanvas::Rect GtkCanvas::visible_area () const { return Rect (0, 0, get_allocation().get_width (), get_allocation().get_height ()); @@ -1108,7 +1309,7 @@ GtkCanvas::start_tooltip_timeout (Item* item) { stop_tooltip_timeout (); - if (item) { + if (item && Gtkmm2ext::PersistentTooltip::tooltips_enabled ()) { current_tooltip_item = item; /* wait for the first idle that happens after this is @@ -1124,7 +1325,7 @@ GtkCanvas::start_tooltip_timeout (Item* item) bool GtkCanvas::really_start_tooltip_timeout () { - /* an idle has occured since we entered a tooltip-bearing widget. Now + /* an idle has occurred since we entered a tooltip-bearing widget. Now * wait 1 second and if the timeout isn't cancelled, show the tooltip. */ @@ -1172,12 +1373,12 @@ GtkCanvas::show_tooltip () (void) toplevel->get_window()->get_pointer (pointer_x, pointer_y, mask); Duple tooltip_window_origin (pointer_x, pointer_y); - + /* convert to root window coordinates */ int win_x, win_y; dynamic_cast(toplevel)->get_position (win_x, win_y); - + tooltip_window_origin = tooltip_window_origin.translate (Duple (win_x, win_y)); /* we don't want the pointer to be inside the window when it is @@ -1199,7 +1400,7 @@ GtkCanvas::show_tooltip () /* ready to show */ tooltip_window->present (); - + /* called from a timeout handler, don't call it again */ return false; @@ -1220,6 +1421,12 @@ GtkCanvas::hide_tooltip () } } +Glib::RefPtr +GtkCanvas::get_pango_context () +{ + return Glib::wrap (gdk_pango_context_get()); +} + /** Create a GtkCanvaSViewport. * @param hadj Adjustment to use for horizontal scrolling. * @param vadj Adjustment to use for vertica scrolling. @@ -1249,7 +1456,7 @@ void GtkCanvasViewport::on_size_request (Gtk::Requisition* req) { /* force the canvas to size itself */ - // _canvas.root()->bounding_box(); + // _canvas.root()->bounding_box(); req->width = 16; req->height = 16;