# HG changeset patch
# User "David Bryant <bagnose@gmail.com>"
# Date 1281270714 -34200
# Node ID 9960c4fbd0dd1629bbe5d258e5c0ee29ae4df73b
# Parent  b190a9d9352ea3f22a521d15a7ac4a7c8cf5acf7
I is for Interface

diff -r b190a9d9352e -r 9960c4fbd0dd doodle/dia/grid_layer.d
--- a/doodle/dia/grid_layer.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/grid_layer.d	Sun Aug 08 22:01:54 2010 +0930
@@ -17,7 +17,7 @@
     }
 }
 
-class GridLayer : Layer, Grid {
+class GridLayer : Layer, IGrid {
     static const double MIN_SPACING = 5.0;      // pixels
 
     this(in string name) {
@@ -32,7 +32,7 @@
         return Rectangle();
     }
 
-    override void draw(in Viewport viewport,
+    override void draw(in IViewport viewport,
                        in Rectangle pixelDamage, scope Context pixelCr,
                        in Rectangle modelDamage, scope Context modelCr) const {
         assert(_zoomValid);
@@ -89,7 +89,7 @@
         } modelCr.restore();
     }
 
-    // Grid overrides:
+    // IGrid overrides:
 
     override void zoomChanged(double zoom) {
         _zoom = zoom;
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/dia/icanvas.d
--- a/doodle/dia/icanvas.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/icanvas.d	Sun Aug 08 22:01:54 2010 +0930
@@ -13,7 +13,7 @@
 mixin(defineEnum!("Cursor",
                   "DEFAULT", "HAND", "CROSSHAIR"));
 
-interface Viewport {
+interface IViewport {
     void zoomRelative(in Point pixelDatum, in double factor);
     void panRelative(in Vector pixelDisplacement);
     void setCursor(in Cursor cursor);
@@ -36,27 +36,27 @@
     */
 }
 
-interface EventHandler {
-    bool handleButtonPress(scope Viewport viewport, in ButtonEvent event);
-    bool handleButtonRelease(scope Viewport viewport, in ButtonEvent event);
-    bool handleMotion(scope Viewport viewport, in MotionEvent event);
-    bool handleScroll(scope Viewport viewport, in ScrollEvent event);
-    //bool handleEnter(scope Viewport viewport, CrossingEvent event);
-    //bool handleLeave(scope Viewport viewport, CrossingEvent event);
-    //bool handleFocusIn(scope Viewport viewport, FocusEvent event);
-    //bool handleFocusOut(scope Viewport viewport, FocusEvent event);
-    bool handleKeyPress(scope Viewport viewport, in KeyEvent event);
-    bool handleKeyRelease(scope Viewport viewport, in KeyEvent event);
+interface IEventHandler {
+    bool handleButtonPress(scope IViewport viewport, in ButtonEvent event);
+    bool handleButtonRelease(scope IViewport viewport, in ButtonEvent event);
+    bool handleMotion(scope IViewport viewport, in MotionEvent event);
+    bool handleScroll(scope IViewport viewport, in ScrollEvent event);
+    //bool handleEnter(scope IViewport viewport, CrossingEvent event);
+    //bool handleLeave(scope IViewport viewport, CrossingEvent event);
+    //bool handleFocusIn(scope IViewport viewport, FocusEvent event);
+    //bool handleFocusOut(scope IViewport viewport, FocusEvent event);
+    bool handleKeyPress(scope IViewport viewport, in KeyEvent event);
+    bool handleKeyRelease(scope IViewport viewport, in KeyEvent event);
 }
 
-interface Grid {
+interface IGrid {
     void zoomChanged(double zoom);
 
     // TODO  inout?
     bool snap(in Point a, out Point b) const;
 }
 
-interface Page {
+interface IPage {
     // TODO
 }
 
@@ -69,7 +69,7 @@
 
     Rectangle bounds() const;
 
-    void draw(in Viewport viewport,
+    void draw(in IViewport viewport,
               in Rectangle pixelDamage, scope Context pixelCr,
               in Rectangle modelDamage, scope Context modelCr) const;
 
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/dia/page_layer.d
--- a/doodle/dia/page_layer.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/page_layer.d	Sun Aug 08 22:01:54 2010 +0930
@@ -8,7 +8,7 @@
     import doodle.cairo.routines;
 }
 
-class PageLayer : Layer, Page {
+class PageLayer : Layer, IPage {
     this(in string name) {
         super(name);
         _pageGeometry = Rectangle(Point.DEFAULT, Vector(210.0, 297.0));
@@ -21,7 +21,7 @@
         return _pageGeometry;
     }
 
-    override void draw(in Viewport viewport,
+    override void draw(in IViewport viewport,
                        in Rectangle pixelDamage, scope Context pixelCr,
                        in Rectangle modelDamage, scope Context modelCr) const {
         // Make the paper white, with a border
@@ -39,7 +39,7 @@
         } modelCr.restore;
     }
 
-    // Page overrides:
+    // IPage overrides:
 
     private {
         Rectangle _pageGeometry;
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/dia/standard_tools.d
--- a/doodle/dia/standard_tools.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/standard_tools.d	Sun Aug 08 22:01:54 2010 +0930
@@ -11,7 +11,7 @@
 }
 
 final class PanTool : Tool {
-    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.MIDDLE) {
             mLastPosition = event.pixelPoint;
             return true;
@@ -21,7 +21,7 @@
         }
     }
 
-    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+    override bool handleMotion(scope IViewport viewport, in MotionEvent event) {
         if (event.mask.isSet(Modifier.MIDDLE_BUTTON)) {
             viewport.panRelative(mLastPosition - event.pixelPoint);
             mLastPosition = event.pixelPoint;
@@ -33,7 +33,7 @@
         }
     }
 
-    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+    override bool handleScroll(scope IViewport viewport, in ScrollEvent event) {
         if (event.mask.isUnset(Modifier.MIDDLE_BUTTON)) {
             Vector delta;
 
@@ -67,7 +67,7 @@
 }
 
 final class ZoomTool : Tool {
-    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+    override bool handleScroll(scope IViewport viewport, in ScrollEvent event) {
         if (event.mask.isSet(Modifier.CONTROL)) {
             if (event.scrollDirection == ScrollDirection.DOWN) {
                 viewport.zoomRelative(event.pixelPoint, 1.0 / ZOOM);
@@ -92,7 +92,7 @@
 }
 
 final class SelectTool : Tool {
-    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.LEFT) {
             _active = true;
             _anchorPoint = _currentPoint = event.pixelPoint;
@@ -104,7 +104,7 @@
         }
     }
 
-    override bool handleButtonRelease(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonRelease(scope IViewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.LEFT && _active) {
             _active = false;
             viewport.damagePixel(feather(Rectangle(_anchorPoint, _currentPoint), LINE_WIDTH / 2.0));
@@ -116,7 +116,7 @@
         }
     }
 
-    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+    override bool handleMotion(scope IViewport viewport, in MotionEvent event) {
         if (_active) {
             viewport.damagePixel(feather(Rectangle(_anchorPoint, _currentPoint), LINE_WIDTH / 2.0));
             _currentPoint = event.pixelPoint;
@@ -126,7 +126,7 @@
         return false;
     }
 
-    override void draw(in Viewport viewport,
+    override void draw(in IViewport viewport,
                        in Rectangle pixelDamage, scope Context pixelCr) const {
         if (_active) {
             /*
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/dia/tool.d
--- a/doodle/dia/tool.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/tool.d	Sun Aug 08 22:01:54 2010 +0930
@@ -32,17 +32,17 @@
     abstract void stop(IToolStack tool_stack);
     */
 
-    bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) { return false; }
-    bool handleButtonRelease(scope Viewport viewport, in ButtonEvent event) { return false; }
-    bool handleMotion(scope Viewport viewport, in MotionEvent event) { return false; }
-    bool handleScroll(scope Viewport viewport, in ScrollEvent event) { return false; }
+    bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) { return false; }
+    bool handleButtonRelease(scope IViewport viewport, in ButtonEvent event) { return false; }
+    bool handleMotion(scope IViewport viewport, in MotionEvent event) { return false; }
+    bool handleScroll(scope IViewport viewport, in ScrollEvent event) { return false; }
     //bool handleEnter(scope viewport, CrossingEvent event) { return false; }
     //bool handleLeave(scope viewport, CrossingEvent event) { return false; }
     //bool handleFocusIn(scope viewport, FocusEvent event) { return false; }
     //bool handleFocusOut(scope viewport, FocusEvent event) { return false; }
-    bool handleKeyPress(scope Viewport viewport, in KeyEvent event) { return false; }
-    bool handleKeyRelease(scope Viewport viewport, in KeyEvent event) { return false; }
+    bool handleKeyPress(scope IViewport viewport, in KeyEvent event) { return false; }
+    bool handleKeyRelease(scope IViewport viewport, in KeyEvent event) { return false; }
 
-    void draw(in Viewport viewport,
+    void draw(in IViewport viewport,
               in Rectangle pixelDamage, scope Context pixelCr) const { }
 }
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/dia/tool_layer.d
--- a/doodle/dia/tool_layer.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/tool_layer.d	Sun Aug 08 22:01:54 2010 +0930
@@ -9,10 +9,10 @@
     import doodle.cairo.routines;
 }
 
-interface ToolStack {
+interface IToolStack {
 }
 
-class ToolLayer : Layer, EventHandler, ToolStack {
+class ToolLayer : Layer, IEventHandler, IToolStack {
     this(in Tool[] tools, in string name) {
         super(name);
         _tools = tools.dup;
@@ -24,7 +24,7 @@
         return Rectangle();
     }
 
-    override void draw(const Viewport viewport,
+    override void draw(const IViewport viewport,
                        in Rectangle pixelDamage, scope Context pixelCr,
                        in Rectangle modelDamage, scope Context modelCr) const {
         if (_grabbedTool) {
@@ -34,7 +34,7 @@
 
     // EventHandler overrides:
 
-    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) {
         // writefln("%s", event);
 
         if (_grabbedTool is null) {
@@ -53,7 +53,7 @@
         return true;
     }
 
-    override bool handleButtonRelease(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonRelease(scope IViewport viewport, in ButtonEvent event) {
         // writefln("%s", event);
 
         if (_grabbedTool !is null) {
@@ -67,19 +67,19 @@
         return true;
     }
 
-    override bool handleKeyPress(scope Viewport viewport, in KeyEvent event) {
+    override bool handleKeyPress(scope IViewport viewport, in KeyEvent event) {
         // writefln("%s", event);
 
         return true;
     }
 
-    override bool handleKeyRelease(scope Viewport viewport, in KeyEvent event) {
+    override bool handleKeyRelease(scope IViewport viewport, in KeyEvent event) {
         // writefln("%s", event);
 
         return true;
     }
 
-    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+    override bool handleMotion(scope IViewport viewport, in MotionEvent event) {
         //writefln("%s", event);
 
         if (_grabbedTool is null) {
@@ -96,7 +96,7 @@
         return true;
     }
 
-    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+    override bool handleScroll(scope IViewport viewport, in ScrollEvent event) {
         // writefln("%s", event);
 
         if (_grabbedTool is null) {
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/fig/diagram_layer.d
--- a/doodle/fig/diagram_layer.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/fig/diagram_layer.d	Sun Aug 08 22:01:54 2010 +0930
@@ -21,7 +21,7 @@
         return Rectangle.DEFAULT;
     }
 
-    override void draw(in Viewport viewport,
+    override void draw(in IViewport viewport,
                        in Rectangle pixelDamage, scope Context pixelCr,
                        in Rectangle modelDamage, scope Context modelCr) const {
         foreach (e; _elements) {
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/gtk/canvas.d
--- a/doodle/gtk/canvas.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/gtk/canvas.d	Sun Aug 08 22:01:54 2010 +0930
@@ -46,8 +46,8 @@
 //   zoom about a point (hold control and move scroll wheel)
 //   resize the widget
 
-class Canvas : Table, Viewport {
-    this(in Layer[] layers, EventHandler eventHandler, Grid grid, in double ppi) {
+class Canvas : Table, IViewport {
+    this(in Layer[] layers, IEventHandler eventHandler, IGrid grid, in double ppi) {
         super(3, 3, 0);
 
         _damage = Rectangle.DEFAULT;
@@ -574,8 +574,8 @@
         VScrollbar _vScrollbar;
 
         Layer[] _layers;
-        EventHandler _eventHandler;
-        Grid _grid;
+        IEventHandler _eventHandler;
+        IGrid _grid;
         double _ppi;
     }
 }
diff -r b190a9d9352e -r 9960c4fbd0dd doodle/main/prog/doodler.d
--- a/doodle/main/prog/doodler.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/main/prog/doodler.d	Sun Aug 08 22:01:54 2010 +0930
@@ -57,7 +57,7 @@
     }
 
     private {
-        ToolStack _toolStack;
+        IToolStack _toolStack;
 
         void paletteCallback(int index) {
             switch (index) {