X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.java;h=ba99a8e72734a285c71ac553e4b2ec1a8fe4fac2;hb=8ca06b850fb51673a7cfe751643ea45ec528070d;hp=f0b6a6948c1954e6b6b24003bd7652519e470fd9;hpb=de71be6ed2ac0542abb790006896980b2c2211a8;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/Win32.java b/src/org/xwt/plat/Win32.java
index f0b6a69..ba99a8e 100644
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/xwt/plat/Win32.java
@@ -55,61 +55,6 @@ public class Win32 extends GCJ {
 
         new Thread() { public void run() { natInit(); } }.start();
         messagePumpStarted.block();
-        fontList = new String[fontListVec.size()];
-        fontListVec.toArray(fontList);
-        fontListVec = null;
-    }
-
-
-    // Font Handling ////////////////////////////////////////////////////////////////////////////
-
-    // FEATURE: query the registry for the user's default font
-    protected String _getDefaultFont() { return "dialog8"; }
-    protected int _getMaxAscent(String font) { return getFont(font).maxAscent; }
-    protected int _getMaxDescent(String font) { return getFont(font).maxDescent; }
-    protected native int _stringWidth(String font, String text);
-
-    // methods/members used to enumerate platform fonts on startup
-    public static Vector fontListVec = new Vector();
-    public static String[] fontList = null;
-    protected String[] _listFonts() { return fontList; }
-    public static void addFont(String name, int height, boolean italic, boolean bold) {
-        fontListVec.addElement(name.replace(' ', '_').toLowerCase() + "" + height + (italic ? "i" : "") + (bold ? "b" : ""));
-    }
-
-    static Hash fontCache = new Hash();
-    public static class Win32Font {
-        int hfont;
-        int maxAscent;
-        int maxDescent;
-    }
-
-        /** Called once XWT is initialized and the application is running. On Win32, we need to block the main thread
-        *       on a semaphore because if the main thread exits, the whole application quits. */
-        protected void _running() {
-                // gcj-win32 exit()'s when the original thread dies, so we have to deadlock ourselves
-                if (Log.on) Log.log(Main.class, "main thread blocking on new semaphore");
-                new org.xwt.util.Semaphore().block();
-        }
-
-    /** takes a parsed font and finds the closest platform-specific font */
-    static native Win32Font mapFont(Platform.ParsedFont pf);
-
-    /** takes an unparsed font and finds the closest platform-specific font */
-    static Win32Font getFont(String font) {
-        Win32Font ret = (Win32Font)fontCache.get(font);
-        if (ret != null) return ret;
-
-        Platform.ParsedFont pf = new Platform.ParsedFont(font);
-        if (pf.name.equals("serif")) pf.name = "Times New Roman";
-        else if (pf.name.equals("sansserif")) pf.name = "Arial";
-        else if (pf.name.equals("monospace")) pf.name = "Courier New";
-        else if (pf.name.equals("dialog")) pf.name = "MS Sans Serif";
-        else if (pf.name.equals("tty")) pf.name = "FixedSys";
-
-        ret = mapFont(pf);
-        fontCache.put(font, ret);
-        return ret;
     }
 
 
@@ -198,7 +143,7 @@ public class Win32 extends GCJ {
 
     // Win32Surface ////////////////////////////////////////////////////////////////////////////
 
-    public static class Win32Surface extends Surface {
+    public static class Win32Surface extends Surface.DoubleBufferedSurface {
 
         /** used to block while waiting for the message pump thread to create a hwnd for us */
         public Semaphore hwndCreated = new Semaphore();
@@ -249,7 +194,7 @@ public class Win32 extends GCJ {
         public native void setInvisible(boolean i);
         public native void _setMaximized(boolean m);
         public native void setSize(int w, int h);
-        public native void setLocation(int x, int y);
+        public native void setLocation();
         public native void setTitleBarText(String s);
         public native void setIcon(Picture p);
         public native void _dispose();
@@ -318,13 +263,27 @@ public class Win32 extends GCJ {
 
         public native void setClip(int x, int y, int x2, int y2);
         public native void fillRect(int x, int y, int x2, int y2, int color);
-        public native void drawString(String font, String text, int x, int y, int color);
         public native void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2);
+        public native void drawPictureAlphaOnly(Picture source, int dx1, int dy1, int dx2, int dy2,
+                                                int sx1, int sy1, int sx2, int sy2, int rgb);
         public native void finalize();
         public void drawPicture(Picture source, int x, int y) {
             drawPicture(source, x, y, x + source.getWidth(), y + source.getHeight(), 0, 0, source.getWidth(), source.getHeight());
         }
 
+        // FIXME: try to use os acceleration
+        public void fillTrapezoid(int x1, int x2, int y1, int x3, int x4, int y2, int argb) {
+            if (x1 == x3 && x2 == x4) {
+                fillRect(x1, y1, x4, y2, argb);
+            } else for(int y=y1; y<y2; y++) {
+                int _x1 = (int)Math.floor((y - y1) * (x3 - x1) / (y2 - y1) + x1);
+                int _y1 = (int)Math.floor(y);
+                int _x2 = (int)Math.ceil((y - y1) * (x4 - x2) / (y2 - y1) + x2);
+                int _y2 = (int)Math.floor(y) + 1;
+                if (_x1 > _x2) { int _x0 = _x1; _x1 = _x2; _x2 = _x0; }
+                fillRect(_x1, _y1, _x2, _y2, argb);
+            }
+        }
     }
 
 }