X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FX11.java;h=925593b2af8a1b4c6662ce0b0cf9b1b19717109a;hb=8ca06b850fb51673a7cfe751643ea45ec528070d;hp=c6b42ad495558851c85691bc1ee0fd02c9d58bce;hpb=c4826a4340164c333525b709e533742b5e33fe7f;p=org.ibex.core.git diff --git a/src/org/xwt/plat/X11.java b/src/org/xwt/plat/X11.java index c6b42ad..925593b 100644 --- a/src/org/xwt/plat/X11.java +++ b/src/org/xwt/plat/X11.java @@ -1,14 +1,11 @@ -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL] +// Copyright 2003 Adam Megacz, see the COPYING file for licensing [LGPL] package org.xwt.plat; -import java.awt.*; -import java.awt.image.*; import gnu.gcj.RawData; import java.net.*; import java.lang.reflect.*; import java.io.*; import java.util.*; -import java.awt.peer.*; import org.xwt.util.*; import org.xwt.*; @@ -35,34 +32,29 @@ public class X11 extends POSIX { // General Methods /////////////////////////////////////////////////////// protected String _getAltKeyName() { return System.getProperty("os.name", "").indexOf("SunOS") != -1 ? "Meta" : "Alt"; } - protected String[] _listFonts() { return fontList; } protected Picture _createPicture(int[] data, int w, int h) { return new X11Picture(data, w, h); } - protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new X11DoubleBuffer(w, h); } + protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return new X11PixelBuffer(w, h); } protected Surface _createSurface(Box b, boolean framed) { return new X11Surface(b, framed); } protected boolean _needsAutoClick() { return true; } protected native int _getScreenWidth(); protected native int _getScreenHeight(); protected native String _getClipBoard(); protected native void _setClipBoard(String s); - protected native int _stringWidth(String font, String text); - protected native int _getMaxAscent(String font); - protected native int _getMaxDescent(String font); protected boolean _needsAutoDoubleClick() { return true; } protected native void eventThread(); private native void natInit(); public X11() { } public void init() { - natInit(); + natInit(); (new Thread() { public void run() { eventThread(); } }).start(); - initFonts(); } // X11Surface ///////////////////////////////////////////////////// /** Implements a Surface as an X11 Window */ - public static class X11Surface extends Surface { + public static class X11Surface extends Surface.DoubleBufferedSurface { gnu.gcj.RawData window; gnu.gcj.RawData gc; @@ -75,14 +67,14 @@ public class X11 extends POSIX { public native void _setMinimized(boolean b); public native void setTitleBarText(String s); public native void setSize(int w, int h); - public native void setLocation(int x, int y); + public native void setLocation(); public native void natInit(); public native void toFront(); public native void toBack(); public native void syncCursor(); public native void _dispose(); public native void setLimits(int minw, int minh, int maxw, int maxh); - public native void blit(DoubleBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2); + public native void blit(PixelBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2); public native void dispatchEvent(gnu.gcj.RawData ev); public X11Surface(Box root, boolean framed) { @@ -99,8 +91,8 @@ public class X11 extends POSIX { /** * Implements a Picture. No special X11 structure is created * unless the image has no alpha (in which case a - * non-shared-pixmap DoubleBuffer is created), or all-or-nothing - * alpha (in which case a non-shared-pixmap DoubleBuffer with a + * non-shared-pixmap PixelBuffer is created), or all-or-nothing + * alpha (in which case a non-shared-pixmap PixelBuffer with a * stipple bitmap is created). */ public static class X11Picture extends Picture { @@ -108,7 +100,7 @@ public class X11 extends POSIX { int width; int height; int[] data = null; - public X11DoubleBuffer doublebuf = null; + public X11PixelBuffer doublebuf = null; public int getWidth() { return width; } public int getHeight() { return height; } @@ -126,37 +118,36 @@ public class X11 extends POSIX { else if ((data[i] & 0xFF000000) != 0x00) return; - buildDoubleBuffer(needsStipple); + buildPixelBuffer(needsStipple); } - void buildDoubleBuffer(boolean needsStipple) { + void buildPixelBuffer(boolean needsStipple) { if (doublebuf != null) return; // no point in using a shared pixmap since we'll only write to this image once - X11DoubleBuffer b = new X11DoubleBuffer(width, height, false); - b.drawPicture(this, 0, 0); + X11PixelBuffer b = new X11PixelBuffer(width, height, false); + b.drawPicture(this, 0, 0, width, height, 0, 0, width, height); if (needsStipple) b.createStipple(this); doublebuf = b; } - } /** - * An X11DoubleBuffer is implemented as an X11 pixmap. "Normal" - * DoubleBuffers will use XShm shared pixmaps if - * available. X11DoubleBuffers created to accelerate Pictures + * An X11PixelBuffer is implemented as an X11 pixmap. "Normal" + * PixelBuffers will use XShm shared pixmaps if + * available. X11PixelBuffers created to accelerate Pictures * with all-or-nothing alpha will not use shared pixmaps, however * (since they are only written to once. */ - public static class X11DoubleBuffer extends DoubleBuffer { + public static class X11PixelBuffer extends PixelBuffer { int clipx, clipy, clipw, cliph; int width; int height; - /** DoubleBuffers of X11Pictures can have stipples -- the stipple of the Picture */ + /** PixelBuffers of X11Pictures can have stipples -- the stipple of the Picture */ RawData stipple = null; - /** Sets the DoubleBuffer's internal stipple to the alpha==0x00 regions of xpi */ + /** Sets the PixelBuffer's internal stipple to the alpha==0x00 regions of xpi */ public native void createStipple(X11Picture xpi); RawData pm; // Pixmap (if any) representing this Picture @@ -167,9 +158,9 @@ public class X11 extends POSIX { RawData gc; // Graphics Context on pm (never changes, so it's fast) RawData clipped_gc; // Graphics Context on pm, use this one if you need a clip/stipple - /** DoubleBuffer mode */ - public X11DoubleBuffer(int w, int h) { this(w, h, true); } - public X11DoubleBuffer(int w, int h, boolean shared_pixmap) { + /** PixelBuffer mode */ + public X11PixelBuffer(int w, int h) { this(w, h, true); } + public X11PixelBuffer(int w, int h, boolean shared_pixmap) { width = clipw = w; height = cliph = h; clipx = clipy = 0; @@ -184,9 +175,8 @@ public class X11 extends POSIX { cliph = y2 - y; if (cliph < 0) cliph = 0; } - 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()); - } + 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 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) @@ -205,147 +195,21 @@ public class X11 extends POSIX { public int getHeight() { return height; } public native void natInit(); 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 finalize(); - } - - - // Font Handling //////////////////////////////////////////////////////////////////// - - static String[] fontList = null; - - /** hashtable of all built in X11 fonts; key is XWT font spec, value is X11 font string */ - static Hashtable nativeFontList = new Hashtable(); - - /** cache of all already-looked-up X11 fonts; key is XWT font name, value is a WrappedRawData */ - static Hashtable xwtFontToFontStruct = new Hashtable(); - - /** dumps a list of X11 font strings */ - private native String[] listNativeFonts(); - - /** load native font list */ - public void initFonts() { - // use the font list to build nativeFontList - String[] fonts = listNativeFonts(); - - Vector v = new Vector(); - for(int k=0; k 12) { - if (!font[12].equals("iso8859") && !font[12].equals("")) continue; - if (font.length < 14 || !font[13].equals("1")) continue; - } - - String name = font[1]; - String size = font[6]; - String slant = (font[3].equals("i") || font[3].equals("o")) ? "i" : ""; - String bold = font[2].equals("bold") ? "b" : ""; - String tail = s2.substring(1 + font[0].length() + 1 + font[1].length() + 1 + font[2].length() + 1 + - font[3].length() + 1 + font[4].length() + 1); - - if (bold.equals("*") && slant.equals("*")) { - nativeFontList.put(name + size, font[0] + "-" + font[1] + "-regular-r-" + font[4] + "-" + tail); - nativeFontList.put(name + size + "b", font[0] + "-" + font[1] + "-bold-r-" + font[4] + "-" + tail); - nativeFontList.put(name + size + "i", font[0] + "-" + font[1] + "-regular-i-" + font[4] + "-" + tail); - nativeFontList.put(name + size + "bi", font[0] + "-" + font[1] + "-bold-i-" + font[4] + "-" + tail); - - } else if (bold.equals("*")) { - nativeFontList.put(name + size + slant, font[0] + "-" + font[1] + "-regular-" + font[3] + "-" + font[4] + "-" + tail); - nativeFontList.put(name + size + "b" + slant, font[0] + "-" + font[1] + "-bold-" + font[3] + "-" + font[4] + "-" + tail); - - } else if (slant.equals("*")) { - nativeFontList.put(name + size + bold, font[0] + "-" + font[1] + "-" + font[2] + "-r-" + font[4] + "-" + tail); - nativeFontList.put(name + size + bold + "i", font[0] + "-" + font[1] + "-" + font[2] + "-i-" + font[4] + "-" + tail); - - } else { - nativeFontList.put(name + size + bold + slant, s2); - - } - } catch (ArrayIndexOutOfBoundsException e) { - if (Log.on) Log.log(this, "skipping incomplete font string " + s2); - continue; - } - } - fontList = new String[nativeFontList.size()]; - Enumeration e = nativeFontList.keys(); - for(int i=0; e.hasMoreElements(); i++) fontList[i] = (String)e.nextElement(); - } - - /** so we can put XFontStruct's into Hashtables */ - private static class WrappedRawData { - public RawData wrapee = null; - public WrappedRawData(RawData r) { wrapee = r; } - } - - /** translates an X11 font string into an XFontStruct* */ - public static native gnu.gcj.RawData fontStringToStruct(String s); - - /** translates an XWT font string into an XFontStruct*, performing caching as well */ - public static RawData fontToXFont(String s) { - if (s == null) s = "sansserif"; - s = s.toLowerCase(); - - WrappedRawData wrap = (WrappedRawData)xwtFontToFontStruct.get(s); - if (wrap != null) return wrap.wrapee; - - String bestmatch = ""; - int metric = -1 * Integer.MAX_VALUE; - ParsedFont arg = new ParsedFont(s); - ParsedFont pf = new ParsedFont(); - - if (arg.size == -1) arg.size = 10; - Enumeration e = nativeFontList.keys(); - while(e.hasMoreElements()) { - String jfont = (String)e.nextElement(); - pf.parse(jfont); - int thismetric = 0; - if (!pf.name.equals(arg.name)) { - if (pf.name.equals("lucidabright") && arg.name.equals("serif")) thismetric -= 1000; - else if (pf.name.equals("times") && arg.name.equals("serif")) thismetric -= 2000; - else if (pf.name.equals("helvetica") && arg.name.equals("sansserif")) thismetric -= 1000; - else if (pf.name.equals("courier") && arg.name.equals("monospaced")) thismetric -= 1000; - else if (pf.name.equals("lucida") && arg.name.equals("dialog")) thismetric -= 1000; - else if (pf.name.equals("helvetica") && arg.name.equals("dialog")) thismetric -= 2000; - else if (pf.name.equals("fixed") && arg.name.equals("tty")) thismetric -= 1000; - else if (pf.name.equals("sansserif")) thismetric -= 4000; - else thismetric -= 4004; - } - if (pf.size != 0) thismetric -= Math.abs(pf.size - arg.size) * 4; - if (pf.bold != arg.bold) thismetric -= 1; - if (pf.italic != arg.italic) thismetric -= 1; - if (thismetric > metric) { - metric = thismetric; - bestmatch = jfont; + // 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 _x2) { int _x0 = _x1; _x1 = _x2; _x2 = _x0; } + fillRect(_x1, _y1, _x2, _y2, argb); } } - - pf.parse(bestmatch); - String target = (String)nativeFontList.get(bestmatch); - if (pf.size == 0) { - int i = 0; - for(int j=0; j<6; j++) i = target.indexOf('-', i + 1); - target = target.substring(0, i + 1) + arg.size + target.substring(target.indexOf('-', i+1)); - } - if (Log.on) Log.log(X11.class, "mapping font \"" + s + "\" to \"" + target + "\""); - RawData ret = fontStringToStruct(target); - if (ret == null) ret = fontStringToStruct("fixed"); - xwtFontToFontStruct.put(s, new WrappedRawData(ret)); - return ret; } }