2003/10/28 10:10:18

[org.ibex.core.git] / src / org / xwt / plat / X11.java

diff --git a/src/org/xwt/plat/X11.java b/src/org/xwt/plat/X11.java
index 9973742..ba739ec 100644 (file)
--- a/src/org/xwt/plat/X11.java
+++ b/src/org/xwt/plat/X11.java
@@ -66,7 +66,7 @@ public class X11 extends POSIX {
         public native void setIcon(Picture p);
         public native void _setMinimized(boolean b);
         public native void setTitleBarText(String s);
-        public native void setSize(int w, int h);
+        public native void _setSize(int w, int h);
         public native void setLocation();
         public native void natInit();
         public native void toFront();
@@ -125,7 +125,7 @@ public class X11 extends POSIX {
             if (doublebuf != null) return;
             // no point in using a shared pixmap since we'll only write to this image once
             X11PixelBuffer b = new X11PixelBuffer(width, height, false);
-            b.drawPicture(this, 0, 0, width, height, 0, 0, width, height);
+            b.drawPicture(this, 0, 0, 0, 0, width, height);
             if (needsStipple) b.createStipple(this);
             doublebuf = b;
         }
@@ -168,29 +168,21 @@ public class X11 extends POSIX {
             natInit();
         }
 
-        public void setClip(int x, int y, int x2, int y2) {
-            clipx = x; if (clipx < 0) clipx = 0;
-            clipy = y; if (clipy < 0) clipy = 0;
-            clipw = x2 - x; if (clipw < 0) clipw = 0;
-            cliph = y2 - y; if (cliph < 0) cliph = 0;
+        public void drawPictureAlphaOnly(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {        
+            slowDrawPicture(source, dx, dy, cx1, cy1, cx2, cy2, rgb, true);
         }
-        
-        public void drawPictureAlphaOnly(Picture source, int dx1, int dy1, int dx2, int dy2,
-                                         int sx1, int sy1, int sx2, int sy2, int rgb) {
-            slowDrawPicture(source, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, rgb, true);
-        }
-        public void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2) {
-            if (!(dx2 - dx1 != sx2 - sx1 || dy2 - dy1 != sy2 - sy1) && ((X11Picture)source).doublebuf != null)
-                fastDrawPicture(source, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2);
+        public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
+            if (((X11Picture)source).doublebuf != null)
+                fastDrawPicture(source, dx, dy, cx1, cy1, cx2, cy2);
             else 
-                slowDrawPicture(source, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, 0, false);
+                slowDrawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false);
         }
 
         /** fast path for image drawing (no scaling, all-or-nothing alpha) */
-        public native void fastDrawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2);
+        public native void fastDrawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2);
 
         /** slow path for image drawing */
-        public native void slowDrawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, int rgb, boolean alphaOnly);
+        public native void slowDrawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb, boolean alphaOnly);
 
         public int getWidth() { return width; }
         public int getHeight() { return height; }