--- a/doodle/tk/events.d	Sun Aug 15 23:18:05 2010 +0930
+++ b/doodle/tk/events.d	Sun Aug 15 23:43:04 2010 +0930
@@ -95,34 +95,34 @@
 }
 
 abstract class PointerEvent : Event {
-    this(in Point pixelPoint, in Point modelPoint, in Mask mask) {
+    this(in Point screenPoint, in Point modelPoint, in Mask mask) {
         super(mask);
-        _pixelPoint = pixelPoint;
+        _screenPoint = screenPoint;
         _modelPoint = modelPoint;
     }
 
-    Point pixelPoint() const { return _pixelPoint; }
+    Point screenPoint() const { return _screenPoint; }
     Point modelPoint() const { return _modelPoint; }
 
     private {
-        Point _pixelPoint;
+        Point _screenPoint;
         Point _modelPoint;
     }
 }
 
 final class CrossingEvent : PointerEvent {
     this(in CrossingMode crossingMode,
-         in Point pixelPoint,
+         in Point screenPoint,
          in Point modelPoint,
          in Mask mask) {
-        super(pixelPoint, modelPoint, mask);
+        super(screenPoint, modelPoint, mask);
         _crossingMode = crossingMode;
     }
 
     CrossingMode crossingMode() const { return _crossingMode; }
 
     override string toString() const {
-        return std.string.format("Crossing event: %s, %s, %s, %s", enumToString(_crossingMode), pixelPoint, modelPoint, mask);
+        return std.string.format("Crossing event: %s, %s, %s, %s", enumToString(_crossingMode), screenPoint, modelPoint, mask);
     }
 
     private {
@@ -133,10 +133,10 @@
 final class ButtonEvent : PointerEvent {
     this(in ButtonAction buttonAction,
          in ButtonName buttonName,
-         in Point pixelPoint,
+         in Point screenPoint,
          in Point modelPoint,
          in Mask mask) {   
-        super(pixelPoint, modelPoint, mask);
+        super(screenPoint, modelPoint, mask);
         _buttonAction = buttonAction;
         _buttonName = buttonName;
     }
@@ -144,7 +144,7 @@
     override string toString() const {
         return std.string.format("Button event: %s, %s, %s, %s, %s",
                                  enumToString(_buttonAction), enumToString(_buttonName),
-                                 _pixelPoint, _modelPoint, _mask);
+                                 _screenPoint, _modelPoint, _mask);
     }
 
     ButtonAction buttonAction() const { return _buttonAction; }
@@ -157,30 +157,30 @@
 }
 
 final class MotionEvent : PointerEvent {
-    this(in Point pixelPoint,
+    this(in Point screenPoint,
          in Point modelPoint,
          in Mask mask) {
-        super(pixelPoint, modelPoint, mask);
+        super(screenPoint, modelPoint, mask);
     }
 
     override string toString() const {
         return std.string.format("Motion event: %s, %s, %s",
-                                 _pixelPoint, _modelPoint, _mask);
+                                 _screenPoint, _modelPoint, _mask);
     }
 }
 
 final class ScrollEvent : PointerEvent {
     this(in ScrollDirection scrollDirection,
-         in Point pixelPoint,
+         in Point screenPoint,
          in Point modelPoint,
          in Mask mask) {
-        super(pixelPoint, modelPoint, mask);
+        super(screenPoint, modelPoint, mask);
         _scrollDirection = scrollDirection;
     }
 
     override string toString() const {
         return std.string.format("Scroll event: %s, %s, %s, %s",
-                                 enumToString(_scrollDirection), _pixelPoint, _modelPoint, _mask);
+                                 enumToString(_scrollDirection), _screenPoint, _modelPoint, _mask);
     }
 
     ScrollDirection scrollDirection() const { return _scrollDirection; }