2003/09/07 03:04:31

[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 a65c41b..97b989c 100644 (file)
--- 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]
 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.*;
 
@@ -37,8 +34,8 @@ public class X11 extends POSIX {
     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 POSIX.X11Picture(data, w, h); }
-    protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new POSIX.X11DoubleBuffer(w, h); }
+    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 Surface _createSurface(Box b, boolean framed) { return new X11Surface(b, framed); }
     protected boolean _needsAutoClick() { return true; }
     protected native int _getScreenWidth();
@@ -52,8 +49,9 @@ public class X11 extends POSIX {
     protected native void eventThread();
     private native void natInit();
 
+    public X11() { }
     public void init() {
-       super.init();
+        natInit();
         (new Thread() { public void run() { eventThread(); } }).start();
         initFonts();
     }
@@ -69,7 +67,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, "POSIX/X11 can't maximize windows"); }
+        public void _setMaximized(boolean m) { if (Log.on) Log.log(this, "X11 can't maximize windows"); }
         public native void setIcon(Picture p);
         public native void _setMinimized(boolean b);
         public native void setTitleBarText(String s);
@@ -340,7 +338,7 @@ public class X11 extends POSIX {
             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(POSIX.class, "mapping font \"" + s + "\" to \"" + target + "\"");
+        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));