an awful lot of tweaks to drawing details

[ardour.git] / libs / canvas / types.cc

diff --git a/libs/canvas/types.cc b/libs/canvas/types.cc
index c2612a0b2b9b34418817e4f6f650ec79959a9b69..a8c690bbbe85e2a9bea8cbc7af143f82a3cb0807 100644 (file)
--- a/libs/canvas/types.cc
+++ b/libs/canvas/types.cc
@@ -20,14 +20,15 @@
 #include <algorithm>
 #include <cfloat>
 #include <cassert>
+
+#include <cairomm/context.h>
+
 #include "canvas/types.h"
 
 using namespace std;
 using namespace ArdourCanvas;
 
-Coord const ArdourCanvas::COORD_MAX = DBL_MAX;
-/* XXX: empirically arrived at */
-Coord const ArdourCanvas::CAIRO_MAX = 65536;
+Coord const ArdourCanvas::COORD_MAX = 1.7e307;
 
 static inline Coord
 safe_add (Coord a, Coord b)
@@ -120,6 +121,39 @@ Rect::fix () const
        return r;
 }
 
+Rect
+Rect::convert_to_device (Cairo::RefPtr<Cairo::Context> c) const
+{
+       Coord xa, ya, xb, yb;
+
+       xa = x0;
+       xb = x1;
+       ya = y0;
+       yb = y1;
+
+       c->user_to_device (xa, ya);
+       c->user_to_device (xb, yb);
+
+       return Rect (xa, ya, xb, yb);
+}
+
+
+Rect
+Rect::convert_to_user (Cairo::RefPtr<Cairo::Context> c) const
+{
+       Coord xa, ya, xb, yb;
+
+       xa = x0;
+       xb = x1;
+       ya = y0;
+       yb = y1;
+
+       c->device_to_user (xa, ya);
+       c->device_to_user (xb, yb);
+
+       return Rect (xa, ya, xb, yb);
+}
+
 Duple
 ArdourCanvas::operator- (Duple const & o)
 {
@@ -132,6 +166,12 @@ ArdourCanvas::operator+ (Duple const & a, Duple const & b)
        return Duple (safe_add (a.x, b.x), safe_add (a.y, b.y));
 }
 
+bool
+ArdourCanvas::operator== (Duple const & a, Duple const & b)
+{
+       return a.x == b.x && a.y == b.y;
+}
+
 Duple
 ArdourCanvas::operator- (Duple const & a, Duple const & b)
 {