new PixelBuffer API (mainly tons of renames)

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

diff --git a/src/org/ibex/plat/Win32.java b/src/org/ibex/plat/Win32.java
index 550bdaf..86f79a3 100644 (file)
--- a/src/org/ibex/plat/Win32.java
+++ b/src/org/ibex/plat/Win32.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 org.ibex.util.*;
@@ -88,7 +85,7 @@ public class Win32 extends GCJ {
 
         HTTP.Proxy ret = new HTTP.Proxy();
         if (container[2] != null) {
-           // FIXME!!!
+            // FIXME
             //ret.proxyAutoConfigFunction = HTTP.Proxy.getProxyAutoConfigFunction(container[2]);
             if (ret.proxyAutoConfigFunction != null) return ret;
         }
@@ -140,8 +137,13 @@ public class Win32 extends GCJ {
 
     // Win32Surface ////////////////////////////////////////////////////////////////////////////
 
-    public static class Win32Surface extends Surface.DoubleBufferedSurface {
+    public static class Win32Surface extends Surface {
+
+    public PixelBuffer getPixelBuffer() { return null; }  // FIXME
 
+        // hack
+        String cursor;
+        
         /** used to block while waiting for the message pump thread to create a hwnd for us */
         public Semaphore hwndCreated = new Semaphore();
 
@@ -233,8 +235,12 @@ public class Win32 extends GCJ {
 
     // Win32PixelBuffer //////////////////////////////////////////////////////////////////////////
 
-    public static class Win32PixelBuffer extends PixelBuffer {
+    public static class Win32PixelBuffer 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 w = 0;
         int h = 0;
 
@@ -263,7 +269,7 @@ public class Win32 extends GCJ {
             ((Win32Picture)source).init();
             drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false);
         }
-        public void drawGlyph(org.ibex.graphics.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+        public void drawGlyph(Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
             Win32Picture p = ((Win32Picture)((Platform.DefaultGlyph)source).getPicture());
             p.init();
             drawPicture(p, dx, dy, cx1, cy1, cx2, cy2, rgb, true);