Thread: [Jnode-svn-commits] SF.net SVN: jnode:[4302] trunk/gui/src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4302
          http://jnode.svn.sourceforge.net/jnode/?rev=4302&view=rev
Author:   lsantha
Date:     2008-07-17 09:51:29 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
Graphics improvements.

Modified Paths:
--------------
    trunk/gui/src/awt/org/jnode/awt/image/BufferedImageSurface.java
    trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java
    trunk/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java
    trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Surface.java
    trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java
    trunk/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaCore.java
    trunk/gui/src/driver/org/jnode/driver/video/util/AbstractSurface.java
    trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java
    trunk/gui/src/driver/org/jnode/driver/video/vga/VGASurface.java
    trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java

Modified: trunk/gui/src/awt/org/jnode/awt/image/BufferedImageSurface.java
===================================================================

--- trunk/gui/src/awt/org/jnode/awt/image/BufferedImageSurface.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/awt/org/jnode/awt/image/BufferedImageSurface.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -67,7 +67,7 @@
      * @param color
      * @param mode
      */
-    protected void drawPixel(int x, int y, int color, int mode) {
+    public void drawPixel(int x, int y, int color, int mode) {
         if (bitmapGraphics != null) {
             bitmapGraphics.drawPixels(x, y, 1, color, mode);
         } else {
@@ -132,6 +132,22 @@
     }
 
     /**
+     * Fill a rectangle with the given color.
+     *
+     * @param x
+     * @param y
+     * @param w
+     * @param h
+     * @param color
+     * @param mode
+     */
+    @Override
+    public void fillRect(int x, int y, int w, int h, int color, int mode) {
+        super.fillRect(x, y, w, h, color, mode);
+        //bitmapGraphics.fillRect(x, y, w, h, color, mode);
+    }
+
+    /**
      * @return the color model
      * @see org.jnode.driver.video.Surface#getColorModel()
      */
@@ -141,7 +157,7 @@
 
     /**
      * @see org.jnode.driver.video.Surface#drawAlphaRaster(java.awt.image.Raster, java.awt.geom.AffineTransform,
-     * int, int, int, int, int, int, java.awt.Color)
+     *      int, int, int, int, int, int, java.awt.Color)
      */
     public void drawAlphaRaster(Raster raster, AffineTransform tx, int srcX, int srcY,
                                 int dstX, int dstY, int width, int height, Color color) {
@@ -153,8 +169,13 @@
     }
 
     @Override
-    public int getRGBPixel(int x, int y) {
-        return bitmapGraphics.doGetPixel(x, y);
+    public int getRGBPixel(final int x, final int y) {
+        if (0 <= x && x < bitmapGraphics.getWidth() && 0 <= y && y < bitmapGraphics.getHeight()) {
+            return bitmapGraphics.doGetPixel(x, y);
+        } else {
+            //todo investigate this case
+            return 0;
+        }
     }
 
     @Override

Modified: trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -62,8 +62,35 @@
      * @see org.jnode.driver.video.Surface#copyArea(int, int, int, int, int,
      *      int)
      */
-    public final void copyArea(int srcX, int srcY, int w, int h, int dstX,
-                               int dstY) {
+    public final void copyArea(final int srcX, final int srcY, final int w, final int h,
+                               final int deltaX, final int deltaY) {
+        if (w < 1 || h < 1)
+            return;
+
+        final int dstX = srcX + deltaX;
+        final int dstY = srcY + deltaY;
+
+        final int bytesForWidth = getBytesForWidth(w);
+
+        if (deltaY < 0) {
+            int srcOfs = getOffset(srcX, srcY);
+            int dstOfs = getOffset(dstX, dstY);
+            for (int row = 0; row < h; row++) {
+                mem.copy(srcOfs, dstOfs, bytesForWidth);
+                srcOfs += bytesPerLine;
+                dstOfs += bytesPerLine;
+            }
+        } else {
+            int srcOfs = getOffset(srcX, srcY + h - 1);
+            int dstOfs = getOffset(dstX, dstY + h - 1);
+            for (int row = 0; row < h; row++) {
+                mem.copy(srcOfs, dstOfs, bytesForWidth);
+                srcOfs -= bytesPerLine;
+                dstOfs -= bytesPerLine;
+            }
+        }
+
+        /*
         if ((dstY < this.height) && (dstX < this.width)) {
             if (dstX < 0) {
                 srcX -= dstX;
@@ -81,7 +108,7 @@
                 doCopyArea(srcX, srcY, w, h, dstX, dstY);
             }
         }
-        // TODO Auto-generated method stub
+        */
 
     }
 
@@ -239,6 +266,19 @@
         }
     }
 
+    @Override
+    public void fillRect(int x, int y, int width, int height, int color, int mode) {
+        if ((x >= 0) && (x < this.width) && (y >= 0) && (y < this.height) &&
+            (x + width >= 0) && (x + width < this.width) && (y + height >= 0) && (y + height < this.height)) {
+
+            for (int i = 0; i < height; i++)
+                doDrawPixels(x, y + i, width, color, mode);
+
+        } else {
+            // super.fillRect(x, y, width, height, color, mode);
+        }
+    }
+
     /**
      * @see org.jnode.driver.video.Surface#copyArea(int, int, int, int, int,
      *      int)

Modified: trunk/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/awt/org/jnode/awt/util/AbstractGraphics.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -402,6 +402,7 @@
     public void transform(AffineTransform tx) {
         transform.concatenate(tx);
         // Adjust clip
+        /*
         Rectangle2D r = clip.getBounds2D();
         double[] coords = new double[]{r.getX(), r.getY(),
             r.getX() + r.getWidth(), r.getY() + r.getHeight()};
@@ -412,6 +413,7 @@
         } catch (java.awt.geom.NoninvertibleTransformException e) {
             e.printStackTrace();
         }
+        */
     }
 
     /**
@@ -420,7 +422,9 @@
      * @see java.awt.Graphics2D#translate(double, double)
      */
     public void translate(double tx, double ty) {
-        transform(AffineTransform.getTranslateInstance(tx, ty));
+        //transform(AffineTransform.getTranslateInstance(tx, ty));
+        //transform.translate(tx,ty);
+        translate((int) tx, (int) ty);
     }
 
     /**
@@ -429,7 +433,16 @@
      * @see java.awt.Graphics#translate(int, int)
      */
     public void translate(int x, int y) {
-        transform(AffineTransform.getTranslateInstance(x, y));
+        transform.translate(x, y);
+        //adjust clip
+        if (clip != null) {
+            if (clip instanceof Rectangle) {
+                Rectangle r = (Rectangle) clip;
+                r.translate(x, y);
+            } else {
+                throw new UnsupportedOperationException();
+            }
+        }
     }
 
     /**
@@ -454,7 +467,17 @@
      * @see java.awt.Graphics#clipRect(int, int, int, int)
      */
     public void clipRect(int x, int y, int width, int height) {
-        clip(new Rectangle(x, y, width, height));
+        Rectangle r = new Rectangle(x, y, width, height);
+        if (transform != null)
+            r.translate((int) transform.getTranslateX(), (int) transform.getTranslateY());
+
+        if (clip == null)
+            clip = r;
+        else if (clip instanceof Rectangle) {
+            clip = ((Rectangle) clip).intersection(r);
+        } else {
+            throw new UnsupportedOperationException();
+        }
     }
 
     /**
@@ -791,6 +814,9 @@
      * @see java.awt.Graphics#setClip(int, int, int, int)
      */
     public void setClip(int x, int y, int width, int height) {
+        Rectangle r = new Rectangle(x, y, width, height);
+        if (transform != null)
+            r.translate((int) transform.getTranslateX(), (int) transform.getTranslateY());
         clip = new Rectangle(x, y, width, height);
     }
 

