X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas.cc;h=242f8ecbfd20acadf161e7df36b3b121fd6b7ec4;hb=a0cb2f95f0706179f88dc0175769705ddeded389;hp=8638344966724bf2f2d39e134d6c28966ff14fe1;hpb=e0533e9dd7df504236892fe0d8693e7ad9a6a278;p=ardour.git diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc index 8638344966..242f8ecbfd 100644 --- a/libs/canvas/canvas.cc +++ b/libs/canvas/canvas.cc @@ -48,8 +48,6 @@ Canvas::Canvas () void Canvas::scroll_to (Coord x, Coord y) { - _scroll_offset = Duple (x, y); - /* We do things this way because we do not want to recurse through the canvas for every scroll. In the presence of large MIDI tracks this means traversing item lists that include @@ -61,7 +59,7 @@ Canvas::scroll_to (Coord x, Coord y) */ for (list::iterator i = scrollers.begin(); i != scrollers.end(); ++i) { - (*i)->scroll_to (_scroll_offset); + (*i)->scroll_to (Duple (x, y)); } pick_current_item (0); // no current mouse position @@ -112,11 +110,17 @@ Canvas::render (Rect const & area, Cairo::RefPtr const & context _root.render (*draw, context); - // This outlines the rect being rendered, after it has been drawn. - // context->rectangle (draw->x0, draw->y0, draw->x1 - draw->x0, draw->y1 - draw->y0); - // context->set_source_rgba (1.0, 0, 0, 1.0); - // context->stroke (); - +#ifdef CANVAS_DEBUG + 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->set_source_rgba (r, g, b, 0.25); + context->fill (); + } +#endif } } @@ -167,7 +171,9 @@ Canvas::item_shown_or_hidden (Item* item) { boost::optional bbox = item->bounding_box (); if (bbox) { - queue_draw_item_area (item, bbox.get ()); + if (item->item_to_window (*bbox).intersection (visible_area ())) { + queue_draw_item_area (item, bbox.get ()); + } } } @@ -180,7 +186,9 @@ Canvas::item_visual_property_changed (Item* item) { boost::optional bbox = item->bounding_box (); if (bbox) { - queue_draw_item_area (item, bbox.get ()); + if (item->item_to_window (*bbox).intersection (visible_area ())) { + queue_draw_item_area (item, bbox.get ()); + } } } @@ -192,15 +200,24 @@ Canvas::item_visual_property_changed (Item* item) void Canvas::item_changed (Item* item, boost::optional pre_change_bounding_box) { + + Rect window_bbox = visible_area (); + if (pre_change_bounding_box) { - /* request a redraw of the item's old bounding box */ - queue_draw_item_area (item, pre_change_bounding_box.get ()); + + 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 ()); + } } boost::optional post_change_bounding_box = item->bounding_box (); if (post_change_bounding_box) { - /* request a redraw of the item's new bounding box */ - queue_draw_item_area (item, post_change_bounding_box.get ()); + + 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 ()); + } } } @@ -215,8 +232,21 @@ Canvas::window_to_canvas (Duple const & d) const std::list const& root_children (_root.items()); ScrollGroup* sg = 0; + /* if the coordinates are negative, clamp to zero and find the item + * that covers that "edge" position. + */ + + Duple in_window (d); + + if (in_window.x < 0) { + in_window.x = 0; + } + if (in_window.y < 0) { + 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 (d)) { + if (((sg = dynamic_cast(*i)) != 0) && sg->covers_window (in_window)) { break; } } @@ -225,9 +255,7 @@ Canvas::window_to_canvas (Duple const & d) const return d.translate (sg->scroll_offset()); } - /* fallback to global canvas offset ... it would be nice to remove this */ - - return d.translate (_scroll_offset); + return d; } Duple @@ -252,7 +280,7 @@ Canvas::canvas_to_window (Duple const & d, bool rounded) const if (sg) { wd = d.translate (-sg->scroll_offset()); } else { - wd = d.translate (-_scroll_offset); + wd = d; } /* Note that this intentionally almost always returns integer coordinates */ @@ -312,7 +340,7 @@ GtkCanvas::GtkCanvas () { /* these are the events we want to know about */ add_events (Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK | - Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK); + Gdk::SCROLL_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK); } void @@ -334,7 +362,11 @@ GtkCanvas::pick_current_item (int state) pick_current_item (Duple (x, y), state); } - + +/** Given @param point (a position in window coordinates) + * and mouse state @param state, check to see if _current_item + * (which will be used to deliver events) should change. + */ void GtkCanvas::pick_current_item (Duple const & point, int state) { @@ -344,7 +376,7 @@ GtkCanvas::pick_current_item (Duple const & point, int state) return; } - /* find the items at the given position */ + /* find the items at the given window position */ vector items; _root.add_items_at_point (point, items); @@ -374,15 +406,14 @@ GtkCanvas::pick_current_item (Duple const & point, int state) for (i = items.begin(); i != items.end(); ++i) { - Item const * new_item = *i; + Item const * possible_item = *i; - /* We ignore invisible items, groups and items that ignore events */ + /* We ignore invisible items, containers and items that ignore events */ - if (!new_item->visible() || new_item->ignore_events() || dynamic_cast(new_item) != 0) { + if (!possible_item->visible() || possible_item->ignore_events() || dynamic_cast(possible_item) != 0) { continue; } - - within_items.push_front (new_item); + within_items.push_front (possible_item); } if (within_items.empty()) { @@ -421,8 +452,14 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) enter_event.mode = GDK_CROSSING_NORMAL; enter_event.focus = FALSE; enter_event.state = state; - enter_event.x = point.x; - enter_event.y = point.y; + + /* 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; GdkEventCrossing leave_event = enter_event; leave_event.type = GDK_LEAVE_NOTIFY; @@ -476,7 +513,6 @@ GtkCanvas::deliver_enter_leave (Duple const & point, int state) enter_detail = GDK_NOTIFY_INFERIOR; leave_detail = GDK_NOTIFY_ANCESTOR; - } else if (_new_current_item->is_descendant_of (*_current_item)) { /* move from ancestor to descendant (X: "_new_current_item is * an inferior ("child") of _current_item") @@ -667,6 +703,32 @@ GtkCanvas::context () return w->create_cairo_context (); } +/** Handler for GDK scroll events. + * @param ev Event. + * @return true if the event was handled. + */ +bool +GtkCanvas::on_scroll_event (GdkEventScroll* 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; + 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 scroll @ %1, %2 => %3\n", ev->x, ev->y, where)); + return deliver_event (reinterpret_cast(©)); +} + /** Handler for GDK button press events. * @param ev Event. * @return true if the event was handled. @@ -719,6 +781,28 @@ GtkCanvas::on_button_release_event (GdkEventButton* ev) return deliver_event (reinterpret_cast(©)); } +bool +GtkCanvas::get_mouse_position (Duple& winpos) const +{ + int x; + int y; + Gdk::ModifierType mask; + Glib::RefPtr self = Glib::RefPtr::cast_const (get_window ()); + + if (!self) { + std::cerr << " no self window\n"; + winpos = Duple (0, 0); + return false; + } + + Glib::RefPtr win = self->get_pointer (x, y, mask); + + winpos.x = x; + winpos.y = y; + + return true; +} + /** Handler for GDK motion events. * @param ev Event. * @return true if the event was handled. @@ -738,7 +822,9 @@ GtkCanvas::on_motion_notify_event (GdkEventMotion* ev) /* Coordinates in "copy" will be canvas coordinates, */ - // DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas motion @ %1, %2\n", ev->x, ev->y)); + 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)); + + MouseMotion (point); /* EMIT SIGNAL */ pick_current_item (point, ev->state); @@ -772,7 +858,19 @@ GtkCanvas::on_leave_notify_event (GdkEventCrossing* ev) void GtkCanvas::request_redraw (Rect const & request) { - queue_draw_area (request.x0, request.y0, request.width(), request.height()); + Rect real_area; + + Coord const w = width (); + Coord const h = height (); + + /* 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)); + + queue_draw_area (real_area.x0, real_area.y0, real_area.width(), real_area.height()); } /** Called to request that we try to get a particular size for ourselves. @@ -833,13 +931,23 @@ GtkCanvas::unfocus (Item* item) } } -/** @return The visible area of the canvas, in canvas coordinates */ +/** @return The visible area of the canvas, in window coordinates */ Rect GtkCanvas::visible_area () const { - Distance const xo = _scroll_offset.x; - Distance const yo = _scroll_offset.y; - return Rect (xo, yo, xo + get_allocation().get_width (), yo + get_allocation().get_height ()); + return Rect (0, 0, get_allocation().get_width (), get_allocation().get_height ()); +} + +Coord +GtkCanvas::width() const +{ + return get_allocation().get_width(); +} + +Coord +GtkCanvas::height() const +{ + return get_allocation().get_height(); } /** Create a GtkCanvaSViewport.