new PixelBuffer API (mainly tons of renames)

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

diff --git a/src/org/ibex/plat/X11.java b/src/org/ibex/plat/X11.java
index 3d2d1dc..cc1bea6 100644 (file)
--- a/src/org/ibex/plat/X11.java
+++ b/src/org/ibex/plat/X11.java
@@ -1,7 +1,4 @@
-// Copyright 2000-2005 the Contributors, as shown in the revision logs.
-// Licensed under the GNU General Public License version 2 ("the License").
-// You may not use this file except in compliance with the License.
-
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]

 package org.ibex.plat;
 
 import gnu.gcj.RawData;
 package org.ibex.plat;
 
 import gnu.gcj.RawData;

@@ -56,9 +53,12 @@ public class X11 extends POSIX {
 
     // X11Surface /////////////////////////////////////////////////////
 
 
     // X11Surface /////////////////////////////////////////////////////
 

+

     /** Implements a Surface as an X11 Window */
     /** Implements a Surface as an X11 Window */

-    public static class X11Surface extends Surface.DoubleBufferedSurface {
+    public static class X11Surface extends Surface {

         
         

+        public PixelBuffer getPixelBuffer() { return null; }  // FIXME
+

         gnu.gcj.RawData window;
         gnu.gcj.RawData gc;
         boolean framed = false;
         gnu.gcj.RawData window;
         gnu.gcj.RawData gc;
         boolean framed = false;

@@ -141,7 +141,12 @@ public class X11 extends POSIX {
      *  with all-or-nothing alpha will not use shared pixmaps, however
      *  (since they are only written to once.
      */
      *  with all-or-nothing alpha will not use shared pixmaps, however
      *  (since they are only written to once.
      */

-    public static class X11PixelBuffer extends PixelBuffer {
+    public static class X11PixelBuffer implements PixelBuffer {
+
+    public void drawLine(int x1, int y1, int x2, int y2, int color) { }
+    public void drawGlyph(Font.Glyph source, int dx1, int dy1, int cx1, int cy1, int cx2, int cy2, int rgb, int pc){}
+    public void stroke(Polygon p, int color){}
+    public void fill(Polygon p, Paint paint){}

 
         int clipx, clipy, clipw, cliph;
         int width;
 
         int clipx, clipy, clipw, cliph;
         int width;