2004-01-22 Graydon Hoare <graydon@redhat.com>

	* gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java:
	* gnu/java/awt/peer/gtk/GdkGlyphVector.java:
	Predicate static initialization on GtkToolkit.useGraphics2D().
	* java/awt/Component.java (processPaintEvent): Consume event.
	* javax/swing/AbstractButton.java: Reimplement, document.
	* javax/swing/DefaultButtonModel.java: Reimplement, document.
	* javax/swing/JComponent.java (paint): Use double buffer.
	(listenerList): Enable member.
	* javax/swing/ToggleButtonModel.java: Remove incorrect constructor.
	* javax/swing/JToggleButton.java
	(JToggleButton): Modify model constructor.
	* javax/swing/SwingUtilities.java
	(layoutCompoundLabel): Adjust arithmetic.
	* javax/swing/plaf/basic/BasicButtonUI.java: Reimplement, document.
	* javax/swing/plaf/basic/BasicGraphicsUtils.java
	(getPreferredButtonSize): Include margins in calculation.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals):
	Receive up events from subordinate layout component.

From-SVN: r76344

2 files changed, 283 insertions, 76 deletions

diff --git a/libjava/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/javax/swing/plaf/basic/BasicButtonUI.java
index 37ce9099..3bcff94 100644
--- a/libjava/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/libjava/javax/swing/plaf/basic/BasicButtonUI.java
@@ -35,16 +35,23 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package javax.swing.plaf.basic;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Stroke;
 import java.awt.Insets;
 import java.awt.Rectangle;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
 import javax.swing.SwingUtilities;