Modified: trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Surface.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Surface.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Surface.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -73,7 +73,7 @@
         return color.getRGB();
     }
 
-    protected void drawPixel(int x, int y, int color, int mode) {
+    public void drawPixel(int x, int y, int color, int mode) {
         bitmapGraphics.drawPixels(x, y, 1, color, mode);
     }
 

Modified: trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -112,7 +112,7 @@
      * @see org.jnode.driver.video.util.AbstractSurface#drawPixel(int, int, int,
      *      int)
      */
-    protected void drawPixel(int x, int y, int color, int mode) {
+    public void drawPixel(int x, int y, int color, int mode) {
         bitmapGraphics.drawPixels(x, y, 1, color, mode);
     }
 

Modified: trunk/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaCore.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaCore.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/driver/org/jnode/driver/video/nvidia/NVidiaCore.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -259,7 +259,7 @@
      * @see org.jnode.driver.video.util.AbstractSurface#drawPixel(int, int, int,
      *      int)
      */
-    protected final void drawPixel(int x, int y, int color, int mode) {
+    public final void drawPixel(int x, int y, int color, int mode) {
         bitmapGraphics.drawPixels(x, y, 1, color, mode);
     }
 

Modified: trunk/gui/src/driver/org/jnode/driver/video/util/AbstractSurface.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/util/AbstractSurface.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/driver/org/jnode/driver/video/util/AbstractSurface.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -147,7 +147,7 @@
      */
     public void fillRect(int x, int y, int w, int h, int color, int mode) {
         for (int row = 0; row < h; row++) {
-            drawLine(x, y + row, x + w, y + row, color, mode);
+            drawLine(x, y + row, x + w - 1, y + row, color, mode);
         }
     }
 
@@ -159,7 +159,7 @@
      * @param color
      * @param mode
      */
-    protected abstract void drawPixel(int x, int y, int color, int mode);
+    public abstract void drawPixel(int x, int y, int color, int mode);
 
     /**
      * Draw a line between (x1,y1) and (x2,y2)
@@ -195,7 +195,7 @@
         drawPixel(x1, y1, color, mode);
         if (sizex >= sizey) {
             int y = sizex >> 1;
-            final int loops = sizex - 1;
+            final int loops = sizex;
             for (int i = 0; i < loops; i++) {
                 y += sizey;
                 if (y >= sizex) {
@@ -207,7 +207,7 @@
             }
         } else {
             int x = sizey >> 1;
-            final int loops = sizey - 1;
+            final int loops = sizey;
             for (int i = 0; i < loops; i++) {
                 x += sizex;
                 if (x >= sizey) {

Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -392,7 +392,7 @@
      * @param y
      * @param color
      */
-    protected final void drawPixel(int x, int y, int color, int mode) {
+    public final void drawPixel(int x, int y, int color, int mode) {
         bitmapGraphics.drawPixels(x, y, 1, color, mode);
     }
 

Modified: trunk/gui/src/driver/org/jnode/driver/video/vga/VGASurface.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vga/VGASurface.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/driver/org/jnode/driver/video/vga/VGASurface.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -132,7 +132,7 @@
      * @see org.jnode.driver.video.util.AbstractSurface#drawPixel(int, int, int,
      *      int)
      */
-    protected void drawPixel(int x, int y, int color, int mode) {
+    public void drawPixel(int x, int y, int color, int mode) {
         bitmapGraphics.drawPixels(x, y, 1, color, mode);
     }
 

Modified: trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java	2008-07-12 06:25:41 UTC (rev 4301)
+++ trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java	2008-07-17 09:51:29 UTC (rev 4302)
@@ -314,7 +314,7 @@
      */
     public void copyArea(int x, int y, int width, int height, int dx, int dy) {
         bitmapGraphics.copyArea(x, y, width, height, dx, dy);
-        updateScreen(dx, dy, width, height);
+        updateScreen(x + dx, y + dy, width, height);
     }
 
     /**
@@ -371,6 +371,7 @@
      * @param mode
      */
     public final void fillRect(int x, int y, int width, int height, int color, int mode) {
+        //bitmapGraphics.fillRect(x, y, width, height, color, mode);
         super.fillRect(x, y, width, height, color, mode);
         // todo optimize it
         /*
@@ -411,7 +412,7 @@
      * @param y
      * @param color
      */
-    protected final void drawPixel(int x, int y, int color, int mode) {
+    public final void drawPixel(int x, int y, int color, int mode) {
         bitmapGraphics.drawPixels(x, y, 1, color, mode);
         /*
          * if ((x >= 0) && (x < width) && (y > = 0) && (y < height)) { y; final


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Jnode-svn-commits] SF.net SVN: jnode:[4302] trunk/gui/src

jnode-svn-commits