
2004-06-17 Michael Koch <konqueror@gmx.de> * javax/swing/JToolBar.java (name): Removed. (JToolBar): Use Component.setName(String) instead of doing it all alone. * javax/swing/Timer.java (queueEvent): Added missing modifier. 2004-06-17 Olga Rodimina <rodimina@redhat.coom> * Makefile.am: Added new file. * Makefile.in: Re-generate. * javax/swing/JMenu.java: (insertSeparator): Implemented. * javax/swing/JPopupMenu.java: (JPopupMenu.Separator): Implemented. * javax/swing/MenuSelectionManager.java: (processMouseEvent): Use java.awt.Component for event source instead of javax.swing.JComponent. * javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: New File. Implemented. 2004-06-16 David Jee <djee@redhat.com> * java/awt/GridBagLayout.java (GetLayoutInfo): Adjust cell sizes iff parent size is not zero. Make sure pos_x and pos_y are never negative. 2004-04-16 Andrew Overholt <overholt@redhat.com> * Makefile.am: Add new file. * Makefile.in: Re-generate. * javax/swing/JToolBar.java Partially implemented. * javax/swing/plaf/basic/BasicToolBarUI.java New file. Partially implemented. 2004-06-16 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (setComposite): Accept AlphaComposite arguments. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (createBufferedImage): Add new overloads. * gnu/java/awt/peer/gtk/GtkToolkit.java (createImage): Use GdkPixbufDecoder.createBufferedImage when useGraphics2D() is true. (getImage): Delegate to createImage. * javax/swing/JList.java (isSelectionEmpty): (getFirstVisibleIndex): (getLastVisibleIndex): (setSelectedValue): (ensureIndexIsVisible): New methods. * javax/swing/Timer.java: Reimplement. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (AbstracElement): Made public, implements java.io.Serializable. (AttributeContext): Made public. (BranchElement): Likewise. (Content): Likewise. (DefaultDocumentEvent): Made public, extends javax.swing.undo.CompoundEdit. (ElementEdit): Made public, extends javax.swing.undo.AbstractUndoableEdit. (LeafElement): Made public. (LeafElement.LeafElement): Made public. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/JTextComponent.java: Totally reworked. Removed many methods (that were obviously never be intended to get included hi this class. Added some methods too. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/PlainDocument.java (serialVersionUID): New constant. (lineLimitAttribute): Likewise. (tabSizeAttribute): Likewise. (tabSize): New field. (PlainDocument): Made public. (PlainDocument): New constructor. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (insertString): Throws BadLocationException. * javax/swing/text/Document.java (insertString): Likewise. * javax/swing/text/JTextComponent.java: Javadocs and comments cleaned up. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/event/UndoableEditListener.java: Reformatted. * javax/swing/text/AbstractDocument.java (AbstractDocument): Implements java.io.Serializable. (doc_list): Removed. (undo_list): Removed. (AbstractElement.serialVerionUID): New field. (BranchElement.serialVerionUID): Likewise. (DefaultDocumentEvent.serialVerionUID): Likewise. (ElementEdit.serialVerionUID): Likewise. (LeafElement.serialVerionUID): Likewise. (serialVerionUID): Likewise. (BAD_LOCATION): New constant. (BidiElementName): Likewise. (ContentElementName): Likewise. (ParagraphElementName): Likewise. (SectionElementName): Likewise. (ElementNameAttribute): Likewise. (AbstractDocument): Made protected. (AbstractDocument): New construtor. (listenerList): New field. (fireChangedUpdate): Implemented. (fireInsertUpdate): Likewise. (fireRemoveUpdate): Likewise. (fireUndoableEditUpdate): Likewise. (getListeners): Likewise. (addDocumentListener): Likewise. (removeDocumentListener): Likewise. (addUndoableEditListener): Likewise. (removeUndoableEditListener): Likewise. (getDocumentListeners): New method. (getUndoableEditListeners): Likewise. (getAsynchronousLoadPriority): Made public. (getBidiRootElement): Likewise. (setAsynchronousLoadPriority): Likewise. (setDocumentProperties): Likewise. * javax/swing/text/BadLocationException.java (serialVerionUID): New field. * javax/swing/text/DefaultCaret.java (changeEvent): New field. (listenerList): Likewise. (changes): Removed. (addChangeListener): Reimplemented. (removeChangeListener): Likewise. (getListeners): New method. (getChangeListeners): Likwise. (getComponent): Likewise. * javax/swing/text/GapContent.java (GapContent): Implements java.io.Serializable. (serialVerionUID): New field. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java (treeModel): New field. (JTree): New constructors, one existing one made public. (createTreeModel): New method. (addTreeExpansionListener): Likewise. (removeTreeExpansionListener): Likewise. (getTreeExpansionListeners): Likewise. (fireTreeCollapsed): Likewise. (fireTreeExpanded): Likewise. (addTreeSelectionListener): Likewise. (removeTreeSelectionListener): Likewise. (getTreeSelectionListeners): Likewise. (fireValueChanged): Likewise. (addTreeWillExpandListener): Likewise. (removeTreeWillExpandListener): Likewise. (getTreeWillExpandListeners): Likewise. (fireTreeWillCollapse): Likewise. (fireTreeWillExpand): Likewise. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/JTree.java: Reformatted. 2004-06-16 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java: New file. * javax/swing/JTextField.java (actions): Removed. (notifyAction): New constant. (columns): New field. (JTextField): New constructors. (createDefaultModel): New method. (addActionListener): Reimplmemented. (removeActionListener): Reimplemented. (getActionListeners): New method. (fireActionPerformed): New method. (getColumns): New method. (setColumne): New method. * javax/swing/text/JTextComponent.java (AccessibleJTextComponent.serialVersionUID): New field. (serialVersionUID): Likewise. (DEFAULT_KEYMAP): Likewise. (FOCUS_ACCELERATOR_KEY): Likewise. (doc): Made private. (icon_gap): Likewise. (icon): Likewise. (align): Likewise. (JTextComponent): Some constructors removed. (getScrollableTracksViewportHeight): New method. (getScrollableTracksViewportWidth): Likewise. * Makefile.am: Added javax/swing/JTextArea.java. * Makefile.in: Regenerated. 2004-06-15 Graydon Hoare <graydon@redhat.com> * javax/swing/ImageIcon.java (ImageIcon): New constructor. * javax/swing/JFrame.java (defaultLookAndFeelDecorated): New property. * javax/swing/JViewport.java (getExtentSize): Return size rather than preferred size. (toViewCoordinates): New methods. (getViewSize): Return size rather than preferred size. (setViewSize): Note view size as set. * javax/swing/ViewportLayout.java (layoutContainer): Reimplement. * javax/swing/plaf/basic/BasicScrollBarUI.java (getPreferredSize): Don't redo layout. * javax/swing/plaf/basic/BasicViewportUI.java (paint): Translate image properly and eat exceptions. 2004-06-15 Kim Ho <kho@redhat.com> * javax/swing/JTabbedPane.java (setComponent): Remove old component and add new component. (setSelectedIndex): Don't operate on the components if they're null. Don't set index on the model if the index is the same. (insertTab): Don't add or hide the component if it's null. Repaint the container. * javax/swing/plaf/basic/BasicLookAndFeel.java Change colors for TabbedPane. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (mousePressed): Re-layout and paint the component. (layoutContainer): Don't set location on the view. (ScrollingViewport::paint): Remove. 2004-06-14 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetDispatchKeyEvent): Change warning message to comment. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Wrap baseline y value in PANGO_PIXELS macro, rather than simply dividing by PANGO_SCALE. Call gdk_flush before leaving GDK critical region. (drawLine): Call gdk_flush before leaving GDK critical region. (fillRect): Likewise. (drawRect): Likewise. (copyArea): Likewise. (copyPixmap): Likewise. (clearRect): Likewise. (drawArc): Likewise. (drawPolyline): Likewise. (drawPolygon): Likewise. (fillPolygon): Likewise. (fillArc): Likewise. (drawOval): Likewise. (fillOval): Likewise. * gnu/java/awt/peer/gtk/GdkFontMetrics.java (initState): Add style parameter. (GdkFontMetrics): Add style argument to initState call. (stringWidth(String,int,int,String)): Add style parameter. (stringWidth(String)): Add style argument to stringWidth call. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c (initState): Set pango font style and weight based on AWT style parameter. Pass default GTK language to pango_context_get_metrics. Use PANGO_PIXELS macro rather than simply dividing by PANGO_SCALE. (stringWidth): Set pango font style and weight based on AWT style parameter. * java/awt/Button.java (next_button_number): New field. (paramString): Change output. (generateName): New method. (getUniqueLong): New method. 2004-06-14 Kim Ho <kho@redhat.com> * javax/swing/JTabbedPane.java: (setComponentAt): Set the component, not the enabled status. * javax/swing/plaf/basic/BasicDesktopIconUI.java (actionPerformed): Let deiconize catch exception. 2004-06-14 Olga Rodimina <rodimina@redhat.com> * javax/swing/JPopupMenu.java: (setVisible): Corrected location of a heavyweight popup menu. 2004-06-14 Olga Rodimina <rodimina@redhat.com> * javax/swing/MenuSelectionManager.java: Ran through jalopy to fix formatting style. 2004-06-14 Olga Rodimina <rodimina@redhat.com> * javax/swing/JLayeredPane.java: (remove): Revalidate and repaint layered pane after the component was removed. javax/swing/JMenu.java: (setVisible): Display popup menu at the user location, if one was set by the user. (setMenuLocation): Reimplemented. Fixed javadoc. * javax/swing/JMenuBar.java: Added javadoc. (BORDER_PAINTED_CHANGED_PROPERTY): New Property. (MODEL_CHANGED_PROPERTY): New Property. (isSelected): Implemented. (setBorderPainted): Fire PropertyChangeEvent if paintBorder property changes. (setSelected): Implemented. (setSelectionModel): Implemented. * javax/swing/JPopupMenu.java: Added Javadoc (pack): Implemented. (setVisible): Reimplemented. (show): Fixed location. (JPopupMenu.LigthWeightPopup): Reimplemented to use Container instead of JPanel. * javax/swing/MenuSelectionManager.java: Added Javadocs. (clearSelectedPath): Reimplemented to clear selectedPath in reverse order. (processMouseEvent): Reimplemented. (setSelectedPath): Fire stateChange event indicating that selected menu path has changed. (getPath): Change to use ArrayList instead of Vector. * javax/swing/plaf/basic/BasicMenuBarUI.java: (installUI): call installKeyboardActions(). (uninstallUI): call uninstallKeyboardActions(). 2004-06-13 Michael Koch <konqueror@gmx.de> * javax/swing/text/DefaultCaret.java, javax/swing/text/BadLocationException.java: Reformatted. 2004-06-12 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (DEFAULT_ROWS, DEFAULT_COLS): New variables. (create): Don't allow 0 rows or 0 columns. Instead, set the values to DEFAULT_ROWS or DEFAULT_COLS. (getMinimumSize): Likewise. (getPreferredSize): Likewise. (minimumSize): Likewise. (preferredSize): Likewise. (create): Set peer's editable state. * java/awt/TextArea.java (TextArea()): Set rows and columns to zero. Update javadocs. (TextArea(String)): Likewise. (TextArea(int,int)): Fix javadocs. (TextArea(String,int,int,int)): Only throw exception if one of rows or columns is zero. Fix javadocs. 2004-06-11 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/AWTEvent.java (toString): Handle MenuComponents in addition to Components. * java/awt/MenuItem.java (dispatchEventImpl): If the event wasn't consumed by normal processing, send it to the parent menu. * gnu/java/awt/peer/gtk/GtkImagePainter.java (setPixels(int,int,int,int,ColorModel,int[],int,int)): Remove translation. 2004-06-11 David Jee <djee@redhat.com> * java/awt/MediaTracker.java (addImage(Image,int)): Call imageUpdate() to udpate image status. (addImage(Image,int,int,int)): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java, javax/swing/text/Document.java, javax/swing/text/GapContent.java, javax/swing/text/JTextComponent.java, javax/swing/text/PlainDocument.java: Reformatted. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/JRootPane.java (AccessibleJRootPane.serialVersionUID): New field. (AccessibleJRootPane.AccessibleJRootPane): New constructor. (AccessibleJRootPane.getAccessibleRole): New method. (RootLayout): Implements Serializable. (RootLayout.serialVersionUID): New field. (RootLayout.RootLayout): New constructor. (setJMenuBar): Made public. (getJMenuBar): Likewise. (JRootPane): Likewise. (createContentPane): Likewise. (createGlassPane): Likewise. (createLayeredPane): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/SwingUtilities.java (isLeftMouseButton): Fixed javadoc. (isMiddleMouseButton): Likewise. (isRightMouseButton): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/JScrollPane.java (serialVersionUID): New field. (columnHeader): Made protected. (rowHeader): Likewise. (lowerLeft): Likewise. (lowerRight): Likewise. (upperLeft): Likewise. (upperRight): Likewise. (horizontalScrollBar): Likewise. (horizontalScrollBarPolicy): Likewise. (verticalScrollBar): Likewise. (verticalScrollBarPolicy): Likewise. (viewport): Likewise. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/LookAndFeel.java: Fixed javadocs. 2004-06-11 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java: Fixed javadocs. (JEditorPane): Removed redundant call to to this(). (fireHyperlinkUpdate): Implemented. 2004-06-10 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenu.java: Fixed file name in the file comment. 2004-06-10 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenu.java: Added javadoc. (JMenu): Added MenuChangeListener to listen to ChangeEvents occuring in menu's model. (insert): Throw IllegalArgumentException if index is less than 0 (setSelected): Reimplement. (setPopupMenuVisible): Call menu's model isEnabled() (setDelay): Throw IllegalArgumentException if given amount of delay is less than 0. (createActionComponent): Implemented. (createActionChangeListener): Implemented. (addSeparator): Implemented. (getItem): Throw IllegalArgumentException if index is less than 0. (getItemCount): Implemented. (fireMenuSelected): Changed to use menuEvent. (fireMenuDeselected): Likewise. (fireMenuCanceled): Likewise. (setAccelerator): Changed to throw an error if this method is used. (doClick): Implemented. (JMenu.ActionChangedListener): New inner class to handle PropertyChangeEvents occuring in the actions associated with menu. * javax/swing/plaf/basic/BasicMenuUI.java: Added javadoc. (BasicMenuUI): Added PropertyChangeListener to the menu. (createChangeListener): Implemented. (createMenuDragMouseListener): Likewise. (createMenuKeyListener): Likewise. (createPropertyChangeListener): Likewise. (uninstallListeners): Likewise. (BasicMenuUI.MouseInputHandler): Reimplemented. (BasicMenuUI.PropertyChangeHandler): New class. Not implemented yet. (BasicMenuUI.ChangeHandler): Likewise. (BasicMenuUI.MenuDragMouseHandler): Likewise. (BasicMenuUI.MenuKeyHandler): Likewise. 2004-06-10 David Jee <djee@redhat.com> * java/awt/MediaTracker.java (imageUpdate): Only do notifyAll() if the image is complete. 2004-06-10 Olga Rodimina <rodimina@redhat.com> * javax/swing/JApplet.java: (getJMenuBar): Made public. (setJMenuBar): Likewise. * javax/swing/JFrame.java: (getJMenuBar): Made public. (setJMenuBar): Likewise. * javax/swing/JWindow.java: (getJMenuBar): Removed. (setJMenuBar): Removed. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java (createEditorKitForContentType): Fixed visibility. (fireHyperlinkUpdate): Likewise. (getContentType): Likewise. (getEditorKit): Likewise. (getEditorKitForContentType): Likewise. (getPage): Likewise. (read): Likewise. (registerEditorKitForContentTyoe): Likewise. (replaceSelection): Likewise. (setContentType): Likewise. (setEditorKit): Likewise. (setPage): Likewise. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/Timer.java (Timer): New constructor. * javax/swing/plaf/basic/BasicProgressBarUI.java (animationTimer): Don't initialize at construction. (startAnimationTimer): Added since tag. (stopAnimationTimer): Likewise. (installUI): Use new Timer constructor. * javax/swing/plaf/basic/BasicScrollBarUI.java (installUI): Likewise. * javax/swing/plaf/basic/BasicSliderUI.java (installUI): Likewise. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/ButtonGroup.java (serialVersionUID): Made private. (buttons): Renamed from v, added javadoc. (sel): Added javadoc. (ButtonGroup): Likewise. (add): Likewise. (remove): Likewise. (getElements): Likewise. (getSelection): Likewise. (setSelected): Likewise. (isSelected): Likewise. (getButtonCount): Likewise. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/ButtonGroup.java, javax/swing/ImageIcon.java, javax/swing/JEditorPane.java, javax/swing/JRootPane.java, javax/swing/JTextField.java, javax/swing/LookAndFeel.java, javax/swing/plaf/basic/BasicTextUI.java: Reindented. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/text/Style.java: Added javadocs. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (fireVetoableChange): Removed redundant cast. * javax/swing/JLabel.java (getDisabledIcon): Save icon for next call. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/KeyStroke.java (getKeyStroke(char,boolean)): Marked deprecated. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultCellEditor.java, javax/swing/GrayFilter.java, javax/swing/event/DocumentEvent.java, javax/swing/text/JTextComponent.java, javax/swing/text/MutableAttributeSet.java: Reindented. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/BorderUIResource.java: Added serialVersionUID all over. 2004-06-10 Sascha Brawer <brawer@dandelis.ch> * javax/swing/undo/UndoManager.java: Re-written from scratch. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/table/DefaultTableCellRenderer.java (noFocusBorder): Initialize directly. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicArrowButton.java (setDirection): Use method argument. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/BorderUIResource.java, javax/swing/plaf/ComponentUI.java, javax/swing/undo/CompoundEdit.java, javax/swing/undo/StateEdit.java: Fixed javadocs all over. 2004-06-10 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultButtonModel.java (ARMED): Made public final, fixed value. (ENABLED): Likewise. (PRESSED): Likewise. (ROLLOVER): Likewise. (SELECTED): Likewise. (stateMask): Initialize directly. (listenerList): Likewise. (mnemonic): Likewise. (fireStateChanged): Removed argument, use changeEvent as event. All places where this method is called are fixed too. (getActionCommant): Fixed javadoc. (setGroup): Fixed javadoc. (getGroup): New method. 2004-06-09 Olga Rodimina <rodimina@redhat.com> * javax/swing/AbstractButton.java (AbstractButton): Use init() to initialize the button. (init): New Method. Initializes AbstractButton. * javax/swing/JMenuItem.java: Documented. (JMenuItem): Reimplemented. (init): Implemented. (setEnabled): Changed to call super.setEnabled() (processMouseEvent): Reimplemented. (fireMenuKeyPressed): Implemented. (fireMenuKeyReleased): Implemented. (fireMenuKeyTyped): Implemented. (menuSelectionChanged): disarm the model if the menu item was deselected. * javax/swing/plaf/basic/BasicMenuItemUI.java:Documented. (getPath): Change to use ArrayList instead of Vector. (getPreferredSize): Renamed variable. (paintMenuItem): Paint margin area of menu item. (MouseInputHandler.mouseEntered): Set selection in MenuSelectionManager. (MouseInputHandler.mouseReleased): Check if mouse was pressed inside menu item's bounds before clearing the selection. 2004-06-09 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkTextComponentPeer.java (GtkTextComponentPeer): Set caret position to 0. * java/awt/TextComponent.java (setText): Set caret position to 0. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter): Handle GtkScrolledWindow separately. Fix signal handler blocking. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Make cursor visible. 2004-06-09 Kim Ho <kho@redhat.com> * Makefile.am: New files * Makefile.in: Regenerated * java/awt/Container.java (getComponentAt): Removed. * javax/swing/AbstractAction.java (ENABLED_PROPERTY): New property. (putValue): Fire PropertyChangeEvents. (setEnabled): ditto. (firePropertyChange): Javadoc and implement convenience method. * javax/swing/AbstractButton.java (setAction): Don't create PropertyChangeListener if new Action is null. (setIcon): Don't set icon till after comparing it. (configurePropertiesFromAction): Check mnemonic key before calling intValue(). (createActionPropertyChangeListener): Check properties rather than bulk change. * javax/swing/DefaultDesktopManager.java: Implement. * javax/swing/DesktopManager.java: Jalopy and javadoc. * javax/swing/JComponent.java (fireVetoableChange): Implement. (paintImmediately): Use root component. * javax/swing/JDesktopPane.java: Implement * javax/swing/JInternalFrame.java: Implement * javax/swing/JLabel.java (getDisabledIcon): Return grayscaled icon if no disabled icon specified. * javax/swing/JMenuBar.java (getComponentAtIndex): Use getComponent * javax/swing/JOptionPane.java (getDesktopPaneForComponent): Use SwingUtilities' getAncestorOfClass (getFrameForComponent): ditto. * javax/swing/JSplitPane.java (remove): Use getComponent. * javax/swing/SwingUtilities.java (convertPoint): Implement. * javax/swing/plaf/basic/BasicButtonUI.java (paintButtonNormal): Check opaqueness before filling background. * javax/swing/plaf/basic/BasicDesktopIconUI.java: Implement * javax/swing/plaf/basic/BasicDesktopPaneUI.java: Implement. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java: Implement. * javax/swing/plaf/basic/BasicInternalFrameUI.java: Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change InternalFrame and Desktop colors. 2004-06-09 David Jee <djee@redhat.com> * java/awt/Container.java (remove): Do not set component to invisible. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultMutableTreeNode.java (getLeafCount): Renamed enum to e. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicSplitPaneDivider.java (positionForMouseEvent): Removed redundant semicolon. (continueDrag): Use method arguments. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/border/TitledBorder.java, javax/swing/filechooser/FileSystemView.java, javax/swing/plaf/basic/BasicButtonListener.java, javax/swing/plaf/basic/BasicGraphicsUtils.java, javax/swing/plaf/basic/BasicLabelUI.java, javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java, javax/swing/plaf/basic/BasicScrollBarUI.java, javax/swing/plaf/basic/BasicScrollPaneUI.java, javax/swing/plaf/basic/BasicSliderUI.java, javax/swing/plaf/basic/BasicTabbedPaneUI.java, javax/swing/plaf/basic/BasicToggleButtonUI.java, javax/swing/table/JTableHeader.java, javax/swing/text/AbstractDocument.java, javax/swing/text/DefaultCaret.java, javax/swing/text/StyledEditorKit.java, javax/swing/tree/DefaultTreeCellEditor.java: Reworked import statements. 2004-06-08 Graydon Hoare <graydon@redhat.com> * javax/swing/Box.java: Temporarily comment out code broken due to visibility bug. 2004-06-09 Michael Koch <konqueror@gmx.de> * javax/swing/ImageIcon.java (ImageIcon): Added missing constructor. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/JToggleButton.java (JToggleButton): New constructor. (getAccessibleContext): Moved documentation into javadoc. (getUIClassID): Likewise. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (getDisabledIcon): Create disabled icon if none exists yet. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicLookAndFeel.java (initClassDefaults): Added FormattedTextFieldUI. (loadResourceBundle): Renamed enum to e. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicButtonUI.java (paintIcon): Simplified. (paintText): Paint disabled button correctly. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (createToolTip): Use official JToolTip API. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/JToolTip.java (JToolTip): No arguments in API. (setTipText): New method. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/SwingUtilities.java (isLeftMouseButton): New method. (isMiddleMouseButton): New method. (isRightMouseButton): New method. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java, javax/swing/CellRendererPane.java, javax/swing/JCheckBoxMenuItem.java, javax/swing/JColorChooser.java, javax/swing/JComboBox.java, javax/swing/JComponent.java, javax/swing/JDesktopPane.java, javax/swing/JFileChooser.java, javax/swing/JMenu.java, javax/swing/JMenuItem.java, javax/swing/JOptionPane.java, javax/swing/JPasswordField.java, javax/swing/JPopupMenu.java, javax/swing/JProgressBar.java, javax/swing/JRadioButtonMenuItem.java, javax/swing/JScrollBar.java, javax/swing/JSeparator.java, javax/swing/JSlider.java, javax/swing/JSplitPane.java, javax/swing/JTabbedPane.java, javax/swing/JTextField.java, javax/swing/JToolBar.java, javax/swing/text/JTextComponent.java: Fixed all constructors of accessibility classes. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/ScrollPaneLayout.java: Renamed all memeber variables all over. 2004-06-08 Michael Koch <konqueror@gmx.de> * javax/swing/Box.java (AccessibleBoxFiller): Extends AccessibleAWTComponent. (AccessibleBoxFiller.serialVersionUID): New member variable. * javax/swing/DefaultButtonModel.java (stateMask): Made protected. (listenerList): Likewise. (changeEvent): Likewise. (group): Likewise. (mnemonic): Likewise. (actionCommand): Likewise. (getListeners): New method. (getActionListeners): New method. (getItemListeners): New method. (getChangeListeners): New method. (fireItemStateChanged): Simplified. (fireActionPerformed): Simplified. (fireStateChanged): Simplified. * javax/swing/JFrame.java (JFrame): Implements WindowContants. (HIDE_ON_CLOSE): Removed. (EXIT_ON_CLOSE): Removed. (DISPOSE_ON_CLOSE): Removed. (DO_NOTHING_ON_CLOSE): Removed. (processWindowEvent): Exit with code 0. (setDefaultCloseOperation): Do security check before setting value. * javax/swing/JOptionPane.java (message): Initialize only in constructor. * javax/swing/JToolTip.java: Removed unused imports. * javax/swing/JViewport.java (serialVersionUID): New member variable. (SIMPLE_SCROLL_MODE): Made final, fixed value. (BLIT_SCROLL_MODE): Likewise. (BACKINGSTORE_SCROLL_MODE): Likewise. (scrollUnderway): Made protected. (isViewSizeSet): Likewise. * javax/swing/ListModel.java: Fixed javadoc. * javax/swing/Popup.java: Likewise. * javax/swing/RepaintManager.java (paintDirtyRegions): Don't use internal classes of java.util.AbstractMap. * javax/swing/ScrollPaneConstants.java: Reindented. * javax/swing/ScrollPaneLayout.java (viewport): Made protected. (verticalScrollBar): Made protected, renamed to vsb. (horizontalScrollBar): Made protected, renamed to hsb. (rowHeader): Made protected, renamed to rowHead. (columnHeader): Made protected, renamed to colHead. (lowerLeft): Made protected. (lowerRight): Made protected. (upperLeft): Made protected. (upperRight): Made protected. (verticalScrollBarPolicy): Made protected, renamed to vsbPolicy. (horizontalScrollBarPolicy): Made protected, renamed to hsbPolicy. 2004-06-07 Bernd Schmidt <bernds@btinternet.com> * java/awt/MediaTracker.java (imageUpdate): Only set status to LOADING if flags has SOMEBITS set. 2004-06-07 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java: Reorganized imports. * javax/swing/ActionMap.java: Likewise. * javax/swing/DefaultButtonModel.java: Likewise. * javax/swing/DefaultListModel.java: Likewise. * javax/swing/ImageIcon.java: Likewise. (serialVersionUID): New member variable. * javax/swing/JComboBox.java: Reorganized imports. * javax/swing/JComponent.java: Likewise. (ui): Made protected. (listenerList): Made protected. (TOOL_TIP_TEXT_KEY): New constant. (scrollRectToVisible): Removed redundant null check. * javax/swing/JFrame.java: Reorganized imports. * javax/swing/JInternalFrame.java: Reorganized imports. * javax/swing/JProgressBar.java: Likewise. * javax/swing/JRootPane.java: Likewise. * javax/swing/JScrollBar.java: Likewise. * javax/swing/JSeparator.java: Likewise. * javax/swing/JSlider.java: Likewise. * javax/swing/JTabbedPane.java: Likewise. * javax/swing/JTextField.java: Likewise. * javax/swing/JToolBar.java: Likewise. * javax/swing/JTree.java: Likewise. * javax/swing/JViewport.java: Likewise. * javax/swing/JWindow.java: Likewise. * javax/swing/KeyStroke.java: Likewise. * javax/swing/LookAndFeel.java: Likewise. * javax/swing/MenuSelectionManager.java: Likewise. * javax/swing/SwingUtilities.java: Likewise. * javax/swing/Timer.java: Likewise. * javax/swing/DefaultBoundedRangeModel.java: Fixed javadoc. * javax/swing/JList.java (HORIZONTAL_WRAP): Made final, fixed value. (VERTICAL): Likewise. (VERTICAL_WRAP): Likewise. 2004-06-07 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (serialVersionUID): New member variable. (AccessibleAbstractButton.serialVersionUID): Likewise. (AbstractButton): Made public. * javax/swing/Box.java (AccessibleBox.serialVersionUID): New member variable. (Filler.serialVersionUID): Likewise. * javax/swing/DefaultListSelectionModel.java (serialVersionUID): Likewise. * javax/swing/JApplet.java (serialVersionUID): Likewise. * javax/swing/JCheckBox.java (serialVersionUID): Likewise. * javax/swing/JCheckBoxMenuItem.java (serialVersionUID): Likewise. (AccessibleJCheckBoxMenuItem.serialVersionUID): Likewise. * javax/swing/JColorChooser.java (serialVersionUID): Likewise. (AccessibleJColorChooser.serialVersionUID): Likewise. * javax/swing/JComponent.java (serialVersionUID): Made private. (AccessibleJComponent.serialVersionUID): New member variable. * javax/swing/JDesktopPane.java (serialVersionUID): Likewise. * javax/swing/JDialog.java (serialVersionUID): Likewise. * javax/swing/JFormattedTextField.java (serialVersionUID): Fixed value. * javax/swing/JFrame.java (serialVersionUID): New member variable. (getDefaultCloseOpertation): Made public. * javax/swing/JLayeredPane.java (serialVersionUID): Likewise. (LAYER_PROPERTY): Made final, fixed value. (JLayeredPane): Made public. * javax/swing/JMenu.java (AccessibleJMenu.serialVersionUID): New member variable. (WinListener.serialVersionUID): Likewise. * javax/swing/JMenuBar.java (serialVersionUID): Likewise. (getComponentAtIndex): Added @deprecated tag. * javax/swing/JMenuItem.java (serialVersionUID): New member variable. (AccessibleJMenuItem.serialVersionUID): Likewise. * javax/swing/JOptionPane.java (serialVersionUID): Likewise. (AccessibleJOptionPane.serialVersionUID): Likewise. * javax/swing/JPopupMenu.java (serialVersionUID): Likewise. (AccessibleJPopupMenu.serialVersionUID): Likewise. (getPopupMenuListeners): New method. (getComponentAtIndex): Added @deprecated tag. * javax/swing/JProgressBar.java (serialVersionUID): New member variable. (AccessibleJProgressBar.serialVersionUID): Likewise. * javax/swing/JRadioButton.java (serialVersionUID): Likewise. * javax/swing/JRadioButtonMenuItem.java (serialVersionUID): Likewise. (AccessibleJRadioButtonMenuItem.serialVersionUID): Likewise. * javax/swing/JScrollBar.java (serialVersionUID): Likewise. (AccessibleJScrollBar.serialVersionUID): Likewise. * javax/swing/JSeparator.java (serialVersionUID): Likewise. (AccessibleJSeparator.serialVersionUID): Likewise. * javax/swing/JSlider.java: Fixed javadocs. (AccessibleJSlider.serialVersionUID): New member variable. * javax/swing/JSplitPane.java: Added copyright statement. (serialVersionUID): New member variable. (AccessibleJSplitPane.serialVersionUID): Likewise. * javax/swing/JTabbedPane.java (serialVersionUID): Likewise. (AccessibleJTabbedPane.serialVersionUID): Likewise. (ModelListener.serialVersionUID): Likewise. (ModelListener.ModelListener): New constructor. (SCROLL_TAB_LAYOUT): Made public final, fixed value. (WRAP_TAB_LAYOUT): Likewise. * javax/swing/JTable.java (serialVersionUID): New member variable. * javax/swing/JToggleButton.java (serialVersionUID): Likewise. (ToggleButtonModel): Made static. (ToggleButtonModel.serialVersionUID): New member variable. * javax/swing/JToolTip.java (serialVersionUID): Likewise. * javax/swing/JTree.java (serialVersionUID): Likewise. * javax/swing/JWindow.java (serialVersionUID): Likewise. * javax/swing/Timer.java (serialVersionUID): Likewise. 2004-06-06 Michael Koch <konqueror@gmx.de> * javax/swing/SwingConstants.java (NEXT): New constant. (PREVIOUS): Likewise. * javax/swing/UIManager.java (LookAndFeel): Made public. (LookAndFeel.getClassName): Likewise. (LookAndFeel.getName): Likewise. 2004-06-02 Olga Rodimina <rodimina@redhat.com> * javax/swing/JCheckBoxMenuItem.java: Removed CVS tags. * javax/swing/JMenu.java: Likewise. * javax/swing/JMenuBar.java: Likewise. * javax/swing/JMenuItem.java: Likewise. * javax/swing/JPopupMenu.java: Likewise. * javax/swing/JRadioButtonMenuItem.java: Likewise. * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java:Likewise. * javax/swing/plaf/basic/BasicMenuBarUI.java: Likewise. * javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise. * javax/swing/plaf/basic/BasicMenuUI.java: Likewise. * javax/swing/plaf/basic/BasicPopupMenuUI.java: Likewise. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Likewise. 2004-05-31 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicMenuUI.java: (MouseEntered): Do not call getPath() from MenuSelectionManager. Call getPath() from super class instead. 2004-05-31 David Jee <djee@redhat.com> * java/awt/Container.java (remove): Set component visibility to false after removing it. 2004-05-27 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java (getForeground): Return SystemColor if parent is null. (getBackground): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (item_highlighted): New function. (connectSignals): Set item_highlighted as list's select function. * java/applet/Applet.java: Revert changes from 2004-04-29, 2004-03-15 and 2004-03-14. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Divide baseline y coordinate by PANGO_SCALE, not DPI conversion factor. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (create): Set "Dialog" as the default font. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Likewise. * java/awt/Component.java (getFont): Return "Dialog" font by default. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c: Multiply size argument to pango_font_description_set_size by the DPI conversion factor rather than by PANGO_SCALE. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Divide baseline y coordinate by DPI conversion factor rather than by PANGO_SCALE. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_prepared): Fix typo. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (gtkSetFont): Move gtk_bin_get_child inside GDK critical region. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (dpi_conversion_factor): New global variable. (init_dpi_conversion_factor): New function to calculate and track DPI conversion factor. (dpi_changed_cb): New callback. * jni/gtk-peer/gtkpeer.h (dpi_conversion_factor): Declare. 2004-05-27 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (getGraphics): Return a new GdkGraphics instance. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (getGraphics): Call super.getGraphics(). 2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (setNativeBounds): Clamp width and height values to >= 0. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (find_fg_color_widget): Handle GtkOptionMenu specially. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Only post configure events to visible top-level windows. 2004-05-26 David Jee <djee@redhat.com> * java/awt/BorderLayout.java (layoutContainer): Fix size calculations. 2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (window_wm_protocols_filter): Remove function. (create): Remove filter that removes WM_TAKE_FOCUS client messages. From-SVN: r83324
1576 lines
43 KiB
Java
1576 lines
43 KiB
Java
/* GdkGraphics2D.java
|
|
Copyright (C) 2003 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 gnu.java.awt.peer.gtk;
|
|
|
|
import java.awt.*;
|
|
import java.awt.geom.*;
|
|
import java.awt.font.*;
|
|
import java.awt.color.*;
|
|
import java.awt.image.*;
|
|
import java.awt.image.renderable.*;
|
|
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;
|
|
import gnu.java.awt.peer.ClasspathFontPeer;
|
|
import gnu.classpath.Configuration;
|
|
|
|
public class GdkGraphics2D extends Graphics2D
|
|
{
|
|
|
|
//////////////////////////////////////
|
|
////// State Management Methods //////
|
|
//////////////////////////////////////
|
|
|
|
static
|
|
{
|
|
if (Configuration.INIT_LOAD_LIBRARY)
|
|
{
|
|
System.loadLibrary("gtkpeer");
|
|
}
|
|
|
|
if (GtkToolkit.useGraphics2D ())
|
|
initStaticState ();
|
|
}
|
|
native static void initStaticState ();
|
|
private final int native_state = GtkGenericPeer.getUniqueInteger();
|
|
|
|
private Paint paint;
|
|
private Stroke stroke;
|
|
private Color fg;
|
|
private Color bg;
|
|
private Shape clip;
|
|
private AffineTransform transform;
|
|
private GtkComponentPeer component;
|
|
private Font font;
|
|
private RenderingHints hints;
|
|
private BufferedImage bimage;
|
|
|
|
private Stack stateStack;
|
|
|
|
native private int[] initState (GtkComponentPeer component);
|
|
native private void initState (int width, int height);
|
|
native private void copyState (GdkGraphics2D g);
|
|
native public void dispose ();
|
|
native private int[] getImagePixels();
|
|
native private void cairoSurfaceSetFilter(int filter);
|
|
|
|
public void finalize ()
|
|
{
|
|
dispose();
|
|
}
|
|
|
|
public Graphics create ()
|
|
{
|
|
return new GdkGraphics2D (this);
|
|
}
|
|
|
|
public Graphics create (int x, int y, int width, int height)
|
|
{
|
|
return new GdkGraphics2D (width, height);
|
|
}
|
|
|
|
GdkGraphics2D (GdkGraphics2D g)
|
|
{
|
|
paint = g.paint;
|
|
stroke = g.stroke;
|
|
hints = g.hints;
|
|
|
|
if (g.fg.getAlpha() != -1)
|
|
fg = new Color (g.fg.getRed (), g.fg.getGreen (),
|
|
g.fg.getBlue (), g.fg.getAlpha ());
|
|
else
|
|
fg = new Color (g.fg.getRGB ());
|
|
|
|
if (g.bg.getAlpha() != -1)
|
|
bg = new Color(g.bg.getRed (), g.bg.getGreen (),
|
|
g.bg.getBlue (), g.bg.getAlpha ());
|
|
else
|
|
bg = new Color (g.bg.getRGB ());
|
|
|
|
if (g.clip == null)
|
|
clip = null;
|
|
else
|
|
clip = new Rectangle (g.getClipBounds ());
|
|
|
|
if (g.transform == null)
|
|
transform = new AffineTransform ();
|
|
else
|
|
transform = new AffineTransform (g.transform);
|
|
|
|
font = g.font;
|
|
component = g.component;
|
|
copyState (g);
|
|
|
|
setColor (fg);
|
|
setBackground (bg);
|
|
setPaint (paint);
|
|
setStroke (stroke);
|
|
setClip (clip);
|
|
setTransform (transform);
|
|
stateStack = new Stack();
|
|
}
|
|
|
|
GdkGraphics2D (int width, int height)
|
|
{
|
|
initState (width, height);
|
|
|
|
setColor(Color.black);
|
|
setBackground (Color.black);
|
|
setPaint (getColor());
|
|
setFont (new Font("SansSerif", Font.PLAIN, 12));
|
|
setTransform (new AffineTransform ());
|
|
setStroke (new BasicStroke ());
|
|
setRenderingHints (getDefaultHints());
|
|
|
|
stateStack = new Stack();
|
|
}
|
|
|
|
GdkGraphics2D (GtkComponentPeer component)
|
|
{
|
|
this.component = component;
|
|
int rgb[] = initState (component);
|
|
|
|
setColor (new Color (rgb[0], rgb[1], rgb[2]));
|
|
setBackground (new Color (rgb[3], rgb[4], rgb[5]));
|
|
setPaint (getColor());
|
|
setFont (new Font("SansSerif", Font.PLAIN, 12));
|
|
setTransform (new AffineTransform ());
|
|
setStroke (new BasicStroke ());
|
|
setRenderingHints (getDefaultHints());
|
|
|
|
stateStack = new Stack ();
|
|
}
|
|
|
|
GdkGraphics2D (BufferedImage bimage)
|
|
{
|
|
|
|
this.bimage = bimage;
|
|
initState (bimage.getWidth(), bimage.getHeight());
|
|
|
|
setColor(Color.black);
|
|
setBackground (Color.black);
|
|
setPaint (getColor());
|
|
setFont (new Font("SansSerif", Font.PLAIN, 12));
|
|
setTransform (new AffineTransform ());
|
|
setStroke (new BasicStroke ());
|
|
setRenderingHints (getDefaultHints());
|
|
|
|
stateStack = new Stack();
|
|
|
|
// draw current buffered image to the pixmap associated
|
|
// with it.
|
|
|
|
drawImage (bimage, new AffineTransform (1,0,0,1,0,0), bg, null);
|
|
}
|
|
|
|
|
|
////////////////////////////////////
|
|
////// Native Drawing Methods //////
|
|
////////////////////////////////////
|
|
|
|
// GDK drawing methods
|
|
private native void gdkDrawDrawable (GdkGraphics2D other, int x, int y);
|
|
|
|
// drawing utility methods
|
|
private native void drawPixels (int pixels[], int w, int h, int stride, double i2u[]);
|
|
private native void setTexturePixels (int pixels[], int w, int h, int stride);
|
|
private native void setGradient (double x1, double y1,
|
|
double x2, double y2,
|
|
int r1, int g1, int b1, int a1,
|
|
int r2, int g2, int b2, int a2,
|
|
boolean cyclic);
|
|
|
|
// simple passthroughs to cairo
|
|
private native void cairoSave ();
|
|
private native void cairoRestore ();
|
|
private native void cairoSetMatrix (double m[]);
|
|
private native void cairoSetFont (GdkClasspathFontPeer peer);
|
|
private native void cairoShowGlyphs (int codes[],
|
|
float positions[]);
|
|
private native void cairoSetOperator (int cairoOperator);
|
|
private native void cairoSetRGBColor (double red, double green, double blue);
|
|
private native void cairoSetAlpha (double alpha);
|
|
private native void cairoSetFillRule (int cairoFillRule);
|
|
private native void cairoSetLineWidth (double width);
|
|
private native void cairoSetLineCap (int cairoLineCap);
|
|
private native void cairoSetLineJoin (int cairoLineJoin);
|
|
private native void cairoSetDash (double dashes[], int ndash, double offset);
|
|
private native void cairoSetMiterLimit (double limit);
|
|
private native void cairoNewPath ();
|
|
private native void cairoMoveTo (double x, double y);
|
|
private native void cairoLineTo (double x, double y);
|
|
private native void cairoCurveTo (double x1, double y1,
|
|
double x2, double y2,
|
|
double x3, double y3);
|
|
private native void cairoRelMoveTo (double dx, double dy);
|
|
private native void cairoRelLineTo (double dx, double dy);
|
|
private native void cairoRelCurveTo (double dx1, double dy1,
|
|
double dx2, double dy2,
|
|
double dx3, double dy3);
|
|
private native void cairoRectangle (double x, double y,
|
|
double width, double height);
|
|
private native void cairoClosePath ();
|
|
private native void cairoStroke ();
|
|
private native void cairoFill ();
|
|
private native void cairoClip ();
|
|
|
|
|
|
/////////////////////////////////////////////
|
|
////// General Drawing Support Methods //////
|
|
/////////////////////////////////////////////
|
|
|
|
private class DrawState
|
|
{
|
|
private Paint paint;
|
|
private Stroke stroke;
|
|
private Color fg;
|
|
private Color bg;
|
|
private Shape clip;
|
|
private AffineTransform transform;
|
|
private Font font;
|
|
DrawState (GdkGraphics2D g)
|
|
{
|
|
this.paint = g.paint;
|
|
this.stroke = g.stroke;
|
|
this.fg = g.fg;
|
|
this.bg = g.bg;
|
|
this.clip = g.clip;
|
|
if (g.transform != null)
|
|
this.transform = (AffineTransform) g.transform.clone();
|
|
this.font = g.font;
|
|
}
|
|
public void restore(GdkGraphics2D g)
|
|
{
|
|
g.paint = this.paint;
|
|
g.stroke = this.stroke;
|
|
g.fg = this.fg;
|
|
g.bg = this.bg;
|
|
g.clip = this.clip;
|
|
g.transform = this.transform;
|
|
g.font = this.font;
|
|
}
|
|
}
|
|
|
|
private void stateSave ()
|
|
{
|
|
stateStack.push (new DrawState (this));
|
|
cairoSave ();
|
|
}
|
|
|
|
private void stateRestore ()
|
|
{
|
|
((DrawState)(stateStack.pop ())).restore (this);
|
|
cairoRestore ();
|
|
}
|
|
|
|
|
|
double x;
|
|
double y;
|
|
private void setPos (double nx, double ny)
|
|
{
|
|
x = nx;
|
|
y = ny;
|
|
}
|
|
|
|
private void walkPath(PathIterator p)
|
|
{
|
|
double coords[] = new double[6];
|
|
|
|
cairoSetFillRule (p.getWindingRule ());
|
|
for ( ; ! p.isDone (); p.next())
|
|
{
|
|
int seg = p.currentSegment (coords);
|
|
switch(seg)
|
|
{
|
|
|
|
case PathIterator.SEG_MOVETO:
|
|
setPos(coords[0], coords[1]);
|
|
cairoMoveTo (coords[0], coords[1]);
|
|
break;
|
|
|
|
case PathIterator.SEG_LINETO:
|
|
setPos(coords[0], coords[1]);
|
|
cairoLineTo (coords[0], coords[1]);
|
|
break;
|
|
|
|
case PathIterator.SEG_QUADTO:
|
|
|
|
// splitting a quadratic bezier into a cubic:
|
|
// see: http://pfaedit.sourceforge.net/bezier.html
|
|
|
|
double x1 = x + (2.0/3.0) * (coords[0] - x);
|
|
double y1 = y + (2.0/3.0) * (coords[1] - y);
|
|
|
|
double x2 = x1 + (1.0/3.0) * (coords[2] - x);
|
|
double y2 = y1 + (1.0/3.0) * (coords[3] - y);
|
|
|
|
setPos(coords[2], coords[3]);
|
|
cairoCurveTo (x1, y1,
|
|
x2, y2,
|
|
coords[2], coords[3]);
|
|
break;
|
|
|
|
case PathIterator.SEG_CUBICTO:
|
|
setPos(coords[4], coords[5]);
|
|
cairoCurveTo (coords[0], coords[1],
|
|
coords[2], coords[3],
|
|
coords[4], coords[5]);
|
|
break;
|
|
|
|
case PathIterator.SEG_CLOSE:
|
|
cairoClosePath ();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
private Map getDefaultHints()
|
|
{
|
|
HashMap defaultHints = new HashMap ();
|
|
|
|
defaultHints.put (RenderingHints.KEY_TEXT_ANTIALIASING,
|
|
RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT);
|
|
|
|
defaultHints.put (RenderingHints.KEY_STROKE_CONTROL,
|
|
RenderingHints.VALUE_STROKE_DEFAULT);
|
|
|
|
defaultHints.put (RenderingHints.KEY_FRACTIONALMETRICS,
|
|
RenderingHints.VALUE_FRACTIONALMETRICS_OFF);
|
|
|
|
defaultHints.put (RenderingHints.KEY_ANTIALIASING,
|
|
RenderingHints.VALUE_ANTIALIAS_OFF);
|
|
|
|
defaultHints.put (RenderingHints.KEY_RENDERING,
|
|
RenderingHints.VALUE_RENDER_DEFAULT);
|
|
|
|
return defaultHints;
|
|
|
|
}
|
|
|
|
private void updateBufferedImage()
|
|
{
|
|
int[] pixels = getImagePixels();
|
|
updateImagePixels(pixels);
|
|
}
|
|
|
|
|
|
private boolean isBufferedImageGraphics ()
|
|
{
|
|
|
|
if (bimage != null)
|
|
return true;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
private void updateImagePixels (int[] pixels)
|
|
{
|
|
|
|
// This function can only be used if
|
|
// this graphics object is used to draw into
|
|
// buffered image
|
|
|
|
if (! isBufferedImageGraphics ())
|
|
return;
|
|
|
|
WritableRaster raster = bimage.getRaster();
|
|
DataBuffer db = raster.getDataBuffer ();
|
|
|
|
// update pixels in the bufferedImage
|
|
|
|
if (raster.getSampleModel ().getDataType () == DataBuffer.TYPE_INT
|
|
&& db instanceof DataBufferInt
|
|
&& db.getNumBanks () == 1)
|
|
{
|
|
|
|
// single bank, ARGB-ints buffer in sRGB space
|
|
DataBufferInt dbi = (DataBufferInt) raster.getDataBuffer ();
|
|
|
|
for (int i=0; i < pixels.length; i++)
|
|
dbi.setElem(i, pixels[i]);
|
|
|
|
}
|
|
else
|
|
{
|
|
bimage.getRaster().setPixels (0, 0, raster.getWidth (),
|
|
raster.getHeight (), pixels);
|
|
}
|
|
}
|
|
|
|
|
|
private boolean drawImage(Image img,
|
|
AffineTransform xform,
|
|
Color bgcolor,
|
|
ImageObserver obs)
|
|
{
|
|
if (img instanceof GtkOffScreenImage &&
|
|
img.getGraphics () instanceof GdkGraphics2D &&
|
|
(xform == null
|
|
|| xform.getType () == AffineTransform.TYPE_IDENTITY
|
|
|| xform.getType () == AffineTransform.TYPE_TRANSLATION)
|
|
)
|
|
{
|
|
// we are being asked to flush a double buffer from Gdk
|
|
GdkGraphics2D g2 = (GdkGraphics2D) img.getGraphics ();
|
|
gdkDrawDrawable (g2, (int)xform.getTranslateX(), (int)xform.getTranslateY());
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
|
|
// In this case, xform is an AffineTransform that transforms bounding
|
|
// box of the specified image from image space to user space. However
|
|
// when we pass this transform to cairo, cairo will use this transform
|
|
// to map "user coordinates" to "pixel" coordinates, which is the
|
|
// other way around. Therefore to get the "user -> pixel" transform
|
|
// that cairo wants from "image -> user" transform that we currently
|
|
// have, we will need to invert the transformation matrix.
|
|
|
|
AffineTransform invertedXform = new AffineTransform();
|
|
|
|
try
|
|
{
|
|
invertedXform = xform.createInverse();
|
|
if (img instanceof BufferedImage)
|
|
{
|
|
// draw an image which has actually been loaded
|
|
// into memory fully
|
|
|
|
BufferedImage b = (BufferedImage) img;
|
|
return drawRaster (b.getColorModel (),
|
|
b.getData (),
|
|
invertedXform,
|
|
bgcolor);
|
|
}
|
|
else
|
|
{
|
|
// begin progressive loading in a separate thread
|
|
new PainterThread (this, img, invertedXform, bgcolor);
|
|
return false;
|
|
}
|
|
}
|
|
catch (NoninvertibleTransformException e)
|
|
{
|
|
throw new ImagingOpException("Unable to invert transform "
|
|
+ xform.toString());
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
//////////////////////////////////////////////////
|
|
////// Implementation of Graphics2D Methods //////
|
|
//////////////////////////////////////////////////
|
|
|
|
public void draw (Shape s)
|
|
{
|
|
|
|
if (stroke != null &&
|
|
!(stroke instanceof BasicStroke))
|
|
{
|
|
fill (stroke.createStrokedShape (s));
|
|
return;
|
|
}
|
|
|
|
stateSave ();
|
|
cairoNewPath ();
|
|
|
|
boolean normalize;
|
|
normalize = hints.containsValue (RenderingHints.VALUE_STROKE_NORMALIZE)
|
|
|| hints.containsValue (RenderingHints.VALUE_STROKE_DEFAULT);
|
|
|
|
if (normalize)
|
|
translate (0.5,0.5);
|
|
|
|
if (s instanceof Rectangle2D)
|
|
{
|
|
Rectangle2D r = (Rectangle2D)s;
|
|
cairoRectangle (r.getX (), r.getY (), r.getWidth (), r.getHeight ());
|
|
}
|
|
else
|
|
walkPath (s.getPathIterator (null));
|
|
cairoStroke ();
|
|
|
|
if (normalize)
|
|
translate (-0.5,-0.5);
|
|
|
|
stateRestore ();
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
}
|
|
|
|
public void fill (Shape s)
|
|
{
|
|
stateSave();
|
|
cairoNewPath ();
|
|
if (s instanceof Rectangle2D)
|
|
{
|
|
Rectangle2D r = (Rectangle2D)s;
|
|
cairoRectangle (r.getX (), r.getY (), r.getWidth (), r.getHeight ());
|
|
}
|
|
else
|
|
walkPath (s.getPathIterator (null));
|
|
cairoFill ();
|
|
stateRestore ();
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
}
|
|
|
|
public void clip (Shape s)
|
|
{
|
|
// update it
|
|
|
|
if (clip == null || s == null)
|
|
clip = s;
|
|
else if (s instanceof Rectangle2D
|
|
&& clip instanceof Rectangle2D)
|
|
{
|
|
Rectangle2D r = (Rectangle2D)s;
|
|
Rectangle2D curr = (Rectangle2D)clip;
|
|
clip = curr.createIntersection (r);
|
|
}
|
|
else
|
|
throw new UnsupportedOperationException ();
|
|
|
|
// draw it
|
|
if (clip != null)
|
|
{
|
|
cairoNewPath ();
|
|
if (clip instanceof Rectangle2D)
|
|
{
|
|
Rectangle2D r = (Rectangle2D)clip;
|
|
cairoRectangle (r.getX (), r.getY (),
|
|
r.getWidth (), r.getHeight ());
|
|
}
|
|
else
|
|
walkPath (clip.getPathIterator (null));
|
|
cairoClosePath ();
|
|
cairoClip ();
|
|
}
|
|
}
|
|
|
|
public Paint getPaint ()
|
|
{
|
|
return paint;
|
|
}
|
|
|
|
public AffineTransform getTransform ()
|
|
{
|
|
return (AffineTransform) transform.clone ();
|
|
}
|
|
|
|
public void setPaint (Paint p)
|
|
{
|
|
if (paint == null)
|
|
return;
|
|
|
|
paint = p;
|
|
if (paint instanceof Color)
|
|
{
|
|
setColor ((Color) paint);
|
|
}
|
|
else if (paint instanceof TexturePaint)
|
|
{
|
|
TexturePaint tp = (TexturePaint) paint;
|
|
BufferedImage img = tp.getImage ();
|
|
|
|
// map the image to the anchor rectangle
|
|
|
|
int width = (int) tp.getAnchorRect ().getWidth ();
|
|
int height = (int) tp.getAnchorRect ().getHeight ();
|
|
|
|
double scaleX = width / (double) img.getWidth ();
|
|
double scaleY = width / (double) img.getHeight ();
|
|
|
|
AffineTransform at = new AffineTransform (scaleX, 0, 0, scaleY, 0, 0);
|
|
AffineTransformOp op = new AffineTransformOp (at, getRenderingHints());
|
|
BufferedImage texture = op.filter(img, null);
|
|
int pixels[] = texture.getRGB (0, 0, width, height, null, 0, width);
|
|
setTexturePixels (pixels, width, height, width);
|
|
|
|
}
|
|
else if (paint instanceof GradientPaint)
|
|
{
|
|
GradientPaint gp = (GradientPaint) paint;
|
|
Point2D p1 = gp.getPoint1 ();
|
|
Point2D p2 = gp.getPoint2 ();
|
|
Color c1 = gp.getColor1 ();
|
|
Color c2 = gp.getColor2 ();
|
|
setGradient (p1.getX (), p1.getY (),
|
|
p2.getX (), p2.getY (),
|
|
c1.getRed (), c1.getGreen (),
|
|
c1.getBlue (), c1.getAlpha (),
|
|
c2.getRed (), c2.getGreen (),
|
|
c2.getBlue (), c2.getAlpha (),
|
|
gp.isCyclic ());
|
|
}
|
|
else
|
|
throw new java.lang.UnsupportedOperationException ();
|
|
}
|
|
|
|
public void setTransform (AffineTransform tx)
|
|
{
|
|
transform = tx;
|
|
if (transform != null)
|
|
{
|
|
double m[] = new double[6];
|
|
transform.getMatrix (m);
|
|
cairoSetMatrix (m);
|
|
}
|
|
}
|
|
|
|
public void transform (AffineTransform tx)
|
|
{
|
|
if (transform == null)
|
|
transform = new AffineTransform (tx);
|
|
else
|
|
transform.concatenate (tx);
|
|
setTransform (transform);
|
|
if (clip != null)
|
|
{
|
|
// FIXME: this should actuall try to transform the shape
|
|
// rather than degrade to bounds.
|
|
Rectangle2D r = clip.getBounds2D();
|
|
double[] coords = new double[] { r.getX(), r.getY(),
|
|
r.getX() + r.getWidth(),
|
|
r.getY() + r.getHeight() };
|
|
try
|
|
{
|
|
tx.createInverse().transform(coords, 0, coords, 0, 2);
|
|
r.setRect(coords[0], coords[1],
|
|
coords[2] - coords[0],
|
|
coords[3] - coords[1]);
|
|
clip = r;
|
|
}
|
|
catch (java.awt.geom.NoninvertibleTransformException e)
|
|
{
|
|
}
|
|
}
|
|
}
|
|
|
|
public void rotate(double theta)
|
|
{
|
|
transform (AffineTransform.getRotateInstance (theta));
|
|
}
|
|
|
|
public void rotate(double theta, double x, double y)
|
|
{
|
|
transform (AffineTransform.getRotateInstance (theta, x, y));
|
|
}
|
|
|
|
public void scale(double sx, double sy)
|
|
{
|
|
transform (AffineTransform.getScaleInstance (sx, sy));
|
|
}
|
|
|
|
public void translate (double tx, double ty)
|
|
{
|
|
transform (AffineTransform.getTranslateInstance (tx, ty));
|
|
}
|
|
|
|
public void translate (int x, int y)
|
|
{
|
|
translate ((double) x, (double) y);
|
|
}
|
|
|
|
public void shear(double shearX, double shearY)
|
|
{
|
|
transform (AffineTransform.getShearInstance (shearX, shearY));
|
|
}
|
|
|
|
public Stroke getStroke()
|
|
{
|
|
return stroke;
|
|
}
|
|
|
|
public void setStroke (Stroke st)
|
|
{
|
|
stroke = st;
|
|
if (stroke instanceof BasicStroke)
|
|
{
|
|
BasicStroke bs = (BasicStroke) stroke;
|
|
cairoSetLineCap (bs.getEndCap());
|
|
cairoSetLineWidth (bs.getLineWidth() / 2.0);
|
|
cairoSetLineJoin (bs.getLineJoin());
|
|
cairoSetMiterLimit (bs.getMiterLimit());
|
|
float dashes[] = bs.getDashArray();
|
|
if (dashes != null)
|
|
{
|
|
double double_dashes[] = new double[dashes.length];
|
|
for (int i = 0; i < dashes.length; i++)
|
|
double_dashes[i] = dashes[i];
|
|
cairoSetDash (double_dashes, double_dashes.length,
|
|
(double) bs.getDashPhase ());
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////
|
|
////// Implementation of Graphics Methods //////
|
|
////////////////////////////////////////////////
|
|
|
|
public void setPaintMode ()
|
|
{
|
|
setComposite (java.awt.AlphaComposite.SrcOver);
|
|
}
|
|
|
|
public void setXORMode (Color c)
|
|
{
|
|
setComposite (new gnu.java.awt.BitwiseXORComposite(c));
|
|
}
|
|
|
|
public void setColor (Color c)
|
|
{
|
|
fg = c;
|
|
paint = c;
|
|
cairoSetRGBColor (fg.getRed() / 255.0,
|
|
fg.getGreen() / 255.0,
|
|
fg.getBlue() / 255.0);
|
|
cairoSetAlpha ((fg.getAlpha() & 255) / 255.0);
|
|
}
|
|
|
|
public Color getColor ()
|
|
{
|
|
return fg;
|
|
}
|
|
|
|
public void clipRect (int x, int y, int width, int height)
|
|
{
|
|
clip (new Rectangle (x, y, width, height));
|
|
}
|
|
|
|
public Shape getClip ()
|
|
{
|
|
return getClipInDevSpace ();
|
|
}
|
|
|
|
public Rectangle getClipBounds ()
|
|
{
|
|
if (clip == null)
|
|
return null;
|
|
else
|
|
return clip.getBounds ();
|
|
}
|
|
|
|
protected Rectangle2D getClipInDevSpace ()
|
|
{
|
|
Rectangle2D uclip = clip.getBounds2D ();
|
|
if (transform == null)
|
|
return uclip;
|
|
else
|
|
{
|
|
Point2D pos = transform.transform (new Point2D.Double(uclip.getX (),
|
|
uclip.getY ()),
|
|
(Point2D)null);
|
|
Point2D extent = transform.deltaTransform (new Point2D.Double(uclip.getWidth (),
|
|
uclip.getHeight ()),
|
|
(Point2D)null);
|
|
return new Rectangle2D.Double (pos.getX (), pos.getY (),
|
|
extent.getX (), extent.getY ());
|
|
}
|
|
}
|
|
|
|
public void setClip (int x, int y, int width, int height)
|
|
{
|
|
setClip(new Rectangle2D.Double ((double)x, (double)y,
|
|
(double)width, (double)height));
|
|
}
|
|
|
|
public void setClip (Shape s)
|
|
{
|
|
clip = s;
|
|
if (s != null)
|
|
{
|
|
cairoNewPath ();
|
|
if (s instanceof Rectangle2D)
|
|
{
|
|
Rectangle2D r = (Rectangle2D)s;
|
|
cairoRectangle (r.getX (), r.getY (),
|
|
r.getWidth (), r.getHeight ());
|
|
}
|
|
else
|
|
walkPath (s.getPathIterator (null));
|
|
cairoClosePath ();
|
|
cairoClip ();
|
|
}
|
|
}
|
|
|
|
public void draw3DRect(int x, int y, int width,
|
|
int height, boolean raised)
|
|
{
|
|
Color std = fg;
|
|
Color light = std.brighter();
|
|
Color dark = std.darker();
|
|
|
|
if (!raised)
|
|
{
|
|
Color t = light;
|
|
light = dark;
|
|
dark = t;
|
|
}
|
|
|
|
double x1 = (double) x;
|
|
double x2 = (double) x + width;
|
|
|
|
double y1 = (double) y;
|
|
double y2 = (double) y + height;
|
|
|
|
stateSave ();
|
|
|
|
cairoNewPath ();
|
|
|
|
boolean normalize;
|
|
normalize = hints.containsValue (RenderingHints.VALUE_STROKE_NORMALIZE)
|
|
|| hints.containsValue (RenderingHints.VALUE_STROKE_DEFAULT);
|
|
|
|
if (normalize)
|
|
{
|
|
x1 += 0.5;
|
|
y1 += 0.5;
|
|
x2 += 0.5;
|
|
y2 += 0.5;
|
|
}
|
|
|
|
setColor (light);
|
|
cairoMoveTo (x1, y1);
|
|
cairoLineTo (x2, y1);
|
|
cairoLineTo (x2, y2);
|
|
cairoStroke ();
|
|
|
|
cairoNewPath ();
|
|
setColor (dark);
|
|
cairoMoveTo (x1, y1);
|
|
cairoLineTo (x1, y2);
|
|
cairoLineTo (x2, y2);
|
|
cairoStroke ();
|
|
|
|
stateRestore ();
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
}
|
|
|
|
public void fill3DRect(int x, int y, int width,
|
|
int height, boolean raised)
|
|
{
|
|
double step = 1.0;
|
|
if (stroke != null && stroke instanceof BasicStroke)
|
|
{
|
|
BasicStroke bs = (BasicStroke) stroke;
|
|
step = bs.getLineWidth();
|
|
}
|
|
|
|
Color bright = fg.brighter ();
|
|
Color dark = fg.darker ();
|
|
|
|
draw3DRect (x, y, width, height, raised);
|
|
|
|
stateSave ();
|
|
translate (step/2.0, step/2.0);
|
|
cairoNewPath ();
|
|
cairoRectangle ((double) x, (double) y,
|
|
((double) width) - step,
|
|
((double) height) - step );
|
|
cairoClosePath ();
|
|
cairoFill ();
|
|
stateRestore ();
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
}
|
|
|
|
|
|
public void drawRect (int x, int y, int width, int height)
|
|
{
|
|
draw(new Rectangle (x, y, width, height));
|
|
}
|
|
|
|
public void fillRect (int x, int y, int width, int height)
|
|
{
|
|
fill(new Rectangle (x, y, width, height));
|
|
}
|
|
|
|
public void clearRect (int x, int y, int width, int height)
|
|
{
|
|
stateSave ();
|
|
cairoSetRGBColor (bg.getRed() / 255.0,
|
|
bg.getGreen() / 255.0,
|
|
bg.getBlue() / 255.0);
|
|
cairoSetAlpha (1.0);
|
|
cairoNewPath ();
|
|
cairoRectangle (x, y, width, height);
|
|
cairoClosePath ();
|
|
cairoFill ();
|
|
stateRestore ();
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
}
|
|
|
|
public void setBackground(Color c)
|
|
{
|
|
bg = c;
|
|
}
|
|
|
|
public Color getBackground()
|
|
{
|
|
return bg;
|
|
}
|
|
|
|
private void doPolygon(int[] xPoints, int[] yPoints, int nPoints,
|
|
boolean close, boolean fill)
|
|
{
|
|
if (nPoints < 1)
|
|
return;
|
|
GeneralPath gp = new GeneralPath (PathIterator.WIND_EVEN_ODD);
|
|
gp.moveTo ((float)xPoints[0], (float)yPoints[0]);
|
|
for (int i = 1; i < nPoints; i++)
|
|
gp.lineTo ((float)xPoints[i], (float)yPoints[i]);
|
|
|
|
if (close)
|
|
gp.closePath ();
|
|
|
|
Shape sh = gp;
|
|
if (fill == false &&
|
|
stroke != null &&
|
|
!(stroke instanceof BasicStroke))
|
|
{
|
|
sh = stroke.createStrokedShape (gp);
|
|
fill = true;
|
|
}
|
|
|
|
if (fill)
|
|
fill (sh);
|
|
else
|
|
draw (sh);
|
|
}
|
|
|
|
public void drawLine (int x1, int y1, int x2, int y2)
|
|
{
|
|
int xp[] = new int[2];
|
|
int yp[] = new int[2];
|
|
|
|
xp[0] = x1;
|
|
xp[1] = x2;
|
|
yp[0] = y1;
|
|
yp[1] = y2;
|
|
|
|
doPolygon (xp, yp, 2, false, false);
|
|
}
|
|
|
|
public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
|
|
{
|
|
doPolygon (xPoints, yPoints, nPoints, true, true);
|
|
}
|
|
|
|
public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
|
|
{
|
|
doPolygon (xPoints, yPoints, nPoints, true, false);
|
|
}
|
|
|
|
public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
|
|
{
|
|
doPolygon (xPoints, yPoints, nPoints, false, false);
|
|
}
|
|
|
|
private boolean drawRaster (ColorModel cm, Raster r,
|
|
AffineTransform imageToUser,
|
|
Color bgcolor)
|
|
{
|
|
if (r == null)
|
|
return false;
|
|
|
|
SampleModel sm = r.getSampleModel ();
|
|
DataBuffer db = r.getDataBuffer ();
|
|
|
|
if (db == null || sm == null)
|
|
return false;
|
|
|
|
if (cm == null)
|
|
cm = ColorModel.getRGBdefault ();
|
|
|
|
double[] i2u = new double[6];
|
|
if (imageToUser != null)
|
|
imageToUser.getMatrix(i2u);
|
|
else
|
|
{
|
|
i2u[0] = 1; i2u[1] = 0;
|
|
i2u[2] = 0; i2u[3] = 1;
|
|
i2u[4] = 0; i2u[5] = 0;
|
|
}
|
|
|
|
int pixels[] = null;
|
|
|
|
if (sm.getDataType () == DataBuffer.TYPE_INT &&
|
|
db instanceof DataBufferInt &&
|
|
db.getNumBanks () == 1)
|
|
{
|
|
// single bank, ARGB-ints buffer in sRGB space
|
|
DataBufferInt dbi = (DataBufferInt)db;
|
|
pixels = dbi.getData ();
|
|
}
|
|
else
|
|
pixels = r.getPixels (0, 0, r.getWidth (), r.getHeight (), pixels);
|
|
|
|
ColorSpace cs = cm.getColorSpace ();
|
|
if (cs != null &&
|
|
cs.getType () != ColorSpace.CS_sRGB)
|
|
{
|
|
int pixels2[] = new int[pixels.length];
|
|
for (int i = 0; i < pixels2.length; i++)
|
|
pixels2[i] = cm.getRGB (pixels[i]);
|
|
pixels = pixels2;
|
|
}
|
|
|
|
// change all transparent pixels in the image to the
|
|
// specified bgcolor
|
|
|
|
if (bgcolor != null)
|
|
{
|
|
for (int i = 0; i < pixels.length; i++)
|
|
{
|
|
if (cm.getAlpha (pixels[i]) == 0)
|
|
pixels[i] = bgcolor.getRGB ();
|
|
}
|
|
}
|
|
|
|
stateSave ();
|
|
translate (x, y);
|
|
drawPixels (pixels, r.getWidth (), r.getHeight (), r.getWidth (), i2u);
|
|
stateRestore ();
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
return true;
|
|
}
|
|
|
|
public void drawRenderedImage(RenderedImage image,
|
|
AffineTransform xform)
|
|
{
|
|
drawRaster (image.getColorModel(), image.getData(), xform, bg);
|
|
}
|
|
|
|
public void drawRenderableImage(RenderableImage image,
|
|
AffineTransform xform)
|
|
{
|
|
drawRenderedImage (image.createRendering (new RenderContext (xform)), xform);
|
|
}
|
|
|
|
public boolean drawImage(Image img,
|
|
AffineTransform xform,
|
|
ImageObserver obs)
|
|
{
|
|
return drawImage(img, xform, bg, obs);
|
|
}
|
|
|
|
public void drawImage(BufferedImage image,
|
|
BufferedImageOp op,
|
|
int x,
|
|
int y)
|
|
{
|
|
Image filtered = op.filter(image, null);
|
|
drawImage(filtered, new AffineTransform(1f,0f,0f,1f,x,y), bg, null);
|
|
}
|
|
|
|
public boolean drawImage (Image img, int x, int y,
|
|
ImageObserver observer)
|
|
{
|
|
return drawImage(img, new AffineTransform(1f,0f,0f,1f,x,y), bg, observer);
|
|
}
|
|
|
|
|
|
////////////////////////////////////////
|
|
////// Supporting Private Classes //////
|
|
////////////////////////////////////////
|
|
|
|
private class PainterThread implements Runnable, ImageConsumer
|
|
{
|
|
|
|
// this is a helper which is spun off when someone tries to do
|
|
// Graphics2D.drawImage on an image we cannot determine to be either
|
|
// one of our own offscreen images or a BufferedImage; that is, when
|
|
// someone wants to draw an image which is possibly still loading over
|
|
// a network or something. you run it in a separate thread and it
|
|
// writes through to the underlying Graphics2D as pixels becomg
|
|
// available.
|
|
|
|
GdkGraphics2D gr;
|
|
Image image;
|
|
ColorModel defaultModel;
|
|
AffineTransform xform;
|
|
Color bgcolor;
|
|
|
|
public PainterThread (GdkGraphics2D g, Image im,
|
|
AffineTransform xf, Color bg)
|
|
{
|
|
image = im;
|
|
xform = xf;
|
|
bgcolor = bg;
|
|
this.gr = (GdkGraphics2D) g.create ();
|
|
new Thread (this).start ();
|
|
}
|
|
|
|
public void imageComplete (int status)
|
|
{
|
|
}
|
|
|
|
public void setColorModel (ColorModel model)
|
|
{
|
|
defaultModel = model;
|
|
}
|
|
|
|
public void setDimensions (int width, int height)
|
|
{
|
|
}
|
|
|
|
public void setHints (int hintflags)
|
|
{
|
|
}
|
|
|
|
public void setPixels (int x, int y, int w, int h, ColorModel model,
|
|
byte[] pixels, int off, int scansize)
|
|
{
|
|
}
|
|
|
|
public void setPixels (int x, int y, int w, int h, ColorModel model,
|
|
int[] pixels, int off, int scansize)
|
|
{
|
|
gr.stateSave ();
|
|
gr.translate (x, y);
|
|
|
|
if (model == null)
|
|
model = defaultModel;
|
|
|
|
int pixels2[];
|
|
if (model != null)
|
|
{
|
|
pixels2 = new int[pixels.length];
|
|
for (int yy = 0; yy < h; yy++)
|
|
for (int xx = 0; xx < w; xx++)
|
|
{
|
|
int i = yy * scansize + xx;
|
|
pixels2[i] = model.getRGB (pixels[i]);
|
|
}
|
|
}
|
|
else
|
|
pixels2 = pixels;
|
|
|
|
// change all transparent pixels in the image to the
|
|
// specified bgcolor
|
|
|
|
if (bgcolor != null)
|
|
{
|
|
for (int i = 0; i < pixels2.length; i++)
|
|
{
|
|
if (model.getAlpha (pixels2[i]) == 0)
|
|
pixels2[i] = bgcolor.getRGB ();
|
|
}
|
|
}
|
|
|
|
double[] xf = new double[6];
|
|
xform.getMatrix(xf);
|
|
gr.drawPixels (pixels2, w, h, scansize, xf);
|
|
gr.stateRestore ();
|
|
}
|
|
|
|
public void setProperties (java.util.Hashtable props)
|
|
{
|
|
}
|
|
|
|
public void run ()
|
|
{
|
|
image.getSource ().startProduction (this);
|
|
gr.dispose ();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
///////////////////////////////////////////////
|
|
////// Unimplemented Stubs and Overloads //////
|
|
///////////////////////////////////////////////
|
|
|
|
|
|
|
|
public boolean hit(Rectangle rect, Shape text,
|
|
boolean onStroke)
|
|
{
|
|
throw new java.lang.UnsupportedOperationException ();
|
|
}
|
|
|
|
public GraphicsConfiguration getDeviceConfiguration()
|
|
{
|
|
throw new java.lang.UnsupportedOperationException ();
|
|
}
|
|
|
|
public void setComposite(Composite comp)
|
|
{
|
|
if (comp instanceof AlphaComposite)
|
|
{
|
|
AlphaComposite a = (AlphaComposite) comp;
|
|
cairoSetOperator(a.getRule());
|
|
Color c = getColor();
|
|
setColor(new Color(c.getRed(),
|
|
c.getGreen(),
|
|
c.getBlue(),
|
|
(int) (a.getAlpha() * ((float) c.getAlpha()))));
|
|
}
|
|
else
|
|
throw new java.lang.UnsupportedOperationException ();
|
|
}
|
|
|
|
public void setRenderingHint(RenderingHints.Key hintKey,
|
|
Object hintValue)
|
|
{
|
|
hints.put (hintKey, hintValue);
|
|
|
|
if (hintKey.equals(RenderingHints.KEY_INTERPOLATION)
|
|
|| hintKey.equals(RenderingHints.KEY_ALPHA_INTERPOLATION))
|
|
{
|
|
|
|
if (hintValue.equals(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR))
|
|
cairoSurfaceSetFilter(0);
|
|
|
|
else if (hintValue.equals(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
|
|
cairoSurfaceSetFilter(1);
|
|
|
|
else if (hintValue.equals(RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED))
|
|
cairoSurfaceSetFilter(2);
|
|
|
|
else if (hintValue.equals(RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY))
|
|
cairoSurfaceSetFilter(3);
|
|
|
|
else if (hintValue.equals(RenderingHints.VALUE_ALPHA_INTERPOLATION_DEFAULT))
|
|
cairoSurfaceSetFilter(4);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
public Object getRenderingHint(RenderingHints.Key hintKey)
|
|
{
|
|
return hints.get (hintKey);
|
|
}
|
|
|
|
public void setRenderingHints(Map hints)
|
|
{
|
|
this.hints = new RenderingHints (getDefaultHints ());
|
|
this.hints.add (new RenderingHints (hints));
|
|
|
|
if (hints.containsKey(RenderingHints.KEY_INTERPOLATION))
|
|
{
|
|
if(hints.containsValue(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR))
|
|
cairoSurfaceSetFilter(0);
|
|
|
|
else if(hints.containsValue(RenderingHints.VALUE_INTERPOLATION_BILINEAR))
|
|
cairoSurfaceSetFilter(1);
|
|
}
|
|
|
|
if (hints.containsKey(RenderingHints.KEY_ALPHA_INTERPOLATION))
|
|
{
|
|
if (hints.containsValue(RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED))
|
|
cairoSurfaceSetFilter(2);
|
|
|
|
else if (hints.containsValue(RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY))
|
|
cairoSurfaceSetFilter(3);
|
|
|
|
else if(hints.containsValue(RenderingHints.VALUE_ALPHA_INTERPOLATION_DEFAULT))
|
|
cairoSurfaceSetFilter(4);
|
|
}
|
|
}
|
|
|
|
public void addRenderingHints(Map hints)
|
|
{
|
|
this.hints.add (new RenderingHints (hints));
|
|
}
|
|
|
|
public RenderingHints getRenderingHints()
|
|
{
|
|
return hints;
|
|
}
|
|
|
|
public Composite getComposite()
|
|
{
|
|
throw new java.lang.UnsupportedOperationException ();
|
|
}
|
|
|
|
public FontRenderContext getFontRenderContext ()
|
|
{
|
|
return new FontRenderContext (transform, true, true);
|
|
}
|
|
|
|
public void drawGlyphVector (GlyphVector g, float x, float y)
|
|
{
|
|
stateSave ();
|
|
setFont (g.getFont ());
|
|
translate ((double)x, (double)y);
|
|
cairoMoveTo (0, 0);
|
|
int nglyphs = g.getNumGlyphs ();
|
|
int codes[] = g.getGlyphCodes (0, nglyphs, (int []) null);
|
|
float posns[] = g.getGlyphPositions (0, nglyphs, (float []) null);
|
|
cairoShowGlyphs (codes, posns);
|
|
|
|
if (isBufferedImageGraphics ())
|
|
updateBufferedImage();
|
|
|
|
stateRestore ();
|
|
}
|
|
|
|
public void copyArea (int x, int y, int width, int height, int dx, int dy)
|
|
{
|
|
throw new java.lang.UnsupportedOperationException ();
|
|
}
|
|
|
|
public void drawArc (int x, int y, int width, int height,
|
|
int startAngle, int arcAngle)
|
|
{
|
|
draw (new Arc2D.Double((double)x, (double)y,
|
|
(double)width, (double)height,
|
|
(double)startAngle, (double)arcAngle,
|
|
Arc2D.OPEN));
|
|
}
|
|
|
|
public boolean drawImage (Image img, int x, int y, Color bgcolor,
|
|
ImageObserver observer)
|
|
{
|
|
return drawImage (img, x, y, img.getWidth (observer),
|
|
img.getHeight (observer), bgcolor, observer);
|
|
}
|
|
|
|
public boolean drawImage (Image img, int x, int y, int width, int height,
|
|
Color bgcolor, ImageObserver observer)
|
|
{
|
|
|
|
double scaleX = width / (double) img.getWidth (observer);
|
|
double scaleY = height / (double) img.getHeight (observer);
|
|
|
|
return drawImage (img,
|
|
new AffineTransform(scaleX, 0f, 0f, scaleY, x, y),
|
|
bgcolor,
|
|
observer);
|
|
|
|
}
|
|
|
|
public boolean drawImage (Image img, int x, int y, int width, int height,
|
|
ImageObserver observer)
|
|
{
|
|
|
|
return drawImage (img, x, y, width, height, bg, observer);
|
|
|
|
}
|
|
|
|
public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2,
|
|
int sx1, int sy1, int sx2, int sy2,
|
|
Color bgcolor, ImageObserver observer)
|
|
{
|
|
|
|
Image subImage;
|
|
|
|
int sourceWidth = sx2 - sx1;
|
|
int sourceHeight = sy2 - sy1;
|
|
|
|
int destWidth = dx2 - dx1;
|
|
int destHeight = dy2 - dy1;
|
|
|
|
double scaleX = destWidth / (double) sourceWidth;
|
|
double scaleY = destHeight / (double) sourceHeight;
|
|
|
|
// Get the subimage of the source enclosed in the
|
|
// rectangle specified by sx1, sy1, sx2, sy2
|
|
|
|
if (img instanceof BufferedImage)
|
|
{
|
|
|
|
BufferedImage b = (BufferedImage) img;
|
|
subImage = b.getSubimage(sx1,sy1,sx2,sy2);
|
|
}
|
|
else
|
|
{
|
|
|
|
// FIXME: This code currently doesn't work. Null Pointer
|
|
// exception is thrown in this case. This happens
|
|
// because img.getSource() always returns null, since source gets
|
|
// never initialized when it is created with the help of
|
|
// createImage(int width, int height).
|
|
|
|
CropImageFilter filter = new CropImageFilter(sx1,sx2,sx2,sy2);
|
|
FilteredImageSource src = new FilteredImageSource(img.getSource(),
|
|
filter);
|
|
|
|
subImage = Toolkit.getDefaultToolkit().createImage(src);
|
|
}
|
|
|
|
return drawImage(subImage, new AffineTransform(scaleX, 0, 0,
|
|
scaleY, dx1, dy1),
|
|
bgcolor,
|
|
observer);
|
|
}
|
|
|
|
public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2,
|
|
int sx1, int sy1, int sx2, int sy2,
|
|
ImageObserver observer)
|
|
{
|
|
|
|
return drawImage (img, dx1, dy1, dx2, dy2,
|
|
sx1, sy1, sx2, sy2, bg, observer);
|
|
}
|
|
|
|
public void drawOval(int x, int y, int width, int height)
|
|
{
|
|
drawArc (x, y, width, height, 0, 360);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
public void drawString (String str, int x, int y)
|
|
{
|
|
drawString (str, (float)x, (float)y);
|
|
}
|
|
|
|
public void drawString (String str, float x, float y)
|
|
{
|
|
GlyphVector gv = font.createGlyphVector (getFontRenderContext(), str);
|
|
drawGlyphVector (gv, x, y);
|
|
}
|
|
|
|
public void drawString (AttributedCharacterIterator ci, int x, int y)
|
|
{
|
|
drawString (ci, (float)x, (float)y);
|
|
}
|
|
|
|
public void drawString (AttributedCharacterIterator ci, float x, float y)
|
|
{
|
|
GlyphVector gv = font.createGlyphVector (getFontRenderContext(), ci);
|
|
drawGlyphVector (gv, x, y);
|
|
}
|
|
|
|
public void fillArc (int x, int y, int width, int height,
|
|
int startAngle, int arcAngle)
|
|
{
|
|
fill (new Arc2D.Double((double)x, (double)y,
|
|
(double)width, (double)height,
|
|
(double)startAngle, (double)arcAngle,
|
|
Arc2D.OPEN));
|
|
}
|
|
|
|
public void fillOval(int x, int y, int width, int height)
|
|
{
|
|
fillArc (x, y, width, height, 0, 360);
|
|
}
|
|
|
|
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);
|
|
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);
|
|
}
|
|
|
|
public Font getFont ()
|
|
{
|
|
return font;
|
|
}
|
|
|
|
public FontMetrics getFontMetrics ()
|
|
{
|
|
return Toolkit.getDefaultToolkit ().getFontMetrics (font);
|
|
}
|
|
|
|
public FontMetrics getFontMetrics (Font f)
|
|
{
|
|
return Toolkit.getDefaultToolkit ().getFontMetrics (f);
|
|
}
|
|
|
|
public void setFont (Font f)
|
|
{
|
|
if (f.getPeer() instanceof GdkClasspathFontPeer)
|
|
font = f;
|
|
else
|
|
font =
|
|
((ClasspathToolkit)(Toolkit.getDefaultToolkit ()))
|
|
.getFont (f.getName(), f.getAttributes ());
|
|
|
|
if (f != null &&
|
|
f.getPeer() instanceof GdkClasspathFontPeer)
|
|
cairoSetFont ((GdkClasspathFontPeer) f.getPeer());
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
return getClass ().getName () +
|
|
"[font=" + font.toString () +
|
|
",color=" + fg.toString () + "]";
|
|
}
|
|
|
|
}
|