diff options
Diffstat (limited to 'libjava/gnu')
21 files changed, 383 insertions, 208 deletions
diff --git a/libjava/gnu/awt/LightweightRedirector.java b/libjava/gnu/awt/LightweightRedirector.java index a0ea7bcff4b..41dc124279c 100644 --- a/libjava/gnu/awt/LightweightRedirector.java +++ b/libjava/gnu/awt/LightweightRedirector.java @@ -141,7 +141,7 @@ public class LightweightRedirector MouseEvent redirected = new MouseEvent(source, event.getID(), event.getWhen(), - event.getModifiers(), + event.getModifiersEx(), x, y, event.getClickCount(), event.isPopupTrigger()); @@ -157,20 +157,20 @@ public class LightweightRedirector */ int getButtonNumber(InputEvent event) { - int modifiers = event.getModifiers(); + int modifiers = event.getModifiersEx(); modifiers &= - InputEvent.BUTTON1_MASK | - InputEvent.BUTTON2_MASK | - InputEvent.BUTTON3_MASK; + InputEvent.BUTTON1_DOWN_MASK | + InputEvent.BUTTON2_DOWN_MASK | + InputEvent.BUTTON3_DOWN_MASK; switch (modifiers) { - case InputEvent.BUTTON1_MASK: + case InputEvent.BUTTON1_DOWN_MASK: return 1; - case InputEvent.BUTTON2_MASK: + case InputEvent.BUTTON2_DOWN_MASK: return 2; - case InputEvent.BUTTON3_MASK: + case InputEvent.BUTTON3_DOWN_MASK: return 3; case 0: return 0; diff --git a/libjava/gnu/awt/xlib/XEventLoop.java b/libjava/gnu/awt/xlib/XEventLoop.java index 5f5026b0cdb..66878185b51 100644 --- a/libjava/gnu/awt/xlib/XEventLoop.java +++ b/libjava/gnu/awt/xlib/XEventLoop.java @@ -197,13 +197,13 @@ public class XEventLoop implements Runnable switch (buttonEvt.button) { case 1: - modifiers = InputEvent.BUTTON1_MASK; + modifiers = InputEvent.BUTTON1_DOWN_MASK; break; case 2: - modifiers = InputEvent.BUTTON2_MASK; + modifiers = InputEvent.BUTTON2_DOWN_MASK; break; case 3: - modifiers = InputEvent.BUTTON2_MASK; + modifiers = InputEvent.BUTTON2_DOWN_MASK; break; } diff --git a/libjava/gnu/java/awt/peer/GLightweightPeer.java b/libjava/gnu/java/awt/peer/GLightweightPeer.java index dfd9e1e26e9..643c40f2ad4 100644 --- a/libjava/gnu/java/awt/peer/GLightweightPeer.java +++ b/libjava/gnu/java/awt/peer/GLightweightPeer.java @@ -1,5 +1,5 @@ /* GLightweightPeer.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,6 @@ import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Font; -import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.GraphicsConfiguration; diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java index 8ea6817f33e..c374ba21826 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java @@ -64,7 +64,7 @@ public class GdkGraphics extends Graphics static final int GDK_COPY = 0, GDK_XOR = 2; - native int[] initState (GtkComponentPeer component); + native void initState (GtkComponentPeer component); native void initState (int width, int height); native void copyState (GdkGraphics g); @@ -84,15 +84,15 @@ public class GdkGraphics extends Graphics initState (width, height); color = Color.black; clip = new Rectangle (0, 0, width, height); - font = new Font ("Dialog", Font.PLAIN, 10); + font = new Font ("Dialog", Font.PLAIN, 12); } GdkGraphics (GtkComponentPeer component) { this.component = component; - int rgb[] = initState (component); - color = new Color (rgb[0], rgb[1], rgb[2]); - font = component.awtComponent.getFont(); + initState (component); + color = component.awtComponent.getForeground (); + font = component.awtComponent.getFont (); Dimension d = component.awtComponent.getSize (); clip = new Rectangle (0, 0, d.width, d.height); } @@ -126,6 +126,11 @@ public class GdkGraphics extends Graphics native public void dispose (); native void copyPixmap (Graphics g, int x, int y, int width, int height); + native void copyAndScalePixmap (Graphics g, boolean flip_x, boolean flip_y, + int src_x, int src_y, + int src_width, int src_height, + int dest_x, int dest_y, + int dest_width, int dest_height); public boolean drawImage (Image img, int x, int y, Color bgcolor, ImageObserver observer) { @@ -161,7 +166,10 @@ public class GdkGraphics extends Graphics { if (img instanceof GtkOffScreenImage) { - throw new RuntimeException (); + copyAndScalePixmap (img.getGraphics (), false, false, + 0, 0, img.getWidth (null), img.getHeight (null), + x, y, width, height); + return true; } GtkImage image = (GtkImage) img; @@ -186,7 +194,60 @@ public class GdkGraphics extends Graphics { if (img instanceof GtkOffScreenImage) { - throw new RuntimeException (); + int dx_start, dy_start, d_width, d_height; + int sx_start, sy_start, s_width, s_height; + boolean x_flip = false; + boolean y_flip = false; + + if (dx1 < dx2) + { + dx_start = dx1; + d_width = dx2 - dx1; + } + else + { + dx_start = dx2; + d_width = dx1 - dx2; + x_flip ^= true; + } + if (dy1 < dy2) + { + dy_start = dy1; + d_height = dy2 - dy1; + } + else + { + dy_start = dy2; + d_height = dy1 - dy2; + y_flip ^= true; + } + if (sx1 < sx2) + { + sx_start = sx1; + s_width = sx2 - sx1; + } + else + { + sx_start = sx2; + s_width = sx1 - sx2; + x_flip ^= true; + } + if (sy1 < sy2) + { + sy_start = sy1; + s_height = sy2 - sy1; + } + else + { + sy_start = sy2; + s_height = sy1 - sy2; + y_flip ^= true; + } + + copyAndScalePixmap (img.getGraphics (), x_flip, y_flip, + sx_start, sy_start, s_width, s_height, + dx_start, dy_start, d_width, d_height); + return true; } GtkImage image = (GtkImage) img; @@ -238,13 +299,48 @@ public class GdkGraphics extends Graphics public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { - // System.out.println ("drawRoundRect called [UNIMPLEMENTED]"); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + + drawArc (x, y, arcWidth, arcHeight, 90, 90); + drawArc (xx, y, arcWidth, arcHeight, 0, 90); + drawArc (xx, yy, arcWidth, arcHeight, 270, 90); + drawArc (x, yy, arcWidth, arcHeight, 180, 90); + + int y1 = y + arcHeight / 2; + int y2 = y + height - arcHeight / 2; + drawLine (x, y1, x, y2); + drawLine (x + width, y1, x + width, y2); + + int x1 = x + arcWidth / 2; + int x2 = x + width - arcWidth / 2; + drawLine (x1, y, x2, y); + drawLine (x1, y + height, x2, y + height); } public void fillRoundRect (int x, int y, int width, int height, int arcWidth, int arcHeight) { - // System.out.println ("fillRoundRect called [UNIMPLEMENTED]"); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + + fillArc (x, y, arcWidth, arcHeight, 90, 90); + fillArc (xx, y, arcWidth, arcHeight, 0, 90); + fillArc (xx, yy, arcWidth, arcHeight, 270, 90); + fillArc (x, yy, arcWidth, arcHeight, 180, 90); + + fillRect (x, y + arcHeight / 2, width, height - arcHeight + 1); + fillRect (x + arcWidth / 2, y, width - arcWidth + 1, height); } public Shape getClip () diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java index ebff68ef987..0986960b8b3 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java @@ -1,5 +1,5 @@ /* GdkGraphics2D.java - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,6 @@ import java.util.HashMap; import java.util.Map; import java.text.AttributedCharacterIterator; -import java.util.Map; import java.util.Stack; import java.lang.Integer; import gnu.java.awt.ClasspathToolkit; @@ -88,7 +87,7 @@ public class GdkGraphics2D extends Graphics2D private Stack stateStack; - native private int[] initState (GtkComponentPeer component); + native private void initState (GtkComponentPeer component); native private void initState (int width, int height); native private void copyState (GdkGraphics2D g); native public void dispose (); @@ -169,10 +168,10 @@ public class GdkGraphics2D extends Graphics2D GdkGraphics2D (GtkComponentPeer component) { this.component = component; - int rgb[] = initState (component); + initState (component); - setColor (new Color (rgb[0], rgb[1], rgb[2])); - setBackground (new Color (rgb[3], rgb[4], rgb[5])); + setColor (component.awtComponent.getForeground ()); + setBackground (component.awtComponent.getBackground ()); setPaint (getColor()); setFont (new Font("SansSerif", Font.PLAIN, 12)); setTransform (new AffineTransform ()); @@ -1478,14 +1477,28 @@ public class GdkGraphics2D extends Graphics2D public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { - int x1 = x + arcWidth, x2 = x + width - arcWidth; - int y1 = y + arcHeight, y2 = y + height - arcHeight; - fillRect (x1, y, x2 - x1, height); - fillRect (x, y1, width, y2 - y1); - fillArc (x, y, arcWidth, arcHeight, 90, 90); - fillArc (x1, y, arcWidth, arcHeight, 0, 90); - fillArc (x2, y2, arcWidth, arcHeight, 270, 90); - fillArc (x, y2, arcWidth, arcHeight, 180, 90); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + + drawArc (x, y, arcWidth, arcHeight, 90, 90); + drawArc (xx, y, arcWidth, arcHeight, 0, 90); + drawArc (xx, yy, arcWidth, arcHeight, 270, 90); + drawArc (x, yy, arcWidth, arcHeight, 180, 90); + + int y1 = y + arcHeight / 2; + int y2 = y + height - arcHeight / 2; + drawLine (x, y1, x, y2); + drawLine (x + width, y1, x + width, y2); + + int x1 = x + arcWidth / 2; + int x2 = x + width - arcWidth / 2; + drawLine (x1, y, x2, y); + drawLine (x1, y + height, x2, y + height); } public void drawString (String str, int x, int y) @@ -1527,14 +1540,21 @@ public class GdkGraphics2D extends Graphics2D public void fillRoundRect (int x, int y, int width, int height, int arcWidth, int arcHeight) { - int x1 = x + arcWidth, x2 = x + width - arcWidth; - int y1 = y + arcHeight, y2 = y + height - arcHeight; - fillRect (x1, y, x2 - x1, height); - fillRect (x, y1, width, y2 - y1); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + fillArc (x, y, arcWidth, arcHeight, 90, 90); - fillArc (x1, y, arcWidth, arcHeight, 0, 90); - fillArc (x2, y2, arcWidth, arcHeight, 270, 90); - fillArc (x, y2, arcWidth, arcHeight, 180, 90); + fillArc (xx, y, arcWidth, arcHeight, 0, 90); + fillArc (xx, yy, arcWidth, arcHeight, 270, 90); + fillArc (x, yy, arcWidth, arcHeight, 180, 90); + + fillRect (x, y + arcHeight / 2, width, height - arcHeight + 1); + fillRect (x + arcWidth / 2, y, width - arcWidth + 1, height); } public Font getFont () diff --git a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java index cdd5f9ca907..db8aed6087b 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java @@ -50,12 +50,13 @@ import java.awt.peer.ButtonPeer; public class GtkButtonPeer extends GtkComponentPeer implements ButtonPeer { - native void create (); + native void create (String label); + public native void connectJObject (); public native void connectSignals (); native void gtkSetFont (String name, int style, int size); - native void gtkSetLabel(String label); + native void gtkSetLabel (String label); native void gtkWidgetSetForeground (int red, int green, int blue); native void gtkActivate (); @@ -64,6 +65,11 @@ public class GtkButtonPeer extends GtkComponentPeer super (b); } + void create () + { + create (((Button) awtComponent).getLabel ()); + } + public void setLabel (String label) { gtkSetLabel(label); @@ -78,10 +84,10 @@ public class GtkButtonPeer extends GtkComponentPeer p.translate(((Component) me.getSource()).getX(), ((Component) me.getSource()).getY()); if (!me.isConsumed () - && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0 + && (me.getModifiersEx () & MouseEvent.BUTTON1_DOWN_MASK) != 0 && awtComponent.getBounds().contains(p)) postActionEvent (((Button)awtComponent).getActionCommand (), - me.getModifiers ()); + me.getModifiersEx ()); } if (e.getID () == KeyEvent.KEY_PRESSED) @@ -90,18 +96,11 @@ public class GtkButtonPeer extends GtkComponentPeer if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_SPACE) { postActionEvent (((Button) awtComponent).getActionCommand (), - ke.getModifiers ()); + ke.getModifiersEx ()); gtkActivate (); } } super.handleEvent (e); } - - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); - - args.add ("label", ((Button)component).getLabel ()); - } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java index a4657988184..361136f08e9 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java @@ -52,39 +52,39 @@ public class GtkCheckboxPeer extends GtkComponentPeer // The current state of the GTK checkbox. private boolean currentState; - public native void nativeCreate (GtkCheckboxGroupPeer group, - boolean state); + public native void create (GtkCheckboxGroupPeer group); public native void nativeSetCheckboxGroup (GtkCheckboxGroupPeer group); public native void connectSignals (); native void gtkSetFont (String name, int style, int size); - public native void gtkSetLabel (String label); + native void gtkButtonSetLabel (String label); + native void gtkToggleButtonSetActive (boolean is_active); public GtkCheckboxPeer (Checkbox c) { super (c); } - // We can't fully use the ordinary getArgs code here, due to - // oddities of this particular widget. In particular we must be - // able to switch between a checkbutton and a radiobutton - // dynamically. + // FIXME: we must be able to switch between a checkbutton and a + // radiobutton dynamically. public void create () { - CheckboxGroup g = ((Checkbox) awtComponent).getCheckboxGroup (); + Checkbox checkbox = (Checkbox) awtComponent; + CheckboxGroup g = checkbox.getCheckboxGroup (); old_group = GtkCheckboxGroupPeer.getCheckboxGroupPeer (g); - currentState = ((Checkbox)awtComponent).getState(); - nativeCreate (old_group, currentState); + create (old_group); + gtkToggleButtonSetActive (checkbox.getState ()); + gtkButtonSetLabel (checkbox.getLabel ()); } public void setState (boolean state) { if (currentState != state) - set ("active", state); + gtkToggleButtonSetActive (state); } public void setLabel (String label) { - gtkSetLabel (label); + gtkButtonSetLabel (label); } public void setCheckboxGroup (CheckboxGroup group) @@ -100,13 +100,6 @@ public class GtkCheckboxPeer extends GtkComponentPeer } } - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); - args.add ("active", ((Checkbox) component).getState ()); - args.add ("label", ((Checkbox) component).getLabel ()); - } - // Override the superclass postItemEvent so that the peer doesn't // need information that we have. public void postItemEvent (Object item, int stateChange) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java index a03a410508c..2ecea5cb9ba 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java @@ -58,25 +58,22 @@ public class GtkChoicePeer extends GtkComponentPeer items[i] = c.getItem (i); append (items); - - // Must set our state before notifying listeners - ((Choice) awtComponent).select (c.getItem (0)); - postItemEvent (c.getItem (0), ItemEvent.SELECTED); } } native void create (); native void append (String items[]); - native int getHistory (); + native int nativeGetSelected (); native void nativeAdd (String item, int index); native void nativeRemove (int index); + native void nativeRemoveAll (); native public void select (int position); public void add (String item, int index) { - int before = getHistory(); + int before = nativeGetSelected(); nativeAdd (item, index); @@ -92,11 +89,11 @@ public class GtkChoicePeer extends GtkComponentPeer public void remove (int index) { - int before = getHistory(); + int before = nativeGetSelected(); int after; nativeRemove (index); - after = getHistory(); + after = nativeGetSelected(); /* Generate an ItemEvent if we are removing the currently selected item and there are at least one item left. */ @@ -110,7 +107,7 @@ public class GtkChoicePeer extends GtkComponentPeer public void removeAll () { - nativeRemove (-1); + nativeRemoveAll(); } public void addItem (String item, int position) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 15e73d9c3f7..eae5a948bc4 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -61,7 +61,6 @@ import java.awt.Toolkit; import java.awt.Window; import java.awt.event.FocusEvent; import java.awt.event.ItemEvent; -import java.awt.event.FocusEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.PaintEvent; @@ -93,6 +92,8 @@ public class GtkComponentPeer extends GtkGenericPeer native void gtkWidgetSetCursor (int type); native void gtkWidgetSetBackground (int red, int green, int blue); native void gtkWidgetSetForeground (int red, int green, int blue); + native void gtkWidgetSetSensitive (boolean sensitive); + native void gtkWidgetSetParent (ComponentPeer parent); native void gtkWidgetRequestFocus (); native void gtkWidgetDispatchKeyEvent (int id, long when, int mods, int keyCode, int keyLocation); @@ -115,37 +116,59 @@ public class GtkComponentPeer extends GtkGenericPeer this.awtComponent = awtComponent; insets = new Insets (0, 0, 0, 0); - create (); - - GtkArgList args = new GtkArgList (); - getArgs (awtComponent, args); - args.setArgs (this); - - connectJObject (); - connectSignals (); - - if (awtComponent.getForeground () != null) - setForeground (awtComponent.getForeground ()); - if (awtComponent.getBackground () != null) - setBackground (awtComponent.getBackground ()); - if (awtComponent.getFont() != null) - setFont(awtComponent.getFont()); - - setCursor (awtComponent.getCursor ()); - if (this instanceof GtkFileDialogPeer && awtComponent.getHeight() == 0 - && awtComponent.getWidth() == 0) + create (); + + setParent (); + + connectJObject (); + connectSignals (); + + if (awtComponent.getForeground () != null) + setForeground (awtComponent.getForeground ()); + if (awtComponent.getBackground () != null) + setBackground (awtComponent.getBackground ()); + if (awtComponent.getFont() != null) + setFont(awtComponent.getFont()); + + setCursor (awtComponent.getCursor ()); + + setComponentBounds (); + + Rectangle bounds = awtComponent.getBounds (); + setBounds (bounds.x, bounds.y, bounds.width, bounds.height); + setVisibleAndEnabled (); + } + + void setParent () + { + ComponentPeer p; + Component component = awtComponent; + do { - int[] dims = new int[2]; - gtkWidgetGetDimensions(dims); - ((GtkFileDialogPeer) this).setBoundsCallback((Window)awtComponent, - awtComponent.getX(), - awtComponent.getY(), - dims[0], dims[1]); + component = component.getParent (); + p = component.getPeer (); } + while (p instanceof java.awt.peer.LightweightPeer); + + if (p != null) + gtkWidgetSetParent (p); + } + + /* + * Set the bounds of this peer's AWT Component based on dimensions + * returned by the native windowing system. Most Components impose + * their dimensions on the peers so the default implementation does + * nothing. However some peers, like GtkFileDialogPeer, need to + * pass their size back to the AWT Component. + */ + void setComponentBounds () + { + } - Rectangle bounds = awtComponent.getBounds (); - setBounds (bounds.x, bounds.y, bounds.width, bounds.height); + void setVisibleAndEnabled () + { setVisible (awtComponent.isVisible ()); + setEnabled (awtComponent.isEnabled ()); } public int checkImage (Image image, int width, int height, @@ -260,12 +283,12 @@ public class GtkComponentPeer extends GtkGenericPeer break; case KeyEvent.KEY_PRESSED: ke = (KeyEvent) event; - gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (), + gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiersEx (), ke.getKeyCode (), ke.getKeyLocation ()); break; case KeyEvent.KEY_RELEASED: ke = (KeyEvent) event; - gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (), + gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiersEx (), ke.getKeyCode (), ke.getKeyLocation ()); break; } @@ -417,7 +440,7 @@ public class GtkComponentPeer extends GtkGenericPeer public void setEnabled (boolean b) { - set ("sensitive", b); + gtkWidgetSetSensitive (b); } public void setFont (Font f) @@ -506,45 +529,6 @@ public class GtkComponentPeer extends GtkGenericPeer item, stateChange)); } - public void getArgs (Component component, GtkArgList args) - { - args.add ("sensitive", component.isEnabled ()); - - ComponentPeer p; - - do - { - component = component.getParent (); - p = component.getPeer (); - } while (p instanceof java.awt.peer.LightweightPeer); - - if (p != null) - args.add ("parent", p); - } - - native void set (String name, String value); - native void set (String name, boolean value); - native void set (String name, int value); - native void set (String name, float value); - native void set (String name, Object value); - - void set (GtkArg arg) - { - String name = arg.getName (); - Object value = arg.getValue (); - - if (value instanceof Boolean) - set (name, ((Boolean)value).booleanValue ()); - else if (value instanceof Integer) - set (name, ((Integer)value).intValue ()); - else if (value instanceof Float) - set (name, ((Float)value).floatValue ()); - else if (value instanceof String) - set (name, ((String) value)); - else - set (name, value); - } - public GraphicsConfiguration getGraphicsConfiguration () { // FIXME: just a stub for now. diff --git a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java index 4febbef9c9a..1d6ce8b8bf0 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java @@ -85,17 +85,11 @@ public class GtkDialogPeer extends GtkWindowPeer { // Create a decorated dialog window. create (GDK_WINDOW_TYPE_HINT_DIALOG, true); - } - - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); - Dialog dialog = (Dialog) component; + Dialog dialog = (Dialog) awtComponent; - args.add ("title", dialog.getTitle ()); - args.add ("modal", dialog.isModal ()); - args.add ("allow_shrink", dialog.isResizable ()); - args.add ("allow_grow", dialog.isResizable ()); + gtkWindowSetModal (dialog.isModal ()); + setTitle (dialog.getTitle ()); + setResizable (dialog.isResizable ()); } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java index 712247c4a85..d31e0c5be02 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java @@ -42,6 +42,7 @@ import java.awt.AWTEvent; import java.awt.Dialog; import java.awt.FileDialog; import java.awt.Graphics; +import java.awt.Window; import java.awt.event.WindowEvent; import java.awt.peer.FileDialogPeer; import java.io.FilenameFilter; @@ -81,6 +82,20 @@ public class GtkFileDialogPeer extends GtkDialogPeer implements FileDialogPeer super (fd); } + void setComponentBounds () + { + if (awtComponent.getHeight () == 0 + && awtComponent.getWidth () == 0) + { + int[] dims = new int[2]; + gtkWidgetGetPreferredDimensions (dims); + ((GtkFileDialogPeer) this).setBoundsCallback ((Window) awtComponent, + awtComponent.getX (), + awtComponent.getY (), + dims[0], dims[1]); + } + } + public void setFile (String fileName) { /* If nothing changed do nothing. This usually happens because diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java index c542b63ad31..e1a877eedcb 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java @@ -47,6 +47,7 @@ import java.awt.MenuBar; import java.awt.Rectangle; import java.awt.Window; import java.awt.event.PaintEvent; +import java.awt.image.ColorModel; import java.awt.peer.FramePeer; import java.awt.peer.MenuBarPeer; @@ -115,10 +116,9 @@ public class GtkFramePeer extends GtkWindowPeer setSize (awtComponent.getWidth() - insets.left - insets.right, awtComponent.getHeight() - insets.top - insets.bottom + menuBarHeight); - set ("allow_shrink", resizable); - set ("allow_grow", resizable); - } - + gtkWindowSetResizable (resizable); + } + protected void postInsetsChangedEvent (int top, int left, int bottom, int right) { @@ -137,24 +137,46 @@ public class GtkFramePeer extends GtkWindowPeer { // Create a normal decorated window. create (GDK_WINDOW_TYPE_HINT_NORMAL, true); - setMenuBar(((Frame) awtComponent).getMenuBar()); - awtComponent.setForeground(java.awt.SystemColor.windowText); - } - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); + Frame frame = (Frame) awtComponent; - Frame frame = (Frame) component; + setMenuBar (frame.getMenuBar ()); - args.add ("title", frame.getTitle ()); - args.add ("allow_shrink", frame.isResizable ()); - args.add ("allow_grow", frame.isResizable ()); + setTitle (frame.getTitle ()); + setResizable (frame.isResizable ()); + setIconImage(frame.getIconImage()); } + native void nativeSetIconImageFromDecoder (GdkPixbufDecoder decoder); + native void nativeSetIconImageFromData (int[] pixels, int width, int height); public void setIconImage (Image image) { - /* TODO: Waiting on Toolkit Image routines */ + if (image != null) + { + GtkImage img = (GtkImage) image; + // FIXME: Image should be loaded, but if not, do image loading here. + if (img.isLoaded()) + { + if (img.getSource() instanceof GdkPixbufDecoder) + { + nativeSetIconImageFromDecoder((GdkPixbufDecoder) img.getSource()); + } + else + { + int[] pixels = img.getPixelCache(); + ColorModel model = img.getColorModel(); + int[] data = new int[pixels.length * 4]; + for (int i = 0; i < pixels.length; i++) + { + data[i * 4] = model.getRed(pixels[i]); + data[i * 4 + 1] = model.getGreen(pixels[i]); + data[i * 4 + 2] = model.getBlue(pixels[i]); + data[i * 4 + 3] = model.getAlpha(pixels[i]); + } + nativeSetIconImageFromData(data, img.getWidth(null), img.getHeight(null)); + } + } + } } public Graphics getGraphics () diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImage.java b/libjava/gnu/java/awt/peer/gtk/GtkImage.java index 27d3d6a0655..9234d248aba 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkImage.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkImage.java @@ -89,6 +89,18 @@ public class GtkImage extends Image implements ImageConsumer this.observer = observer; } + public synchronized int[] + getPixelCache () + { + return pixelCache; + } + + public synchronized ColorModel + getColorModel () + { + return model; + } + public synchronized int getWidth (ImageObserver observer) { diff --git a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java index 9ca30c92fa9..a85aba952fd 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java @@ -144,7 +144,7 @@ public class GtkListPeer extends GtkComponentPeer // multiple click. MouseEvent me = (MouseEvent) e; if (!me.isConsumed () - && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0 + && (me.getModifiersEx () & MouseEvent.BUTTON1_DOWN_MASK) != 0 && me.getClickCount() == 2) { String selectedItem = ((List) awtComponent).getSelectedItem (); @@ -153,7 +153,7 @@ public class GtkListPeer extends GtkComponentPeer // something is selected. if (selectedItem != null) postActionEvent (((List) awtComponent).getSelectedItem (), - me.getModifiers ()); + me.getModifiersEx ()); } } @@ -167,7 +167,7 @@ public class GtkListPeer extends GtkComponentPeer // Enter only generates an Action event if something is // selected. if (selectedItem != null) - postActionEvent (selectedItem, ke.getModifiers ()); + postActionEvent (selectedItem, ke.getModifiersEx ()); } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java b/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java index 6efa8410197..4cbe190731c 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java @@ -43,7 +43,18 @@ public class GtkMainThread extends GtkGenericPeer implements Runnable private static Thread mainThread = null; private static Object mainThreadLock = new Object(); - static native void gtkInit(); + // Whether the gtk+ subsystem has been initialized. + private boolean gtkInitCalled = false; + + /** + * Call gtk_init. It is very important that this happen before any other + * gtk calls. + * + * @param portableNativeSync 1 if the Java property + * gnu.classpath.awt.gtk.portable.native.sync is set to "true". 0 if it is + * set to "false". -1 if unset. + */ + static native void gtkInit(int portableNativeSync); native void gtkMain(); public GtkMainThread() @@ -59,18 +70,38 @@ public class GtkMainThread extends GtkGenericPeer implements Runnable synchronized (this) { mainThread.start(); - try { - wait(); - } catch (InterruptedException e) { } + + while (!gtkInitCalled) + { + try + { + wait(); + } + catch (InterruptedException e) { } + } } } public void run() { + /* Pass the value of the gnu.classpath.awt.gtk.portable.native.sync system + * property to C. */ + int portableNativeSync; + String portNatSyncProp = + System.getProperty("gnu.classpath.awt.gtk.portable.native.sync"); + + if (portNatSyncProp == null) + portableNativeSync = -1; // unset + else if (Boolean.valueOf(portNatSyncProp).booleanValue()) + portableNativeSync = 1; // true + else + portableNativeSync = 0; // false + synchronized (this) { - gtkInit(); - notify(); + gtkInit(portableNativeSync); + gtkInitCalled = true; + notifyAll(); } gtkMain(); } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java index 40462818081..b9cca1a5c38 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java @@ -56,15 +56,12 @@ public class GtkMenuBarPeer extends GtkMenuComponentPeer create (); } + native void nativeSetHelpMenu(MenuPeer menuPeer); + /* In Gnome, help menus are no longer right flushed. */ public void addHelpMenu (Menu menu) { - addMenu (menu); - } - - public void addMenu (Menu menu) - { - addMenu ((MenuPeer) menu.getPeer ()); + nativeSetHelpMenu((MenuPeer) menu.getPeer()); } native public void delMenu (int index); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java index 55581d1c64e..c32839ec6ba 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java @@ -89,10 +89,8 @@ public class GtkMenuItemPeer extends GtkMenuComponentPeer setEnabled (true); } - public void setEnabled (boolean b) - { - // do nothing, for now. - } + native public void setEnabled (boolean b); + native public void setLabel (String label); protected void postMenuActionEvent () diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java index 9b3f678856e..dc170b1cf12 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java @@ -52,11 +52,15 @@ public class GtkMenuPeer extends GtkMenuItemPeer native void create (String label); native void addItem (MenuItemPeer item, int key, boolean shiftModifier); native void setupAccelGroup (GtkGenericPeer container); + native void addTearOff (); public GtkMenuPeer (Menu menu) { super (menu); + if (menu.isTearOff()) + addTearOff(); + MenuContainer parent = menu.getParent (); if (parent instanceof Menu) setupAccelGroup ((GtkGenericPeer)((Menu)parent).getPeer ()); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java b/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java index 22086c5a08c..786c4b44936 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java @@ -76,7 +76,10 @@ public class GtkOffScreenImage extends Image public Graphics getGraphics () { - return g; + if (g instanceof GdkGraphics2D) + return new GdkGraphics2D ((GdkGraphics2D) this.g); + else + return new GdkGraphics ((GdkGraphics) this.g); } public Object getProperty (String name, ImageObserver observer) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java index 111c1f96979..d4a702deb35 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java @@ -50,6 +50,8 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer implements TextFieldPeer { native void create (int width); + native void gtkWidgetSetBackground (int red, int green, int blue); + native void gtkWidgetSetForeground (int red, int green, int blue); void create () { @@ -76,6 +78,8 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer int text_width = cols * fm.getMaxAdvance (); create (text_width); + + setEditable (tf.isEditable ()); } native int gtkEntryGetBorderWidth (); @@ -162,7 +166,7 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_ENTER) - postActionEvent (getText (), ke.getModifiers ()); + postActionEvent (getText (), ke.getModifiersEx ()); } super.handleEvent (e); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java index 7e77e0dcbf0..a2357699b3c 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java @@ -60,6 +60,10 @@ public class GtkWindowPeer extends GtkContainerPeer private boolean hasBeenShown = false; private int oldState = Frame.NORMAL; + native void gtkWindowSetTitle (String title); + native void gtkWindowSetResizable (boolean resizable); + native void gtkWindowSetModal (boolean modal); + native void create (int type, boolean decorated, int width, int height, GtkWindowPeer parent, @@ -92,6 +96,16 @@ public class GtkWindowPeer extends GtkContainerPeer create (GDK_WINDOW_TYPE_HINT_NORMAL, false); } + void setParent () + { + setVisible (awtComponent.isVisible ()); + setEnabled (awtComponent.isEnabled ()); + } + + void setVisibleAndEnabled () + { + } + native void connectJObject (); native void connectSignals (); @@ -100,12 +114,6 @@ public class GtkWindowPeer extends GtkContainerPeer super (window); } - public void getArgs (Component component, GtkArgList args) - { - args.add ("visible", component.isVisible ()); - args.add ("sensitive", component.isEnabled ()); - } - native public void toBack (); native public void toFront (); @@ -120,7 +128,7 @@ public class GtkWindowPeer extends GtkContainerPeer public void setTitle (String title) { - set ("title", title); + gtkWindowSetTitle (title); } native void setSize (int width, int height); @@ -132,8 +140,7 @@ public class GtkWindowPeer extends GtkContainerPeer // was resizable. setSize (awtComponent.getWidth() - insets.left - insets.right, awtComponent.getHeight() - insets.top - insets.bottom); - set ("allow_shrink", resizable); - set ("allow_grow", resizable); + gtkWindowSetResizable (resizable); } native void setBoundsCallback (Window window, |