X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FAWT.java;h=4a79839ea1272a03fa8de05cf9232bb43ae3bcb2;hb=a4aa681612c27f10fa6fb8ab3856454750768daf;hp=5a0b1201e10d3badc7fca33c815d33cadbcaf744;hpb=bc199d84016367dfa1ea731e2420935cf3edb87f;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java
index 5a0b120..4a79839 100644
--- a/src/org/xwt/plat/AWT.java
+++ b/src/org/xwt/plat/AWT.java
@@ -25,6 +25,27 @@ public class AWT extends Platform {
     protected int _stringWidth(String font, String text) { return getFont(font).metrics.stringWidth(text); }
     protected int _getMaxAscent(String font) { return getFont(font).metrics.getMaxAscent(); }
     protected int _getMaxDescent(String font) { return getFont(font).metrics.getMaxDescent(); }
+    protected boolean _supressDirtyOnResize() { return true; }
+
+    protected void _criticalAbort(String message) {
+        if (Log.on) Log.log(this, message);
+        final Dialog d = new Dialog(new Frame(), "XWT Cannot Continue");
+        d.setLayout(new BorderLayout());
+        TextArea ta = new TextArea("XWT cannot continue because:\n\n" + message, 10, 80);
+        ta.setEditable(false);
+        d.add(ta, "Center");
+        Button b = new Button("OK");
+        b.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    d.dispose();
+                }
+            });
+        d.add(b, "South");
+        d.setModal(true);
+        d.pack();
+        d.show();
+        new Semaphore().block();
+    }
 
     protected String _getClipBoard() {
         Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -48,6 +69,42 @@ public class AWT extends Platform {
         return 0;
     }
 
+    static class FileDialogHelper extends FileDialog implements WindowListener, ComponentListener {
+        Semaphore s;
+        public FileDialogHelper(String suggestedFileName, Semaphore s, boolean write) {
+            super(new Frame(), write ? "Save" : "Open", write ? FileDialog.SAVE : FileDialog.LOAD);
+            this.s = s;
+            addWindowListener(this);
+            addComponentListener(this);
+            if (suggestedFileName.indexOf(File.separatorChar) == -1) {
+                setFile(suggestedFileName);
+            } else {
+                setDirectory(suggestedFileName.substring(0, suggestedFileName.lastIndexOf(File.separatorChar)));
+                setFile(suggestedFileName.substring(suggestedFileName.lastIndexOf(File.separatorChar) + 1));
+            }
+            show();
+        }
+        public void windowActivated(WindowEvent e) { }
+        public void windowClosed(WindowEvent e) { s.release(); }
+        public void windowClosing(WindowEvent e) { }
+        public void windowDeactivated(WindowEvent e) { }
+        public void windowDeiconified(WindowEvent e) { }
+        public void windowIconified(WindowEvent e) { }
+        public void windowOpened(WindowEvent e) { }
+        public void componentHidden(ComponentEvent e) { s.release(); }
+        public void componentMoved(ComponentEvent e) { }
+        public void componentResized(ComponentEvent e) { }
+        public void componentShown(ComponentEvent e) { }
+    };
+
+    protected String _fileDialog(String suggestedFileName, boolean write) {
+        final Semaphore s = new Semaphore();
+        FileDialogHelper fd = new FileDialogHelper(suggestedFileName, s, write);
+        s.block();
+        return fd.getDirectory() + File.separatorChar + fd.getFile();
+    }
+
+
     // Inner Classes /////////////////////////////////////////////////////////////////////////////////////
 
     protected static class AWTPicture implements Picture {
@@ -171,6 +228,9 @@ public class AWT extends Platform {
                     componentResized(window.getWidth() - insets.left - insets.right, window.getHeight() - insets.top - insets.bottom);
 
                 Dirty(r.x - insets.left, r.y - insets.top, r.width, r.height);
+
+                // this is safe because AWT's low-level drawing functions are threadsafe
+                blitDirtyScreenRegions();
             }
         }
 
@@ -180,6 +240,9 @@ public class AWT extends Platform {
             public void paint(Graphics gr) {
                 Rectangle r = gr.getClipBounds();
                 Dirty(r.x - insets.left, r.y - insets.top, r.width, r.height);
+
+                // this is safe because AWT's low-level drawing functions are threadsafe
+                blitDirtyScreenRegions();
             }
         }
 
@@ -332,35 +395,10 @@ public class AWT extends Platform {
             case KeyEvent.VK_SHIFT: return "shift";
             case KeyEvent.VK_TAB: return "tab";
             case KeyEvent.VK_UP: return "up";
-
-            // we special-case letters since (C-a).getKeyChar() != 'a'
-            case KeyEvent.VK_A: return "a";
-            case KeyEvent.VK_B: return "b";
-            case KeyEvent.VK_C: return "c";
-            case KeyEvent.VK_D: return "d";
-            case KeyEvent.VK_E: return "e";
-            case KeyEvent.VK_F: return "f";
-            case KeyEvent.VK_G: return "g";
-            case KeyEvent.VK_H: return "h";
-            case KeyEvent.VK_I: return "i";
-            case KeyEvent.VK_J: return "j";
-            case KeyEvent.VK_K: return "k";
-            case KeyEvent.VK_L: return "l";
-            case KeyEvent.VK_M: return "m";
-            case KeyEvent.VK_N: return "n";
-            case KeyEvent.VK_O: return "o";
-            case KeyEvent.VK_P: return "p";
-            case KeyEvent.VK_Q: return "q";
-            case KeyEvent.VK_R: return "r";
-            case KeyEvent.VK_S: return "s";
-            case KeyEvent.VK_T: return "t";
-            case KeyEvent.VK_U: return "u";
-            case KeyEvent.VK_V: return "v";
-            case KeyEvent.VK_W: return "w";
-            case KeyEvent.VK_X: return "x";
-            case KeyEvent.VK_Y: return "y";
-            case KeyEvent.VK_Z: return "z";
-            default: return String.valueOf(k.getKeyChar());
+            default:
+                char c = k.getKeyChar();
+                if (c >= 1 && c <= 26) c = (char)('a' + c - 1);
+                return String.valueOf(c);
             }
         }
     }