
2004-05-25 David Jee <djee@redhat.com> * java/awt/Container.java (remove): Set component's parent to null only after we removed the component from its parent's layout manager. 2004-05-25 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): Set bounds regardless of whether awtComponent is valid. * gnu/java/awt/peer/gtk/GtkListPeer.java (getSize): Change native method declaration. (minimumSize): Pass visible row count into getSize(). (preferredSize): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize): Use scroll window's natural size. Use visible row count to determine the final height value to return. 2004-05-21 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (setClip): Minor correction to order of operations. * javax/swing/JScrollPane.java: Extend sketchy implementation. * javax/swing/ScrollPaneLayout.java: Likewise. * javax/swing/JViewPort.java: Likewise. * javax/swing/ViewportLayout.java: Likewise. * javax/swing/JComponent.java: Rewrite. * javax/swing/RepaintManager.java: Likewise. * javax/swing/JLayeredPane.java: Change validate() to revalidate(). * javax/swing/JList.java (setSelectedIndices): (getSelectedIndices): (getSelectedValues): New functions. (getPreferredScrollableViewportSize): Return preferred size. (getScrollableUnitIncrement): (getScrollableBlockIncrement): Initial implementations. * javax/swing/JRootPane.java: Clean up slightly. (getUI): (setUI): (updateUI): (getUIClassID): (isValidateRoot): Add overrides from JComponent. * javax/swing/JScrollBar.java: Set default orientation to VERTICAL. * javax/swing/UIManager.java (getDimension): Return the dimension. * javax/swing/plaf/basic/BasicButtonUI.java: Set component opaque. * javax/swing/plaf/basic/BasicLabelUI.java: Likewise. * javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise. * javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise. * javax/swing/plaf/basic/BasicSliderUI.java: Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: Likewise. * javax/swing/plaf/basic/BasicRootPaneUI.java: Likewise, and set background. * javax/swing/plaf/basic/BasicListUI.java: Likewise, and improve a bit. * javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise, and adjust calculations. * javax/swing/plaf/basic/BasicViewportUI.java: Likewise, and improve a bit. * javax/swing/plaf/basic/BasicLookAndFeel.java (Button.margin): Shrink. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c: Hack to set horizontal always, workaround pango. * jni/gtk-peer/gtkcairopeer.h: Change to match pattern API. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Synchronize more often, check cairo status after ops, handle changes to cairo pattern API, check for disposal. 2004-05-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicMenuItemUI.java: (BasicMenuItemUI): Create propertyChangeListener. (getPath):Implemented. (installListeners): Add propertyChangeListener to menuItem. (uninstallListeners): Remove propertyChangeListener from menuItem. (update): Implemented. * javax/swing/plaf/basic/BasicMenuUI.MouseInputHandler: (mouseEntered): Take insets of popup menu into account when calculating position of popup menu. 2004-05-18 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JMenuBar.java: Started implementation. * javax/swing/JPopupMenu.java: (setVisible): Fixed location of lightweight/mediumweight popup menu. (show): Fixed location of PopupMenu. * javax/swing/plaf/basic/BasicMenuBarUI.java: New file. UI Delegate for JMenuBar. * javax/swing/plaf/basic/BasicMenuUI.MouseInputHandler: (mouseEntered): Corrected position of the submenu. 2004-05-18 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Remove calls to _gtk_accel_group_attach. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c: Likewise. * gnu/java/awt/peer/gtk/GtkButtonPeer.java: Give gtkSetFont package access. Don't override setFont. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Give gtkWidgetRequestFocus package access. * gnu/java/awt/peer/gtk/GtkLabelPeer.java: Don't override setFont. * gnu/java/awt/peer/gtk/GtkListPeer.java: Override gtkSetFont. Give gtkWidgetRequestFocus package access. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Give gtkWidgetRequestFocus package access. Don't override setFont. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Don't override setFont. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (gtkSetLabel): Move call to gtk_bin_get_child into GDK critical region. (gtkSetFont): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (gtkSetFont): Implement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkSetFont): Whitespace fix. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetSetUsize): Remove method. 2004-05-18 David Jee <djee@redhat.com> * java/awt/image/MemoryImageSource.java (newPixels(int,int,int,int,boolean)): Set only the specified rectangle of pixels. (newPixels(byte[],ColorModel,int,int)): Implement. (newPixels(int[],ColorModel,int,int)): Implement. 2004-05-18 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JMenu.java: Started implementation. * javax/swing/JPopupMenu.java: (insert): If specified index is -1, then add component at the end. (isPopupTrigger): Reimplemented. (JPopupMenu.LightWeightPopup): setBounds of the lightWeightPopup before adding it to the layeredPane. (javax/swing/plaf/basic/BasicIconFactory.java): (getMenuArrowIcon): Implemented. * javax/swing/plaf/basic/BasicMenuItemUI.java: (getPreferredSize): Add size of the arrow icon if this menu item is instance of JMenu. (paintMenuItem): Paint arrow icon if this menu item is a submenu. * javax/swing/plaf/basic/BasicMenuUI.java: New File. UI Delegate for JMenu. 2004-05-17 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (postKeyEvent): Post KEY_TYPED events. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (generates_key_typed_event): Remove function. 2004-05-17 Olga Rodimina <rodimina@redhat.com> * javax/swing/JRootPane.java (JRootPane.RootLayout): Reimplemented to set bounds of contentPane and menuBar. (setJMenuBar): Add menu bar to the layered pane. (createLayeredPane): Set layout of layeredPane to null. * javax/swing/JLayeredPane.java: (addImpl): Calculate index of the component in the layeredPane according to the specified position within the layer. 2004-05-17 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkImagePainter.java (setPixels): Change color model to the default model after converting pixels. * java/awt/image/MemoryImageSource.java (newPixels): Set only the specified rectangle of pixels. 2004-05-13 Thomas Fitzsimmons <fitzsim@redhat.com> * libgcj.spec.in (lib): Add -l-java-awt -l-java-applet -l-java-beans -l-javax-accessibility -l-javax-swing. * java/awt/AWTEvent.java (toString): Print source's name rather than the source itself. 2004-05-12 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkToolkit.java (loadSystemColors): Make native. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (gdk_color_to_java_color): New function. * jni/gtk-peer/gtkpeer.h: Add SystemColor defines. 2004-05-12 David Jee <djee@redhat.com> * java/awt/image/RGBImageFilter.java: Initialize origmodel as null. (makeColor): Fix pixel component order. (filterRGBPixels): Fix pixel iteration. (setPixels): Add extra checks for index color model. Convert pixels to default color model if necessary. (convertColorModelToDefault): New override method for byte pixels. (convertColorModelToDefault): For int pixels, fix pixel iteration. (makeColorbyDefaultCM): New override method for byte pixels. (makeColorbyDefaultCM): For int pixel, add color model as argument. (makeColor): Fix pixel component order. 2004-05-11 Kim Ho <kho@redhat.com> * javax/swing/Box.java: Comment out more parts of Box.Filler. 2004-05-11 Kim Ho <kho@redhat.com> * javax/swing/Box.java: Remove reference to AccessibleAWTComponent so it compiles again. 2004-05-10 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkListPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Update implementation of list peer to use GtkTreeView instead of deprecated GtkCList. 2004-05-07 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkWidgetDispatchKeyEvent): Remove keyChar parameter. (handleEvent): Remove keyChar argument to gtkWidgetDispatchKeyEvent calls. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Fix compiler warnings. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c: Likewise. 2004-05-06 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkWidgetRequestFocus): Mark protected. (GtkComponentPeer): Only set the peer's bounds if its component is valid. * java/awt/Component.java (static): Set the default keyboard focus manager. (requestFocus(), requestFocus(boolean), requestFocusInWindow(), requestFocusInWindow(temporary)): Don't request focus if the component is not showing. Get tree lock before traversing component hierarchy. * java/awt/DefaultKeyboardFocusManager.java (dispatchEvent): Only set the global focus owner if it is not a Window. (processKeyEvent): Consume keystrokes associated with the focus traversal keystroke. (focusPreviousComponent, focusNextComponent, upFocusCycle, downFocusCycle): Call requestFocusInWindow instead of requestFocus. * java/awt/EventDispatchThread.java (run): Move setting of default keyboard focus manager to Component.java. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (awt_keycode_to_keysym): New function. (gtkWidgetDispatchKeyEvent): Finish implementation. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Add FIXME comment. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkWidgetRequestFocus): New method. * java/awt/TextArea.java (TextArea): Set focus traversal keys to disable Tab and Shift-Tab keystrokes. (addNotify, appendText, insertText, replaceText): Simplify peer retrieval code. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c (connectSignals): Remove connections to "commit" signals. Remove C++-style comments. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (handleEvent): Activate GTK button when the space bar key is pressed. (gtkActivate): New method. 2004-05-06 David Jee <djee@redhat.com> * java/awt/image/CropImageFilter.java (setPixels): Implement for byte array pixels. * java/awt/image/ReplicateScaleFilter.java (setPixels): Implement for byte array pixels. (replicatePixels): Overload for byte array pixels. 2004-05-06 Kim Ho <kho@redhat.com> * javax/swing/Box.java: (getAccessibleContext): Return an instance of the correct class. 2004-05-05 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage): When component is null, use SystemColor.window as the default bgcolor. * gnu/java/awt/peer/gtk/GtkImage.java (setPixels): We can avoid iterating through the pixel rows only when height is 1. * java/awt/Image.java (getScaledInstance): Partially implement. * java/awt/image/CropImageFilter.java (setProperties): Fix "filter" property. (setPixels): Implement. * java/awt/image/ReplicateScaleFilter.java (setDimensions): Use scaled dimensions. (setPixels): Implement. (replicatePixels): New method. 2004-05-05 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkImagePainter.java (convertPixels): If either pixels or model is null, return null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c (Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels): If jpixels is null, do nothing and return. 2004-05-03 Kim Ho <kho@redhat.com> * gnu/java/awt/peer/gtk/GtkDialogPeer.java: (getGraphics): Like GtkFramePeer, the Graphics object needs to be translate to account for window decorations. (postMouseEvent): New method. Account for translation. (postExposeEvent): ditto. * javax/swing/Box.java: Stubbed. * javax/swing/JDialog.java: Ran through jalopy to fix indentation. (JDialog): Call SwingUtilities' getOwnerFrame for null owners. (setLayout): Check isRootPaneCheckingEnabled * javax/swing/JOptionPane.java: Re-implemented. * javax/swing/SwingUtilities.java: (getOwnerFrame): Static method to grab a default owner frame for Dialogs that don't specify owners. * javax/swing/event/SwingPropertyChangeSupport.java: (firePropertyChange): Fix early exit condition. * javax/swing/plaf/basic/BasicLabelUI.java: (paint): Avoid painting text if it is null or empty. * javax/swing/plaf/basic/BasicOptionPaneUI.java: Implement. 2004-05-03 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JPopupMenu.java: Started implementation. * javax/swing/JWindow.java (JWindow): call super() if parent for window is not specified. * javax/swing/plaf/basic/BasicPopupMenuUI.java: New File. UI Delegate for JPopupMenu. 2004-04-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/JApplet.java: Indicated that JApplet implements RootPaneContainer and made method of this interface public. * javax/swing/JFrame.java: Ditto. * javax/swing/JWindow.java: Ditto. 2004-04-29 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetBounds): Call gdk_window_move in addition to gtk_window_move. * java/applet/Applet.java (preferredSize): Call parent's preferredSize if the applet stub is null. (minimumSize): Likewise for parent's minimumSize. 2004-04-27 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenuItem.java (createActionPropertyChangeListener): Implemented. (processMouseEvent): Ditto. (fireMenuDragMouseEntered): Ditto. (fireMenuDragMouseExited): Ditto. (fireMenuDragMouseDragged): Ditto. (fireMenuDragMouseReleased): Ditto. (menuSelectionChanged): Ditto. (getSubElements): Ditto. (getComponent): Ditto. (addMenuDragMouseListener): Ditto. (removeMenuDragMouseListener):Ditto. (addMenuKeyListener): Ditto. (removeMenuKeyListener): Ditto. * javax/swing/plaf/basic/BasicMenuItemUI.java (doClick): Imlemented. * javax/swing/plaf/basic/BasicMenuItemUI.MouseInputHandler: Don't handle mouse events here. Pass them to MenuSelectionManager. 2004-04-26 Olga Rodimina <rodimina@redhat.com> Used correct version of jalopy configuration file to fix style in the files below. 2004-04-26 Olga Rodimina <rodimina@redhat.com> * javax/swing/JCheckBoxMenuItem.java: Fixed style and removed unnecessary comments. * javax/swing/JMenuItem.java: Ditto. * javax/swing/JRadioButtonMenuItem.java: Ditto. * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java: Ditto. * javax/swing/plaf/basic/BasicMenuItemUI.java: Ditto. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Ditto. 2004-04-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu_java_awt_peer_gtk_GtkWindowPeer.c: Change FIXME comment to C-style. * gnu_java_awt_peer_gtk_GtkWindowPeer.c: Add FIXME comment. * java/awt/ContainerOrderFocusTraversalPolicy.java (getComponentAfter): Start from current component and work up the component hierarchy until an acceptable component is found. Synchronize on tree lock. (getComponentBefore): Likewise. 2004-04-22 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java: Remove focus-related debugging messages. * java/awt/DefaultKeyboardFocusManager.java: Likewise. * java/awt/EventDispatchThread.java: Likewise. * java/awt/KeyboardFocusManager.java: Likewise. * java/awt/Window.java: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Change new C++-style comments to C-style comments. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (handleEvent): Dispatch key press and key release events to backing widget. (requestFocus): Post a FOCUS_GAINED event to the event queue. (gtkWidgetRequestFocus): New method. (gtkWidgetDispatchKeyEvent): Likewise. * java/awt/Component.java (requestFocus, requestFocus(boolean), requestFocusInWindow, requestFocusInWindow(boolean), getFocusCycleRootAncestor, nextFocus, transferFocus, transferFocusBackward, transferFocusUpCycle, hasFocus, isFocusOwner): Implement and document focus-handling methods. (setFocusTraversalKeys): Inherit focus traversal keys when keystrokes argument is null. Fix focus-handling documentation throughout class. * java/awt/Container.java (setFocusTraversalKeys, getFocusTraversalKeys, areFocusTraversalKeysSet, isFocusCycleRoot, setFocusTraversalPolicy, getFocusTraversalPolicy, isFocusTraversalPolicySet, setFocusCycleRoot, isFocusCycleRoot, transferFocusDownCycle): Implement and document focus-handling methods. (transferFocusBackward): Remove method. (readObject, writeObject): Implement and document serialization methods. * java/awt/ContainerOrderFocusTraversalPolicy.java: Implement and document. * java/awt/DefaultFocusTraversalPolicy.java: Implement and document. * java/awt/DefaultKeyboardFocusManager.java: Implement and partially document. * java/awt/EventDispatchThread.java (run): Set default keyboard focus manager. Attempt to dispatch each event to the keyboard focus manager before normal dispatch. * java/awt/KeyboardFocusManager.java: Implement and partially document. * java/awt/Window.java (Window): Set focusCycleRoot to true. (show): Focus initial component when window is shown for the first time. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Replace complex key press and key release logic with simple callbacks into GtkComponentPeer. * jni/gtk-peer/gtkpeer.h: Fix FOCUS_GAINED/FOCUS_LOST reversal. 2004-04-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/MenuSelectionManager.java (componentForPoint): Added new method. (defaultManager): New Method. Implemented. (getSelectedPath): Ditto. (isComponentPartOfCurrentMenu): Ditto. (processKeyEvent): Added new method. (processMouseEvent): New Method. Implemented. (setSelectedPath): Ditto. (getPath): Ditto. 2004-04-19 Kim Ho <kho@redhat.com> * java/awt/Container.java: (remove): Set the component's parent to null. (getComponentAt): Implement. * javax/swing/JComponent.java: (JComponent): Initialize defaultLocale (getDefaultLocale): Implement. (setDefaultLocale): ditto. * javax/swing/JSlider.java: (JSlider): Fix calculation of value. * javax/swing/JSplitPane.java: Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change SplitPane's default divider size. * javax/swing/plaf/basic/BasicScrollBarUI.java: (paint): Remove unused code. * javax/swing/plaf/basic/BasicSplitPaneDivider.java: Added comments and ran through jalopy. (setBasicSplitPaneUI): Get reference to hidden divider and set up one touch buttons if necessary. (setBorder): Fire propertyChangeEvent only if borders are different. (getPreferredSize): Defer to layout manager. (propertyChange): Implement. (oneTouchExpandableChanged): ditto. (createLeftOneTouchButton): Use BasicArrowButton. (createRightOneTouchButton): ditto. (moveDividerTo): New method. Moves the divider to a set location based on the last divider location. (BasicSplitPaneDivider::MouseHandler): Implement. (BasicSplitPaneDivider::OneTouchButton): Removed. (BasicSplitPaneDivider::DragController): Implement. (BasicSplitPaneDivider::VerticalDragController): ditto. (BasicSplitPaneDivider::DividerLayout): ditto. * javax/swing/plaf/basic/BasicSplitPaneUI.java: Reimplement. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (calculateLayoutInfo): Don't show component if it's null. (paintTab): Fix title paint logic. From-SVN: r82314
530 lines
16 KiB
Java
530 lines
16 KiB
Java
/* RepaintManager.java --
|
|
Copyright (C) 2002 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
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;
|
|
|
|
import java.awt.Component;
|
|
import java.awt.Dimension;
|
|
import java.awt.Image;
|
|
import java.awt.Rectangle;
|
|
import java.util.AbstractMap;
|
|
import java.util.Enumeration;
|
|
import java.util.Hashtable;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.Vector;
|
|
|
|
|
|
/**
|
|
* <p>The repaint manager holds a set of dirty regions, invalid components,
|
|
* and a double buffer surface. The dirty regions and invalid components
|
|
* are used to coalesce multiple revalidate() and repaint() calls in the
|
|
* component tree into larger groups to be refreshed "all at once"; the
|
|
* double buffer surface is used by root components to paint
|
|
* themselves.</p>
|
|
*
|
|
* <p>In general, painting is very confusing in swing. see <a
|
|
* href="http://java.sun.com/products/jfc/tsc/articles/painting/index.html">this
|
|
* document</a> for more details.</p>
|
|
*
|
|
* @author Graydon Hoare (graydon@redhat.com)
|
|
*/
|
|
public class RepaintManager
|
|
{
|
|
|
|
/**
|
|
* <p>A helper class which is placed into the system event queue at
|
|
* various times in order to facilitate repainting and layout. There is
|
|
* typically only one of these objects active at any time. When the
|
|
* {@link RepaintManager} is told to queue a repaint, it checks to see if
|
|
* a {@link RepaintWorker} is "live" in the system event queue, and if
|
|
* not it inserts one using {@link SwingUtilities.invokeLater}.</p>
|
|
*
|
|
* <p>When the {@link RepaintWorker} comes to the head of the system
|
|
* event queue, its {@link RepaintWorker#run} method is executed by the
|
|
* swing paint thread, which revalidates all invalid components and
|
|
* repaints any damage in the swing scene.</p>
|
|
*/
|
|
|
|
protected class RepaintWorker
|
|
implements Runnable
|
|
{
|
|
boolean live;
|
|
public RepaintWorker()
|
|
{
|
|
live = false;
|
|
}
|
|
public synchronized void setLive(boolean b)
|
|
{
|
|
live = b;
|
|
}
|
|
public synchronized boolean isLive()
|
|
{
|
|
return live;
|
|
}
|
|
public void run()
|
|
{
|
|
RepaintManager rm = RepaintManager.globalManager;
|
|
setLive(false);
|
|
rm.validateInvalidComponents();
|
|
rm.paintDirtyRegions();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* A table storing the dirty regions of components. The keys of this
|
|
* table are components, the values are rectangles. Each component maps
|
|
* to exactly one rectangle. When more regions are marked as dirty on a
|
|
* component, they are union'ed with the existing rectangle.
|
|
*
|
|
* @see #addDirtyRegion
|
|
* @see #getDirtyRegion
|
|
* @see #isCompletelyDirty
|
|
* @see #markCompletelyClean
|
|
* @see #markCompletelyDirty
|
|
*/
|
|
Hashtable dirtyComponents;
|
|
|
|
/**
|
|
* A single, shared instance of the helper class. Any methods which mark
|
|
* components as invalid or dirty eventually activate this instance. It
|
|
* is added to the event queue if it is not already active, otherwise
|
|
* reused.
|
|
*
|
|
* @see #addDirtyRegion
|
|
* @see #addInvalidComponent
|
|
*/
|
|
RepaintWorker repaintWorker;
|
|
|
|
/**
|
|
* The set of components which need revalidation, in the "layout" sense.
|
|
* There is no additional information about "what kind of layout" they
|
|
* need (as there is with dirty regions), so it is just a vector rather
|
|
* than a table.
|
|
*
|
|
* @see #addInvalidComponent
|
|
* @see #removeInvalidComponent
|
|
* @see #validateInvalidComponents
|
|
*/
|
|
Vector invalidComponents;
|
|
|
|
/**
|
|
* Whether or not double buffering is enabled on this repaint
|
|
* manager. This is merely a hint to clients; the RepaintManager will
|
|
* always return an offscreen buffer when one is requested.
|
|
*
|
|
* @see #getDoubleBufferingEnabled
|
|
* @see #setDoubleBufferingEnabled
|
|
*/
|
|
boolean doubleBufferingEnabled;
|
|
|
|
/**
|
|
* The current offscreen buffer. This is reused for all requests for
|
|
* offscreen drawing buffers. It grows as necessary, up to {@link
|
|
* #doubleBufferMaximumSize}, but there is only one shared instance.
|
|
*
|
|
* @see #getOffscreenBuffer
|
|
* @see #doubleBufferMaximumSize
|
|
*/
|
|
Image doubleBuffer;
|
|
|
|
/**
|
|
* The maximum width and height to allocate as a double buffer. Requests
|
|
* beyond this size are ignored.
|
|
*
|
|
* @see #paintDirtyRegions
|
|
* @see #getDoubleBufferMaximumSize
|
|
* @see #setDoubleBufferMaximumSize
|
|
*/
|
|
Dimension doubleBufferMaximumSize;
|
|
|
|
|
|
/**
|
|
* The global, shared RepaintManager instance. This is reused for all
|
|
* components in all windows.
|
|
*
|
|
* @see #currentManager
|
|
* @see #setCurrentManager
|
|
*/
|
|
private static RepaintManager globalManager;
|
|
|
|
/**
|
|
* Create a new RepaintManager object.
|
|
*/
|
|
public RepaintManager()
|
|
{
|
|
dirtyComponents = new Hashtable();
|
|
invalidComponents = new Vector();
|
|
repaintWorker = new RepaintWorker();
|
|
doubleBufferMaximumSize = new Dimension(2000,2000);
|
|
doubleBufferingEnabled = true;
|
|
}
|
|
|
|
/**
|
|
* Get the value of the shared {@link #globalManager} instance, possibly
|
|
* returning a special manager associated with the specified
|
|
* component. The default implementaiton ignores the component parameter.
|
|
*
|
|
* @param component A component to look up the manager of
|
|
*
|
|
* @return The current repaint manager
|
|
*
|
|
* @see #setCurrentManager
|
|
*/
|
|
public static RepaintManager currentManager(Component component)
|
|
{
|
|
if (globalManager == null)
|
|
globalManager = new RepaintManager();
|
|
return globalManager;
|
|
}
|
|
|
|
/**
|
|
* Get the value of the shared {@link #globalManager} instance, possibly
|
|
* returning a special manager associated with the specified
|
|
* component. The default implementaiton ignores the component parameter.
|
|
*
|
|
* @param component A component to look up the manager of
|
|
*
|
|
* @return The current repaint manager
|
|
*
|
|
* @see #setCurrentManager
|
|
*/
|
|
public static RepaintManager currentManager(JComponent component)
|
|
{
|
|
return currentManager((Component)component);
|
|
}
|
|
|
|
/**
|
|
* Set the value of the shared {@link #globalManager} instance.
|
|
*
|
|
* @param manager The new value of the shared instance
|
|
*
|
|
* @see #currentManager
|
|
*/
|
|
public static void setCurrentManager(RepaintManager manager)
|
|
{
|
|
globalManager = manager;
|
|
}
|
|
|
|
/**
|
|
* Add a component to the {@link #invalidComponents} vector. If the
|
|
* {@link #repaintWorker} class is not active, insert it in the system
|
|
* event queue.
|
|
*
|
|
* @param component The component to add
|
|
*
|
|
* @see #removeInvalidComponent
|
|
*/
|
|
public synchronized void addInvalidComponent(JComponent component)
|
|
{
|
|
while ((component.getParent() != null)
|
|
&& (component.getParent() instanceof JComponent)
|
|
&& (component.isValidateRoot()))
|
|
component = (JComponent) component.getParent();
|
|
|
|
if (invalidComponents.contains(component))
|
|
return;
|
|
|
|
invalidComponents.add(component);
|
|
component.invalidate();
|
|
|
|
if (! repaintWorker.isLive())
|
|
{
|
|
repaintWorker.setLive(true);
|
|
SwingUtilities.invokeLater(repaintWorker);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Remove a component from the {@link #invalidComponents} vector.
|
|
*
|
|
* @param component The component to remove
|
|
*
|
|
* @see #addInvalidComponent
|
|
*/
|
|
public synchronized void removeInvalidComponent(JComponent component)
|
|
{
|
|
invalidComponents.removeElement(component);
|
|
}
|
|
|
|
/**
|
|
* Add a region to the set of dirty regions for a specified component.
|
|
* This involves union'ing the new region with any existing dirty region
|
|
* associated with the component. If the {@link #repaintWorker} class
|
|
* is not active, insert it in the system event queue.
|
|
*
|
|
* @param component The component to add a dirty region for
|
|
* @param x The left x coordinate of the new dirty region
|
|
* @param y The top y coordinate of the new dirty region
|
|
* @param w The width of the new dirty region
|
|
* @param h The height of the new dirty region
|
|
*
|
|
* @see #addDirtyRegion
|
|
* @see #getDirtyRegion
|
|
* @see #isCompletelyDirty
|
|
* @see #markCompletelyClean
|
|
* @see #markCompletelyDirty
|
|
*/
|
|
public synchronized void addDirtyRegion(JComponent component, int x, int y,
|
|
int w, int h)
|
|
{
|
|
Rectangle r = new Rectangle(x, y, w, h);
|
|
if (dirtyComponents.containsKey(component))
|
|
r = r.union((Rectangle)dirtyComponents.get(component));
|
|
dirtyComponents.put(component, r);
|
|
if (! repaintWorker.isLive())
|
|
{
|
|
repaintWorker.setLive(true);
|
|
SwingUtilities.invokeLater(repaintWorker);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the dirty region associated with a component, or <code>null</code>
|
|
* if the component has no dirty region.
|
|
*
|
|
* @param component The component to get the dirty region of
|
|
*
|
|
* @return The dirty region of the component
|
|
*
|
|
* @see #dirtyComponents
|
|
* @see #addDirtyRegion
|
|
* @see #isCompletelyDirty
|
|
* @see #markCompletelyClean
|
|
* @see #markCompletelyDirty
|
|
*/
|
|
public Rectangle getDirtyRegion(JComponent component)
|
|
{
|
|
return (Rectangle) dirtyComponents.get(component);
|
|
}
|
|
|
|
/**
|
|
* Mark a component as dirty over its entire bounds.
|
|
*
|
|
* @param component The component to mark as dirty
|
|
*
|
|
* @see #dirtyComponents
|
|
* @see #addDirtyRegion
|
|
* @see #getDirtyRegion
|
|
* @see #isCompletelyDirty
|
|
* @see #markCompletelyClean
|
|
*/
|
|
public void markCompletelyDirty(JComponent component)
|
|
{
|
|
Rectangle r = component.getBounds();
|
|
addDirtyRegion(component, r.x, r.y, r.width, r.height);
|
|
}
|
|
|
|
/**
|
|
* Remove all dirty regions for a specified component
|
|
*
|
|
* @param component The component to mark as clean
|
|
*
|
|
* @see #dirtyComponents
|
|
* @see #addDirtyRegion
|
|
* @see #getDirtyRegion
|
|
* @see #isCompletelyDirty
|
|
* @see #markCompletelyDirty
|
|
*/
|
|
public void markCompletelyClean(JComponent component)
|
|
{
|
|
dirtyComponents.remove(component);
|
|
}
|
|
|
|
/**
|
|
* Return <code>true</code> if the specified component is completely
|
|
* contained within its dirty region, otherwise <code>false</code>
|
|
*
|
|
* @param component The component to check for complete dirtyness
|
|
*
|
|
* @return Whether the component is completely dirty
|
|
*
|
|
* @see #dirtyComponents
|
|
* @see #addDirtyRegion
|
|
* @see #getDirtyRegion
|
|
* @see #isCompletelyDirty
|
|
* @see #markCompletelyClean
|
|
*/
|
|
public boolean isCompletelyDirty(JComponent component)
|
|
{
|
|
Rectangle dirty = (Rectangle) dirtyComponents.get(component);
|
|
if (dirty == null)
|
|
return false;
|
|
Rectangle r = component.getBounds();
|
|
if (r == null)
|
|
return true;
|
|
return dirty.contains(r);
|
|
}
|
|
|
|
/**
|
|
* Validate all components which have been marked invalid in the {@link
|
|
* #invalidComponents} vector.
|
|
*/
|
|
public void validateInvalidComponents()
|
|
{
|
|
for (Enumeration e = invalidComponents.elements(); e.hasMoreElements(); )
|
|
{
|
|
JComponent comp = (JComponent) e.nextElement();
|
|
if (! (comp.isVisible() && comp.isShowing()))
|
|
continue;
|
|
comp.validate();
|
|
}
|
|
invalidComponents.clear();
|
|
}
|
|
|
|
/**
|
|
* Repaint all regions of all components which have been marked dirty in
|
|
* the {@link #dirtyComponents} table.
|
|
*/
|
|
public void paintDirtyRegions()
|
|
{
|
|
// step 1: pull out roots and calculate spanning damage
|
|
|
|
HashMap roots = new HashMap();
|
|
for (Enumeration e = dirtyComponents.keys(); e.hasMoreElements(); )
|
|
{
|
|
JComponent comp = (JComponent) e.nextElement();
|
|
if (! (comp.isVisible() && comp.isShowing()))
|
|
continue;
|
|
Rectangle damaged = getDirtyRegion(comp);
|
|
if (damaged.width == 0 || damaged.height == 0)
|
|
continue;
|
|
JRootPane root = comp.getRootPane();
|
|
Rectangle rootDamage = SwingUtilities.convertRectangle(comp, damaged, root);
|
|
if (! roots.containsKey(root))
|
|
{
|
|
roots.put(root, rootDamage);
|
|
}
|
|
else
|
|
{
|
|
roots.put(root, ((Rectangle)roots.get(root)).union(rootDamage));
|
|
}
|
|
}
|
|
dirtyComponents.clear();
|
|
|
|
// step 2: paint those roots
|
|
Iterator i = roots.iterator(AbstractMap.ENTRIES);
|
|
while(i.hasNext())
|
|
{
|
|
AbstractMap.BasicMapEntry ent = (AbstractMap.BasicMapEntry) i.next();
|
|
JRootPane root = (JRootPane) ent.getKey();
|
|
Rectangle rect = (Rectangle) ent.getValue();
|
|
root.paintImmediately(rect);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get an offscreen buffer for painting a component's image. This image
|
|
* may be smaller than the proposed dimensions, depending on the value of
|
|
* the {@link #doubleBufferMaximumSize} property.
|
|
*
|
|
* @param component The component to return an offscreen buffer for
|
|
* @param proposedWidth The proposed width of the offscreen buffer
|
|
* @param proposedHeight The proposed height of the offscreen buffer
|
|
*
|
|
* @return A shared offscreen buffer for painting
|
|
*
|
|
* @see #doubleBuffer
|
|
*/
|
|
public Image getOffscreenBuffer(Component component, int proposedWidth,
|
|
int proposedHeight)
|
|
{
|
|
if (doubleBuffer == null
|
|
|| (((doubleBuffer.getWidth(null) < proposedWidth)
|
|
|| (doubleBuffer.getHeight(null) < proposedHeight))
|
|
&& (proposedWidth < doubleBufferMaximumSize.width)
|
|
&& (proposedHeight < doubleBufferMaximumSize.height)))
|
|
{
|
|
doubleBuffer = component.createImage(proposedWidth, proposedHeight);
|
|
}
|
|
return doubleBuffer;
|
|
}
|
|
|
|
/**
|
|
* Get the value of the {@link #doubleBufferMaximumSize} property.
|
|
*
|
|
* @return The current value of the property
|
|
*
|
|
* @see #setDoubleBufferMaximumSize
|
|
*/
|
|
public Dimension getDoubleBufferMaximumSize()
|
|
{
|
|
return doubleBufferMaximumSize;
|
|
}
|
|
|
|
/**
|
|
* Set the value of the {@link #doubleBufferMaximumSize} property.
|
|
*
|
|
* @param size The new value of the property
|
|
*
|
|
* @see #getDoubleBufferMaximumSize
|
|
*/
|
|
public void setDoubleBufferMaximumSize(Dimension size)
|
|
{
|
|
doubleBufferMaximumSize = size;
|
|
}
|
|
|
|
/**
|
|
* Set the value of the {@link #doubleBufferingEnabled} property.
|
|
*
|
|
* @param buffer The new value of the property
|
|
*
|
|
* @see #getDoubleBufferingEnabled
|
|
*/
|
|
public void setDoubleBufferingEnabled(boolean buffer)
|
|
{
|
|
doubleBufferingEnabled = buffer;
|
|
}
|
|
|
|
/**
|
|
* Get the value of the {@link #doubleBufferingEnabled} property.
|
|
*
|
|
* @return The current value of the property
|
|
*
|
|
* @see #setDoubleBufferingEnabled
|
|
*/
|
|
public boolean isDoubleBufferingEnabled()
|
|
{
|
|
return doubleBufferingEnabled;
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
return "RepaintManager";
|
|
}
|
|
}
|