@@ -53,20 +60,161 @@ import javax.swing.plaf.ComponentUI;
 
 public class BasicButtonUI extends ButtonUI
 {
+  /** A constant used to pad out elements in the button's layout and
+      preferred size calculations. */
     int gap = 3;
-    //    int y_text_space = 2, x_text_space + 5;
 
-    Color textColor, disabledTextColor;
-    Color pressedBackgroundColor;
-    Color normalBackgroundColor;
+  /** The color that text will be painted when the button is enabled */
+  Color textColor;
 
+  /** The color that text will be painted when the button is disabled */
+  Color disabledTextColor;
+
+  /** The color that the button's background will be painted when the
+      button is pressed. */
+    Color pressedBackgroundColor;
 
+  /** The color that the button's background will be painted when the
+      button is not pressed. */
+  Color normalBackgroundColor;
+
+  /**
+   * Factory method to create an instance of BasicButtonUI for a given
+   * {@link JComponent}, which should be an {@link AbstractButton}.
+   *
+   * @param c The component to create a UI got
+   *
+   * @return A new UI capable of drawing the component
+   */
     public static ComponentUI createUI(final JComponent c) 
     {
 	return new BasicButtonUI();
     }
 
+  /**
+   * Helper class which listens to a button's focus events and disarms the
+   * button's model when focus is lost.
+   */
+  private static class FocusUIListener extends FocusAdapter
+  {
+    /** Button to listen to focus events from */
+    AbstractButton button;
+
+    /**
+     * Creates a new FocusUIListener object.
+     *
+     * @param b The button to listen to
+     */
+    FocusUIListener(AbstractButton b)
+    {
+      button = b;
+    }
     
+    /**
+     * Called when the button loses focus.
+     *
+     * @param event The loss of focus event.
+     */
+    public void focusLost(FocusEvent event)
+    {
+      // System.err.println("ButtonUI :: lost focus -- disarming");
+      button.getModel().setArmed(false);
+    }
+  }
+
+  /**
+   * A helper class which interprets mouse events as 
+   * state changes to the button's underlying model.
+   */
+  private static class ButtonUIListener extends MouseAdapter
+  {
+    /** The button to change the model of */
+    AbstractButton button;
+
+    /**
+     * Creates a new ButtonUIListener object.
+     *
+     * @param b The button to change the model of
+     */
+    public ButtonUIListener(AbstractButton b)
+    {
+      button = b;
+    }
+
+    /**
+     * Accept a mouse press event and arm the button's model.
+     *
+     * @param e The mouse press event to accept
+     */
+    public void mousePressed(MouseEvent e)
+    {
+      // System.err.println("ButtonUI :: mouse pressed");
+      if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+        {
+          // System.err.println("ButtonUI :: arming");
+          button.getModel().setArmed(true);
+        }
+    }
+
+    /**
+     * Accept a mouse enter event and set the button's model's
+     * "rollover" property to <code>true</code>. If the button's
+     * model is currently armed and the mouse button is not held
+     * down, this enter event will also disarm the model.
+     *
+     * @param e The mouse enter event to accept
+     */
+    public void mouseEntered(MouseEvent e)
+    {
+      // System.err.println("ButtonUI :: mouse entered");
+      // System.err.println("ButtonUI :: rolling over");
+      button.getModel().setRollover(true);
+      if (button.getModel().isArmed() 
+          && (e.getModifiers() & InputEvent.BUTTON1_MASK) == 0)
+        {
+          // System.err.println("ButtonUI :: no button pressed -- disarming");
+          button.getModel().setArmed(false);
+        }
+    }
+
+    /**
+     * Accept a mouse exit event and set the button's model's
+     * "rollover" property to <code>false</code>.
+     *
+     * @param e The mouse exit event to accept
+     */
+    public void mouseExited(MouseEvent e)
+    {
+      // System.err.println("ButtonUI :: mouse exited");
+      button.getModel().setRollover(false);
+    }
+
+    /**
+     * Accept a mouse release event and set the button's model's
+     * "pressed" property to <code>true</code>, if the model
+     * is armed. If the model is not armed, ignore the event.
+     *
+     * @param e The mouse release event to accept
+     */
+    public void mouseReleased(MouseEvent e)
+    {
+      // System.err.println("ButtonUI :: mouse released");
+      if (button.getModel().isArmed()
+          && (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+        {
+          button.getModel().setPressed(true);
+        }
+    }
+  }
+
+  /**
+   * Install the BasicButtonUI as the UI for a particular component.
+   * This means registering all the UI's listeners with the component,
+   * and setting any properties of the button which are particular to 
+   * this look and feel.
+   *
+   * @param c The component to install the UI into
+   */
     public void installUI(final JComponent c) 
     {
 	super.installUI(c);
@@ -76,18 +224,37 @@ public class BasicButtonUI extends ButtonUI
 	pressedBackgroundColor   = new Color(150,150,150);
 	pressedBackgroundColor   = new Color(150,150,150);
 	normalBackgroundColor    = new Color(192,192,192);
-    }
-    
 
+    // this tells the border (if we have one) how to paint.
+    c.setBackground(normalBackgroundColor);
+    ((AbstractButton)c).setMargin (new Insets(10,10,10,10));
+
+    c.addMouseListener(new ButtonUIListener((AbstractButton) c));
+    c.addFocusListener(new FocusUIListener((AbstractButton) c));
+  }
+
+  /**
+   * Calculate the preferred size of this component, by delegating to
+   * {@link BasicGraphicsUtils.getPreferredButtonSize}.
+   *
+   * @param c The component to measure
+   *
+   * @return The preferred dimensions of the component
+   */
     public Dimension getPreferredSize(JComponent c) 
     {
 	AbstractButton b = (AbstractButton)c;
 	Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b, gap);
-	//	System.out.println("^^^^^^^^^^^^^^^^^^^^^^   BASIC-PREF="+d + ",T="+b.text);
 	return d;
     }
     
-
+  /**
+   * Paint the component, which is an {@link AbstractButton}, according to 
+   * its current state.
+   *
+   * @param g The graphics context to paint with
+   * @param c The component to paint the state of
+   */
     public void paint(Graphics g, JComponent c)
     {      
 	AbstractButton b = (AbstractButton) c;
@@ -95,6 +262,7 @@ public class BasicButtonUI extends ButtonUI
 	Rectangle tr = new Rectangle();
 	Rectangle ir = new Rectangle();
 	Rectangle vr = new Rectangle();
+    Rectangle br = new Rectangle();
 
         Font f = c.getFont();
 
@@ -102,115 +270,150 @@ public class BasicButtonUI extends ButtonUI
 
         FontMetrics fm = g.getFontMetrics(f);
 
-        Insets i = c.getInsets();
+    Insets border = b.getInsets();
+    Insets margin = b.getMargin();
 
-        vr.x      = i.left;
-        vr.y      = i.top;
-        vr.width  = b.getWidth()  - (i.right  + vr.x);
-        vr.height = b.getHeight() - (i.bottom + vr.y);
-	
-	//System.out.println("             VIEW-RECT-BUTTON="+vr+", insets="+i+", FONTM="+fm);
-	
-	String text = SwingUtilities.layoutCompoundLabel(c,
-							 fm, 
-							 b.getText(),
+    br.x = border.left;
+    br.y = border.top;
+    br.width = b.getWidth() - (border.right + border.left);
+    br.height = b.getHeight() - (border.top + border.bottom);
+
+    vr.x = br.x + margin.left;
+    vr.y = br.y + margin.top;
+    vr.width = br.width - (margin.right + margin.left);
+    vr.height = br.height - (margin.top + margin.bottom);
+
+    String text = SwingUtilities.layoutCompoundLabel(c, fm, b.getText(),
 							 b.getIcon(),
 							 b.getVerticalAlignment(), 
 							 b.getHorizontalAlignment(),
 							 b.getVerticalTextPosition(), 
 							 b.getHorizontalTextPosition(),
-							 vr,
-							 ir,
-							 tr,
-							 gap);
+                                                     vr, ir, tr, gap);
 
-        if (b.getModel().isPressed() ||
-	    b.getModel().isSelected())
-	    {
-	      //System.out.println("paint pressed");
-		paintButtonPressed(g, c);
-	    }
+    if ((b.getModel().isRollover() && b.getModel().isArmed()) 
+        || b.getModel().isSelected())
+      paintButtonPressed(g, br, c);
 	else
-	    {
-	      //System.out.println("paint normal");
-		paintButtonNormal(g, c);
-	    }
+      paintButtonNormal(g, br, c);
 	
 	paintIcon(g, c, ir);
 	paintText(g, c, tr, b.getText());
 	paintFocus(g, c, vr, tr, ir);
     }
 
-
-    protected void paintFocus(Graphics g, 
-			      JComponent c,
-			      Rectangle vr,
-			      Rectangle tr,
-			      Rectangle ir)
+  /**
+   * Paint any focus decoration this {@link JComponent} might have.  The
+   * component, which in this case will be an {@link AbstractButton},
+   * should only have focus decoration painted if it has the focus, and its
+   * "focusPainted" property is <code>true</code>.
+   *
+   * @param g Graphics context to paint with
+   * @param c Component to paint the focus of
+   * @param vr Visible rectangle, the area in which to paint
+   * @param tr Text rectangle, contained in visible rectangle
+   * @param ir Icon rectangle, contained in visible rectangle
+   *
+   * @see AbstractButton.isFocusPainted()
+   * @see JComponent.hasFocus()
+   */
+  protected void paintFocus(Graphics g, JComponent c, Rectangle vr,
+                            Rectangle tr, Rectangle ir)
+  {
+    AbstractButton b = (AbstractButton) c;
+    if (b.hasFocus() && b.isFocusPainted())
     {
+        Graphics2D g2 = (Graphics2D) g;
+        Stroke saved_stroke = g2.getStroke();
+        Color saved_color = g2.getColor();
+        float dashes[] = new float[] {1.0f, 1.0f};        
+        BasicStroke s = new BasicStroke(1.0f, 
+                                        BasicStroke.CAP_SQUARE, 
+                                        BasicStroke.JOIN_MITER,
+                                        10, dashes, 0.0f);
+        g2.setStroke(s);
+        g2.setColor(Color.BLACK);
+        g2.drawRect(vr.x + 2, 
+                    vr.y + 2, 
+                    vr.width - 4,
+                    vr.height - 4);
+        g2.setStroke(saved_stroke);
+        g2.setColor(saved_color);
+      }
     }
 
-    protected void paintIcon(Graphics g, 
-			     JComponent c, 
-			     Rectangle iconRect)
+  /**
+   * Paint the icon for this component. Depending on the state of the
+   * component and the availability of the button's various icon
+   * properties, this might mean painting one of several different icons.
+   *
+   * @param g Graphics context to paint with
+   * @param c Component to paint the icon of
+   * @param iconRect Rectangle in which the icon should be painted
+   */
+  protected void paintIcon(Graphics g, JComponent c, Rectangle iconRect)
     {
 	AbstractButton b = (AbstractButton) c;
 	if (b.getIcon() != null)
 	    {
 		int x = iconRect.x;
 		int y = iconRect.y;
-
-		System.out.println("WE HAVE AN ICON: " + b.getIcon());
- 
 		b.getIcon().paintIcon(c, g, x, y);
 	    }
-	else
-	    {
-		//System.out.println("NO ICON FOR BUTTON:" + b.text);
-	    }
     }
 
-    protected void paintButtonPressed(Graphics g,
-				      JComponent b)
+  /**
+   * Paints the background area of an {@link AbstractButton} in the pressed
+   * state.  This means filling the supplied area with the {@link
+   * pressedBackgroundColor}.
+   *
+   * @param g The graphics context to paint with
+   * @param area The area in which to paint
+   * @param b The component to paint the state of
+   */
+  protected void paintButtonPressed(Graphics g, Rectangle area, JComponent b)
     {
 	Dimension size = b.getSize();
 	
 	g.setColor(pressedBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
-
+    g.fillRect(area.x, area.y, area.width, area.height);
     }
     
-    protected void paintButtonNormal(Graphics g,
-				     JComponent b)
+  /**
+   * Paints the background area of an {@link AbstractButton} in the normal,
+   * non-pressed state.  This means filling the supplied area with the
+   * {@link normalBackgroundColor}.
+   *
+   * @param g The graphics context to paint with
+   * @param area The area in which to paint
+   * @param b The component to paint the state of
+   */
+  protected void paintButtonNormal(Graphics g, Rectangle area, JComponent b)
     {
 	Dimension size = b.getSize();
-	
 	g.setColor(normalBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
-
+    g.fillRect(area.x, area.y, area.width, area.height);
     }
     
-    protected void paintText(Graphics g,
-			     JComponent c,
-			     Rectangle textRect,
+  /**
+   * Paints the "text" property of an {@link AbstractButton}, using the
+   * {@link textColor} color.
+   *
+   * @param g The graphics context to paint with
+   * @param c The component to paint the state of
+   * @param textRect The area in which to paint the text
+   * @param text The text to paint
+   */
+  protected void paintText(Graphics g, JComponent c, Rectangle textRect,
 			     String text) 
     {	
 	Font f = c.getFont();
-
         g.setFont(f);
-
         FontMetrics fm = g.getFontMetrics(f);
-
 	g.setColor(c.isEnabled() ? textColor : disabledTextColor);
-
-	BasicGraphicsUtils.drawString(g,
-				      text, 
+    BasicGraphicsUtils.drawString(g, text, 
 				      0,
 				      textRect.x, 
-				      textRect.y + fm.getAscent()/2);
+                                  textRect.y + fm.getAscent());
     } 
 }
-
-
-
-
diff --git a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
index d7b53d5..f88bf92 100644
--- a/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
+++ b/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java
@@ -595,6 +595,7 @@ public class BasicGraphicsUtils
     Rectangle iconRect = new Rectangle();
     Rectangle textRect = new Rectangle();
     Insets insets = b.getInsets();
+    Insets margin = b.getMargin();
     
     /* For determining the ideal size, do not assume a size restriction. */
     viewRect = new Rectangle(0, 0,
@@ -620,7 +621,6 @@ public class BasicGraphicsUtils
       viewRect, iconRect, textRect,
       textIconGap);
 
-
     /*  +------------------------+       +------------------------+
      *  |                        |       |                        |
      *  | ICON                   |       | CONTENTCONTENTCONTENT  |
@@ -630,7 +630,11 @@ public class BasicGraphicsUtils
      */
     contentRect = textRect.union(iconRect);
 
-    return new Dimension(insets.left + contentRect.width + insets.right,
-                         insets.top + contentRect.height + insets.bottom);
+    return new Dimension(insets.left + margin.left
+			 + contentRect.width 
+			 + insets.right + margin.right,
+                         insets.top + margin.top
+			 + contentRect.height 
+			 + insets.bottom + margin.bottom);
   }
 }