2003/12/29 03:44:16

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

diff --git a/src/org/xwt/plat/X11.java b/src/org/xwt/plat/X11.java
index b8652cb..113512b 100644 (file)
--- a/src/org/xwt/plat/X11.java
+++ b/src/org/xwt/plat/X11.java
@@ -33,7 +33,7 @@ public class X11 extends POSIX {
 
     protected String _getAltKeyName() { return System.getProperty("os.name", "").indexOf("SunOS") != -1 ? "Meta" : "Alt"; }
 
-    protected Picture _createPicture(int[] data, int w, int h) { return new X11Picture(data, w, h); }
+    protected Picture _createPicture() { return new X11Picture(); }
     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; }
@@ -62,7 +62,7 @@ public class X11 extends POSIX {
         Semaphore waitForCreation = new Semaphore();
         
         public native void setInvisible(boolean i);
-        public void _setMaximized(boolean m) { if (Log.on) Log.log(this, "X11 can't maximize windows"); }
+        public void _setMaximized(boolean m) { if (Log.on) Log.warn(this, "X11 can't maximize windows"); }
         public native void setIcon(Picture p);
         public native void _setMinimized(boolean b);
         public native void setTitleBarText(String s);
@@ -105,14 +105,14 @@ public class X11 extends POSIX {
         public int getWidth() { return width; }
         public int getHeight() { return height; }
 
-        public X11Picture(int[] data, int w, int h) {
-            this.data = data;
-            this.width = w;
-            this.height = h;
+        boolean initialized = false;
+        public void init() {
+            if (initialized) return;
+            initialized = true;
             boolean needsStipple = false;
 
             // if we have any non-0x00, non-0xFF alphas, we can't double buffer ourselves
-            for(int i=0; i<w*h; i++)
+            for(int i=0; i<width*height; i++)
                 if ((data[i] & 0xFF000000) == 0xFF000000)
                     needsStipple = true;
                 else if ((data[i] & 0xFF000000) != 0x00)
@@ -155,8 +155,8 @@ public class X11 extends POSIX {
         RawData fake_ximage = null;    // a 'fake' XImage corresponding to the shared pixmap; gives us the address and depth parameters
         RawData shm_segment = null;    // XShmSegmentInfo
 
-        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
+        RawData gc;                    // Graphics Interpreter on pm (never changes, so it's fast)
+        RawData clipped_gc;            // Graphics Interpreter on pm, use this one if you need a clip/stipple
 
         /** PixelBuffer mode */
         public X11PixelBuffer(int w, int h) { this(w, h, true); }
@@ -168,20 +168,21 @@ public class X11 extends POSIX {
             natInit();
         }
 
-        public void drawPictureAlphaOnly(Picture 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) {        
            cx1 = Math.max(dx, cx1);
            cy1 = Math.max(dy, cy1);
-           cx2 = Math.min(dx + width, cx2); 
-           cy2 = Math.min(dy + height, cy2); 
+           cx2 = Math.min(dx + source.width, cx2); 
+           cy2 = Math.min(dy + source.height, cy2); 
            if (cx1 >= cx2 || cy1 >= cy2) return;
-            slowDrawPicture(source, dx, dy, cx1, cy1, cx2, cy2, rgb, true);
+            slowDrawPicture(((DefaultGlyph)source).getPicture(), dx, dy, cx1, cy1, cx2, cy2, rgb, true);
         }
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
            cx1 = Math.max(dx, cx1);
            cy1 = Math.max(dy, cy1);
-           cx2 = Math.min(dx + width, cx2); 
-           cy2 = Math.min(dy + height, cy2); 
+           cx2 = Math.min(dx + source.width, cx2); 
+           cy2 = Math.min(dy + source.height, cy2); 
            if (cx1 >= cx2 || cy1 >= cy2) return;
+            ((X11Picture)source).init();
             if (((X11Picture)source).doublebuf != null)
                 fastDrawPicture(source, dx, dy, cx1, cy1, cx2, cy2);
             else