--- a/doodle/gtk/events.d	Sun Aug 15 01:21:14 2010 +0930
+++ b/doodle/gtk/events.d	Sun Aug 15 01:36:22 2010 +0930
@@ -29,12 +29,12 @@
    }
 */
 
-ButtonEvent makeButtonEvent(const GdkEventButton * event, in PixelModel pixelModel) {
-    Point pixelPoint = Point(event.x + 0.5, pixelModel.viewBounds.h - (event.y + 0.5));
-    Point modelPoint = pixelModel.pixelToModel(pixelPoint);
+ButtonEvent makeButtonEvent(const GdkEventButton * event, in ScreenModel screenModel) {
+    Point screenPoint = Point(event.x + 0.5, screenModel.viewBoundsScreen.h - (event.y + 0.5));
+    Point modelPoint = screenModel.screenToModel(screenPoint);
     return new ButtonEvent(gtk2tkButtonAction(event.type),
                            gtk2tkButtonName(event.button),
-                           pixelPoint, modelPoint, gtk2tkMask(event.state));
+                           screenPoint, modelPoint, gtk2tkMask(event.state));
 }
 
 /*
@@ -53,11 +53,11 @@
    }
  */
 
-MotionEvent makeMotionEvent(const GdkEventMotion * event, in PixelModel pixelModel) {
-    Point pixelPoint = Point(event.x + 0.5, pixelModel.viewBounds.h - (event.y + 0.5));
-    Point modelPoint = pixelModel.pixelToModel(pixelPoint);
+MotionEvent makeMotionEvent(const GdkEventMotion * event, in ScreenModel screenModel) {
+    Point screenPoint = Point(event.x + 0.5, screenModel.viewBoundsScreen.h - (event.y + 0.5));
+    Point modelPoint = screenModel.screenToModel(screenPoint);
 
-    return new MotionEvent(pixelPoint, modelPoint, gtk2tkMask(event.state));
+    return new MotionEvent(screenPoint, modelPoint, gtk2tkMask(event.state));
 }
 
 /*
@@ -77,7 +77,7 @@
    }
  */
 
-KeyEvent makeKeyEvent(const GdkEventKey * event, in PixelModel pixelModel) {
+KeyEvent makeKeyEvent(const GdkEventKey * event, in ScreenModel screenModel) {
     return new KeyEvent(event.string[0..strlen(event.string)].idup,
                         event.keyval,
                         gtk2tkMask(event.state));
@@ -98,11 +98,11 @@
    }
  */
 
-ScrollEvent makeScrollEvent(const GdkEventScroll * event, in PixelModel pixelModel) {
-    Point pixelPoint = Point(event.x + 0.5, pixelModel.viewBounds.h - (event.y + 0.5));
-    Point modelPoint = pixelModel.pixelToModel(pixelPoint);
+ScrollEvent makeScrollEvent(const GdkEventScroll * event, in ScreenModel screenModel) {
+    Point screenPoint = Point(event.x + 0.5, screenModel.viewBoundsScreen.h - (event.y + 0.5));
+    Point modelPoint = screenModel.screenToModel(screenPoint);
     return new ScrollEvent(gtk2tkDirection(event.direction),
-                           pixelPoint,
+                           screenPoint,
                            modelPoint,
                            gtk2tkMask(event.state));
 }
@@ -134,11 +134,11 @@
    }
  */
 
-CrossingEvent makeCrossingEvent(const GdkEventCrossing * event, in PixelModel pixelModel) {
-    Point pixelPoint = Point(event.x + 0.5, pixelModel.viewBounds.h - (event.y + 0.5));
-    Point modelPoint = pixelModel.pixelToModel(pixelPoint);
+CrossingEvent makeCrossingEvent(const GdkEventCrossing * event, in ScreenModel screenModel) {
+    Point screenPoint = Point(event.x + 0.5, screenModel.viewBoundsScreen.h - (event.y + 0.5));
+    Point modelPoint = screenModel.screenToModel(screenPoint);
     return new CrossingEvent(gtk2tkCrossingMode(event.mode),
-                             pixelPoint,
+                             screenPoint,
                              modelPoint,
                              gtk2tkMask(event.state));
 }