diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-09 14:22:58 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-09 14:22:58 -0400 |
commit | 053eaf77fde7639d4e200d36a9db99b2d4fc615b (patch) | |
tree | 1ef0d29aae9c0130b74ae42abb4bb2873291d5ae /libs/canvas/canvas.cc | |
parent | 1267b1d61cbce8688f3d0f1c4c7932de49735e75 (diff) |
a variety of fixes for the cairocanvas, but it still buggy as hell handling events and lots of other stuff
Diffstat (limited to 'libs/canvas/canvas.cc')
-rw-r--r-- | libs/canvas/canvas.cc | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc index c4eded11bf..fe9d08ced4 100644 --- a/libs/canvas/canvas.cc +++ b/libs/canvas/canvas.cc @@ -77,9 +77,13 @@ Canvas::Canvas (XMLTree const * tree) void Canvas::render (Rect const & area, Cairo::RefPtr<Cairo::Context> const & context) const { - cerr << "CANVAS @ " << this << endl; - dump (cerr); - cerr << "-------------------------\n"; +#ifdef CANVAS_DEBUG + if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) { + cerr << "CANVAS @ " << this << endl; + dump (cerr); + cerr << "-------------------------\n"; + } +#endif checkpoint ("render", "-> render"); render_count = 0; @@ -136,6 +140,18 @@ Canvas::indent() const return s; } +std::string +Canvas::render_indent() const +{ + string s; + + for (int n = 0; n < ArdourCanvas::render_depth; ++n) { + s += ' '; + } + + return s; +} + void Canvas::dump (ostream& o) const { @@ -334,6 +350,10 @@ GtkCanvas::deliver_event (Duple point, GdkEvent* event) while (i != items.rend()) { if ((*i)->ignore_events ()) { + DEBUG_TRACE ( + PBD::DEBUG::CanvasEvents, + string_compose ("canvas event ignored by %1 %2\n", (*i)->whatami(), (*i)->name.empty() ? "[unknown]" : (*i)->name) + ); ++i; continue; } @@ -342,7 +362,7 @@ GtkCanvas::deliver_event (Duple point, GdkEvent* event) /* this item has just handled the event */ DEBUG_TRACE ( PBD::DEBUG::CanvasEvents, - string_compose ("canvas event handled by %1\n", (*i)->name.empty() ? "[unknown]" : (*i)->name) + string_compose ("canvas event handled by %1 %2\n", (*i)->whatami(), (*i)->name.empty() ? "[unknown]" : (*i)->name) ); return true; @@ -350,7 +370,7 @@ GtkCanvas::deliver_event (Duple point, GdkEvent* event) DEBUG_TRACE ( PBD::DEBUG::CanvasEvents, - string_compose ("canvas event ignored by %1\n", (*i)->name.empty() ? "[unknown]" : (*i)->name) + string_compose ("canvas event left unhandled by %1 %2\n", (*i)->whatami(), (*i)->name.empty() ? "[unknown]" : (*i)->name) ); ++i; |