X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas.cc;h=a166c23521f1aca0d37eceefd61858050c84dea2;hb=2729f59aba2a4e965253c2acf38bf3187515876c;hp=35fe31041d0f6ee471b2b3e00348d1fb83a73d93;hpb=592bfdd3f4af9463e2e6a691d7240839ba50d61d;p=ardour.git diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc index 35fe31041d..a166c23521 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. */ @@ -68,7 +72,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 @@ -100,7 +104,7 @@ Canvas::render (Rect const & area, Cairo::RefPtr const & context #endif render_count = 0; - + boost::optional root_bbox = _root.bounding_box(); if (!root_bbox) { /* the root has no bounding box, so there's nothing to render */ @@ -109,7 +113,7 @@ Canvas::render (Rect const & area, Cairo::RefPtr const & context boost::optional draw = root_bbox->intersection (area); if (draw) { - + /* there's a common area between the root and the requested area, so render it. */ @@ -140,7 +144,7 @@ operator<< (ostream& o, Canvas& c) std::string Canvas::indent() const -{ +{ string s; for (int n = 0; n < ArdourCanvas::dump_depth; ++n) { @@ -152,7 +156,7 @@ Canvas::indent() const std::string Canvas::render_indent() const -{ +{ string s; for (int n = 0; n < ArdourCanvas::render_depth; ++n) { @@ -167,7 +171,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. @@ -206,7 +210,7 @@ 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) { @@ -219,7 +223,7 @@ Canvas::item_changed (Item* item, boost::optional pre_change_bounding_box) boost::optional post_change_bounding_box = item->bounding_box (); if (post_change_bounding_box) { - + 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 ()); @@ -230,12 +234,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 @@ -251,14 +250,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; @@ -281,7 +299,6 @@ Canvas::canvas_to_window (Duple const & d, bool rounded) const break; } } - if (sg) { wd = d.translate (-sg->scroll_offset()); @@ -369,12 +386,15 @@ 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) { /* 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 @@ -387,7 +407,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()) { @@ -434,7 +454,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; @@ -464,7 +484,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()); } @@ -506,7 +526,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; @@ -515,8 +535,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; @@ -540,7 +560,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()) { @@ -550,12 +570,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); } @@ -601,7 +621,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; @@ -666,22 +686,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) { @@ -703,7 +723,7 @@ GtkCanvas::item_going_away (Item* item, boost::optional bounding_box) if (bounding_box) { queue_draw_item_area (item, bounding_box.get ()); } - + if (_new_current_item == item) { _new_current_item = 0; } @@ -727,24 +747,30 @@ 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_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 } /** Handler for GDK expose events. @@ -754,28 +780,60 @@ 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 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 +#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 */ - - render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), draw_context); + 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); + + } 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 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 /* 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); @@ -784,6 +842,9 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev) window_context->set_operator (Cairo::OPERATOR_SOURCE); window_context->paint (); #endif +#ifdef OPTIONAL_CAIRO_IMAGE_SURFACE + } +#endif return true; } @@ -800,12 +861,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. */ @@ -814,6 +875,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. @@ -826,17 +909,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(©)); } @@ -846,13 +929,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; @@ -862,7 +945,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(©)); } @@ -906,7 +989,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)); @@ -961,6 +1044,10 @@ GtkCanvas::on_leave_notify_event (GdkEventCrossing* ev) void GtkCanvas::request_redraw (Rect const & request) { + if (_in_dtor) { + return; + } + Rect real_area; Coord const w = width (); @@ -1074,7 +1161,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. */ @@ -1106,7 +1193,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"); } @@ -1122,12 +1209,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 @@ -1139,7 +1226,8 @@ GtkCanvas::show_tooltip () * to get it away from the pointer. */ - tooltip_window_origin.x += 20; + tooltip_window_origin.x += 30; + tooltip_window_origin.y += 45; /* move the tooltip window into position */ @@ -1148,7 +1236,7 @@ GtkCanvas::show_tooltip () /* ready to show */ tooltip_window->present (); - + /* called from a timeout handler, don't call it again */ return false; @@ -1161,6 +1249,11 @@ GtkCanvas::hide_tooltip () 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; } } @@ -1193,7 +1286,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;