
2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextAreaUI.java (create): New method. * javax/swing/text/DefaultHighlighter.java (DefaultHighlightPainter.debugRect): Removed. * javax/swing/text/StyleContext.java (DEFAULT_STYLE): New field. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicLookAndFeel.java (initComponentDefaults): Add keybindings for selection.backward and selection-forward for text components. * javax/swing/plaf/basic/BasicTextUI.java (paintSafely): Paint highlight only when something is actually selected. * javax/swing/text/DefaultCaret.java (handleHighlight): New method. (setSelectionVisible): Don't do anything when nothing changes. Handle highlight. (moveDot): Reimplemented. Handle highlight. (setDot): Set mark too. Handle highlight. (getSelectionPainter): New method. * javax/swing/text/DefaultEditorKit.java (defaultActions): Added new actions for text selection. * javax/swing/text/DefaultHighlighter.java (DefaultHighlightPainter): New inner class. (DefaultPainter): New field. (paint): Implemented. * javax/swing/text/PlainView.java (paint): Don't draw background here again. * javax/swing/text/Utilities.java (getTabbedTextWidth): Use width of ' ' instead of 'm' for tabsize. (drawTabbedText): Likewise. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/JComponent.java (resetKeyboardActions): Add null checks. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/DefaultButtonModel.java: Skip group notification when no group is set. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/JColorChooser.java: Make a couple inner classes static, for jikes. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RottView.modelToView): New method. (UpdateHandler): Renamed from EventHandler. (updateHandler): Renamed from eventHandler. (modelToView): Implemented. * javax/swing/text/AbstractDocument.java (BranchElement.getElement): Return null for non-existing indeces. (BranchElement.getElementIndex): Return 0 in some corner cases. * javax/swing/text/FieldView.java (modelToView): New method. * javax/swing/text/PlainView.java (modelToView): Made public. 2004-08-31 Kim Ho <kho@redhat.com> * Makefile.am: New files. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * java/awt/Color.java: Fix documentation. (RGBtoHSB): Use floats for conversions. * javax/swing/ButtonGroup.java: Run Jalopy. (setSelected): Reimplement. * javax/swing/DefaultButtonModel.java: Run Jalopy. (changeState): Let ButtonGroup know that the button is changing state. * javax/swing/JColorChooser.java: Implement. * javax/swing/JLabel.java: Run Jalopy. * javax/swing/JSpinner.java: Run Jalopy. (setValue): New method. * javax/swing/JTabbedPane.java: Run Jalopy. (removeTabAt): Call correct remove method. * javax/swing/SpinnerNumberModel.java: Run Jalopy. (getPreviousValue): Compare minimum value. * javax/swing/Timer.java: Run Jalopy. (run): Comment out println. * javax/swing/ToolTipManager.java: (mouseMoved): Get new tooltip text for location. * javax/swing/colorchooser/AbstractColorChooserPanel.java: Jalopy and Javadoc. * javax/swing/colorchooser/ColorChooserComponentFactory.java: Implement. * javax/swing/colorchooser/DefaultColorSelectionModel.java: Run Jalopy. (setSelectedColor): Fire ChangeEvent. * javax/swing/colorchooser/DefaultHSBChooserPanel.java: New file. Implement. * javax/swing/colorchooser/DefaultPreviewPanel.java: Ditto. * javax/swing/colorchooser/DefaultRGBChooserPanel.java: Ditto. * javax/swing/colorchooser/DefaultSwatchChooserPanel.java: Ditto. * javax/swing/plaf/basic/BasicArrowButton.java: (getArrow): Fix size of upward pointing button. * javax/swing/plaf/basic/BasicColorChooserUI.java: Implement. * javax/swing/plaf/basic/BasicSliderUI.java: (getWidthOfWidestLabel): Use preferred dimensions. (getHeightOfTallestLabel): Ditto. * javax/swing/plaf/basic/BasicSpinnerUI.java: Run Jalopy. (mousePressed): Disable changes to spinner if it is not enabled. * testsuite/Makefile.in: Regenerate. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTableHeaderUI.java, javax/swing/plaf/basic/BasicTableUI.java: Added copyright notice. 2004-08-31 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added new files. * Makefile.in: Regenerate. * javax/swing/ComboBoxEditor.java: Added javadocs. * javax/swing/ComboBoxModel.java: Likewise. * javax/swing/DefaultComboBoxModel.java: Implemented. * javax/swing/DefaultListCellRenderer.java: Added javadocs and ran through jalopy to fix formatting style. (getListCellRendererComponent): Use appropriate border if renderer has focus and use noFocusBorder when it doesn't. * javax/swing/JComboBox.java: Implemented. * javax/swing/JList.java: (locationToIndex): New Method. Implemented. (indexToLocation): New Method. * javax/swing/JPopupMenu.java: (visible): New field. (isVisible): Changed to use new field above. (setVisible): Likewise. * javax/swing/MutableComboBoxModel.java: Added javadocs. * javax/swing/plaf/basic/BasicArrowButton.java: (shadow): Changed default color to Color.gray. * javax/swing/plaf/basic/BasicComboBoxUI.java: New File. UI delegate for JComboBox. * javax/swing/plaf/basic/BasicComboPopup.java: New File. Popup menu containing list of JComboBox's items. * javax/swing/plaf/basic/BasicComboBoxEditor.java: New File. * javax/swing/plaf/basic/BasicComboBoxRenderer.java: New File. * javax/swing/plaf/basic/BasicComboBoxUI.java: New File. * javax/swing/plaf/basic/BasicComboPopup.java: New File. * javax/swing/plaf/basic/BasicPopupMenuUI.java: (popupMenuWillBecomeVisible): Set selected path to the first element only if it is of type MenuElement. Also fix formatting style. * javax/swing/plaf/basic/ComboPopup.java: Added javadocs and missing methods signatures. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (createBranchElement): Use new constructor of BranchElement. (createLeafElement): Renamed arguments. (getRootElements): Implemented. (BranchElement.start): Removed. (BranchElement.end): Likewise. (BranchElement.BranchElement): Fixed arguments. (BranchElement.getEndOffset): Reimplemented. (BranchElement.getStartOffset): Likewis. * javax/swing/text/DefaultCaret.java (paint): Draw simple vertical line as caret instead of a rectangle. * javax/swing/text/JTextComponent.java (setText): Use doc directly. * javax/swing/text/PlainView.java (nextTabStop): Implemented. * javax/swing/text/Utilities.java (drawTabbedText): nextTabStop() returns an absolute x position. (getTabbedTextWidth): Likewise. 2004-08-31 Graydon Hoare <graydon@redhat.com> * java/awt/Component.java (isFocusTraversable): Predicate on isLightweight() (setFocusable): Set isFocusTraversableOverridden. (requestFocus): Predicate peer dispatch on !isLightweight() (requestFocusInWindow): Likewise. (dispatchEventImpl): Coordinate with KeyboardFocusManager. * java/awt/Container.java (dispatchEventImpl): Predicate on event mask. (LightweightDispatcher): Remove focus machinery. * java/awt/DefaultFocusTraversalPolicy.java (accept): Expand predicate to include isFocusable(). * java/awt/DefaultKeyboardFocusManager.java: Globally change c.dispatchEvent(e) to redispatchEvent(c,e) * java/awt/KeyboardFocusManager.java (redispatchEvent): Synchronize on event to prevent feedback. * javax/swing/AbstractButton.java (ButtonFocusListener): Remove class. (init): Set focusPainted, focusable. * javax/swing/ActionMap.java (get): Check parent for null. * javax/swing/InputMap.java (get): Likewise. * javax/swing/JComponent.java (inputMap_whenFocused): New InputMap. (inputMap_whenAncestorOfFocused): Likewise. (inputMap_whenInFocusedWindow): Likewise. (getActionForKeyStroke): Rewrite. (getConditionForKeystroke): Likewise. (ActionListenerProxy): New private class. (setInputMap): Implement. (getInputMap): Likewise. (setActionMap): Likewise. (getActionMap): Likewise. (processComponentKeyEvent): New empty method. (processKeyEvent): Implement. (processKeyBinding): Likewise. (resetKeyboardActions): Rewrite. * javax/swing/KeyStroke.java: Rewrite. * javax/swing/SwingUtilities.java (notifyAction): Implement. (replaceUIActionMap): Likewise. (replaceUIInputMap): Likewise. * javax/swing/plaf/basic/BasicButtonListener.java (focusGained): Implement. (focusLost): Repaint if focusPainted(). (installKeyboardActions): Install pressed / released actions. (uninstallKeyboardActions): Implement. * javax/swing/plaf/basic/BasicButtonUI.java (focusColor): New field. (installDefaults): Load focus color, install input map. (installKeyboardActions): Implement. (uninstallKeyboardActions): Likewise. (paintFocus): Rewrite. * javax/swing/plaf/basic/BasicLookAndFeel.java (Button.focus): New default, midPurple. * javax/swing/plaf/basic/BasicTextUI.java (kit): Make static. (installUI): Get doc from kit, load defaults. (getKeymapName): Implement. (createKeymap): Likewise. (installKeyboardActions): Likewise. (getInputMap): Likewise. (getActionMap): Likewise. (createActionMap): Likewise. * javax/swing/text/AbstractDocument.java (getStartPosition): Implement. (getEndPosition): Likewise. * javax/swing/text/DefaultEditorKit.java (CopyAction): New class. (CutAction): Likewise. (DefaultKeyTypedAction): Likewise. (InsertBreakAction): Likewise. (InsertContentAction): Likewise. (InsertTabAction): Likewise. (PasteAction): Likewise. (defaultActions): New static table. (createCaret): Implement. (getActions): Likewise. * javax/swing/text/JTextComponent.java (KeymapWrapper): New private class. (KeymapActionMap): Likewise. (DefaultKeymap): New class. (keymaps): New static table. (keymap): New field. (getKeymap): Implement. (removeKeymap): Likewise. (addKeymap): Likewise. (setKeymap): Likewise. (loadKeymap): Likewise. (getActions): Likewise. (margin): New field. (JTextComponent): Build and install default keymap. * javax/swing/text/TextAction.java (textAction): Call super properly. (getTextComponent): Implement. * javax/swing/text/Utilities.java (drawTabbedText): Adjust position by ascent. 2004-08-31 David Jee <djee@redhat.com> PR AWT/17156 * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (setEnabled): Make it a native method. * java/awt/DefaultKeyboardFocusManager.java (postProcessKeyEvent): Only post event if the menu item is active. * java/awt/MenuItem.java: Private field 'enabled' should be true by default. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (setEnabled): New function. 2004-08-31 David Jee <djee@redhat.com> PR AWT/17059 * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (nativeSetHelpMenu): New native method declaration. (addHelpMenu): Call nativeSetHelpMenu(). (addMenu): Remove. * java/awt/MenuBar.java (setHelpMenu): Call addNotify() on the new help menu. (add): Call addNotify() on the new menu. (addNotify): Set the help menu if one exists. * java/awt/peer/MenuBarPeer.java (addMenu): Remove. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c (nativeSetHelpMenu): New method. 2004-08-31 Graydon Hoare <graydon@redhat.com> * Makefile.am: Add new files. * Makefile.in: Regenerate. * javax/swing/Box.java: Fix setting of layout in ctor. * javax/swing/JScrollPane.java: Scroll headers as well. * javax/swing/JTable.java: Reimplement. * javax/swing/JViewPort.java: Only add non-null children. * javax/swing/ScrollPaneLayout.java: Correct header calculations. * javax/swing/Timer.java: Fix stopping null waker. * javax/swing/plaf/basic/BasicTableHeaderUI.java: New file. * javax/swing/plaf/basic/BasicTableUI.java: New file. * javax/swing/table/DefaultTableCellRenderer.java: Configure. * javax/swing/table/DefaultTableColumnModel.java: Flesh out. * javax/swing/table/DefaultTableModel.java: Clean up. * javax/swing/table/JTableHeader.java: Implement. 2004-08-31 Mark Wielaard <mark@klomp.org> * javax/swing/JSpinner.java (getChangeListeners): Remove double semi-colon. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Declare variables at top of functions/block. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/lang/Rectangle.java (intersects): Check r.width and r.height first. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/PlainView.java (selectedColor): New field. (unselectedColor): Likewise. (font): Likewise. (updateMetrics): New method. (lineToRect): Likewise. (modelToView): Likewise. (drawSelectedText): Use color from JTextComponent ad draw with Utilities class. (drawUnselectedText): Likewise. (paint): Initialize helper fields. * javax/swing/text/View.java (getChildAllocation): New method. (getViewIndex): Likewise. (getToolTipText): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/Utilities.java (drawTabbedText): Reimplemented. (getTabbedTextWidth): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (installDefaults): Install caret and highlighter. (modelToView): Use Bias.Forward when calling sibling. * javax/swing/text/AbstractDocument.java (ElementEdit): Implements DocumentEvent.ElementChange. (ElementEdit.ElementEdit): New method. (ElementEdit.getChildrenAdded): Likewise. (ElementEdit.getChildrenRemoved): Likewise. (ElementEdit.getElement): Likewise. (ElementEdit.getIndex): Likewise. * javax/swing/text/DefaultCaret.java (color): Removed. (textComponent): Renamed from parent, made private. (selectionVisible): Renamed from vis_sel, made private. (blinkRate): Renamed from blink, made private. (magicCaretPosition): Renamed from magic, made private. (visible): Renamed from vis, made private. (dot): Made private. (mark): Likewise. (deinstall): Remove as MouseMotionListener. (install): Initialize textComponent first. Add as MouseMotionListener. (paint): Reimplemented. * javax/swing/text/JTextComponent.java (setCaret): Deinstall old caret, install new one and fire property change after setting property. (setHighlighter): Deinstall old highlighter, install new one and fire property change after setting property. (setCaretColor): Fire property change after setting property. (setDisabledTextColor): Likewise. (setSelectedTextColor): Likewise. (setSelectionColor): Likewise. (modelToView): New method. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (getText): Simplified. * javax/swing/text/Segment.java (current): New field. (current): Reimplemented. (first): Likewise. (getIndex): Likewise. (last): Likewise. (next): Likewise. (previous): Likewise. (setIndex): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicButtonUI.java (defaultTextIconGap): Made protected. (defaultTextShiftOffset): Likewise. (textShiftOffset): New field. (clearTextShiftOffset): New method. (getTextShiftOffset): Likewise. (setTextShiftOffset): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (installUI): Add eventHandler as property listener. (uninstallUI): remove eventHandler as propert listener. (installDefaults): Added comment. (installListeners): Likewise. (installKeyboardActions): Likewise. (uninstallDefaults): Likewise. (uninstallListeners): Likewise. (uninstallKeyboardActions): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java: Fixed some typos in comments. (insertString): Reimplemented. (remove): Likewise. (replace): New method. (children): Dont use fully qualified class name. (DefaultDocumentEvent.offset): Renamed from off. (DefaultDocumentEvent.length): Renamed from len. (DefaultDocumentEvent.type): New field. (DefaultDocumentEvent.DefaultDocumentEvent): New constructor. (DefaultDocumentEvent.getType): Implemented. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RootView.textComponent): Removed. (RootView.RootView): Don't initialize textComponent. (RootView.getViewFactory): New method. (EventHandler): New inner class. (rootView): Initialize at instance creation. (eventHandler): New field. (installUI): Don't create view hierarchy directly, call modelChanged() instead. (modelChanged): New method. * javax/swing/text/JTextComponent.java (setDocument): Fire property change event. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (RootView.paint): Removed debug output. (paintSafely): Draw highlighter before text. (paintBackground): Use background color of text component. * javax/swing/plaf/basic/BasicToggleButtonUI.java: Reformatted. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicToolBarUI.java (BasicToolBarUI): Fixed arguments for constructor. (createUI): Fixed creation of object. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultListSelectionModel.java (fireValueChanged): Renamed from fireSelectionValueChanged, made protected. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/text/TabSet.java (TabSet): Implements java.io.Serializable. * javax/swing/text/TabStop.java (TabStop): Implements java.io.Serializable. (TabStop): Made public. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (setUI): Fire PropertyChange. * javax/swing/JLabel.java (text): Renamed from labelText. (horizontalAlignment): New default vlaue. (icon): Renamed from activeIcon. (displayedMnemonic): Renamed from mnemonicKey, added default value. (displayedMnemonicIndex): Renamed from underlineChar. (setDisplayedMnemonic): Reimplemented. * javax/swing/JRadioButton.java (JRadioButton): New constructors. * javax/swing/JTextField.java (JTextField): Throw exception if colums < 0, initialitialz this.columns directly and initialize document with text conditionally. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicFormattedTextFieldUI.java, javax/swing/plaf/basic/BasicPasswordFieldUI.java, javax/swing/plaf/basic/BasicTextAreaUI.java: New files. * javax/swing/text/FieldView.java (paint): Just call super method for now. * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-08-31 Ka-Hing Cheung <kahing@javabsp.org> * javax/swing/AbstractSpinnerModel.java, javax/swing/JSpinner.java, javax/swing/SpinnerNumberModel.java, javax/swing/plaf/basic/BasicSpinnerUI.java: New files. * javax/swing/plaf/basic/BasicLookAndFeel.java (initClassDefaults): Added defaults for BasicSpinnerUI. 2004-08-31 Michael Koch <konqueror@gmx.de> * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/TransferHandler.java, javax/swing/plaf/basic/ComboPopup.java: New files * Makefile.am: Added javax/swing/TransferHandler.java and javax/swing/plaf/basic/ComboPopup.java * Makefile.in: Regenerated. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/text/Utilities.java: New file. 2004-08-31 Michael Koch <konqueror@gmx.de> * Makefile.am: Added javax/swing/text/Utilities.java. * Makefile.in: Regenerated. 2004-08-31 Graydon Hoare <graydon@redhat.com> * javax/swing/text/SimpleAttributeSet.java: New file. * javax/swing/text/StyleConstants.java: New file. * javax/swing/text/StyleContext.java: New file. * javax/swing/text/TabSet.java: New file. * javax/swing/text/TabStop.java: New file. * javax/swing/text/AbstactDocument.java: (AbstractElement): Implement attribute support. * javax/swing/text/AttributeSet.java (NameAttribute): New static field. (ResolveAttribute): New static field. * Makefile.am: Update for new files. * Makefile.in: Regenerate. 2004-08-31 Craig Black <craig.black@aonix.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage): Add support for scaling pixmaps. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (copyAndScalePixmap): New native method. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> PR AWT/16121 * jni/gtk-peer/gthread-jni.c: Include stdio.h. Eliminate type-punning compiler warnings using unions. (throw): Replace bzero with memset. 2004-08-31 Andreas Tobler <a.tobler@schweiz.ch> Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: Move NSA_PB macros to gtkpeer.h. Include gtkpeer.h. * jni/gtk-peer/gtkpeer.h: Move NSA_PB macros here. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImageFromDecoder): Use NSA_GET_PB_PTR macro. 2004-08-31 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: #include gdk.h, not gtk.h. #include jni.h, native_state.h, string.h and stdlib.h, not gtkpeer.h. (*vm): New static variable. (areaPreparedID): Make static. (areaUpdatedID): Likewise. (area_prepared): Get and use JNIEnv through stored JavaVM *vm. (area_prepared): Likewise. (area_updated): Likewise. (closed): Likewise. (initStaticState): Initialize *vm javaVM. (pumpBytes): Use given env, not global gdk_env. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/awt/geom/CubicCurve2D.java (solveCubic): Removed duplicate comments. 2004-08-31 Sven de Marothy <sven@physto.se> * java/awt/geom/CubicCurve2D.java: Reindent. (contains): Implemented. (intersects): Implemented. * java/awt/geom/QuadCurve2D.java: Likewise. * java/awt/geom/GeneralPath.java: Reindent and document. Fully (re)implemented using separate xpoints and ypoints float[] coords. * java/awt/geom/RoundRectangle2D.java: Several bugfixes (Bug #6007). 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JMenuItem.java (getMenuDragMouseListeners): New method. (getMenuKeyListeners): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (model): Made protected. (actionListener): Likewise. (changeListener): Likewise. (itemListener): Likewise. (multiClickThreshhold): New field. (getActionListeners): New method. (getChangeListeners): Likewise. (getItemListeners): Likewise. (fireItemStateChanged): Simplified implementation. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. (getMultiClickThreshhold): New method. (setMultiClickThreshhold): Likewise. 2004-08-31 Tom Tromey <tromey@redhat.com> * java/awt/image/Kernel.java (clone): Use super.clone(). 2004-08-31 David Jee <djee@redhat.com> PR AWT/16682 * gnu/java/awt/peer/gtk/GtkFramePeer.java (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. (nativeSetIconImageFromData): New native method declaration. (setIconImage): Handle images not produced from GdkPixbufDecoder. * gnu/java/awt/peer/gtk/GtkImage.java (getPixelCache): New method. (getColorModel): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. (free_pixbuf_data): New helper function. (nativeSetIconImageFromData): New function. 2004-08-31 Graydon Hoare <graydon@redhat.com> PR SWING/16576 * javax/swing/JLayeredPane.java (setLayer): Permit changing layer after addition. (setPosition): Permit over-length positions. (layerToRange): Compare intValue()s. * javax/swing/Box.java (createHorizontalBox): Implement. (createRigidArea): Likewise. (createVerticalBox): Likewise. 2004-08-31 Kim Ho <kho@redhat.com> * java/awt/Component.java: (processMouseEvent): Consume event after listeners process it. (processMouseMotionEvent): ditto. (processMouseWheelEvent): ditto. * java/awt/Container.java: (acquireComponentForMouseEvent): Do not dispatch to events that have been removed from the Container. (handleEvent): Consume the MouseEvents. * javax/swing/RepaintManager.java: (paintDirtyRegions): Do not add to list of damaged areas if the component has no root. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicMenuItemUI.java: Clean ip imports. 2004-08-31 Mark Wielaard <mark@klomp.org> * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Don't return null when a MissingResourceException is thrown. Should never happen. 2004-08-31 Mark Wielaard <mark@klomp.org> * java/awt/EventQueue.java (postEvent): Throw NullPointerException when argument is null. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter): Define hid at start of function. (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter): Likewise. 2004-08-31 Mark Wielaard <mark@klomp.org> * gnu/java/awt/EmbeddedWindow.java: Reindent. * javax/swing/JButton.java: Reindent. * javax/swing/JCheckBox.java: Reindent. 2004-08-31 Mark Wielaard <mark@klomp.org> * Makefile.am (gtk_c_source_files): Added jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c. (gtk_awt_peer_sources): Added gnu/java/awt/peer/gtk/GThreadMutex.java and gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java. * Makefile.in: Regenerated. 2004-08-31 Archie Cobbs <archie@dellroad.org> * jni/gtk-peer/gthread-jni.c: don't #include nonexistent files 2004-08-31 Steven Augart <augart@watson.ibm.com> * jni/gtk-peer/gthread-jni.c (c-font-lock-extra-types): Added jfieldID, jmethodID. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): Initialize gdk_env before calling any gdk or gtk function. * gnu/java/awt/peer/gtk/GtkMainThread.java (gtkInitCalled): New field. (GtkMainThread): Call wait() in while loop waiting for gtkInitCalled. (run): Set gtkInitCalled. 2004-08-31 Steven Augart <augart@watson.ibm.com> * gnu/java/awt/peer/gtk/GtkMainThread.java (run): Pass the value of the gnu.classpath.awt.gtk.portable.native.sync system property to C. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): New argument, portableNativeSync. Delegate PORTABLE_NATIVE_SYNC work to init_glib_threads. (init_glib_threads): New function. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_ PRIORITY when not already defined in header file. 2004-08-31 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gthread-jni.c (setup_cache): Call ExceptionOccurred, not ExceptionCheck, when we don't have JNI 1.2. 2004-08-31 Steven Augart <augart@watson.ibm.com> * gnu/native/jni/gtk-peer/gthread-jni.c: Indentation fixes. Implemented missing functions for GTK2. Added error handling. Renamed static functions out of the g_ namespace. Added TRACE_API_CALLS, EXPLAIN_TROUBLE, EXPLAIN_BROKEN, EXPLAIN_BADLY_BROKEN, and DELETE_LOCAL_REFS options. Rewrote global-reference code. Eliminated cascading errors. (mutex_trylock_jni_impl) Fully implemented. (cond_timed_wait_jni_impl) Went from millisecond to microsecond resolution. (setup_cache) New function. (mutex_cond_wait_jni_impl, mutex_cond_timed_wait_jni_impl) Fixed bug where they were not unlocking the GMutex associated with the condition variable during the wait on that condition variable. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, native/jni/gtk-peer/gthread-jni.c, native/jni/gtk-peer/gthread-jni.h (g_thread_jni_functions): Renamed to ... (portable_native_sync_jni_functions): this name. (gdk_vm): Renamed to... (the_vm): this name. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (gdk_vm): Removed duplicate definition. (gtkInit): Removed stray message to stdout. (gtkInit): Use g_malloc and g_free instead of malloc and free. (gtkInit): Fix a const assignment bug. (gtkInit): Simplified code. * gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c, native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h, gnu/java/awt/peer/gtk/GThreadMutex.java: New files. 2004-08-31 Mark Wielaard <mark@klomp.org> * javax/swing/Box.java: Put FIXME comment above class declaration. * javax/swing/JButton.java: Remove illegal L&F HTML from comments. * javax/swing/JCheckBox.java: Likewise. * javax/swing/JDialog.java: Likewise. * javax/swing/JRadioButton.java: Likewise. * javax/swing/JToggleButton.java: Likewise. * javax/swing/UIManager.java: Likewise. * javax/swing/border/TitledBorder.java: Likewise. * javax/swing/plaf/basic/BasicLabelUI.java: Likewise. * javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise. * javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: Likewise. * javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise. * javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise. * javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise. * javax/swing/text/JTextComponent.java: Likewise. 2004-08-31 David Jee <djee@redhat.com> PR AWT/16682 * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Add a FIXME for unhandled cases. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> PR AWT/16040 * gnu/awt/LightweightRedirector.java: Call getModifiersEx, not getModifiers. Replace old button masks with new ones. * gnu/awt/xlib/XEventLoop.java: Likewise. * gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise. * gnu/java/awt/peer/gtk/GtkListPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise. * java/awt/AWTKeyStroke.java: Remove old modifier masks. * java/awt/Component.java: Replace old modifier masks with new ones. * java/awt/Container.java: Call getModifiersEx, not getModifiers. * java/awt/DefaultKeyboardFocusManager.java: Likewise. Remove old modifier masks. * javax/swing/JMenuItem.java: Replace old button masks with new ones. * javax/swing/KeyStroke.java: Call getModifiersEx, not getModifiers. * javax/swing/SwingUtilities.java: Likewise. * javax/swing/plaf/basic/BasicButtonListener.java: Likewise. * javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Replace old mask macros with new ones. * jni/gtk-peer/gtkpeer.h: Replace old button and modifier mask macros with new ones representing new masks. 2004-08-31 Craig Black <craig.black@aonix.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawRoundRect): Implemented. (fillRoundRect): Implemented. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawRoundRect): Reimplemented to match GdkGraphics. (fillRoundRect): Reimplemented to match GdkGraphics. 2004-08-31 Mark Wielaard <mark@klomp.org> * Makefile.in: Regenerated. 2004-08-31 Michael Koch <konqueror@gmx.de> * gnu/java/awt/EmbeddedWindow.java (addNotify): Use AccessController to allow execution of privileged code. 2004-08-31 Michael Koch <konqueror@gmx.de> * gnu/java/awt/EmbeddedWindow.java (static): Removed. (addNotify): Set peer via reflection. (setWindowPeer): Removed. * gnu/java/awt/natEmbeddedWindow.cc: Removed. * Makefile.am (nat_source_files): Removed gnu/java/awt/natEmbeddedWindow.cc. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * Makefile.am: Add gnu/java/security/action/GetPropertyAction.java and gnu/java/security/action/SetAccessibleAction.java. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/security/action/GetPropertyAction.java (setParameters): Renamed from 'setName'. New 2-argument form with default value. (run): Pass default 'value' parameter to System.getProperty(). * gnu/java/security/action/SetAccessibleAction.java: Fix javadoc typos. 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/security/action/GetPropertyAction.java: New class. * gnu/java/security/action/SetAccessibleAction.java: New class. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Check if image is null. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (create): Set the icon image. (nativeSetIconImage): New native method declaration. (setIconImage): Implement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (nativeSetIconImage): New function. 2004-08-31 Dalibor Topic <robilad@kaffe.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (filenameFilterCallback): Declare local variable accepted before use. 2004-08-31 Dalibor Topic <robilad@kaffe.org> * gnu/java/awt/ComponentDataBlitOp.java: Cleaned up imports. 2004-08-31 Tom Tromey <tromey@redhat.com> * gnu/java/awt/peer/GLightweightPeer.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, javax/swing/JScrollPane.java: Removed redundant imports. 2004-08-31 David Jee <djee@redhat.com> * java/awt/DefaultKeyboardFocusManager.java (postProcessKeyEvent): Only activate MenuShortcuts on KEY_PRESSED event. Fix shift modifier checking. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (accel_attach): Remove. (setupAccelGroup): Remove calls to accel_attach. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkArg.java: Remove file. * gnu/java/awt/peer/gtk/GtkArgList.java: Remove file. * Makefile.am (gtk_awt_peer_sources): Remove GtkArg.java and GtkArgList.java. (gtk_c_files): Use CAIRO_CFLAGS and PANGOFT2_CFLAGS, not _LIBS. * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (create(String)): New method. (create): Call new create method. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (nativeCreate): Rename to create. (gtkSetLabel): Rename to gtkButtonSetLabel. (gtkToggleButtonSetActive): New method. (create): Call gtkToggleButtonSetActive and gtkButtonSetLabel. (setState): Replace set call with gtkToggleButtonSetActive. (setLabel): Replace gtkSetLabel call with gtkButtonSetLabel. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetSetSensitive): New method. (gtkWidgetSetParent): Likewise. (GtkComponentPeer): Call setParent, setComponentBounds and setVisibleAndEnabled. (setParent): New method. (setComponentBounds): New method. (setVisibleAndEnabled): New method. (setEnabled): Call gtkWidgetSetSensitive. (getArgs): Remove method. Remove all set methods. * gnu/java/awt/peer/gtk/GtkDialogPeer.java (create): Call gtkWindowSetModal, setTitle and setResizable. (getArgs): Remove method. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java (setComponentBounds): New method. * gnu/java/awt/peer/gtk/GtkFramePeer.java (setResizable): Replace set call with gtkWindowSetResizable. (getArgs): Remove method. (create): Call setTitle and setResizable. * gnu/java/awt/peer/gtk/GtkWindowPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (gtkWindowSetTitle): New method. (gtkWindowSetResizable): New method. (gtkWindowSetModal): New method. (setParent): New method. (setVisibleAndEnabled): New method. (getArgs): Remove method. (setTitle): Call gtkWindowSetTitle. (setResizable): Call gtkWindowSetResizable. * jni/gtk-peer/gtkpeer.h [DEBUG_LOCKING]: New define to turn on and off locking instrumentation. 2004-08-31 Kim Ho <kho@redhat.com> * Makefile.am: Add new file. * Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate * include/Makefile.in: * java/awt/Container.java: (acquireComponentForMouseEvent): Respect the event mask when looking for candidate. * javax/swing/JComponent.java: Remove toolTip field. (createToolTip): Create a tooltip on demand. (setToolTipText): Register with the ToolTipManager. (getToolTipText(MouseEvent)): Return getToolTipText(). * javax/swing/JToolTip.java: Implement. * javax/swing/Timer.java: Jalopy. (restart): Call stop, then start. (stop): Interrupt the timer rather than wait for the timer to come to a stop naturally. * javax/swing/ToolTipManager.java: Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change ToolTip.background color. * javax/swing/plaf/basic/BasicToolTipUI.java: Implement. * testsuite/Makefile.in: Regenerate 2004-08-31 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/DirectColorModel.java (DirectColorModel): Fix constructor param comments. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java: Document AWT 1.0 event handler methods. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/Box.java: (createGlue): Implemented (createHorizontalGlue): Implemented (createHorizontalStrut): Implemented (createVerticalGlue): Implemented (createVerticalStrut): Implemented 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkChoicePeer.java (GtkChoicePeer): Do not automatically select first item. (getHistory): Remove. (nativeGetSelected): New method. (nativeRemoveAll): New method. (add): Use nativeGetSelected() instead of getHistory(). (remove): Likewise. (removeAll): Call nativeRemoveAll(). * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (create): Migrate to GtkComboBox. (append): Likewise. (nativeAdd): Likewise. (nativeRemove): Likewise. (select): Likewise. (nativeRemoveAll): New method. (nativeGetSelected): New method. (selection_changed): New method. (getHistory): Remove. (item_activate): Remove. (item_removed): Remove. (connect_choice_item_selectable_hook): Remove. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Use tf variable in setEditable call. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c (gtkWidgetSetBackground): New method. (gtkWidgetSetForeground): Likewise. (create): Set peer's editable state based on awtComponent's. * java/awt/Button.java (Button()): Use empty string rather than null in no-label constructor. 2004-08-31 Roman Kennke <roman@ontographics.com> * javax/swing/BoxLayout.java: Reimplement. 2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java, gnu_java_awt_peer_gtk_GdkGraphics.c (initState(GtkComponentPeer)): Don't return array of colour values. (GdkGraphics(int,int)): Set default font to size 12. (GdkGraphics(GtkComponentPeer)): Set graphics colour to component's foreground colour. * gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu_java_awt_peer_gtk_GdkGraphics2D.c (initState(GtkComponentPeer)): Don't return array of colour values. (GdkGraphics2D(GtkComponentPeer)): Set foreground and background colours to component's colours. (current_colors_of_widget): Remove function. * gnu/java/awt/peer/gtk/GtkOffScreenImage.java (getGraphics): Return a new graphics object. * java/awt/Font.java (toString): Fix format. * java/awt/Graphics.java (toString): Likewise. 2004-08-31 Craig Black <craig.black@aonix.com> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (addTearOff): New function. * gnu/java/awt/peer/gtk/GtkMenuPeer.java (addTearOff): New native method. (init): Call addTearOff() when menu.isTearOff(). 2004-08-31 Bryce McKinlay <mckinlay@redhat.com> * gnu/java/awt/ClasspathToolkit.java (createImageProducer): New. Default implementation. * gnu/java/awt/peer/gtk/GtkToolkit.java (createImageProducer): New. Implement using GdkPixbufDecoder. 2004-08-31 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): Use gtkWidgetGetPreferredDimensions() for setting the size of GtkFileDialogPeers. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetGetPreferredDimensions): For widgets extending GtkWindow, use their default sizes rather than their natural requisitions. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java (JFormattedTextField): Implemented. * javax/swing/text/DefaultEditorKit.java (BeepAction): New inner class. * javax/swing/text/Segment.java (partialReturn): New field. (setPartialReturn): New method. (isPartialReturn): Likewise. * javax/swing/text/View.java (createFragment): Fixed typo. (getStartOffset): New method. (getEndOffset): Likewise. 2004-08-31 Michael Koch <konqueror@gmx.de> * javax/swing/table/DefaultTableColumnModel.java (serialVersionUID): Made private. (listenerList): Initialize. (changeEvent): Initialize. * javax/swing/table/JTableHeader.java (JTableHeader): New constructors. (createDefaultColumnModel): New method. * javax/swing/table/TableColumn.java (setHeaderRenderer): Simplified code. (setCellRenderer): Likewise. (setWidth): Likewise. From-SVN: r86956
1596 lines
44 KiB
Java
1596 lines
44 KiB
Java
/* GdkGraphics2D.java
|
|
Copyright (C) 2003, 2004 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.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 void 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;
|
|
initState (component);
|
|
|
|
setColor (component.awtComponent.getForeground ());
|
|
setBackground (component.awtComponent.getBackground ());
|
|
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)
|
|
{
|
|
if (arcWidth > width)
|
|
arcWidth = width;
|
|
if (arcHeight > height)
|
|
arcHeight = height;
|
|
|
|
int xx = x + width - arcWidth;
|
|
int yy = y + height - arcHeight;
|
|
|
|
drawArc (x, y, arcWidth, arcHeight, 90, 90);
|
|
drawArc (xx, y, arcWidth, arcHeight, 0, 90);
|
|
drawArc (xx, yy, arcWidth, arcHeight, 270, 90);
|
|
drawArc (x, yy, arcWidth, arcHeight, 180, 90);
|
|
|
|
int y1 = y + arcHeight / 2;
|
|
int y2 = y + height - arcHeight / 2;
|
|
drawLine (x, y1, x, y2);
|
|
drawLine (x + width, y1, x + width, y2);
|
|
|
|
int x1 = x + arcWidth / 2;
|
|
int x2 = x + width - arcWidth / 2;
|
|
drawLine (x1, y, x2, y);
|
|
drawLine (x1, y + height, x2, y + height);
|
|
}
|
|
|
|
public void drawString (String str, int x, int y)
|
|
{
|
|
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)
|
|
{
|
|
if (arcWidth > width)
|
|
arcWidth = width;
|
|
if (arcHeight > height)
|
|
arcHeight = height;
|
|
|
|
int xx = x + width - arcWidth;
|
|
int yy = y + height - arcHeight;
|
|
|
|
fillArc (x, y, arcWidth, arcHeight, 90, 90);
|
|
fillArc (xx, y, arcWidth, arcHeight, 0, 90);
|
|
fillArc (xx, yy, arcWidth, arcHeight, 270, 90);
|
|
fillArc (x, yy, arcWidth, arcHeight, 180, 90);
|
|
|
|
fillRect (x, y + arcHeight / 2, width, height - arcHeight + 1);
|
|
fillRect (x + arcWidth / 2, y, width - arcWidth + 1, height);
|
|
}
|
|
|
|
public 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 () + "]";
|
|
}
|
|
|
|
}
|