--- a/doodle/dia/standard_tools.d	Tue Aug 03 16:57:06 2010 +0930
+++ b/doodle/dia/standard_tools.d	Tue Aug 03 17:37:21 2010 +0930
@@ -11,9 +11,9 @@
 }
 
 final class PanTool : Tool {
-    override bool handle_button_press(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.MIDDLE) {
-            mLastPosition = event.pixel_point;
+            mLastPosition = event.pixelPoint;
             return true;
         }
         else {
@@ -21,10 +21,10 @@
         }
     }
 
-    override bool handle_motion(scope Viewport viewport, in MotionEvent event) {
-        if (event.mask.is_set(Modifier.MIDDLE_BUTTON)) {
-            viewport.pan_relative(mLastPosition - event.pixel_point);
-            mLastPosition = event.pixel_point;
+    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+        if (event.mask.isSet(Modifier.MIDDLE_BUTTON)) {
+            viewport.panRelative(mLastPosition - event.pixelPoint);
+            mLastPosition = event.pixelPoint;
 
             return true;
         }
@@ -33,16 +33,16 @@
         }
     }
 
-    override bool handle_scroll(scope Viewport viewport, in ScrollEvent event) {
-        if (event.mask.is_unset(Modifier.MIDDLE_BUTTON)) {
+    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+        if (event.mask.isUnset(Modifier.MIDDLE_BUTTON)) {
             Vector delta;
 
-            switch (event.scroll_direction) {
+            switch (event.scrollDirection) {
             case ScrollDirection.UP:
-                delta = event.mask.is_set(Modifier.SHIFT) ? Vector(-AMOUNT, 0.0) : Vector(0.0, AMOUNT);
+                delta = event.mask.isSet(Modifier.SHIFT) ? Vector(-AMOUNT, 0.0) : Vector(0.0, AMOUNT);
                 break;
             case ScrollDirection.DOWN:
-                delta = event.mask.is_set(Modifier.SHIFT) ? Vector(AMOUNT, 0.0) : Vector(0.0, -AMOUNT);
+                delta = event.mask.isSet(Modifier.SHIFT) ? Vector(AMOUNT, 0.0) : Vector(0.0, -AMOUNT);
                 break;
             case ScrollDirection.LEFT:
                 delta = Vector(-AMOUNT, 0.0);
@@ -54,7 +54,7 @@
                 assert(0);
             }
 
-            viewport.pan_relative(delta);
+            viewport.panRelative(delta);
         }
 
         return true;
@@ -67,14 +67,14 @@
 }
 
 final class ZoomTool : Tool {
-    override bool handle_scroll(scope Viewport viewport, in ScrollEvent event) {
-        if (event.mask.is_set(Modifier.CONTROL)) {
-            if (event.scroll_direction == ScrollDirection.DOWN) {
-                viewport.zoom_relative(event.pixel_point, 1.0 / ZOOM);
+    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+        if (event.mask.isSet(Modifier.CONTROL)) {
+            if (event.scrollDirection == ScrollDirection.DOWN) {
+                viewport.zoomRelative(event.pixelPoint, 1.0 / ZOOM);
                 return true;
             }
-            else if (event.scroll_direction == ScrollDirection.UP) {
-                viewport.zoom_relative(event.pixel_point, ZOOM);
+            else if (event.scrollDirection == ScrollDirection.UP) {
+                viewport.zoomRelative(event.pixelPoint, ZOOM);
                 return true;
             }
             else {
@@ -92,11 +92,11 @@
 }
 
 final class LassoTool : Tool {      // TODO convert to SelectTool
-    override bool handle_button_press(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.LEFT) {
-            mActive = true;
-            mAnchorPoint = mCurrentPoint = event.pixel_point;
-            viewport.set_cursor(Cursor.HAND);
+            _active = true;
+            _anchorPoint = _currentPoint = event.pixelPoint;
+            viewport.setCursor(Cursor.HAND);
             return true;
         }
         else {
@@ -104,11 +104,11 @@
         }
     }
 
-    override bool handle_button_release(scope Viewport viewport, in ButtonEvent event) {
-        if (event.button_name == ButtonName.LEFT && mActive) {
-            mActive = false;
-            viewport.damage_pixel(feather(Rectangle(mAnchorPoint, mCurrentPoint), LINE_WIDTH / 2.0));
-            viewport.set_cursor(Cursor.DEFAULT);
+    override bool handleButtonRelease(scope Viewport viewport, in ButtonEvent event) {
+        if (event.button_name == ButtonName.LEFT && _active) {
+            _active = false;
+            viewport.damagePixel(feather(Rectangle(_anchorPoint, _currentPoint), LINE_WIDTH / 2.0));
+            viewport.setCursor(Cursor.DEFAULT);
             return true;
         }
         else {
@@ -116,42 +116,42 @@
         }
     }
 
-    override bool handle_motion(scope Viewport viewport, in MotionEvent event) {
-        if (mActive) {
-            viewport.damage_pixel(feather(Rectangle(mAnchorPoint, mCurrentPoint), LINE_WIDTH / 2.0));
-            mCurrentPoint = event.pixel_point;
-            viewport.damage_pixel(feather(Rectangle(mAnchorPoint, mCurrentPoint), LINE_WIDTH / 2.0));
+    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+        if (_active) {
+            viewport.damagePixel(feather(Rectangle(_anchorPoint, _currentPoint), LINE_WIDTH / 2.0));
+            _currentPoint = event.pixelPoint;
+            viewport.damagePixel(feather(Rectangle(_anchorPoint, _currentPoint), LINE_WIDTH / 2.0));
         }
 
         return false;
     }
 
     override void draw(in Viewport viewport,
-                       in Rectangle pixel_damage, scope Context pixel_cr,
-                       in Rectangle model_damage, scope Context model_cr) const {
-        if (mActive) {
-            pixel_cr.save; {
-                pixel_cr.setSourceRgba(0.0, 0.0, 0.8, 0.3);
-                rectangle(pixel_cr, Rectangle(mCurrentPoint, mAnchorPoint));
-                pixel_cr.fill();
-            } pixel_cr.restore();
+                       in Rectangle pixelDamage, scope Context pixelCr,
+                       in Rectangle modelDamage, scope Context modelCr) const {
+        if (_active) {
+            pixelCr.save; {
+                pixelCr.setSourceRgba(0.0, 0.0, 0.8, 0.3);
+                rectangle(pixelCr, Rectangle(_currentPoint, _anchorPoint));
+                pixelCr.fill();
+            } pixelCr.restore();
 
-            pixel_cr.save(); {
+            pixelCr.save(); {
                 //double[] dashes = [ 4.0, 4.0 ];
-                //pixel_cr.setDash(dashes, 0.0);
-                pixel_cr.setSourceRgba(0.0, 0.0, 0.5, 1.0);
-                pixel_cr.setLineWidth(LINE_WIDTH);
-                //writefln("Drawing rectangle: %s", Rectangle(mCurrentPoint, mAnchorPoint));
-                rectangle(pixel_cr, Rectangle(mCurrentPoint, mAnchorPoint));
-                pixel_cr.stroke;
-            } pixel_cr.restore;
+                //pixelCr.setDash(dashes, 0.0);
+                pixelCr.setSourceRgba(0.0, 0.0, 0.5, 1.0);
+                pixelCr.setLineWidth(LINE_WIDTH);
+                //writefln("Drawing rectangle: %s", Rectangle(_currentPoint, _anchorPoint));
+                rectangle(pixelCr, Rectangle(_currentPoint, _anchorPoint));
+                pixelCr.stroke;
+            } pixelCr.restore;
         }
     }
 
     private {
-        bool mActive;
-        Point mCurrentPoint;
-        Point mAnchorPoint;      // Pixel
+        bool _active;
+        Point _currentPoint;
+        Point _anchorPoint;      // Pixel
         static invariant double LINE_WIDTH = 1.0;
     }
 }