X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas.cc;h=fb06b06b975eb49eca34793a18cfee07c125742f;hb=e157a84c2b6cb27ef22134c11fde5f277a87e8c7;hp=9d35d1091c83bdcd07c0ae672dc76c5aab503b7a;hpb=bb68d83e438b710e5fb73d1302adb73c270f3617;p=ardour.git diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc index 9d35d1091c..fb06b06b97 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,20 +32,32 @@ #include #include +#include "gtkmm2ext/persistent_tooltip.h" + #include "pbd/compose.h" #include "pbd/stacktrace.h" #include "canvas/canvas.h" +#include "canvas/colors.h" #include "canvas/debug.h" #include "canvas/line.h" #include "canvas/scroll_group.h" +#include "canvas/utils.h" + +#ifdef __APPLE__ +#include +#include "gtkmm2ext/nsglview.h" +#endif using namespace std; using namespace ArdourCanvas; +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)) { set_epoch (); } @@ -63,7 +79,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 @@ -95,29 +111,29 @@ 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); -#ifdef CANVAS_DEBUG +#if defined CANVAS_DEBUG && !PLATFORM_WINDOWS if (getenv ("CANVAS_HARLEQUIN_DEBUGGING")) { // This transparently colors the rect being rendered, after it has been drawn. 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 (); } @@ -135,7 +151,7 @@ operator<< (ostream& o, Canvas& c) std::string Canvas::indent() const -{ +{ string s; for (int n = 0; n < ArdourCanvas::dump_depth; ++n) { @@ -147,7 +163,7 @@ Canvas::indent() const std::string Canvas::render_indent() const -{ +{ string s; for (int n = 0; n < ArdourCanvas::render_depth; ++n) { @@ -162,7 +178,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. @@ -170,10 +186,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); } } } @@ -185,10 +201,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); } } } @@ -199,25 +215,23 @@ 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)) { + if (item->item_to_window (post_change_bounding_box).intersection (window_bbox)) { /* 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); } } } @@ -225,12 +239,7 @@ Canvas::item_changed (Item* item, boost::optional pre_change_bounding_box) Duple Canvas::window_to_canvas (Duple const & d) const { - /* Find the scroll group that covers d (a window coordinate). Scroll groups are only allowed - * as children of the root group, so we just scan its first level - * children and see what we can find. - */ - - std::list const& root_children (_root.items()); + ScrollGroup* best_group = 0; ScrollGroup* sg = 0; /* if the coordinates are negative, clamp to zero and find the item @@ -246,14 +255,33 @@ Canvas::window_to_canvas (Duple const & d) const in_window.y = 0; } - for (std::list::const_iterator i = root_children.begin(); i != root_children.end(); ++i) { - if (((sg = dynamic_cast(*i)) != 0) && sg->covers_window (in_window)) { - break; + for (list::const_iterator s = scrollers.begin(); s != scrollers.end(); ++s) { + + if ((*s)->covers_window (in_window)) { + sg = *s; + + /* 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. + */ + + /* 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. + */ + if (!best_group || sg->sensitivity() > best_group->sensitivity()) { + best_group = sg; + if (sg->sensitivity() == (ScrollGroup::ScrollsVertically | ScrollGroup::ScrollsHorizontally)) { + /* Can't do any better than this. */ + break; + } + } } } - if (sg) { - return d.translate (sg->scroll_offset()); + if (best_group) { + return d.translate (best_group->scroll_offset()); } return d; @@ -276,7 +304,6 @@ Canvas::canvas_to_window (Duple const & d, bool rounded) const break; } } - if (sg) { wd = d.translate (-sg->scroll_offset()); @@ -300,7 +327,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 @@ -312,13 +339,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); } } @@ -332,6 +359,24 @@ Canvas::queue_draw_item_area (Item* item, Rect area) request_redraw (item->item_to_window (area)); } +void +Canvas::set_tooltip_timeout (uint32_t msecs) +{ + tooltip_timeout_msecs = msecs; +} + +void +Canvas::set_background_color (Color c) +{ + _bg_color = c; + + Rect r = _root.bounding_box(); + + if (r) { + request_redraw (_root.item_to_window (r)); + } +} + void GtkCanvas::re_enter () { @@ -346,12 +391,26 @@ GtkCanvas::GtkCanvas () , _new_current_item (0) , _grabbed_item (0) , _focused_item (0) + , _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 | - Gdk::SCROLL_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK); + Gdk::SCROLL_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | + 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 @@ -364,7 +423,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()) { @@ -411,7 +470,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; @@ -441,7 +500,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()); } @@ -483,7 +542,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; @@ -492,8 +551,8 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) leave_event.type = GDK_LEAVE_NOTIFY; Item* i; - GdkNotifyType enter_detail; - GdkNotifyType leave_detail; + GdkNotifyType enter_detail = GDK_NOTIFY_UNKNOWN; + GdkNotifyType leave_detail = GDK_NOTIFY_UNKNOWN; vector items_to_leave_virtual; vector items_to_enter_virtual; @@ -517,7 +576,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()) { @@ -527,12 +586,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); } @@ -578,7 +637,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; @@ -607,12 +666,11 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) if (_new_current_item && !_new_current_item->ignore_events()) { enter_event.detail = enter_detail; DEBUG_TRACE (PBD::DEBUG::CanvasEnterLeave, string_compose ("ENTER %1/%2\n", _new_current_item->whatami(), _new_current_item->name)); + start_tooltip_timeout (_new_current_item); _new_current_item->Event ((GdkEvent*)&enter_event); } - start_tooltip_timeout (_new_current_item); _current_item = _new_current_item; - } @@ -644,22 +702,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) { @@ -671,17 +729,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; } @@ -705,12 +772,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 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. @@ -720,21 +828,111 @@ GtkCanvas::item_going_away (Item* item, boost::optional bounding_box) bool GtkCanvas::on_expose_event (GdkEventExpose* ev) { - Cairo::RefPtr cairo_context = get_window()->create_cairo_context (); - render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), cairo_context); - return true; -} + 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 -/** @return Our Cairo context, or 0 if we don't have one */ -Cairo::RefPtr -GtkCanvas::context () -{ - Glib::RefPtr w = get_window (); - if (!w) { - return Cairo::RefPtr (); +#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 window_context = get_window()->create_cairo_context (); +#else + Cairo::RefPtr draw_context = get_window()->create_cairo_context (); +#endif - return w->create_cairo_context (); + draw_context->rectangle (ev->area.x, ev->area.y, ev->area.width, ev->area.height); + draw_context->clip(); + +#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); + } + 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; } /** Handler for GDK scroll events. @@ -749,12 +947,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. */ @@ -763,6 +961,28 @@ GtkCanvas::on_scroll_event (GdkEventScroll* ev) return deliver_event (reinterpret_cast(©)); } +/** Handler for GDK key press events. + * @param ev Event. + * @return true if the event was handled. + */ +bool +GtkCanvas::on_key_press_event (GdkEventKey* ev) +{ + DEBUG_TRACE (PBD::DEBUG::CanvasEvents, "canvas key press\n"); + return deliver_event (reinterpret_cast(ev)); +} + +/** Handler for GDK key release events. + * @param ev Event. + * @return true if the event was handled. + */ +bool +GtkCanvas::on_key_release_event (GdkEventKey* ev) +{ + DEBUG_TRACE (PBD::DEBUG::CanvasEvents, "canvas key release\n"); + return deliver_event (reinterpret_cast(ev)); +} + /** Handler for GDK button press events. * @param ev Event. * @return true if the event was handled. @@ -775,17 +995,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(©)); } @@ -795,13 +1015,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; @@ -811,7 +1031,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(©)); } @@ -855,7 +1075,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)); @@ -883,17 +1103,67 @@ GtkCanvas::on_enter_notify_event (GdkEventCrossing* ev) bool GtkCanvas::on_leave_notify_event (GdkEventCrossing* ev) { + switch (ev->detail) { + case GDK_NOTIFY_ANCESTOR: + case GDK_NOTIFY_UNKNOWN: + case GDK_NOTIFY_VIRTUAL: + case GDK_NOTIFY_NONLINEAR: + case GDK_NOTIFY_NONLINEAR_VIRTUAL: + /* leaving window, cancel any tooltips */ + stop_tooltip_timeout (); + hide_tooltip (); + break; + default: + /* we don't care about any other kind + of leave event (notably GDK_NOTIFY_INFERIOR) + */ + break; + } _new_current_item = 0; deliver_enter_leave (Duple (ev->x, ev->y), ev->state); 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) { + if (_in_dtor) { + return; + } + Rect real_area; Coord const w = width (); @@ -968,7 +1238,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 ()); @@ -991,7 +1261,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 @@ -1007,12 +1277,12 @@ 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. */ if (current_tooltip_item) { - _current_timeout_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &GtkCanvas::show_tooltip), 1000); + tooltip_timeout_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &GtkCanvas::show_tooltip), tooltip_timeout_msecs); } return false; /* this is called from an idle callback, don't call it again */ @@ -1022,7 +1292,7 @@ void GtkCanvas::stop_tooltip_timeout () { current_tooltip_item = 0; - _current_timeout_connection.disconnect (); + tooltip_timeout_connection.disconnect (); } bool @@ -1039,7 +1309,7 @@ GtkCanvas::show_tooltip () tooltip_label = manage (new Gtk::Label); tooltip_label->show (); tooltip_window->add (*tooltip_label); - tooltip_window->set_border_width (6); + tooltip_window->set_border_width (1); tooltip_window->set_name ("tooltip"); } @@ -1054,23 +1324,35 @@ GtkCanvas::show_tooltip () (void) toplevel->get_window()->get_pointer (pointer_x, pointer_y, mask); - Duple tooltip_item_center (pointer_x, pointer_y); - + 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_item_center = tooltip_item_center.translate (Duple (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 + * displayed, because then we generate a leave/enter event pair when + * the window is displayed then hidden - the enter event will + * trigger a new tooltip timeout. + * + * So move the window right of the pointer position by just a enough + * to get it away from the pointer. + */ + + tooltip_window_origin.x += 30; + tooltip_window_origin.y += 45; /* move the tooltip window into position */ - tooltip_window->move (tooltip_item_center.x, tooltip_item_center.y); + tooltip_window->move (tooltip_window_origin.x, tooltip_window_origin.y); /* ready to show */ tooltip_window->present (); - + /* called from a timeout handler, don't call it again */ return false; @@ -1079,11 +1361,24 @@ GtkCanvas::show_tooltip () void GtkCanvas::hide_tooltip () { + /* hide it if its there */ + if (tooltip_window) { tooltip_window->hide (); + + // Delete the tooltip window so it'll get re-created + // (i.e. properly re-sized) on the next usage. + delete tooltip_window; + tooltip_window = NULL; } } +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. @@ -1113,7 +1408,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;