ea28b8f60f
2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (drawImage variants): Update image observer. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (createImage): Start image production. * gnu/java/awt/peer/gtk/GtkFramePeer.java (setMenuBar): Protect against negative menu bar widths. (setBounds): Likewise. (postConfigureEvent): Likewise. * gnu/java/awt/peer/gtk/GtkImage.java (imageComplete): Don't remove consumer unless only a single frame has completed. * gnu/java/awt/peer/gtk/GtkImagePainter.java (GtkImagePainter): Add observer parameter. (setPixels): Update image observer. (imageComplete): Likewise. * java/applet/Applet.java (width): New field. (height): Likewise. (setStub): Set size if width or height field has been set. (resize): If stub is null save width and height values. * java/awt/Component.java (reshape): Protect against null parent. * java/awt/image/MemoryImageSource.java (MemoryImageSource(int,int,ColorModel,byte[],int,int)): Document. (MemoryImageSource(int,int,ColorModel,int[],int,int)): Likewise. (MemoryImageSource(int,int,ColorModel,byte[],int,int,Hashtable)): Reference pixel array directly, rather than creating a local copy. (MemoryImageSource(int,int,ColorModel,int[],int,int,Hashtable)): Likewise. (newPixels(int,int,int,int)): Fix for loop and array copy bounds. (newPixels(int,int,int,int,boolean)): Likewise. (startProduction): If animated call imageComplete with SINGLEFRAME. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Uncomment gdk_flush lines. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c (drawPixels): Return if g is null or g->drawable is not a gdk drawable. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/DefaultSingleSelectionModel.java, javax/swing/JPasswordField.java, javax/swing/tree/AbstractLayoutCache.java: Reformatted and javadocs cleaned up. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/Component.java: Fixed argument names to match javadocs. (setFont): Rewritten set property first and then fire event. (setLocale): Likewise. * javax/swing/text/JTextComponent.java (setEditable): Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Button.java (AccessibleAWTButton.getAccessibleActionDescription): Explain the source of 'click'. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java: Remove stub comments. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Button.java (AccessibleAWTButton.getAccessibleActionDescription): Return 'click'. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/CardLayout.java: Made some constants static. (serialVersionUID): Made private. (addLayoutComponent): Simplified code. * java/awt/event/InputEvent.java (getModifiersEx): Added missing @param tag. * java/awt/image/RGBImageFilter.java (filterRGBPixels): Reformatted, removed wrong @param tag. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/text/FieldView.java, javax/swing/text/JTextComponent.java: Removed debug code. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/BorderFactory.java (BorderFactory): Added private constructor. * javax/swing/SwingUtilities.java (SwingUtilities): Likewise. (computeStringWidth): New method. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/color/ICC_Profile.java (icSigNamedColorTag): Removed. * java/awt/datatransfer/DataFlavor.java (isMimeTypeEqual): Made final. * java/awt/image/AffineTransformOp.java: Reworked javadocs. (TYPE_BICUBIC): Added @since tag. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java (AccessibleAWTCheckBox): Remove todo comments. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java (itemStateChanged): Implement function. (getAccessibleContext): Add AccessibleAWTCheckBox to item listeners. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/Polygon.java (contains): Reimplemented. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/print/PrinterJob.java: Reformatted. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/AffineTransformOp.java, java/awt/image/ColorConvertOp.java, java/awt/image/LookupOp.java, java/awt/image/RescaleOp.java: Added final keywords where they belong. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/CardLayout.java, java/awt/Component.java, java/awt/Font.java, java/awt/image/SinglePixelPackedSampleModel.java: Fixed javadocs and argument names all over. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/DataBufferShort.java: Fixed file header. * java/awt/image/DataBufferUShort.java: Likewise. (DataBufferUShort): Throw NullPointerException if dataArray is null. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Arc2D.java (setAngleStart): Corrected (wrong sign on atan2 y parameter). (setAngles): Likewise. (containsAngle): Return false on zero extent, don't include final angle. (contains): Treat OPEN-type arcs like CHORD ones, not as PIE ones. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/AffineTransform.java, (inverseTransform): Fixed bug and simplified code. (createTransformedShape): Return null on null parameter. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/color/ICC_ColorSpace.java, java/awt/color/ICC_Profile.java, java/awt/color/ICC_ProfileGray.java, java/awt/color/ICC_ProfileRGB.java: Re-indent copyright header to be standardish. * java/awt/datatransfer/StringSelection.java: Reformatted. * java/awt/geom/Area.java (EPSILON): Made static. (RS_EPSILON): Likewise. (PE_EPSILON): Likewide. 2004-11-30 Sven de Marothy <sven@physto.se> * javax/swing/SwingUtilities.java: (computeDifference): Implemented (computeIntersection): Likewise (computeUnion): Likewise (isRectangleContainingRectangle): Likewise 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/BasicStroke.java, java/awt/Button.java, java/awt/Canvas.java, java/awt/CheckboxMenuItem.java, java/awt/Container.java, java/awt/EventQueue.java, java/awt/FileDialog.java, java/awt/FlowLayout.java, java/awt/FontMetrics.java, java/awt/Graphics.java, java/awt/GridLayout.java, java/awt/KeyboardFocusManager.java, java/awt/Label.java, java/awt/LayoutManager2.java, java/awt/List.java, java/awt/MenuBar.java, java/awt/Scrollbar.java, java/awt/Toolkit.java, java/awt/Window.java, java/awt/datatransfer/DataFlavor.java, java/awt/datatransfer/FlavorTable.java, java/awt/event/ActionListener.java, java/awt/event/HierarchyBoundsAdapter.java, java/awt/geom/Arc2D.java, java/awt/geom/Rectangle2D.java, java/awt/geom/RectangularShape.java, java/awt/im/spi/InputMethod.java, java/awt/image/ByteLookupTable.java, java/awt/image/ColorModel.java, java/awt/image/DirectColorModel.java, java/awt/image/ShortLookupTable.java, java/awt/print/Book.java: Fixed javadocs and method argument names all over. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkFontPeer.java (buildString): Optimise String building. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/TextArea.java (AccessibleAWTTextArea, getAccessibleContext): Implement. * java/awt/TextField.java (AccessibleAWTTextField, getAccessibleContext): Implement. 2004-11-30 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. * Makefile.am (jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.lo): Fixed typo. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Menu.java (AccessibleAWTMenu, getAccessibleContext): Implement. * java/awt/PopupMenu.java (AccessibleAWTMenu, getAccessibleContext): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/print/PrinterJob.java (lookupPrintServices, getPrintService, setPrintService): Implement. (lookupStreamPrintServices): Add commented out implementation. (printer): New field. 2004-11-30 Mark Wielaard <mark@klomp.org> * javax/swing/ToolTipManager.java (mouseMoved): Set currentComponent when not yet set. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/GeneralPath.java (evaluateCrossings): Fixed epsilon value, should always be nonzero. 2004-11-30 Paul Jenner <psj.home@ntlworld.com> * java/awt/image/Raster.java (createPackedRaster): Implemented. 2004-11-30 Graydon Hoare <graydon@redhat.com> * javax/swing/plaf/basic/BasicTextUI.java: Listen to focus events, indicate focus via caret. * javax/swing/text/GapContent.java (getString): Return substring. * javax/swing/text/PlainDocument.java (reindex): New method. (createDefaultRoot): Call it. (insertUpdate): Likewise. (removeUpdate): Likewise. * javax/swing/text/Utilities.java (drawTabbedText): Always advance on tab and newline, even if no painting happens. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am: List peer JNI header: Java source file dependencies explicitly. Likewise for JNI .lo: JNI header dependencies. * Makefile.in: Regenerate. 2004-11-30 Graydon Hoare <graydon@redhat.com> * Makefile.am: Add entry for BasicTextPaneUI.java * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (GdkGraphics2D): Set clip after transform. (drawImage): Protect against null image. * gnu/java/awt/peer/gtk/GtkFramePeer.java (setIconImage): Protect against non-GtkImage args. * gnu/java/awt/peer/gtk/GtkToolkit.java (checkImage): Protect against non-GtkImage args. * java/awt/print/PrinterJob.java: (print): Add variant taking PrintRequestAttributeSet. (printDialog): Likewise. * javax/swing/JComponent.java: (transferHandler): New field. (getComponentGraphics): Build new Graphics for each sub-paint. (getTransferHandler): New method. (setTransferHandler): New method. * javax/swing/JDesktopPane.java (setDragMode): Force LIVE_DRAG_MODE. * javax/swing/JMenuItem.java (menuSelectionChanged): Protect against null parent. * javax/swing/JTable.java (setDefaultRenderer): New method. * javax/swing/JTree.java: Get basic ctors and UI working. * javax/swing/JViewport.java (JViewport): Set scroll mode. * javax/swing/RepaintManager.java (addDirtyRegion): Skip empty regions. * javax/swing/ScrollPaneLayout.java (minimumLayoutSize): Do not bound scrollpane minimum by central view minimum. * javax/swing/ToolTipManager.java (showTip): Guard against null component. * javax/swing/TransferHandler.java: Stub out. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add entry for TextPaneUI, change Tree icons to pngs. * javax/swing/plaf/basic/BasicMenuItemUI.java: (installDefaults): Set text position and alignment. (paintMenuItem): Layout icon with normal compound function. * javax/swing/plaf/basic/BasicTableHeaderUI.java: (getMaximumSize): Delete. (getMinimumSize): Delete. (getPreferredSize): Use column model's total width. * javax/swing/plaf/basic/BasicTextPaneUI.java: New file. * javax/swing/plaf/basic/BasicTextUI.java (modelChanged): Make resilient against nulls. * javax/swing/plaf/basic/BasicTreeUI.java: Add some simplistic config / painting functions. * javax/swing/plaf/basic/BasicViewportUI.java (paintSimple): Add new non-backingstore paint mode. (paintBackingStore): Split out backing store code. (paint): Switch on painting mode. * javax/swing/text/SimpleAttributeSet.java (SimpleAttributeSet): Resist nulls. * javax/swing/tree/DefaultTreeCellRenderer.java: Implement. * javax/swing/tree/DefaultTreeModel.java: Partially implement. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (setFont): Set pango context's description and language. 2004-11-30 Mark Wielaard <mark@klomp.org> * java/awt/image/LookupOp.java: Comments and indentation fixes. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Checkbox.java (AccessibleAWTCheckBox): Implement. (getAccessibleContext): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/TextComponent.java (AccessibleAWTTextComponent): Implement. (getIndexAtPoint, getCharacterBounds): New methods. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Button.java (AccessibleAWTButton): Implement. 2004-11-30 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (filenameFilterCallback): Made static. 2004-11-30 Michael Koch <konqueror@gmx.de> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (cairoShowGlyphs) Removed. 2004-11-30 Sven de Marothy <sven@physto.se> * gnu/java/awt/color/RgbProfileConverter.java (RgbProfileConverter): Don't invert matrix when reverse CLUT is available. * gnu/java/awt/color/LinearRGBConverter.java: Documentation update. * java/awt/color/ICC_ColorSpace.java: Likewise. * java/awt/color/ICC_Profile.java: Likewise. * java/awt/color/ICC_ProfileGray.java: Likewise. * java/awt/color/ICC_ProfileRGB.java: Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/MenuItem.java (AccessibleAWTMenuItem): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/Choice.java (AccessibleAWTChoice): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BandedSampleModel.java (scanlineStride): Remove field hiding ComponentSampleModel.scanlineStride. 2004-11-30 Noa Resare <noa@resare.com> * java/awt/geom/GeneralPath.java (currentSegment): Fix typo in transform.transform() invocation. 2004-11-30 Sven de Marothy <sven@physto.se> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (createImage): Created bitmap should be filled with bg color 2004-11-30 Noa Resare <noa@resare.com> * java/awt/Choice.java (add): Implement correct selection behavior when peer == null. (insert): Likewise. (remove): Likewise. 2004-11-30 Mark Wielaard <mark@klomp.org> * gnu/java/awt/peer/gtk/GtkChoicePeer.java (GtkChoicePeer): Call select() when Choice has a selected item. 2004-11-30 Michael Koch <address@bogus.example.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c: Fixed method names to start at begin of line. This is desired by GNU coding style guide. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkWidgetSetVisible): Unused. Removed. (connectJObject): Likewise. * gnu/java/awt/peer/gtk/GtkScrollPanePeer.java (gtkScrolledWindowSetScrollPosition): Commented out. 2004-11-30 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c (Java_gnu_java_awt_peer_gtk_GdkTextLayout_setText): Installed and renamed from Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText. 2004-11-30 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText): Removed. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (init_dpi_conversion_factor): Correct prototype. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/image/ConvolveOp.java: Added missing copyright notice. 2004-11-30 Robert Schuster <theBohemian@gmx.net> Fixes bug #10908 * gnu/java/beans/IntrospectionIncubator.java: (addMethod): static methods are discarded now, too. 2004-11-30 Mark Wielaard <mark@klomp.org> * Makefile.am (awt_java_source_files): Add new gnu/java/awt/color java source files. * Makefile.in: Regenerated. 2004-11-30 Sven de Marothy <sven@physto.se> * gnu/java/awt/color/CieXyzConverter.java, gnu/java/awt/color/GrayScaleConverter.java, gnu/java/awt/color/SrgbConverter.java, gnu/java/awt/color/ClutProfileConverter.java, gnu/java/awt/color/LinearRGBConverter.java, gnu/java/awt/color/TagEntry.java, gnu/java/awt/color/ColorLookUpTable.java, gnu/java/awt/color/ProfileHeader.java, gnu/java/awt/color/ToneReproductionCurve.java, gnu/java/awt/color/ColorSpaceConverter.java, gnu/java/awt/color/PyccConverter.java, gnu/java/awt/color/GrayProfileConverter.java, gnu/java/awt/color/RgbProfileConverter.java: New files. * java/awt/color/ICC_ColorSpace.java, java/awt/color/ICC_Profile.java, java/awt/color/ICC_ProfileGray.java, java/awt/color/ICC_ProfileRGB.java: Implemented (sans PhotoYCC color space). 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/AffineTransformOp.java (filter): Implement bilinear interpolation for Rasters. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (IndexColorModel): Actually use the provided colormap. Throw documented exceptions. Document exceptions. 2004-11-30 Paul Jenner <psj.home@ntlworld.com> * java/awt/image/IndexColorModel.java (IndexColorModel): Fix constructor. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/AffineTransformOp.java: Add TYPE_BICUBIC. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/AffineTransformOp.java (filter): Implement Raster filtering. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentSampleModel.java (getDataElements, setDataElements): Implement SHORT, FLOAT, and INT transfer types. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Font.java (name): New field. (size): Likewise. (style): Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (createBandedRaster): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ConvolveOp.java: New class. * Makefile.am: Add ConvolveOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/RescaleOp.java (BandCombineOp, ColorConvertOp, LookupOp, RescaleOp): Fix loop bounds. 2004-11-30 jlquinn <jlquinn@optonline.net> * Makefile.am: Fix typo in BandCombineOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BandCombineOp.java: New class. * Makefile.am: Add BandCombineOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/LookupOp.java: New class. * Makefile.am: Add LookupOp. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/SampleModel.java (createSubsetSampleModel): Add javadocs. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorModel.java (cloneColorModel): Fix line wrap. Use Boolean.valueOf. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (releasePeerGraphicsResource): Fixed typo in method name. * gnu/java/awt/peer/gtk/GdkFontPeer.java (finalize): Fixed typo in releasePeerGraphicsResource. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/font/TextAttribute.java (RUN_DIRECTION_LTR): Initialie with static value instead of calculating it. (RUN_DIRECTION_RTL): Likewise. (STRIKETHROUGH_ON): Likewise. (SWAP_COLORS_ON): Likewise. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorConvertOp.java: New class. * java/awt/image/ColorModel.java (cloneColorModel): New method. * Makefile.am: Add ColorConvertOp. * Makefile.in: Regenerate. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/DefaultKeyboardFocusManager.java (dispatchEvent): Track Window focus owner on FOCUS_GAINED events. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c (Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun): Fix pointer warning. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter): Fix pointer warning. * jni/gtk-peer/gtkpeer.h: Introduce widget_union to fix type punned warnings. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect): Use widget_union to fix type punned pointer warning. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (window_get_new_state): Introduce unions to fix warnings as above. (window_property_changed_cb): Likewise. (window_active_state_change_cb): Mark unused variables unused. (window_focus_state_change_cb): Likewise. (window_focus_in_cb): Likewise. (window_focus_out_cb): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Convert PangoFontMap correctly with PANGO_FT2FONT_MAP macro. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JMenuBar.java (updateUI): Simplified. * javax/swing/tree/DefaultTreeSelectionModel.java: Reorganized import statements. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/font/TextAttribute.java, javax/swing/JComponent.java, javax/swing/JInternalFrame.java, javax/swing/table/TableColumn.java, javax/swing/text/StyleConstants.java: Replaced "new Boolean(boolean)" with "Boolean.valueOf(boolean)". 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultTreeCellEditor.java, javax/swing/tree/DefaultTreeModel.java, javax/swing/tree/DefaultTreeSelectionModel.java: Jalopied. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/tree/DefaultTreeCellEditor.java (EditorContainer.EditorContainer): Fixed arguments. (EditorContainer.EditorContainer): New method. (DefaultTextField.DefaultTextField): Fixed arguments, implemented. (DefaultTextField.getBorder): Implemented. (listenerList): New field. (addCellEditorListener): Implemented. (removeCellEditorListener): Implemented. (getCellEditorListeners): New method. * javax/swing/tree/DefaultTreeModel.java (addTreeModelListener): Fixed javadoc. (removeTreeModelListener): Likewise. (getTreeModelListeners): New method. (fireTreeNodesChanged): Implemented. (fireTreeNodesInserted): Likewise. (fireTreeNodesRemoved): Likewise. (fireTreeStructureChanged): Likewise. (getListeners): Fixed javadoc. * javax/swing/tree/DefaultTreeSelectionModel.java (addTreeSelectionListener): Implemented. (removeTreeSelectionListener): Likewise. (fireValueChanged): Likewise. (getListeners): Likewise. (addPropertyChangeListener): Likewise. (removePropertyChangeListener): Likewise. (getTreeSelectionListeners): New method. (getPropertyChangeListeners): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicScrollBarUI.java (maximumThumbSize): Removed static keyword. (minimumThumbSize): Likewise. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (CloseAction): Made public. (IconifyAction): Likewise. (MaximizeAction): Likewise. (MoveAction): Likewise. (RestoreAction): Likewise. (SizeAction): Likewise. (SystemMenuBar): Likewise. * javax/swing/plaf/basic/BasicSliderUI.java (TrackListener): Likewise. * javax/swing/plaf/basic/BasicSplitPaneUI.java (KeyboardDownRightHandler): Likewise. (KeyboardEndHandler): Likewise. (KeyboardHomeHandler): Likewise. (KeyboardResizeToggleHandler): Likewise. (KeyboardUpLeftHandler): Likewise. (PropertyHandler): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (PropertyChangeHandler): Likewise. (TabSelectionHandler): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/text/JTextComponent.java (getKeymap): Made public. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java (getStream): Throws IOException. (read): Likewise. * javax/swing/JRootPane.java (createContentPane): Fixed return type. * javax/swing/JSpinner.java (commitEdit): Throws ParseException. * javax/swing/plaf/metal/MetalLookAndFeel.java (serialVersionUID): New field. * javax/swing/table/TableColumn.java (resizedPostingDisableCount): Added @deprecated tag. (disableResizedPosting): Likewise. (enableResizedPosting): Likewise. * javax/swing/text/Document.java (TitleProperty): Fixed value. * javax/swing/tree/TreeCellEditor.java (TreeCellEditor): Extends CellEditor. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JWindow.java javax/swing/SpinnerModel.java javax/swing/Timer.java javax/swing/event/MenuKeyEvent.java javax/swing/plaf/basic/BasicButtonUI.java javax/swing/plaf/basic/BasicIconFactory.java javax/swing/plaf/basic/BasicTabbedPaneUI.java javax/swing/text/AttributeSet.java javax/swing/text/Highlighter.java javax/swing/text/StyleConstants.java javax/swing/tree/TreeCellEditor.java: Removed redundant and reordered modifiers. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicToolTipUI.java: Reformatted copyright header. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractAction.java, javax/swing/AbstractButton.java, javax/swing/AbstractCellEditor.java, javax/swing/AbstractListModel.java, javax/swing/AbstractSpinnerModel.java, javax/swing/ActionMap.java, javax/swing/BorderFactory.java, javax/swing/Box.java, javax/swing/ButtonModel.java, javax/swing/CellEditor.java, javax/swing/CellRendererPane.java, javax/swing/DefaultBoundedRangeModel.java, javax/swing/DefaultButtonModel.java, javax/swing/DefaultCellEditor.java, javax/swing/DefaultDesktopManager.java, javax/swing/DefaultListCellRenderer.java, javax/swing/DefaultListSelectionModel.java, javax/swing/DefaultSingleSelectionModel.java, javax/swing/GrayFilter.java, javax/swing/InputMap.java, javax/swing/JApplet.java, javax/swing/JCheckBoxMenuItem.java, javax/swing/JColorChooser.java, javax/swing/JComboBox.java, javax/swing/JComponent.java, javax/swing/JDesktopPane.java, javax/swing/JDialog.java, javax/swing/JEditorPane.java, javax/swing/JFileChooser.java, javax/swing/JFormattedTextField.java, javax/swing/JFrame.java, javax/swing/JInternalFrame.java, javax/swing/JLabel.java, javax/swing/JLayeredPane.java, javax/swing/JList.java, javax/swing/JMenu.java, javax/swing/JMenuBar.java, javax/swing/JMenuItem.java, javax/swing/JOptionPane.java, javax/swing/JPanel.java, javax/swing/JPasswordField.java, javax/swing/JPopupMenu.java, javax/swing/JRadioButtonMenuItem.java, javax/swing/JRootPane.java, javax/swing/JSpinner.java, javax/swing/JSplitPane.java, javax/swing/JTabbedPane.java, javax/swing/JTable.java, javax/swing/JTextArea.java, javax/swing/JTextPane.java, javax/swing/JToggleButton.java, javax/swing/JToolBar.java, javax/swing/JToolTip.java, javax/swing/JTree.java, javax/swing/JViewport.java, javax/swing/ListModel.java, javax/swing/LookAndFeel.java, javax/swing/MenuSelectionManager.java, javax/swing/ProgressMonitorInputStream.java, javax/swing/RepaintManager.java, javax/swing/RootPaneContainer.java, javax/swing/ScrollPaneLayout.java, javax/swing/SpringLayout.java, javax/swing/SwingUtilities.java, javax/swing/Timer.java, javax/swing/ToolTipManager.java, javax/swing/UIDefaults.java, javax/swing/UIManager.java, javax/swing/border/MatteBorder.java, javax/swing/colorchooser/AbstractColorChooserPanel.java, javax/swing/colorchooser/ColorSelectionModel.java, javax/swing/colorchooser/DefaultColorSelectionModel.java, javax/swing/colorchooser/DefaultHSBChooserPanel.java, javax/swing/colorchooser/DefaultPreviewPanel.java, javax/swing/colorchooser/DefaultRGBChooserPanel.java, javax/swing/colorchooser/DefaultSwatchChooserPanel.java, javax/swing/event/AncestorEvent.java, javax/swing/event/HyperlinkEvent.java, javax/swing/event/InternalFrameEvent.java, javax/swing/event/MenuDragMouseEvent.java, javax/swing/event/TableColumnModelEvent.java, javax/swing/event/TableModelEvent.java, javax/swing/event/TreeExpansionEvent.java, javax/swing/event/TreeModelEvent.java, javax/swing/event/TreeSelectionEvent.java, javax/swing/event/TreeWillExpandListener.java, javax/swing/event/UndoableEditEvent.java, javax/swing/filechooser/FileView.java, javax/swing/plaf/BorderUIResource.java, javax/swing/plaf/ComponentUI.java, javax/swing/plaf/FileChooserUI.java, javax/swing/plaf/IconUIResource.java, javax/swing/plaf/ListUI.java, javax/swing/plaf/PopupMenuUI.java, javax/swing/plaf/SplitPaneUI.java, javax/swing/plaf/TabbedPaneUI.java, javax/swing/plaf/TextUI.java, javax/swing/plaf/TreeUI.java, javax/swing/plaf/basic/BasicArrowButton.java, javax/swing/plaf/basic/BasicBorders.java, javax/swing/plaf/basic/BasicButtonUI.java, javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java, javax/swing/plaf/basic/BasicColorChooserUI.java, javax/swing/plaf/basic/BasicComboBoxEditor.java, javax/swing/plaf/basic/BasicComboBoxRenderer.java, javax/swing/plaf/basic/BasicComboBoxUI.java, javax/swing/plaf/basic/BasicComboPopup.java, javax/swing/plaf/basic/BasicDesktopIconUI.java, javax/swing/plaf/basic/BasicDesktopPaneUI.java, javax/swing/plaf/basic/BasicIconFactory.java, javax/swing/plaf/basic/BasicInternalFrameTitlePane.java, javax/swing/plaf/basic/BasicInternalFrameUI.java, javax/swing/plaf/basic/BasicListUI.java, javax/swing/plaf/basic/BasicLookAndFeel.java, javax/swing/plaf/basic/BasicMenuBarUI.java, javax/swing/plaf/basic/BasicMenuItemUI.java, javax/swing/plaf/basic/BasicMenuUI.java, javax/swing/plaf/basic/BasicOptionPaneUI.java, javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java, javax/swing/plaf/basic/BasicPopupMenuUI.java, javax/swing/plaf/basic/BasicProgressBarUI.java, javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java, javax/swing/plaf/basic/BasicRootPaneUI.java, javax/swing/plaf/basic/BasicScrollBarUI.java, javax/swing/plaf/basic/BasicSeparatorUI.java, javax/swing/plaf/basic/BasicSliderUI.java, javax/swing/plaf/basic/BasicSpinnerUI.java, javax/swing/plaf/basic/BasicSplitPaneDivider.java, javax/swing/plaf/basic/BasicSplitPaneUI.java, javax/swing/plaf/basic/BasicTabbedPaneUI.java, javax/swing/plaf/basic/BasicTableHeaderUI.java, javax/swing/plaf/basic/BasicTableUI.java, javax/swing/plaf/basic/BasicTextAreaUI.java, javax/swing/plaf/basic/BasicTextFieldUI.java, javax/swing/plaf/basic/BasicTextUI.java, javax/swing/plaf/basic/BasicToolBarSeparatorUI.java, javax/swing/plaf/basic/BasicToolBarUI.java, javax/swing/plaf/basic/BasicToolTipUI.java, javax/swing/plaf/basic/BasicTreeUI.java, javax/swing/plaf/basic/BasicViewportUI.java, javax/swing/plaf/basic/ComboPopup.java, javax/swing/table/AbstractTableModel.java, javax/swing/table/DefaultTableCellRenderer.java, javax/swing/table/DefaultTableColumnModel.java, javax/swing/table/DefaultTableModel.java, javax/swing/table/JTableHeader.java, javax/swing/table/TableCellEditor.java, javax/swing/table/TableCellRenderer.java, javax/swing/table/TableColumn.java, javax/swing/table/TableColumnModel.java, javax/swing/text/AbstractDocument.java, javax/swing/text/Caret.java, javax/swing/text/DefaultCaret.java, javax/swing/text/DefaultEditorKit.java, javax/swing/text/DefaultHighlighter.java, javax/swing/text/EditorKit.java, javax/swing/text/JTextComponent.java, javax/swing/text/LayeredHighlighter.java, javax/swing/text/PasswordView.java, javax/swing/text/SimpleAttributeSet.java, javax/swing/text/StyleConstants.java, javax/swing/text/StyleContext.java, javax/swing/text/StyledEditorKit.java, javax/swing/text/TextAction.java, javax/swing/text/View.java, javax/swing/tree/AbstractLayoutCache.java, javax/swing/tree/DefaultTreeCellRenderer.java, javax/swing/tree/DefaultTreeModel.java, javax/swing/tree/DefaultTreeSelectionModel.java, javax/swing/tree/FixedHeightLayoutCache.java, javax/swing/tree/TreeCellRenderer.java, javax/swing/tree/TreeSelectionModel.java, javax/swing/tree/VariableHeightLayoutCache.java, javax/swing/undo/AbstractUndoableEdit.java, javax/swing/undo/UndoableEditSupport.java: Imports cleaned up. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/Container.java, java/awt/Font.java, java/awt/font/TextLayout.java: Imports cleaned up. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java (getLabel): Added @deprecated tag. (setLabel): Likewise. * javax/swing/FocusManager.java (disableSwingFocusManager): Likewise. (isFocusManagerEnabled): Likewise. * javax/swing/JComponent.java (isManagingFocus): Added version to @deprecated tag. (getNextFocusableComponent): Moved @deprecated tag to bottom of javadoc. (getConditionForKeyStroke): Likewise. (getActionForKeyStroke): Likewise. * javax/swing/JDesktopPane.java (LIVE_DRAG_MODE): Added @specnote tag. (OUTLINE_DRAG_MODE): Likewise. * javax/swing/JInternalFrame.java (MENU_BAR_PROPERTY): Fixed value. (getMenuBar): Added @deprecated tag. (setMenuBar): Likewise. * javax/swing/JViewport.java (isBackingStoreEnabled): Likewise. (setBackingStoreEnabled): Likewise. * javax/swing/plaf/basic/BasicDesktopPaneUI.java (closeKey): Likewise. (maximizeKey): Likewise. (minimizeKey): Likewise. (navigateKey): Likewise. (navigateKey2): Likewise. * javax/swing/plaf/basic/BasicInternalFrameUI.java (openMenuKey): Likewise. * javax/swing/plaf/basic/BasicSplitPaneUI.java (keyboardDownRightListener): Likewise. (keyboardEndListener): Likewise. (keyboardHomeListener): Likewise. (keyboardResizeToggleListener): Likewise. (keyboardUpLeftListener): Likewise. (dividerResizeToggleKey): Likewise. (downKey): Likewise. (endKey): Likewise. (homeKey): Likewise. (leftKey): Likewise. (rightKey): Likewise. (upKey): Likewise. (createKeyboardUpLeftListener): Likewise. (createKeyboardDownRightListener): Likewise. (createKeyboardHomeListener): Likewise. (createKeyboardEndListener): Likewise. (createKeyboardResizeToggleListener): Likewise. (getDividerBorderSize): Likewise. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (downKey): Likewise. (leftKey): Likewise. (rightKey): Likewise. (upKey): Likewise. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Use the GTK_TEXT_VIEW macro. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (connect_awt_hook_cb): Mark unused variable unused. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c (selection_get): Do the cast right. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create): According to the gtk API gtk_combo_box_new_text actually returns a GtkWidget. Remove unused var menu. (selection_changed): Remove unused value. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds): Fix pointer warning with using an intermediate variable. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_updated): Fix unused var warning for BE archs. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_connectSignals): Remove unused var. (realize_cb): Mark unused variable unused. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (seek_glyphstring_idx): Fix a C90 warning. * jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c (Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun): Mark unused arguments unused. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_initState), (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setGlyphCodes), (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphCharIndex), (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_glyphIsHorizontal): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c (Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerFontMetrics), (Java_gnu_java_awt_peer_gtk_GdkFontMetrics_getPeerTextMetrics): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter): Likewise. (filenameFilterCallback): Remove unused var. (handle_response): Declare str_fileName and remove last else statement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c: New File. (nativeGetNumFontsFamilies) New function. (nativeGetFontFamilies) Likewise. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java (getAvailableFontFamilyNames): Implement. * Makefile.am (gtk_c_source_files): Add GdkGraphicsEnvironment.c. * Makefile.in: Regenerate. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/ClasspathFontPeer.java (setStandardAttributes(String,Map)): If size attribute doesn't exist, default to size 12. Clamp size value to a minimum of 1. 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * javax/swing/JDialog.java (decorated): Likewise. * javax/swing/JFrame.java (defaultLookAndFeelDecorated): Likewise. 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * javax/swing/plaf/basic/BasicToolBarUI.java (offset, regular): Made final. * javax/swing/plaf/basic/BasicScrollBarUI.java (DECREASE_HIGHLIGHT, INCREASE_HIGHLIGHT, NO_HIGHLIGHT, POSITIVE_SCROLL, NEGATIVE_SCROLL): Made final. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/BitwiseXORComposite.java, gnu/java/awt/ClasspathToolkit.java, gnu/java/awt/image/XBMDecoder.java, gnu/java/awt/peer/GLightweightPeer.java, gnu/java/awt/peer/gtk/GdkGlyphVector.java: Reorganized import statements. 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * java/awt/Button.java (next_button_number): Removed useless initializer. * java/awt/Frame.java (next_frame_number): Likewise. * java/awt/Panel.java (next_panel_number): Likewise, * java/awt/Scrollbar.java (next_scrollbar_number): Likewise. * java/awt/TextArea.java (next_text_number): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/ByteLookupTable.java (ByteLookupTable) :Fixed HTML entities in javadocs. (lookupPixel): Fix case when dst is null. * java/awt/image/ShortLookupTable.java (ShortLookupTable) :Fixed HTML entities in javadocs. (lookupPixel): Fix case when dst is null. * java/awt/image/DataBufferByte.java, java/awt/image/DataBufferDouble.java, java/awt/image/DataBufferFloat.java, java/awt/image/DataBufferInt.java, java/awt/image/DataBufferShort.java, java/awt/image/DataBufferUShort.java: Fix initialization of bankData in constructors. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (setNativeBounds): Set GtkEventBox, GtkButton and GtkLabel size requests. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (setNativeBounds): Make package private. Set size request even if GTK parent is NULL. * gnu/java/awt/peer/gtk/GtkLabelPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (setNativeBounds): Set GtkEventBox and GtkLabel size requests. 2004-11-30 Mark Wielaard <mark@klomp.org> Workaround for bug #17952. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (request_frame_extents): Check window->window != NULL. 2004-11-30 Mark Wielaard <mark@klomp.org> * jni/gtk-peer/gdkfont.h: Include gtkpeer.h not gtkcairopeer.h. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Use native_text_layout_state_table here. * jni/gtk-peer/gdkfont.h: Mark native_text_layout_state_table extern. 2004-11-30 Mark Wielaard <mark@klomp.org> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (setChars): Only call pango_itemize() when vec->glyphitems != NULL. Only call pango_shape() when gi->glyphs->num_glyphs > 0. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkToolkit.java: Merged import statements. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (isBufferedImageGraphics): Simplified. 2004-11-30 Paul Jenner <psj.home@ntlworld.com> * javax/swing/JTree.java (isRootVisible): Fixed typo in method name. * javax/swing/JScrollBar.java (setValues): Likewise. * javax/swing/JScrollPane.java (createScrollListener): Call JScrollBar.setValues. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkContainerPeer.java (endValidate): Don't call setParentAndBounds on GtkWindowPeers. * java/awt/Component.java (static): Don't set default keyboard focus manager. * java/awt/KeyboardFocusManager.java (getCurrentKeyboardFocusManager): If current keyboard focus manager is null set a default. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (gtkWidgetSetBackground): New method. (block_expose_events_cb): New function. (connectSignals): Block the AWT's expose event processing on button press and release. (gtkSetLabel): Set text on proper widget. (gtkWidgetModifyFont): Modify font on proper widget. (gtkWidgetSetBackground): Set normal, active and prelight colours. (gtkWidgetSetForeground): Set forground colour of proper widget. (gtkActivate): Activate the correct widget. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (clearRect): Only clear rectangle if the backing component is not an event box. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (beginNativeRepaintID): New variable. (endNativeRepaintID): Likewise. (gtkInit): Initialize new fields with method IDs. * jni/gtk-peer/gtkpeer.h (beginNativeRepaintID): Declare extern. (endNativeRepaintID): Likewise. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * javax/swing/JList.java (init): Revert accidental commit. * gnu/java/awt/peer/gtk/GdkGraphics.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (GdkGraphics): Call initComponentGraphics or connectSignals depending on component's realization status. (realize_cb): New function. (initComponentGraphics): New method. (connectSignals): New method. (clipRect): Return immediately if component is not realized. (setClip): Likewise. (translate): Likewise. (drawImage variants): Return false immediately if component is not realized. * gnu/java/awt/peer/gtk/GdkGraphics2D.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (connectSignals): New method. (GdkGraphics2D): Call initComponentGraphics2D or connectSignals depending on component's realization status. Move other initialization calls to ... (initComponentGraphics2D): New method. (realize_cb): New function. (cairoSetMatrix): Return immediately if gr is NULL. (cairoNewPath): Likewise. (cairoRectangle): Likewise. (cairoClip): Likewise. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetRepaintArea): Remove method. (isRealized): New method. (GtkComponentPeer): Move setParent, connectJObject and setCursor calls to setParentAndBounds. Call setParentAndBounds. (setParentAndBounds): New method. (setComponentBounds): Return immediately if bounds are all zero. (repaint): Remove call to gtkWidgetRepaintArea. Return immediately if requested paint region is 0x0. (setCursor): New method. (gtkWidgetSetParent): Only set widget's parent if its parent is currently NULL. (setNativeBounds): Only set widget's bounds if it has a parent. (connectSignals): Don't call gtk_widget_realize. Connect "realize" signal to connect_awt_hook_cb handler. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (isValidating): New field. (beginValidate): Set isValidating true. (endValidate): Set parents and bounds for children first, then for this. Set isValidating false. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (connectJObject): Remove method. (connectSignals): Don't call gtk_widget_realize. * gnu/java/awt/peer/gtk/GtkListPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (connectJObject): Remove method. (connectSignals): Don't call gtk_widget_realize. * gnu/java/awt/peer/gtk/GtkPanelPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (connectJObject): Remove method. * gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c (connectJObject): Remove method. * gnu/java/awt/peer/gtk/GtkWindowPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (create): Don't call gtk_widget_realize. (connectJObject): Remove method. (connectSignals): Don't call gtk_widget_realize. Connect "realize" signal to connect_awt_hook_cb handler. (nativeSetBounds): Don't attempt to move GDK window if it is NULL. * java/awt/Container.java (addImpl): Don't call comp.addNotify if peer is not null. (validateTree): Create peers for all children before calling doLayout. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (connectSignals): Don't call gtk_widget_realize. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (connect_awt_hook_cb): New function. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (initComponentGraphicsID): New variable. (initComponentGraphics2DID): Likewise. (setCursorID): Likewise. (gtkInit): Initialize new fields with method IDs. * jni/gtk-peer/gtkpeer.h (initComponentGraphicsID): Declare extern. (initComponentGraphics2DID): Declare extern. (setCursorID): Likewise. (connect_awt_hook_cb): Declare function. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java, gnu/java/awt/peer/gtk/GdkGlyphVector.java, gnu/java/awt/peer/gtk/GdkGraphics2D.java, gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, gnu/java/awt/peer/gtk/GtkButtonPeer.java, gnu/java/awt/peer/gtk/GtkClipboard.java, gnu/java/awt/peer/gtk/GtkDialogPeer.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, gnu/java/awt/peer/gtk/GtkFontPeer.java, gnu/java/awt/peer/gtk/GtkListPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java: Import statements reworked. Some little reformattings. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/image/AffineTransformOp.java (TYPE_BILINEAR): Initialize with 2. * java/awt/print/Printable.java: Jalopied. (PAGE_EXISTS): Initialize with 0; (NO_SUCH_PAGE): Initialized with 1. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * Makefile.am: Add BufferedImageFilter.java. * Makefile.in: Regenerate. 2004-11-30 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (install_font_peer): Minor bug fixes to track cairo font semantics. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BufferedImageFilter.java: Implement. 2004-11-30 Graydon Hoare <graydon@redhat.com> * Makefile.am (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c) (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c) (gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java) (gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java): Remove. (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c) (jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c) (gnu/java/awt/peer/gtk/GdkTextLayout.java) (gnu/java/awt/peer/gtk/GdkFontPeer.java) (gnu/java/awt/peer/ClasspathTextLayoutPeer.java): Add * Makefile.in: Regenerate. * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Add stub. * gnu/java/awt/ClasspathToolkit.java (getClasspathTextLayoutPeer) Add. * gnu/java/awt/peer/ClasspathFontPeer.java (copyStyleToAttrs) (copySizeToAttrs): Make public. * gnu/java/awt/peer/ClasspathTextLayoutPeer.java: New file. * gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java: Remove. * gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java: Remove. * gnu/java/awt/peer/gtk/GdkFontMetrics.java: Rewrite. * gnu/java/awt/peer/gtk/GdkFontPeer.java: New file. * gnu/java/awt/peer/gtk/GdkGlyphVector.java: Adjust type names. * gnu/java/awt/peer/gtk/GdkGraphics.java (getFontPeer): New function. (drawString): Pass font peer to native side. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (cairoSetFont) (cairoShowGlyphs) (PainterThread): Remove. (GdkGraphics2D): Set hints during construction. (shifted) (walkPath) (draw) (setRenderingHint) (setRenderingHints): Reimplement normalization logic. (getDefaultHints) (updateBufferedImage) (isBufferedImageGraphics) (updateImagePixels) (drawImage): Make final. (drawImage): Always paint synchronously. (drawString) (drawGlyphVector): Rewrite. (releasePeerGraphicResource) (getPeerTextMetrics) (getPeerFontMetrics) (drawGdkGlyphVector) (drawGdkTextLayout) (cairoDrawGdkGlyphVector) (cairoDrawGdkTextLayout) (cairoDrawString) (getFontPeer): New functions. * gnu/java/awt/peer/gtk/GdkTextLayout.java: New file. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (getFontMetrics): Get metrics via toolkit, to hit cache. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Use getFontMetrics. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise. * gnu/java/awt/peer/gtk/GtkToolkit.java (LRUCache): New class. (fontCache) (metricsCache) (imageCache): New members. (getFontMetrics) (getImage) (getClasspathFontPeer): Use caches. (getFontPeer): Route through getClasspathFontPeer. * java/awt/Font.java (attrsToMap): Remove, adjust ctors. * java/awt/font/TextLayout.java: Implement in terms of peer. * javax/swing/plaf/basic/BasicSliderUI.java (paintThumb): Use polyline rather than polygon. * javax/swing/plaf/basic/BasicGraphicsUtils.java: Update comment but, alas, still do not switch to using TextLayouts. * javax/swing/text/Utilities.java (drawTabbedText): Draw text run-at-a-time, not char-at-a-time. * jni/gtk-peer/gdkfont.h: Publicize some of the font interface, add layout table. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Remove files. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Rewrite to incorporate brains of old GdkClasspathFontPeerMetrics. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: Rewrite to incorporate brains of old GdkClasspathFontPeer. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: New file. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString): Rewrite to use persistent layout in peer font. Comment out extraneous gdk_flush calls. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (metrics_cairo) (metrics_surface): New static variables. (paint_glyph_run) (install_font_peer): New helper functions. (releasePeerGraphicResource) (getPeerTextMetrics) (getPeerFontMetrics) (cairoDrawGdkTextLayout) (cairoDrawGdkGlyphVector): New native methods. (cairoDrawString): Rewrite, leaving layout-based version commented out for the time being. * jni/gtk-peer/gtkpeer.h (graphics): Add fields for pango stuff. 2004-11-30 David Gilbert <david.gilbert@object-refinery.com> * java/awt/geom/AffineTransform.java: Fixed javadocs overall. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentColorModel.java: Remove FIXME comment since it's correct. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java: Fix use of immutable BigIntegers. 2004-11-30 Tom Tromey <tromey@redhat.com> * javax/swing/plaf/basic/BasicOptionPaneUI.java (MessageIcon): Renamed from 'messageIcon'. (errorIcon, infoIcon, warningIcon, questionIcon): Updated. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/RescaleOp.java: Fix formatting. 2004-11-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicComboPopup.java (SCROLL_DOWN): made final. (SCROLL_UP): made final. 2004-11-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicComboPopup.java: Added javadocs for undocumented fields. (show): scroll down to the selected item and highlight selected item. (startAutoScrolling): Implemented. (stopAutoScrolling): Implemented. (autoScrollUp): Implemented. (autoScrollDown): Implemented. (InvocationMouseHandler.mouseReleased): Implemented. (InvocationMouseMotionHandler.mouseDragged): Implemented. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/RescaleOp.java: Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (getRGBs, convertToIntDiscrete): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java: Add class docs. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (isValid, getValidPixels): Implement. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/MenuBar.java, java/awt/peer/MenuBarPeer.java: Revert accidentally commited changes. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/AWTKeyStroke.java, java/awt/Canvas.java, java/awt/CardLayout.java, java/awt/CheckboxMenuItem.java, java/awt/Component.java, java/awt/Container.java, java/awt/DefaultKeyboardFocusManager.java, java/awt/EventDispatchThread.java, java/awt/FileDialog.java, java/awt/FlowLayout.java, java/awt/Font.java, java/awt/Frame.java, java/awt/Graphics2D.java, java/awt/GraphicsEnvironment.java, java/awt/GridBagConstraints.java, java/awt/GridBagLayout.java, java/awt/GridLayout.java, java/awt/Image.java, java/awt/KeyboardFocusManager.java, java/awt/Label.java, java/awt/List.java, java/awt/MediaTracker.java, java/awt/Menu.java, java/awt/MenuBar.java, java/awt/MenuComponent.java, java/awt/Panel.java, java/awt/PopupMenu.java, java/awt/ScrollPane.java, java/awt/Scrollbar.java, java/awt/SystemColor.java, java/awt/TextArea.java, java/awt/TextField.java, java/awt/Toolkit.java, java/awt/Window.java, java/awt/color/ICC_Profile.java, java/awt/datatransfer/DataFlavor.java, java/awt/datatransfer/StringSelection.java, java/awt/datatransfer/SystemFlavorMap.java, java/awt/dnd/Autoscroll.java, java/awt/dnd/DropTarget.java, java/awt/dnd/DropTargetContext.java, java/awt/dnd/DropTargetDragEvent.java, java/awt/dnd/peer/DropTargetContextPeer.java, java/awt/event/AdjustmentEvent.java, java/awt/event/InputEvent.java, java/awt/event/InvocationEvent.java, java/awt/event/KeyEvent.java, java/awt/event/MouseEvent.java, java/awt/font/TextLayout.java, java/awt/geom/GeneralPath.java, java/awt/geom/Point2D.java, java/awt/im/InputContext.java, java/awt/im/spi/InputMethodContext.java, java/awt/image/AffineTransformOp.java, java/awt/image/BufferedImage.java, java/awt/image/ColorModel.java, java/awt/image/ComponentColorModel.java, java/awt/image/CropImageFilter.java, java/awt/image/DirectColorModel.java, java/awt/image/MemoryImageSource.java, java/awt/image/PackedColorModel.java, java/awt/image/PixelGrabber.java, java/awt/image/RasterOp.java, java/awt/peer/MenuBarPeer.java: Some fixes for checkstyle. Import statement and modifier order redordering. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java (setModel): Reimplemented. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java (append): Re-implemented. (insert): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JSpinner.java (serialVersionUID): New static field. * javax/swing/JToggleButton.java (JToggleButton): Fixed email addresses. * javax/swing/SpinnerNumberModel.java (serialVersionUID): Added javadoc. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java: Don't use JTextComponent.doc directly. GCJ from java-gui-branch has a bug here which is fixed in HEAD ... 2004-11-30 Andrew John Hughes <address@hidden> * javax/swing/JTextArea.java: Added additional documentation. 2004-11-30 Andrew John Hughes <address@hidden> * javax/swing/JRadioButton.java: Implemented additional constructors and accessibility classes. Added documentation and fixed a typo in AbstractButton. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/IndexColorModel.java (IndexColorModel): Implement missing constructor. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentColorModel.java (ComponentColorModel): Implement missing 1.4 constructor. 2004-11-30 Andrew John Hughes <address@hidden> * javax/swing/JToggleButton.java: Implemented additional constructors and accessibility classes. Added documentation and fixed a typo in AbstractButton. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorModel.java (getDataElement, getDataElements): Document since 1.4. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/BandedSampleModel.java: Implement. * Makefile.am: Add java/awt/image/BandedSampleModel.java. * Makefile.in: Regenerated. 2004-11-30 Michael Koch <konqueror@gmx.de> * java/awt/Window.java: Fixed whitespace difference with GNU classpath. 2004-11-30 Mark Wielaard <mark@klomp.org> * Makefile.am: Add javax/swing/SpinnerListModel.java. * Makefile.in: Regenerated. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/swing/SpinnerListModel.java, javax/swing/SpinnerModel.java Implemented SpinnerListModel. Added documentation to SpinnerModel. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (init_dpi_conversion_factor): Apply the patch from main correctly. 2004-06-26 Andreas Tobler <a.tobler@schweiz.ch> 2004-11-30 Tom Tromey <tromey@redhat.com> Bug 9948. * javax/swing/JDesktopPane.java (LIVE_DRAG_MODE): Now final. (OUTLINE_DRAG_MODE): LIVE_DRAG_MODE. * javax/swing/plaf/basic/BasicSplitPaneUI.java (NON_CONTINUOUS_DIVIDER): Now final. Initialize. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/Canvas.java (AccessibleAWTCanvas): added serialization UID * java/awt/Label.java (AccessibleAWTLabel): added serialization UID * javax/swing/JRootPane.java (AccessibleJRootPane): added comment to existing UID * javax/swing/JSpinner.java (DefaultEditor): added serialization UID (NumberEditor): added serialization UID * javax/swing/text/html/HTML.java (UnknownTag): added serialization UID 2004-11-30 Jeroen Frijters <jeroen@frijters.net> * javax/swing/JInternalFrame.java (CONTENT_PANE_PROPERTY,FRAME_ICON_PROPERTY,GLASS_PANE_PROPERTY, IS_CLOSED_PROPERTY,IS_ICON_PROPERTY,IS_MAXIMUM_PROPERTY, IS_SELECTED_PROPERTY,LAYERED_PANE_PROPERTY,MENU_BAR_PROPERTY, ROOT_PANE_PROPERTY,TITLE_PROPERTY): Made final as per API spec. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (CLOSE_CMD,ICONIFY_CMD,MAXIMIZE_CMD,MOVE_CMD,RESTORE_CMD,SIZE_CMD): Made final as per API spec. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gtkpeer.h: Remove duplicated copyright string. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Arc2D.java: Reformatted. (setArc): Correct documentation to say 'upper left corner'. (setArcByTangent,contains,intersects): Implemented. (containsAngle): Corrected to handle negative extents. (ArcIterator): Set to private. (ArcIterator): Corrected for CHORD-type arcs, negative extents. (intersects): Fix: Now checks the arc segment. (contains): Cleaned up. * java/awt/geom/CubicCurve2a.javaD: Fix insideness-test. Reindent. (contains): Implemented. (intersects): Implemented. * java/awt/geom/QuadCurve2D.java: Fix insideness-test. Reindent. * java/awt/geom/GeneralPath: Fix insideness-test. Reindent and document. Fully (re)implemented using separate xpoints and ypoints float[] coords. 2004-11-30 Andreas Tobler <a.tobler@schweiz.ch> * configure.ac: Introduce AC_C_BIGENDIAN_CROSS for WORDS_BIGENDIAN. * configure: Regenerate. * include/config.h.in: Likewise. * jni/gtk-peer/gtkpeer.h (SWAPU32): Introduce macro to swap pixels. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c: Moved SWAPU32 macro to gtkpeer.h. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getImagePixels): Convert pixels from 0xBBGGRRAA to 0xAARRGGBB only on Little Endian architectures. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_updated): Likewise. 2004-11-30 David Gilbert <david.gilbert@object-refinery.com> * java/awt/SystemColor.java: Fix @link doc entries. 2004-11-30 David Gilbert <david.gilbert@object-refinery.com> * java/awt/RenderingHints.java: Documented. (RenderingHints): Accept null init Map. (putAll): Preprocess map to generate appropriate exceptions. (remove): Cast object to Key and remove from hintMap. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/MenuComponent.java, java/awt/MenuBar.java: Implementation of accessibility classes and methods for these two components. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/KeyboardFocusManager.java: Added missing documentation. 2004-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/awt/Label.java, java/awt/Canvas.java: Added accessibility classes to AWT Label and Canvas, as well as additional documentation for Canvas. 2004-11-30 David Gilbert <address@bogus.example.com> * java/awt/image/DataBuffer.java: Update API documentation. * java/awt/image/DataBufferByte.java: Likewise. * java/awt/image/DataBufferDouble.java: Likewise. * java/awt/image/DataBufferFloat.java: Likewise. * java/awt/image/DataBufferInt.java: Likewise. * java/awt/image/DataBufferShort.java: Likewise. * java/awt/image/DataBufferUShort.java: Likewise. 2004-11-30 Dalibor Topic <robilad@kaffe.org> * java/awt/Component.java (postEvent): Only delegate to parent if a parent exists. Reported by: Stephane Meslin-Weber <steph@tangency.co.uk> 2004-11-30 Sven de Marothy <sven@physto.se> *java/awt/AWTEventMulticaster.java, java/awt/Adjustable.java, java/awt/Point.java, java/awt/Polygon.java, java/awt/Rectangle.java, java/awt/Shape.java, java/awt/geom/Area.java, java/awt/geom/Ellipse2D.java, java/awt/geom/PathIterator.java, java/awt/geom/Point2D.java, java/awt/geom/Rectangle2D.java, java/lang/Comparable.java, java/util/Arrays.java: Fixed documentation errors 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentSampleModel.java: Add documentation. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ComponentSampleModel.java (constructor): Initialize numBanks when figuring out the max bank index. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (createPackedRaster): Implement MultiPixelPackedSampleModel codepath. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/MultiPixelPackedSampleModel.java: Implement. * Makefile.am: Add MultiPixelPackedSampleModel.java. * Makefile.in: Regenerate. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (getNumBands): Implement. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Raster.java (createPackedRaster(int,int,int,int,int,Point)): Implement for bands>1. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/SinglePixelPackedSampleModel.java (SinglePixelPackedSampleModel): Throw exception for unsupported datatype. 2004-11-30 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ColorModel.java (getDataElement): Implemented. Update javadoc. (getDataElements): Add missing version. Remove bogus version. Update javadoc. 2004-11-30 Olga Rodimina <rodimina@redhat.com> * javax/swing/plaf/basic/BasicComboBoxUI.java: (paintCurrentValue): Pass correct parameters to getListCellRendererComponent(). (ListDataHandler.intervalRemoved): Implemented. (PropertyChangeHandler.propertyChange): Handle changes in MODEL_CHANGED_PROPERTY of the JComboBox * javax/swing/plaf/basic/BasicComboPopup.java: (BasicComboPopup): Moved code that configures popup to configurePopup() and call it instead. (firePopupMenuWillBecomeVisible): Implemented. (firePopupMenuWillBecomeInvisible): Likewise. (firePopupMenuCanceled): Likewise. (configureList): Set list's visibleRowCount same as comboBox's visibleRowCount. (configurePopup): Implemented. (getPopupHeightForRowCount): Get item's from JComboBox's model and not from model of the JList. (ListMouseMotionHandler.mouseMoved): Implemented. (PropertyChangeHandler.propertyChange): Handles change in the JComboBox's model. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (isMaximumSizeSet): New method. (isMinimumSizeSet): Likewise. (isPreferredSizeSet): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JSpinner.java: Some Re-formatting. (spinner): New field. (DefaultEditor): New method. (getSpinner): Likewise. (NumberEdito): Likewise. (getModel): Likewise 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/InputVerifier.java: Re-formatted. * javax/swing/JComponent.java (inputVerifier): New property field. (getInputVerifier): New method. (setInputVerifier): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JComponent.java (JComponent): Added javadoc comment. (setBorder): Fire property change eventr. (setEnabled): Likewise. (setMaximumSize): Likewise. (setMinimumSize): Likewise. (setPreferredSize): Likewise. (setOpaque): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextField.java (action): New field. (actionCommand): Likewise. (actionPropertyChangeListener): Likewise. (setHorizontalAlignment): Abort soon if new value == old value. Fire event before repainting. (postActionEvent): New method. (getAction): Likewise. (setAction): Likewise. (getActionCommand): Likewise. (setActionCommand): Likewise. (createActionPropertyChangeListener): Likewise. (configurePropertiesFromAction): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/DebugGraphics.java: Re-formatted. Fixed some javadocs. * javax/swing/JApplet.java (rootPaneCheckingEnabled): Renamed from checking. * javax/swing/JCheckBox.java (BORDER_PAINTED_FLAT_CHANGED_PROPERTY): New statif field. * javax/swing/JFrame.java: Re-formatted a bit and reordered some methods. (rootPaneCheckingEnabled): Renamed from checking. (getPreferredSize): Simplified. * javax/swing/JTextArea.java (getColumnWidth): New method. (getLineCount): Likewise. (getLineStartOffset): Likewise. (getLineEndOffset): Likewise. (getLineOfOffset): Likewise. (getRowHeight): Likewise. (insert): Likewise. (replaceRange): Likewise. * javax/swing/JTextField.java (scrollOffset): new field. (getScrollOffset): New method. (setScrollOffset): Likewise. (getColumnWidth): Likewise. * javax/swing/JTree.java (ANCHOR_SELECTION_PATH_PROPERTY): New static field. (CELL_EDITOR_PROPERTY): Likewise. (CELL_RENDERER_PROPERTY): Likewise. (EDITABLE_PROPERTY): Likewise. (EXPANDS_SELECTED_PATHS_PROPERTY): Likewise. (INVOKES_STOP_CELL_EDITING_PROPERTY): Likewise. (LARGE_MODEL_PROPERTY): Likewise. (LEAD_SELECTION_PATH_PROPERTY): Likewise. (ROOT_VISIBLE_PROPERTY): Likewise. (ROW_HEIGHT_PROPERTY): Likewise. (SCROLLS_ON_EXPAND_PROPERTY): Likewise. (SELECTION_MODEL_PROPERTY): Likewise. (SHOWS_ROOT_HANDLES_PROPERTY): Likewise. (TOGGLE_CLICK_COUNT_PROPERTY): Likewise. (TREE_MODEL_PROPERTY): Likewise. (VISIBLE_ROW_COUNT_PROPERTY): Likewise. (cellEditor): New field. (invokesStopCellEditing): Likewise. (largeModel): Likewise. (rowHeight): Likewise. (scrollsOnExpand): Likewise. (selectionModel): Likewise. (toggleClickCount): Likewise. (visibleRowCount): Likewise. (setShowsRootHandles): Fixed typo in method name. (getCellEditor): New method. (setCellEditor): Likewise. (getSelectionModel): Likewise. (setSelectionModel): Likewise. (getVisibleRowCount): Likewise. (setVisibleRowCount): Likewise. (isLargeModel): Likewise. (setLargeModel): Likewise. (getRowHeight): Likewise. (setRowHeight): Likewise. (getInvokesStopCellEditing): Likewise. (setInvokesStopCellEditing): Likewise. (getToggleClickCount): Likewise. (setToggleClickCount): Likewise. (getScrollsOnExpand): Likewise. (setScrollsOnExpand): Likewise. * javax/swing/table/DefaultTableColumnModel.java (addColumnModelListener): Fixed javadoc. (removeColumnModelListener): Implemented. Fixed javadoc. (getColumnModelListeners): New method. * javax/swing/table/JTableHeader.java (columnModel): Made protected. (draggedColumn): Likewise. (draggedDistance): Likewise. (reorderingAllowed): Likewise. (resizingAllowed): Likewise. (resizingColumn): Likewise. (table): Likewise. (updateTableInRealTime): Likewise. (createDefaultColumnModel): Renamed from createDefaultTableColumnModel. (setDefaultRenderer): New method. * javax/swing/table/TableColumn.java (getPropertyChangeListeners): New method. * javax/swing/text/DefaultHighlighter.java (drawsLayeredHighlights): New field. (getDrawsLayeredHighlights): New method. (setDrawsLayeredHighlights): Likewise. * javax/swing/text/DocumentFilter.java (FilterBypass): New inner class. (insertString): New method. (remove): Likewise. (replace): Likewise. * javax/swing/text/JTextComponent.java (dragEnabled): New field. (getSelectedText): New method. (getDragEnabled): Likewise. (setDragEnabled): Likewise. (replaceSelection): Reimplemented. * javax/swing/text/NavigationFilter.java (FilterBypass): New inner class. (NavigationFilter): New method. (moveDot): Likewise. (setDot): Likewise. * javax/swing/text/SimpleAttributeSet.java (EMPTY): Made public final. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/SpinnerNumberModel.java (getMinimum): New method. (setMinimum): Likewise. (getMaximum): Likewise. (setMaximum): Likewise. (getStepSize): Likewise. (setStepSize): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JMenu.java (getMenuListeners): New method. (fireMenuSelected): Simplified. * javax/swing/JRootPane.java (NONE): New static field. (FRAME): Likewise. (PLAIN_DIALOG): Likewise. (INFORMATION_DIALOG): Likewise. (ERROR_DIALOG): Likewise. (COLOR_CHOOSER_DIALOG): Likewise. (FILE_CHOOSER_DIALOG): Likewise. (QUESTION_DIALOG): Likewise. (WARNING_DIALOG): Likewise. (defaultButton): New field. (getDefaultButton): New method. (setDefaultButton): Likewise. * javax/swing/JScrollPane.java (getUI): New method. (setUI): Likewise. * javax/swing/JTable.java (getUI): Javadoc added. (setUI): New method. * javax/swing/JViewport.java (getUI): New method. (setUI): Likewise. * javax/swing/UIDefaults.java (removePropertyChangeListener): Made public. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JApplet.java, javax/swing/JFrame.java: Re-indented. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java: Little re-formatting. (changeEvent): Made protected. (fireStateChanged): Removed argument. (setHorizontalAlignment): Abort method when old value is equal too new value. (setHorizontalTextPosition): Likewise. (setVerticalAlignment): Likewise. (setVerticalTextPosition): Likewise. (setBorderPainted): Likewise. (setIcon): Likewise. (setText): Likewise. (setIconTextGap): Likewise. (setMargin): Likewise. (setPressedIcon): Likewise. (setFocusPainted): Likewise. (setDisabledSelectedIcon): Likewise. (setRolloverIcon): Likewise. (setRolloverSelectedIcon): Likewise. (setSelectedIcon): Likewise. (setContentAreaFilled): Likewise. 2004-11-30 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicArrowButton.java: Jalopy. Reimplement. * javax/swing/plaf/basic/BasicScrollBarUI.java: Jalopy. (arrowIcon, upIcon, downIcon, leftIcon, rightIcon): Removed. (createIncreaseButton): Use BasicArrowButton. (createDecreaseButton): Ditto. * javax/swing/plaf/basic/BasicSplitPaneDivider.java: (createRightOneTouchButton): Remove button border. (createLeftOneTouchButton): Ditto. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JSpinner.java (setModel): New method. * javax/swing/SpringLayout.java (Constraints): May not be final. 2004-11-30 Michael Koch <konqueror@gmx.de> * gnu/java/awt/peer/gtk/GtkClipboard.java, java/awt/datatransfer/Clipboard.java, java/awt/datatransfer/ClipboardOwner.java: Reformated to make it use our coding standard. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/SpinnerNumberModel.java (SpinnerNumberModel): Implements java.io.Serializable. (serialVersionUID): New field. (SpinnerNumberModel): Added missing @throws tags to javadocs. * javax/swing/UIManager.java (get): New method. (getBoolean): Likewise. (getBorder): Likewise. (getColor): Likewise. (getDimension): Likewise. (getFont): Likewise. (getIcon): Likewise. (getInsets): Likewise. (getInt): Likewise. (getString): Likewise. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JPasswordField.java: Reformated. Implemented construtors. * javax/swing/plaf/basic/BasicPasswordFieldUI.java (create): New method. * javax/swing/text/PlainView.java (selectedColor): Made package-private to allow access from sub-classes in same package too. (unselectedColor): Likewise. (font): Likewise. (drawSelectedText): Make protected. (drawUnselectedText): Likewise. * javax/swing/text/PasswordView.java: New file. * Makefile.am: Added javax/swing/text/PasswordView.java. * Makefile.in: Regenerated. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java (setMenuBar): Set menu bar's width. * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (nativeSetHelpMenu): Add FIXME comment. (addHelpMenu): Elide call to nativeSetHelpMenu. * java/awt/Menu.java (isTearOff): Rename to tearOff. (menuSerializedDataVersion): Initialize to 1. (separatorLabel): Mark transient. (insert(MenuItem,int)): Implement. * java/awt/MenuBar.java (setHelpMenu): Call getPeer to retrieve peer. (countMenus): Count help menu. * java/awt/MenuComponent.java (nameExplicitlySet, newEventsOnly, accessibleContext): Add fields. * java/awt/MenuItem.java: Remove event mask FIXME. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (gtkWidgetModifyFont): Only set font if label is non-NULL. (setLabel): Don't treat "-" specially. 2004-11-30 Kim Ho <kho@redhat.com> * javax/swing/colorchooser/DefaultHSBChooserPanel.java: (stateChanged): Only update the image and the track if the values are not being adjusted. (updateChooser): Grab the new mouse point from the spinner values. Update the image and track only if the values are not being adjusted. (getHSBValues): New method. * javax/swing/colorchooser/DefaultRGBChooserPanel.java: (SliderHandler::stateChanged): Changed internalChange to updateChange. Set sliderChange. (SpinnerHandler::stateChanged): Ditto. Set spinnerChange. (spinnerChange): New variable. (sliderChange): Ditto. (updateChange): Renamed from internalChange. (updateChooser): Do not update sliders if the sliders were the original source of the change. Ditto for spinners. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (mousePress): Don't scroll the JViewport if there will be extra space at the end of the run. Change layout() to revalidate(). (calculateSize): Use the component's width/height unless it is smaller than the max tab width/height. (calculateTabRects): Subtract the tab run overlay. (rotateTabRuns): Don't rotate if there's only one run. (layoutContainer): Reuse the viewport point. (createLayoutManager): Set the viewport to use no layout. (paintTabArea): Don't paint the tabs that are not visible to the JViewport. (paintContentBorderTopEdge): Check for scroll tab layout before looking for gap. (paintContentBorderLeftEdge): Ditto. (paintContentBorderBottomEdge): Ditto. (paintContentBorderRightEdge): Ditto. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkButtonPeer.java (gtkWidgetSetFont): Rename ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkFramePeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (setMenuBarWidth): New method. (setBounds): Set the menu bar width. (postConfigureEvent): Set the menu bar width if the window's width has changed. * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java (GtkMenuBarPeer): Don't call create. (setFont): New method. * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java (create): New method. (setFont): Likewise. (GtkMenuComponentPeer): Call create and setFont. * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (connectSignals): Make package private. (gtkWidgetModifyFont): New method. (create): Likewise. (GtkMenuItemPeer): Don't call create. (setFont): New method. * java/awt/CheckboxMenuItem.java (addNotify): Fix peer == null condition. * java/awt/Container.java (validateTree): Fix comment typos. * java/awt/MenuComponent.java (getFont): Return parent's font if our font is null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c (create): Remove call to deprecated gtk_check_menu_item_set_show_toggle function. 2004-11-30 Hans Boehm <Hans.Boehm@hp.com> * java/lang/natObject.cc (LOCK_LOG, LOG): Add debug tracing. (Almost everywhere): add LOG calls, fix, add comments. (_Jv_MonitorEnter): Replace masking of LOCKED bit with assertion. Add explicit check for LOCKED bit in slow case (PR 16662). (_Jv_MonitorExit): Add casts in debug-only code. Always release LOCKED bit before throwing exception. (_Jv_ObjectCheckMonitor): Lock may be held if lightweight lock isn't. Handle easy cases without lock acquisition. (Object::wait): Use NotifyAll for lock inflation. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkFramePeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (gtkFixedMove): Remove method. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Area.java: Implemented. 2004-11-30 Mark Wielaard <mark@klomp.org> * java/awt/geom/Arc2D.java (ArcIterator): Make package private. 2004-11-30 Sven de Marothy <sven@physto.se> * java/awt/geom/Arc2D.java Reformatted. (setArc): Correct documentation to say 'upper left corner'. (setArcByTangent,contains,intersects): Implemented. (containsAngle): Corrected to handle negative extents. (ArcIterator): Set to private. (ArcIterator): Corrected for CHORD-type arcs, negative extents. * java/awt/geom/Ellipse2D.java Documented. (contains,intersects): Implemented. * java/awt/geom/Line2D.java (linesIntersect): Correct handling of special cases. 2004-11-30 Mark Wielaard <mark@klomp.org> * gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Use Color.BLACK if c == null, don't create new Color object each time. * gnu/java/awt/peer/gtk/GdkGraphics2D.java (comp): New private field. (setColor): Use Color.BLACK when argument null. (setComposite): Set this.comp field. (getComposite): Return this.comp, or AlphaComposite.SrcOver when null. (DrawState.comp): New private field. (DrawState.save): Save Composite. (DrawState.restore): Restore comp field. * java/awt/FontMetrics.java (gRC): New static final private field. (getLineMetrics(String, Graphics)): New method. (getLineMetrics(String, int, int, Graphics)): Likewise. (getLineMetrics(char[], int, int, Graphics)): Likewise. (getLineMetrics(CharacterIterator, int, int, Graphics)): Likewise. * javax/swing/JMenu.java (JMenu(String, boolean)): Ignore tearoff argument. PR SWING/17294. * javax/swing/plaf/basic/BasicGraphicsUtils.java (): Always use the fall-back code since none of the TextArea methods are really implemented now. PR SWING/17296. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (GdkGlyphVector_setChars): Replace assert() with if block when pango_itemize() returns null. PR AWT/17295. (GdkGlyphVector_allInkExtents): Likewise when vec->glyphitems is null. 2004-11-30 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (gtk_c_source_files): Add gnu_java_awt_peer_gtk_GtkFramePeer.c. * Makefile.in: Regenerate. * gnu/java/awt/peer/gtk/GdkGraphics.java (getClipBounds): Remove comment. * gnu/java/awt/peer/gtk/GtkButtonPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (create): Pack GtkButton in GtkEventBox. (connectJObject): Remove. (focus_in_cb): New function. (focus_out_cb): Likewise. (connectSignals): Connect focus-in-event and focus-out-event signals. (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. (gtkWidgetRequestFocus): New method. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (isInRepaint): New field. (gtkSetFont): Remove method. (addExposeFilter): Likewise. (removeExposeFilter): Likewise. (gtkWidgetQueueDrawArea): Rename to ... (gtkWidgetRepaintArea): New method. (beginNativeRepaint): New method. (endNativeRepaint): New method. (setComponentBounds): Move implementation here from GtkComponentPeer. (paint): Remove implementation. (repaint): Wrap call to gtkWidgetRepaintArea with calls to beginNativeRepaint and endNativeRepaint. (setBounds): Use menu bar height in bounds calculation. (postExposeEvent): Only post paint event if we're not doing a native repaint. (gtkWidgetSetParent): Replace gtk_layout_put with gtk_fixed_put. (setNativeBounds): Replace gtk_layout_move with gtk_fixed_move. (find_gtk_layout): Remove function. (filter_expose_event_handler): Likewise. * gnu/java/awt/peer/gtk/GtkDialogPeer.java (postExposeEvent): Likewise. * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java (setComponentBounds): Call GtkComponentPeer's setComponentBounds. * gnu/java/awt/peer/gtk/GtkFramePeer.java (getMenuBarHeight): New method. (moveLayout): Rename to ... (gtkFixedMove): New method. (gtkLayoutSetVisible): Rename to ... (gtkFixedSetVisible): New method. (setMenuBar): Rearrange, to make the three separate cases clearer. (postExposeEvent): Only post paint event if we're not doing a native repaint. * gnu/java/awt/peer/gtk/GtkGenericPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkGenericPeer.c (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkImagePainter.java (GtkImagePainter(GtkImage,GdkGraphics,int,int,int,int,Color)): Call run directly, rather than spawning a new thread. (GtkImagePainter(GtkImage,GdkGraphics,int,int,int,int,int,int,int,int,Color)): Likewise. * gnu/java/awt/peer/gtk/GtkLabelPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. (create): Rename ebox to eventbox. * gnu/java/awt/peer/gtk/GtkListPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java (GtkMenuComponentPeer): Set the default font. * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (gtkSetFont): Rename to ... (gtkWidgetModifyFont): New method. * gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise. * java/awt/Component.java (locale): Initialize to default locale. * java/awt/Container.java (invalidateTree): Make package-private. (paint): Paint self first. (setMenuBar): Call invalidateTree. * java/awt/Panel.java (dispatchEventImpl): Remove method. * java/awt/Window.java (show): Call no-parameter variant of requestFocusInWindow. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (initState): Remove special case for window widget. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (grab_current_drawable): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c (create): Replace GtkLayout with GtkFixed. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Remove special cases for GDK_EXPOSE events. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c: New file. Move all GtkFramePeer native method implementations here from gnu_java_awt_peer_gtk_GtkWindowPeer.c. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (create): Replace GtkLayout with GtkFixed. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (find_layout): Remove function. (create): Replace GtkLayout with GtkFixed. (connectSignals): Remove find_layout call. (toBack): Replace XFlush with gdk_flush. (toFront): Replace XFlush with gdk_flush. Move GtkFramePeer native method implementations to gnu_java_awt_peer_gtk_GtkFramePeer.c. * jni/gtk-peer/gtkpeer.h: Remove declaration of find_gtk_layout. 2004-11-30 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java (lineWrap): Renamed from "wrapping". (wrapStyleWord): NEw field. (getLineWrap): Re-edited javadoc comment. (setLineWrap): Likewise. (getWrapStyleWord): New method. (setWrapStyleWord): Likewise. From-SVN: r91544
1749 lines
50 KiB
C
1749 lines
50 KiB
C
/* gnu_java_awt_peer_gtk_GdkGraphics2d.c
|
|
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. */
|
|
|
|
#include "gtkcairopeer.h"
|
|
#include "gdkfont.h"
|
|
#include "gnu_java_awt_peer_gtk_GdkGraphics2D.h"
|
|
#include <gdk/gdktypes.h>
|
|
#include <gdk/gdkprivate.h>
|
|
#include <gdk/gdkx.h>
|
|
|
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
|
#include <gdk-pixbuf/gdk-pixdata.h>
|
|
|
|
#include <cairo.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
struct state_table *native_graphics2d_state_table;
|
|
|
|
#define NSA_G2D_INIT(env, clazz) \
|
|
native_graphics2d_state_table = init_state_table (env, clazz)
|
|
|
|
#define NSA_GET_G2D_PTR(env, obj) \
|
|
get_state (env, obj, native_graphics2d_state_table)
|
|
|
|
#define NSA_SET_G2D_PTR(env, obj, ptr) \
|
|
set_state (env, obj, native_graphics2d_state_table, (void *)ptr)
|
|
|
|
#define NSA_DEL_G2D_PTR(env, obj) \
|
|
remove_state_slot (env, obj, native_graphics2d_state_table)
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initStaticState
|
|
(JNIEnv *env, jclass clazz)
|
|
{
|
|
gdk_threads_enter();
|
|
NSA_G2D_INIT (env, clazz);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
/* these public final constants are part of the java2d public API, so we
|
|
write them explicitly here to save fetching them from the constant pool
|
|
all the time. */
|
|
|
|
#ifndef min
|
|
#define min(x,y) ((x) < (y) ? (x) : (y))
|
|
#endif
|
|
|
|
enum java_awt_alpha_composite_rule
|
|
{
|
|
java_awt_alpha_composite_CLEAR = 1,
|
|
java_awt_alpha_composite_SRC = 2,
|
|
java_awt_alpha_composite_SRC_OVER = 3,
|
|
java_awt_alpha_composite_DST_OVER = 4,
|
|
java_awt_alpha_composite_SRC_IN = 5,
|
|
java_awt_alpha_composite_DST_IN = 6,
|
|
java_awt_alpha_composite_SRC_OUT = 7,
|
|
java_awt_alpha_composite_DST_OUT = 8,
|
|
java_awt_alpha_composite_DST = 9,
|
|
java_awt_alpha_composite_SRC_ATOP = 10,
|
|
java_awt_alpha_composite_DST_ATOP = 11,
|
|
java_awt_alpha_composite_XOR = 12
|
|
};
|
|
|
|
enum java_awt_basic_stroke_join_rule
|
|
{
|
|
java_awt_basic_stroke_JOIN_MITER = 0,
|
|
java_awt_basic_stroke_JOIN_ROUND = 1,
|
|
java_awt_basic_stroke_JOIN_BEVEL = 2
|
|
};
|
|
|
|
enum java_awt_basic_stroke_cap_rule
|
|
{
|
|
java_awt_basic_stroke_CAP_BUTT = 0,
|
|
java_awt_basic_stroke_CAP_ROUND = 1,
|
|
java_awt_basic_stroke_CAP_SQUARE = 2
|
|
};
|
|
|
|
enum java_awt_geom_path_iterator_winding_rule
|
|
{
|
|
java_awt_geom_path_iterator_WIND_EVEN_ODD = 0,
|
|
java_awt_geom_path_iterator_WIND_NON_ZERO = 1
|
|
};
|
|
|
|
enum java_awt_rendering_hints_filter
|
|
{
|
|
java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR = 0,
|
|
java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR = 1,
|
|
java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED = 2,
|
|
java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY = 3,
|
|
java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT = 4
|
|
|
|
};
|
|
|
|
static int
|
|
peer_is_disposed(JNIEnv *env, jobject obj)
|
|
{
|
|
static jfieldID fid = NULL;
|
|
jclass cls;
|
|
jobject peer;
|
|
|
|
return 0;
|
|
|
|
if (fid == NULL)
|
|
{
|
|
cls = (*env)->GetObjectClass(env, obj);
|
|
fid = (*env)->GetFieldID(env, cls, "component",
|
|
"Lgnu/java/awt/peer/gtk/GtkComponentPeer;");
|
|
}
|
|
g_assert(fid != NULL);
|
|
peer = (*env)->GetObjectField(env, obj, fid);
|
|
if (peer == NULL || NSA_GET_PTR (env, peer) != NULL)
|
|
return 0;
|
|
else
|
|
{
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
grab_current_drawable (GtkWidget *widget, GdkDrawable **draw, GdkWindow **win)
|
|
{
|
|
g_assert (widget != NULL);
|
|
g_assert (draw != NULL);
|
|
g_assert (win != NULL);
|
|
|
|
*win = widget->window;
|
|
|
|
*draw = *win;
|
|
gdk_window_get_internal_paint_info (*win, draw, 0, 0);
|
|
g_object_ref (*draw);
|
|
}
|
|
|
|
|
|
static int
|
|
x_server_has_render_extension (void)
|
|
{
|
|
int ev = 0, err = 0;
|
|
return (int) XRenderQueryExtension (GDK_DISPLAY (), &ev, &err);
|
|
}
|
|
|
|
|
|
static void
|
|
init_graphics2d_as_pixbuf (struct graphics2d *gr)
|
|
{
|
|
gint width, height;
|
|
gint bits_per_sample = 8;
|
|
gint total_channels = 4;
|
|
gboolean has_alpha = TRUE;
|
|
|
|
g_assert (gr != NULL);
|
|
g_assert (gr->drawable != NULL);
|
|
|
|
if (gr->debug) printf ("initializing graphics2d as pixbuf\n");
|
|
gdk_drawable_get_size (gr->drawable, &width, &height);
|
|
gr->drawbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
|
|
has_alpha, bits_per_sample,
|
|
width, height);
|
|
g_assert (gr->drawbuf != NULL);
|
|
g_assert (gdk_pixbuf_get_bits_per_sample (gr->drawbuf) == bits_per_sample);
|
|
g_assert (gdk_pixbuf_get_n_channels (gr->drawbuf) == total_channels);
|
|
|
|
gr->surface = cairo_surface_create_for_image (gdk_pixbuf_get_pixels (gr->drawbuf),
|
|
CAIRO_FORMAT_ARGB32,
|
|
gdk_pixbuf_get_width (gr->drawbuf),
|
|
gdk_pixbuf_get_height (gr->drawbuf),
|
|
gdk_pixbuf_get_rowstride (gr->drawbuf));
|
|
g_assert (gr->surface != NULL);
|
|
g_assert (gr->cr != NULL);
|
|
cairo_set_target_surface (gr->cr, gr->surface);
|
|
}
|
|
|
|
static void
|
|
init_graphics2d_as_renderable (struct graphics2d *gr)
|
|
{
|
|
Drawable draw;
|
|
Display * dpy;
|
|
Visual * vis;
|
|
|
|
g_assert (gr != NULL);
|
|
g_assert (gr->drawable != NULL);
|
|
|
|
gr->drawbuf = NULL;
|
|
|
|
if (gr->debug) printf ("initializing graphics2d as renderable\n");
|
|
draw = gdk_x11_drawable_get_xid (gr->drawable);
|
|
|
|
dpy = gdk_x11_drawable_get_xdisplay (gr->drawable);
|
|
g_assert (dpy != NULL);
|
|
|
|
vis = gdk_x11_visual_get_xvisual (gdk_drawable_get_visual (gr->drawable));
|
|
g_assert (vis != NULL);
|
|
|
|
gr->surface = cairo_xlib_surface_create (dpy, draw, vis,
|
|
CAIRO_FORMAT_ARGB32,
|
|
DefaultColormap (dpy, DefaultScreen (dpy)));
|
|
g_assert (gr->surface != NULL);
|
|
g_assert (gr->cr != NULL);
|
|
cairo_set_target_surface (gr->cr, gr->surface);
|
|
}
|
|
|
|
static void
|
|
begin_drawing_operation (struct graphics2d * gr)
|
|
{
|
|
g_assert(cairo_status (gr->cr) == CAIRO_STATUS_SUCCESS);
|
|
if (gr->drawbuf)
|
|
{
|
|
|
|
gint drawable_width, drawable_height;
|
|
gint pixbuf_width, pixbuf_height;
|
|
gint width, height;
|
|
|
|
gdk_drawable_get_size (gr->drawable, &drawable_width, &drawable_height);
|
|
pixbuf_width = gdk_pixbuf_get_width (gr->drawbuf);
|
|
pixbuf_height = gdk_pixbuf_get_height (gr->drawbuf);
|
|
width = min (drawable_width, pixbuf_width);
|
|
height = min (drawable_height, pixbuf_height);
|
|
|
|
gdk_pixbuf_get_from_drawable (gr->drawbuf, /* destination pixbuf */
|
|
gr->drawable,
|
|
NULL, /* colormap */
|
|
0, 0, 0, 0,
|
|
width, height);
|
|
|
|
if (gr->debug) printf ("copied (%d, %d) pixels from GDK drawable to pixbuf\n",
|
|
width, height);
|
|
}
|
|
}
|
|
|
|
static void
|
|
end_drawing_operation (struct graphics2d * gr)
|
|
{
|
|
g_assert(cairo_status (gr->cr) == CAIRO_STATUS_SUCCESS);
|
|
if (gr->drawbuf)
|
|
{
|
|
gint drawable_width, drawable_height;
|
|
gint pixbuf_width, pixbuf_height;
|
|
gint width, height;
|
|
|
|
gdk_drawable_get_size (gr->drawable, &drawable_width, &drawable_height);
|
|
pixbuf_width = gdk_pixbuf_get_width (gr->drawbuf);
|
|
pixbuf_height = gdk_pixbuf_get_height (gr->drawbuf);
|
|
width = min (drawable_width, pixbuf_width);
|
|
height = min (drawable_height, pixbuf_height);
|
|
|
|
gdk_draw_pixbuf (gr->drawable, NULL, gr->drawbuf,
|
|
0, 0, 0, 0,
|
|
width, height,
|
|
GDK_RGB_DITHER_NORMAL, 0, 0);
|
|
|
|
if (gr->debug) printf ("copied (%d, %d) pixels from pixbuf to GDK drawable\n",
|
|
width, height);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
update_pattern_transform (struct graphics2d *gr)
|
|
{
|
|
double a, b, c, d, tx, ty;
|
|
cairo_matrix_t *mat = NULL;
|
|
|
|
g_assert (gr != NULL);
|
|
if (gr->pattern == NULL)
|
|
return;
|
|
|
|
return;
|
|
/* temporarily disabled: ambiguous behavior */
|
|
/* cairo_get_matrix (gr->cr, &a, &b, &c, &d, &tx, &ty); */
|
|
mat = cairo_matrix_create ();
|
|
g_assert (mat != NULL);
|
|
cairo_matrix_set_affine (mat, a, b, c, d, tx, ty);
|
|
cairo_pattern_set_matrix (gr->pattern, mat);
|
|
cairo_matrix_destroy (mat);
|
|
}
|
|
|
|
static void
|
|
check_for_debug (struct graphics2d *gr)
|
|
{
|
|
gr->debug = (gboolean)(getenv("DEBUGJ2D") != NULL);
|
|
}
|
|
|
|
static void
|
|
realize_cb (GtkWidget *widget, jobject peer)
|
|
{
|
|
gdk_threads_leave ();
|
|
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer, initComponentGraphics2DID);
|
|
|
|
gdk_threads_enter ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_copyState
|
|
(JNIEnv *env, jobject obj, jobject old)
|
|
{
|
|
struct graphics2d *g = NULL, *g_old = NULL;
|
|
|
|
gdk_threads_enter();
|
|
g = (struct graphics2d *) malloc (sizeof (struct graphics2d));
|
|
g_assert (g != NULL);
|
|
memset (g, 0, sizeof(struct graphics2d));
|
|
|
|
g_old = (struct graphics2d *) NSA_GET_G2D_PTR (env, old);
|
|
g_assert (g_old != NULL);
|
|
|
|
if (g_old->debug) printf ("copying state from existing graphics2d\n");
|
|
|
|
g->drawable = g_old->drawable;
|
|
g->debug = g_old->debug;
|
|
|
|
g_object_ref (g->drawable);
|
|
|
|
g->cr = cairo_create();
|
|
g_assert (g->cr != NULL);
|
|
|
|
if (x_server_has_render_extension ())
|
|
init_graphics2d_as_renderable (g);
|
|
else
|
|
init_graphics2d_as_pixbuf (g);
|
|
|
|
cairo_surface_set_filter (g->surface, CAIRO_FILTER_FAST);
|
|
|
|
NSA_SET_G2D_PTR (env, obj, g);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__II
|
|
(JNIEnv *env, jobject obj, jint width, jint height)
|
|
{
|
|
struct graphics2d *gr;
|
|
|
|
gdk_threads_enter();
|
|
gr = (struct graphics2d *) malloc (sizeof (struct graphics2d));
|
|
g_assert (gr != NULL);
|
|
memset (gr, 0, sizeof(struct graphics2d));
|
|
|
|
check_for_debug (gr);
|
|
|
|
if (gr->debug) printf ("constructing offscreen drawable of size (%d,%d)\n",
|
|
width, height);
|
|
|
|
gr->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height,
|
|
gdk_rgb_get_visual ()->depth);
|
|
g_assert (gr->drawable != NULL);
|
|
|
|
gr->cr = cairo_create();
|
|
g_assert (gr->cr != NULL);
|
|
|
|
if (x_server_has_render_extension ())
|
|
init_graphics2d_as_renderable (gr);
|
|
else
|
|
init_graphics2d_as_pixbuf (gr);
|
|
|
|
if (gr->debug) printf ("constructed offscreen drawable of size (%d,%d)\n",
|
|
width, height);
|
|
NSA_SET_G2D_PTR (env, obj, gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable
|
|
(JNIEnv *env, jobject self, jobject other, jint x, jint y)
|
|
{
|
|
struct graphics2d *src = NULL, *dst = NULL;
|
|
gint s_height, s_width, d_height, d_width, height, width;
|
|
cairo_matrix_t *matrix;
|
|
cairo_operator_t tmp_op;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, self)) { gdk_threads_leave(); return; }
|
|
src = (struct graphics2d *)NSA_GET_G2D_PTR (env, other);
|
|
dst = (struct graphics2d *)NSA_GET_G2D_PTR (env, self);
|
|
g_assert (src != NULL);
|
|
g_assert (dst != NULL);
|
|
|
|
if (src->debug) printf ("copying from offscreen drawable\n");
|
|
|
|
begin_drawing_operation(dst);
|
|
|
|
/* gdk_flush(); */
|
|
|
|
gdk_drawable_get_size (src->drawable, &s_width, &s_height);
|
|
gdk_drawable_get_size (dst->drawable, &d_width, &d_height);
|
|
width = min (s_width, d_width);
|
|
height = min (s_height, d_height);
|
|
|
|
matrix = cairo_matrix_create ();
|
|
cairo_surface_get_matrix (src->surface, matrix);
|
|
cairo_matrix_translate (matrix, (double)-x, (double)-y);
|
|
cairo_surface_set_matrix (src->surface, matrix);
|
|
|
|
tmp_op = cairo_current_operator (dst->cr);
|
|
cairo_set_operator(dst->cr, CAIRO_OPERATOR_SRC);
|
|
cairo_show_surface (dst->cr, src->surface, width, height);
|
|
cairo_set_operator(dst->cr, tmp_op);
|
|
|
|
cairo_matrix_translate (matrix, (double)x, (double)y);
|
|
cairo_surface_set_matrix (src->surface, matrix);
|
|
cairo_matrix_destroy (matrix);
|
|
|
|
gdk_flush();
|
|
|
|
end_drawing_operation(dst);
|
|
|
|
if (src->debug) printf ("copied %d x %d pixels from offscreen drawable\n", width, height);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_initState__Lgnu_java_awt_peer_gtk_GtkComponentPeer_2
|
|
(JNIEnv *env, jobject obj, jobject peer)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
GtkWidget *widget = NULL;
|
|
void *ptr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
ptr = NSA_GET_PTR (env, peer);
|
|
g_assert (ptr != NULL);
|
|
|
|
gr = (struct graphics2d *) malloc (sizeof (struct graphics2d));
|
|
g_assert (gr != NULL);
|
|
memset (gr, 0, sizeof(struct graphics2d));
|
|
|
|
check_for_debug (gr);
|
|
|
|
gr->cr = cairo_create();
|
|
g_assert (gr->cr != NULL);
|
|
|
|
widget = GTK_WIDGET (ptr);
|
|
g_assert (widget != NULL);
|
|
|
|
grab_current_drawable (widget, &(gr->drawable), &(gr->win));
|
|
g_assert (gr->drawable != NULL);
|
|
|
|
if (x_server_has_render_extension ())
|
|
init_graphics2d_as_renderable (gr);
|
|
else
|
|
init_graphics2d_as_pixbuf (gr);
|
|
|
|
NSA_SET_G2D_PTR (env, obj, gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_connectSignals
|
|
(JNIEnv *env, jobject obj, jobject peer)
|
|
{
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, peer);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
g_signal_connect_after (G_OBJECT (ptr), "realize",
|
|
G_CALLBACK (realize_cb), obj);
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
gr = (struct graphics2d *) NSA_DEL_G2D_PTR (env, obj);
|
|
if (gr == NULL)
|
|
{
|
|
gdk_threads_leave();
|
|
return; /* dispose has been called more than once */
|
|
}
|
|
|
|
if (gr->surface)
|
|
cairo_surface_destroy (gr->surface);
|
|
|
|
cairo_destroy (gr->cr);
|
|
|
|
if (gr->drawbuf)
|
|
g_object_unref (gr->drawbuf);
|
|
|
|
g_object_unref (gr->drawable);
|
|
|
|
if (gr->pattern)
|
|
cairo_pattern_destroy (gr->pattern);
|
|
|
|
if (gr->pattern_surface)
|
|
cairo_surface_destroy (gr->pattern_surface);
|
|
|
|
if (gr->pattern_pixels)
|
|
free (gr->pattern_pixels);
|
|
|
|
if (gr->debug) printf ("disposed of graphics2d\n");
|
|
|
|
free (gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setGradient
|
|
(JNIEnv *env, jobject obj,
|
|
jdouble x1, jdouble y1,
|
|
jdouble x2, jdouble y2,
|
|
jint r1, jint g1, jint b1, jint a1,
|
|
jint r2, jint g2, jint b2, jint a2,
|
|
jboolean cyclic)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
cairo_surface_t *surf = NULL;
|
|
cairo_matrix_t *mat = NULL;
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
if (gr->debug) printf ("setGradient (%f,%f) -> (%f,%f); (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n",
|
|
x1, y1,
|
|
x2, y2,
|
|
r1, g1, b1, a1,
|
|
r2, g2, b2, a2);
|
|
|
|
cairo_save (gr->cr);
|
|
|
|
if (cyclic)
|
|
surf = cairo_surface_create_similar (gr->surface, CAIRO_FORMAT_ARGB32, 3, 2);
|
|
else
|
|
surf = cairo_surface_create_similar (gr->surface, CAIRO_FORMAT_ARGB32, 2, 2);
|
|
g_assert (surf != NULL);
|
|
|
|
cairo_set_target_surface (gr->cr, surf);
|
|
|
|
cairo_identity_matrix (gr->cr);
|
|
|
|
cairo_set_rgb_color (gr->cr, r1 / 255.0, g1 / 255.0, b1 / 255.0);
|
|
cairo_set_alpha (gr->cr, a1 / 255.0);
|
|
cairo_rectangle (gr->cr, 0, 0, 1, 2);
|
|
cairo_fill (gr->cr);
|
|
|
|
cairo_set_rgb_color (gr->cr, r2 / 255.0, g2 / 255.0, b2 / 255.0);
|
|
cairo_set_alpha (gr->cr, a2 / 255.0);
|
|
cairo_rectangle (gr->cr, 1, 0, 1, 2);
|
|
cairo_fill (gr->cr);
|
|
|
|
if (cyclic)
|
|
{
|
|
cairo_set_rgb_color (gr->cr, r1 / 255.0, g1 / 255.0, b1 / 255.0);
|
|
cairo_set_alpha (gr->cr, a1 / 255.0);
|
|
cairo_rectangle (gr->cr, 2, 0, 1, 2);
|
|
cairo_fill (gr->cr);
|
|
}
|
|
|
|
mat = cairo_matrix_create ();
|
|
g_assert (mat != NULL);
|
|
|
|
/*
|
|
consider the vector [x2 - x1, y2 - y1] = [p,q]
|
|
|
|
this is a line in space starting at an 'origin' x1, y1.
|
|
|
|
it can also be thought of as a "transformed" unit vector in either the
|
|
x or y directions. we have just *drawn* our gradient as a unit vector
|
|
(well, a 2-3x unit vector) in the x dimension. so what we want to know
|
|
is which transformation turns our existing unit vector into [p,q].
|
|
|
|
which means solving for M in
|
|
|
|
[p,q] = M[1,0]
|
|
|
|
[p,q] = |a b| [1,0]
|
|
|c d|
|
|
|
|
[p,q] = [a,c], with b = d = 0.
|
|
|
|
what does this mean? it means that our gradient is 1-dimensional; as
|
|
you move through the x axis of our 2 or 3 pixel gradient from logical
|
|
x positions 0 to 1, the transformation of your x coordinate under the
|
|
matrix M causes you to accumulate both x and y values in fill
|
|
space. the y value of a gradient coordinate is ignored, since the
|
|
gradient is one dimensional. which is correct.
|
|
|
|
unfortunately we want the opposite transformation, it seems, because of
|
|
the way cairo is going to use this transformation. I'm a bit confused by
|
|
that, but it seems to work right, so we take reciprocals of values and
|
|
negate offsets. oh well.
|
|
|
|
*/
|
|
{
|
|
double a = (x2 - x1 == 0.) ? 0. : ((cyclic ? 3.0 : 2.0) / (x2 - x1));
|
|
double c = (y2 - y1 == 0.) ? 0. : (1. / (y2 - y1));
|
|
double dx = (x1 == 0.) ? 0. : 1. / x1;
|
|
double dy = (y1 == 0.) ? 0. : 1. / y1;
|
|
|
|
cairo_matrix_set_affine (mat,
|
|
a, 0.,
|
|
c, 0.,
|
|
dx, dy);
|
|
|
|
cairo_surface_set_matrix (surf, mat);
|
|
cairo_matrix_destroy (mat);
|
|
cairo_surface_set_filter (surf, CAIRO_FILTER_BILINEAR);
|
|
}
|
|
|
|
/* FIXME: repeating gradients (not to mention hold gradients) don't seem to work. */
|
|
/* cairo_surface_set_repeat (surf, cyclic ? 1 : 0); */
|
|
|
|
if (gr->pattern)
|
|
cairo_pattern_destroy (gr->pattern);
|
|
|
|
if (gr->pattern_surface)
|
|
cairo_surface_destroy (gr->pattern_surface);
|
|
|
|
if (gr->pattern_pixels)
|
|
free (gr->pattern_pixels);
|
|
|
|
gr->pattern_pixels = NULL;
|
|
gr->pattern_surface = surf;
|
|
gr->pattern = cairo_pattern_create_for_surface(surf);
|
|
|
|
cairo_restore (gr->cr);
|
|
cairo_set_pattern (gr->cr, gr->pattern);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_setTexturePixels
|
|
(JNIEnv *env, jobject obj, jintArray jarr, jint w, jint h, jint stride)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
jint *jpixels = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
|
|
if (gr->debug) printf ("setTexturePixels (%d pixels, %dx%d, stride: %d)\n",
|
|
(*env)->GetArrayLength (env, jarr), w, h, stride);
|
|
|
|
if (gr->pattern)
|
|
cairo_pattern_destroy (gr->pattern);
|
|
|
|
if (gr->pattern_surface)
|
|
cairo_surface_destroy (gr->pattern_surface);
|
|
|
|
if (gr->pattern_pixels)
|
|
free (gr->pattern_pixels);
|
|
|
|
gr->pattern = NULL;
|
|
gr->pattern_surface = NULL;
|
|
gr->pattern_pixels = NULL;
|
|
|
|
gr->pattern_pixels = (char *) malloc (h * stride * 4);
|
|
g_assert (gr->pattern_pixels != NULL);
|
|
|
|
jpixels = (*env)->GetIntArrayElements (env, jarr, NULL);
|
|
g_assert (jpixels != NULL);
|
|
memcpy (gr->pattern_pixels, jpixels, h * stride * 4);
|
|
(*env)->ReleaseIntArrayElements (env, jarr, jpixels, 0);
|
|
|
|
gr->pattern_surface = cairo_surface_create_for_image (gr->pattern_pixels,
|
|
CAIRO_FORMAT_ARGB32,
|
|
w, h, stride * 4);
|
|
g_assert (gr->pattern_surface != NULL);
|
|
cairo_surface_set_repeat (gr->pattern_surface, 1);
|
|
gr->pattern = cairo_pattern_create_for_surface (gr->pattern_surface);
|
|
g_assert (gr->pattern != NULL);
|
|
cairo_set_pattern (gr->cr, gr->pattern);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels
|
|
(JNIEnv *env, jobject obj, jintArray java_pixels,
|
|
jint w, jint h, jint stride, jdoubleArray java_matrix)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
jint *native_pixels = NULL;
|
|
jdouble *native_matrix = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
|
|
if (gr->debug) printf ("drawPixels (%d pixels, %dx%d, stride: %d)\n",
|
|
(*env)->GetArrayLength (env, java_pixels), w, h, stride);
|
|
|
|
native_pixels = (*env)->GetIntArrayElements (env, java_pixels, NULL);
|
|
native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL);
|
|
g_assert (native_pixels != NULL);
|
|
g_assert (native_matrix != NULL);
|
|
g_assert ((*env)->GetArrayLength (env, java_matrix) == 6);
|
|
|
|
begin_drawing_operation (gr);
|
|
|
|
{
|
|
cairo_matrix_t *mat = NULL;
|
|
cairo_surface_t *surf = cairo_surface_create_for_image ((char *)native_pixels,
|
|
CAIRO_FORMAT_ARGB32,
|
|
w, h, stride * 4);
|
|
mat = cairo_matrix_create ();
|
|
cairo_matrix_set_affine (mat,
|
|
native_matrix[0], native_matrix[1],
|
|
native_matrix[2], native_matrix[3],
|
|
native_matrix[4], native_matrix[5]);
|
|
cairo_surface_set_matrix (surf, mat);
|
|
cairo_surface_set_filter (surf, cairo_surface_get_filter(gr->surface));
|
|
|
|
cairo_show_surface (gr->cr, surf, w, h);
|
|
cairo_matrix_destroy (mat);
|
|
cairo_surface_destroy (surf);
|
|
}
|
|
|
|
end_drawing_operation (gr);
|
|
|
|
(*env)->ReleaseIntArrayElements (env, java_pixels, native_pixels, 0);
|
|
(*env)->ReleaseDoubleArrayElements (env, java_matrix, native_matrix, 0);
|
|
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT jintArray JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getImagePixels
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
jintArray java_pixels;
|
|
jint* native_pixels;
|
|
GdkPixbuf *buf = NULL;
|
|
gint width, height;
|
|
gint bits_per_sample = 8;
|
|
gboolean has_alpha = TRUE;
|
|
gint total_channels = 4;
|
|
jint i;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return NULL; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
|
|
if (gr->debug) printf ("getImagePixels\n");
|
|
|
|
gdk_drawable_get_size (gr->drawable, &width, &height);
|
|
|
|
buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, has_alpha,
|
|
bits_per_sample,
|
|
width, height);
|
|
g_assert (buf != NULL);
|
|
g_assert (gdk_pixbuf_get_bits_per_sample (buf) == bits_per_sample);
|
|
g_assert (gdk_pixbuf_get_n_channels (buf) == total_channels);
|
|
|
|
|
|
/* copy pixels from drawable to pixbuf */
|
|
|
|
gdk_pixbuf_get_from_drawable (buf, gr->drawable,
|
|
NULL,
|
|
0, 0, 0, 0,
|
|
width, height);
|
|
|
|
native_pixels= gdk_pixbuf_get_pixels (buf);
|
|
|
|
#ifndef WORDS_BIGENDIAN
|
|
/* convert pixels from 0xBBGGRRAA to 0xAARRGGBB */
|
|
for (i=0; i<width * height; i++)
|
|
{
|
|
native_pixels[i] = SWAPU32 ((unsigned)native_pixels[i]);
|
|
}
|
|
#endif
|
|
|
|
java_pixels = (*env) -> NewIntArray (env, width * height);
|
|
|
|
(*env)->SetIntArrayRegion(env, java_pixels,
|
|
(jsize)0, (jsize) width*height,
|
|
(jint*) native_pixels);
|
|
|
|
gdk_threads_leave();
|
|
return java_pixels;
|
|
}
|
|
|
|
/* passthrough methods to cairo */
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSave
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_save\n");
|
|
cairo_save (gr->cr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRestore
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_restore\n");
|
|
cairo_restore (gr->cr);
|
|
update_pattern_transform (gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix
|
|
(JNIEnv *env, jobject obj, jdoubleArray java_matrix)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
jdouble *native_matrix = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
/* cairoSetMatrix was called before this graphics object's component
|
|
was realized. */
|
|
if (gr == NULL) { gdk_threads_leave (); return; }
|
|
|
|
native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL);
|
|
g_assert (native_matrix != NULL);
|
|
g_assert ((*env)->GetArrayLength (env, java_matrix) == 6);
|
|
|
|
if (gr->debug) printf ("cairo_set_matrix [ %f, %f, %f, %f, %f, %f ]\n",
|
|
native_matrix[0], native_matrix[1],
|
|
native_matrix[2], native_matrix[3],
|
|
native_matrix[4], native_matrix[5]);
|
|
|
|
{
|
|
cairo_matrix_t * mat = cairo_matrix_create ();
|
|
cairo_matrix_set_affine (mat,
|
|
native_matrix[0], native_matrix[1],
|
|
native_matrix[2], native_matrix[3],
|
|
native_matrix[4], native_matrix[5]);
|
|
cairo_set_matrix (gr->cr, mat);
|
|
cairo_matrix_destroy (mat);
|
|
}
|
|
|
|
(*env)->ReleaseDoubleArrayElements (env, java_matrix, native_matrix, 0);
|
|
update_pattern_transform (gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
static void
|
|
install_font_peer(cairo_t *cr,
|
|
struct peerfont *pfont,
|
|
int debug)
|
|
{
|
|
cairo_font_t *ft;
|
|
FT_Face face = NULL;
|
|
|
|
g_assert(cr != NULL);
|
|
g_assert(pfont != NULL);
|
|
|
|
if (pfont->graphics_resource == NULL)
|
|
{
|
|
face = pango_ft2_font_get_face (pfont->font);
|
|
g_assert (face != NULL);
|
|
|
|
ft = cairo_ft_font_create_for_ft_face (face);
|
|
g_assert (ft != NULL);
|
|
|
|
if (debug) printf ("install_font_peer made new cairo font for '%s' at %f\n",
|
|
face->family_name,
|
|
(pango_font_description_get_size (pfont->desc) /
|
|
(double)PANGO_SCALE) * (96.0 / 72.0));
|
|
|
|
cairo_set_font (cr, ft);
|
|
cairo_font_destroy (ft);
|
|
cairo_scale_font (cr,
|
|
(pango_font_description_get_size (pfont->desc) /
|
|
(double)PANGO_SCALE) * (96.0 / 72.0));
|
|
ft = cairo_current_font (cr);
|
|
pfont->graphics_resource = ft;
|
|
}
|
|
else
|
|
{
|
|
if (debug) printf ("install_font_peer reused existing font resource\n");
|
|
ft = (cairo_font_t *) pfont->graphics_resource;
|
|
cairo_set_font (cr, ft);
|
|
}
|
|
}
|
|
|
|
static cairo_t *metrics_cairo = NULL;
|
|
static cairo_surface_t *metrics_surface = NULL;
|
|
|
|
static void
|
|
ensure_metrics_cairo()
|
|
{
|
|
if (metrics_cairo == NULL)
|
|
{
|
|
metrics_cairo = cairo_create ();
|
|
metrics_surface = cairo_image_surface_create (CAIRO_FORMAT_A8, 1, 1);
|
|
cairo_set_target_surface (metrics_cairo, metrics_surface);
|
|
}
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_releasePeerGraphicsResource
|
|
(JNIEnv *env, jclass clazz, jobject java_font)
|
|
{
|
|
struct peerfont *pfont = NULL;
|
|
|
|
g_assert(java_font != NULL);
|
|
|
|
gdk_threads_enter();
|
|
pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, java_font);
|
|
g_assert (pfont != NULL);
|
|
if (pfont->graphics_resource != NULL)
|
|
{
|
|
cairo_font_destroy ((cairo_font_t *) pfont->graphics_resource);
|
|
pfont->graphics_resource = NULL;
|
|
}
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getPeerTextMetrics
|
|
(JNIEnv *env, jclass clazz, jobject java_font, jstring str, jdoubleArray java_metrics)
|
|
{
|
|
struct peerfont *pfont = NULL;
|
|
const char *cstr = NULL;
|
|
jdouble *native_metrics = NULL;
|
|
cairo_text_extents_t extents;
|
|
|
|
g_assert(java_font != NULL);
|
|
gdk_threads_enter();
|
|
|
|
pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, java_font);
|
|
g_assert (pfont != NULL);
|
|
|
|
ensure_metrics_cairo();
|
|
install_font_peer (metrics_cairo, pfont, 0);
|
|
|
|
cstr = (*env)->GetStringUTFChars (env, str, NULL);
|
|
g_assert(cstr != NULL);
|
|
cairo_text_extents (metrics_cairo, cstr, &extents);
|
|
|
|
native_metrics = (*env)->GetDoubleArrayElements (env, java_metrics, NULL);
|
|
g_assert (native_metrics != NULL);
|
|
|
|
native_metrics[TEXT_METRICS_X_BEARING] = extents.x_bearing;
|
|
native_metrics[TEXT_METRICS_Y_BEARING] = extents.y_bearing;
|
|
native_metrics[TEXT_METRICS_WIDTH] = extents.width;
|
|
native_metrics[TEXT_METRICS_HEIGHT] = extents.height;
|
|
native_metrics[TEXT_METRICS_X_ADVANCE] = extents.x_advance;
|
|
native_metrics[TEXT_METRICS_Y_ADVANCE] = extents.y_advance;
|
|
|
|
(*env)->ReleaseStringUTFChars (env, str, cstr);
|
|
(*env)->ReleaseDoubleArrayElements (env, java_metrics, native_metrics, 0);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_getPeerFontMetrics
|
|
(JNIEnv *env, jclass clazz, jobject java_font, jdoubleArray java_metrics)
|
|
{
|
|
struct peerfont *pfont = NULL;
|
|
jdouble *native_metrics = NULL;
|
|
cairo_font_extents_t extents;
|
|
|
|
g_assert(java_font != NULL);
|
|
|
|
gdk_threads_enter();
|
|
|
|
pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, java_font);
|
|
g_assert (pfont != NULL);
|
|
|
|
ensure_metrics_cairo();
|
|
install_font_peer (metrics_cairo, pfont, 0);
|
|
|
|
cairo_current_font_extents (metrics_cairo, &extents);
|
|
|
|
native_metrics = (*env)->GetDoubleArrayElements (env, java_metrics, NULL);
|
|
g_assert (native_metrics != NULL);
|
|
|
|
native_metrics[FONT_METRICS_ASCENT] = extents.ascent;
|
|
native_metrics[FONT_METRICS_MAX_ASCENT] = extents.ascent;
|
|
native_metrics[FONT_METRICS_DESCENT] = extents.descent;
|
|
if (native_metrics[FONT_METRICS_DESCENT] < 0)
|
|
native_metrics[FONT_METRICS_DESCENT] = - native_metrics[FONT_METRICS_DESCENT];
|
|
native_metrics[FONT_METRICS_MAX_DESCENT] = native_metrics[FONT_METRICS_DESCENT];
|
|
native_metrics[FONT_METRICS_MAX_ADVANCE] = extents.max_x_advance;
|
|
|
|
(*env)->ReleaseDoubleArrayElements (env, java_metrics, native_metrics, 0);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
static void
|
|
paint_glyph_run(struct graphics2d *gr,
|
|
cairo_glyph_t **glyphs,
|
|
gint *n_glyphs,
|
|
PangoLayoutRun *run)
|
|
{
|
|
gint i = 0;
|
|
gint x = 0, y = 0;
|
|
|
|
g_assert (gr != NULL);
|
|
g_assert (glyphs != NULL);
|
|
g_assert (n_glyphs != NULL);
|
|
g_assert (run != NULL);
|
|
|
|
if (run->glyphs != NULL && run->glyphs->num_glyphs > 0)
|
|
{
|
|
if (*n_glyphs < run->glyphs->num_glyphs)
|
|
{
|
|
*glyphs = g_realloc(*glyphs,
|
|
(sizeof(cairo_glyph_t)
|
|
* run->glyphs->num_glyphs));
|
|
*n_glyphs = run->glyphs->num_glyphs;
|
|
}
|
|
|
|
g_assert (*glyphs != NULL);
|
|
|
|
if (gr->debug) printf ("painting %d glyphs: ", run->glyphs->num_glyphs);
|
|
|
|
for (i = 0; i < run->glyphs->num_glyphs; ++i)
|
|
{
|
|
(*glyphs)[i].index = run->glyphs->glyphs[i].glyph;
|
|
|
|
(*glyphs)[i].x =
|
|
((double) (x + run->glyphs->glyphs[i].geometry.x_offset))
|
|
/ ((double) PANGO_SCALE);
|
|
|
|
(*glyphs)[i].y =
|
|
((double) (y + run->glyphs->glyphs[i].geometry.y_offset))
|
|
/ ((double) PANGO_SCALE);
|
|
|
|
if (gr->debug) printf(" (%ld @ %f,%f)",
|
|
(*glyphs)[i].index,
|
|
(*glyphs)[i].x,
|
|
(*glyphs)[i].y);
|
|
|
|
x += run->glyphs->glyphs[i].geometry.width;
|
|
}
|
|
|
|
if (gr->debug) printf("\n");
|
|
begin_drawing_operation (gr);
|
|
cairo_show_glyphs (gr->cr, *glyphs, run->glyphs->num_glyphs);
|
|
end_drawing_operation (gr);
|
|
}
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawString
|
|
(JNIEnv *env, jobject obj, jobject font, jstring str, float x, float y)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
const char *cstr = NULL;
|
|
struct peerfont *pfont = NULL;
|
|
|
|
/*
|
|
cairo_glyph_t *glyphs = NULL;
|
|
gint n_glyphs = 0;
|
|
PangoLayoutRun *run = NULL;
|
|
PangoLayoutIter *iter = NULL;
|
|
*/
|
|
|
|
g_assert(obj != NULL);
|
|
g_assert(font != NULL);
|
|
g_assert(str != NULL);
|
|
|
|
gdk_threads_enter ();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert(gr != NULL);
|
|
|
|
pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, font);
|
|
g_assert (pfont != NULL);
|
|
|
|
cstr = (*env)->GetStringUTFChars (env, str, NULL);
|
|
g_assert(cstr != NULL);
|
|
|
|
if (gr->debug) printf ("painting string '%s' at (%f,%f)\n", cstr, x, y);
|
|
|
|
/* For now we let cairo do the glyph conversion; eventually this
|
|
* ought to be unified with pango, but it is impossible to get
|
|
* pango and cairo to agree on metrics at the moment, so we either
|
|
* have to use "all cairo" metrics (the string-based APIs) or
|
|
* "all pango" metrics (the glyph-vector based APIs).
|
|
*/
|
|
|
|
install_font_peer (gr->cr, pfont, gr->debug);
|
|
cairo_move_to (gr->cr, x, y);
|
|
cairo_show_text (gr->cr, cstr);
|
|
|
|
/*
|
|
|
|
pango_layout_set_text (gr->pango_layout, cstr, -1);
|
|
|
|
iter = pango_layout_get_iter (gr->pango_layout);
|
|
g_assert(iter != NULL);
|
|
|
|
cairo_translate (gr->cr, x, y);
|
|
|
|
do
|
|
{
|
|
run = pango_layout_iter_get_run (iter);
|
|
if (run != NULL)
|
|
paint_glyph_run (gr, &glyphs, &n_glyphs, run);
|
|
}
|
|
while (pango_layout_iter_next_run (iter));
|
|
|
|
if (glyphs != NULL)
|
|
g_free (glyphs);
|
|
|
|
cairo_translate (gr->cr, -x, -y);
|
|
|
|
pango_layout_iter_free (iter);
|
|
|
|
*/
|
|
|
|
gdk_threads_leave ();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, str, cstr);
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGdkGlyphVector
|
|
(JNIEnv *env, jobject self, jobject font, jobject java_vec, jfloat x, jfloat y)
|
|
{
|
|
|
|
struct graphics2d *gr = NULL;
|
|
struct peerfont *pfont = NULL;
|
|
struct glyphvec *gv = NULL;
|
|
PangoLayoutRun *run = NULL;
|
|
cairo_glyph_t *glyphs = NULL;
|
|
gint n_glyphs = 0;
|
|
|
|
g_assert (self != NULL);
|
|
g_assert (java_vec != NULL);
|
|
|
|
gdk_threads_enter ();
|
|
if (peer_is_disposed(env, self)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *)NSA_GET_G2D_PTR (env, self);
|
|
gv = (struct glyphvec *)NSA_GET_GV_PTR (env, java_vec);
|
|
pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, font);
|
|
|
|
g_assert (gr != NULL);
|
|
g_assert (gv != NULL);
|
|
g_assert (pfont != NULL);
|
|
|
|
if (gr->debug) printf ("painting pango glyph vector\n");
|
|
|
|
install_font_peer (gr->cr, pfont, gr->debug);
|
|
cairo_translate (gr->cr, x, y);
|
|
|
|
/* nb. PangoLayoutRun is a typedef for PangoGlyphItem. */
|
|
run = (PangoLayoutRun *) gv->glyphitems;
|
|
if (run != NULL)
|
|
paint_glyph_run (gr, &glyphs, &n_glyphs, run);
|
|
|
|
if (glyphs != NULL)
|
|
g_free (glyphs);
|
|
|
|
cairo_translate (gr->cr, -x, -y);
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoDrawGdkTextLayout
|
|
(JNIEnv *env, jobject self, jobject font, jobject java_layout, jfloat x, jfloat y)
|
|
{
|
|
/*
|
|
* FIXME: Some day we expect either cairo or pango will know how to make
|
|
* a pango layout paint to a cairo surface. that day is not yet here.
|
|
*/
|
|
|
|
struct graphics2d *gr = NULL;
|
|
struct peerfont *pfont = NULL;
|
|
struct textlayout *tl = NULL;
|
|
PangoLayoutIter *i = NULL;
|
|
PangoLayoutRun *run = NULL;
|
|
cairo_glyph_t *glyphs = NULL;
|
|
gint n_glyphs = 0;
|
|
|
|
g_assert (self != NULL);
|
|
g_assert (java_layout != NULL);
|
|
|
|
gr = (struct graphics2d *)NSA_GET_G2D_PTR (env, self);
|
|
tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, java_layout);
|
|
pfont = (struct peerfont *) NSA_GET_FONT_PTR (env, font);
|
|
|
|
g_assert (gr != NULL);
|
|
g_assert (tl != NULL);
|
|
g_assert (tl->pango_layout != NULL);
|
|
g_assert (pfont != NULL);
|
|
|
|
if (gr->debug) printf ("painting pango layout\n");
|
|
|
|
gdk_threads_enter ();
|
|
if (peer_is_disposed(env, self)) { gdk_threads_leave(); return; }
|
|
|
|
i = pango_layout_get_iter (tl->pango_layout);
|
|
g_assert (i != NULL);
|
|
|
|
install_font_peer (gr->cr, pfont, gr->debug);
|
|
cairo_translate (gr->cr, x, y);
|
|
|
|
do
|
|
{
|
|
run = pango_layout_iter_get_run (i);
|
|
if (run != NULL)
|
|
paint_glyph_run (gr, &glyphs, &n_glyphs, run);
|
|
}
|
|
while (pango_layout_iter_next_run (i));
|
|
|
|
if (glyphs != NULL)
|
|
g_free (glyphs);
|
|
|
|
cairo_translate (gr->cr, -x, -y);
|
|
|
|
pango_layout_iter_free (i);
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetOperator
|
|
(JNIEnv *env, jobject obj, jint op)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_set_operator %d\n", op);
|
|
switch ((enum java_awt_alpha_composite_rule) op)
|
|
{
|
|
case java_awt_alpha_composite_CLEAR:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_CLEAR);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_SRC:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_SRC);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_SRC_OVER:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_OVER);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_DST_OVER:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_OVER_REVERSE);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_SRC_IN:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_IN);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_DST_IN:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_IN_REVERSE);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_SRC_OUT:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_OUT);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_DST_OUT:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_OUT_REVERSE);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_DST:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_DST);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_SRC_ATOP:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_ATOP);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_DST_ATOP:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_ATOP_REVERSE);
|
|
break;
|
|
|
|
case java_awt_alpha_composite_XOR:
|
|
cairo_set_operator (gr->cr, CAIRO_OPERATOR_XOR);
|
|
break;
|
|
}
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetRGBColor
|
|
(JNIEnv *env, jobject obj, jdouble r, jdouble g, jdouble b)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
|
|
/* this is a very weird fact: GDK Pixbufs and RENDER drawables consider
|
|
colors in opposite pixel order. I have no idea why. thus when you
|
|
draw to a PixBuf, you must exchange the R and B components of your
|
|
color. */
|
|
|
|
if (gr->debug) printf ("cairo_set_rgb_color (%f, %f, %f)\n", r, g, b);
|
|
|
|
if (gr->drawbuf)
|
|
cairo_set_rgb_color (gr->cr, b, g, r);
|
|
else
|
|
cairo_set_rgb_color (gr->cr, r, g, b);
|
|
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetAlpha
|
|
(JNIEnv *env, jobject obj, jdouble a)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_set_alpha %f\n", a);
|
|
cairo_set_alpha (gr->cr, a);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFillRule
|
|
(JNIEnv *env, jobject obj, jint rule)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
if (gr->debug) printf ("cairo_set_fill_rule %d\n", rule);
|
|
g_assert (gr != NULL);
|
|
switch ((enum java_awt_geom_path_iterator_winding_rule) rule)
|
|
{
|
|
case java_awt_geom_path_iterator_WIND_NON_ZERO:
|
|
cairo_set_fill_rule (gr->cr, CAIRO_FILL_RULE_WINDING);
|
|
break;
|
|
case java_awt_geom_path_iterator_WIND_EVEN_ODD:
|
|
cairo_set_fill_rule (gr->cr, CAIRO_FILL_RULE_EVEN_ODD);
|
|
break;
|
|
}
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineWidth
|
|
(JNIEnv *env, jobject obj, jdouble width)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_set_line_width %f\n", width);
|
|
cairo_set_line_width (gr->cr, width);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineCap
|
|
(JNIEnv *env, jobject obj, jint cap)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_set_line_cap %d\n", cap);
|
|
switch ((enum java_awt_basic_stroke_cap_rule) cap)
|
|
{
|
|
case java_awt_basic_stroke_CAP_BUTT:
|
|
cairo_set_line_cap (gr->cr, CAIRO_LINE_CAP_BUTT);
|
|
break;
|
|
|
|
case java_awt_basic_stroke_CAP_ROUND:
|
|
cairo_set_line_cap (gr->cr, CAIRO_LINE_CAP_ROUND);
|
|
break;
|
|
|
|
case java_awt_basic_stroke_CAP_SQUARE:
|
|
cairo_set_line_cap (gr->cr, CAIRO_LINE_CAP_SQUARE);
|
|
break;
|
|
}
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetLineJoin
|
|
(JNIEnv *env, jobject obj, jint join)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_set_line_join %d\n", join);
|
|
switch ((enum java_awt_basic_stroke_join_rule) join)
|
|
{
|
|
case java_awt_basic_stroke_JOIN_MITER:
|
|
cairo_set_line_join (gr->cr, CAIRO_LINE_JOIN_MITER);
|
|
break;
|
|
|
|
case java_awt_basic_stroke_JOIN_ROUND:
|
|
cairo_set_line_join (gr->cr, CAIRO_LINE_JOIN_ROUND);
|
|
break;
|
|
|
|
case java_awt_basic_stroke_JOIN_BEVEL:
|
|
cairo_set_line_join (gr->cr, CAIRO_LINE_JOIN_BEVEL);
|
|
break;
|
|
}
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetDash
|
|
(JNIEnv *env, jobject obj, jdoubleArray dashes, jint ndash, jdouble offset)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
jdouble *dasharr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_set_dash\n");
|
|
dasharr = (*env)->GetDoubleArrayElements (env, dashes, NULL);
|
|
g_assert (dasharr != NULL);
|
|
cairo_set_dash (gr->cr, dasharr, ndash, offset);
|
|
(*env)->ReleaseDoubleArrayElements (env, dashes, dasharr, 0);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMiterLimit
|
|
(JNIEnv *env, jobject obj, jdouble miter)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_set_miter_limit %f\n", miter);
|
|
cairo_set_miter_limit (gr->cr, miter);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoNewPath
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
if (gr == NULL) { gdk_threads_leave (); return; }
|
|
if (gr->debug) printf ("cairo_new_path\n");
|
|
cairo_new_path (gr->cr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoMoveTo
|
|
(JNIEnv *env, jobject obj, jdouble x, jdouble y)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_move_to (%f, %f)\n", x, y);
|
|
cairo_move_to (gr->cr, x, y);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoLineTo
|
|
(JNIEnv *env, jobject obj, jdouble x, jdouble y)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_line_to (%f, %f)\n", x, y);
|
|
cairo_line_to (gr->cr, x, y);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoCurveTo
|
|
(JNIEnv *env, jobject obj, jdouble x1, jdouble y1, jdouble x2, jdouble y2, jdouble x3, jdouble y3)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_curve_to (%f, %f), (%f, %f), (%f, %f)\n", x1, y1, x2, y2, x3, y3);
|
|
cairo_curve_to (gr->cr, x1, y1, x2, y2, x3, y3);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelMoveTo
|
|
(JNIEnv *env, jobject obj, jdouble dx, jdouble dy)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_rel_move_to (%f, %f)\n", dx, dy);
|
|
cairo_rel_move_to (gr->cr, dx, dy);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelLineTo
|
|
(JNIEnv *env, jobject obj, jdouble dx, jdouble dy)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_rel_line_to (%f, %f)\n", dx, dy);
|
|
cairo_rel_line_to (gr->cr, dx, dy);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRelCurveTo
|
|
(JNIEnv *env, jobject obj, jdouble dx1, jdouble dy1, jdouble dx2, jdouble dy2, jdouble dx3, jdouble dy3)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_rel_curve_to (%f, %f), (%f, %f), (%f, %f)\n", dx1, dy1, dx2, dy2, dx3, dy3);
|
|
cairo_rel_curve_to (gr->cr, dx1, dy1, dx2, dy2, dx3, dy3);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoRectangle
|
|
(JNIEnv *env, jobject obj, jdouble x, jdouble y, jdouble width, jdouble height)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
if (gr == NULL) { gdk_threads_leave (); return; }
|
|
if (gr->debug) printf ("cairo_rectangle (%f, %f) (%f, %f)\n", x, y, width, height);
|
|
cairo_rectangle (gr->cr, x, y, width, height);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClosePath
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_close_path\n");
|
|
cairo_close_path (gr->cr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoStroke
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_stroke\n");
|
|
begin_drawing_operation (gr);
|
|
cairo_stroke (gr->cr);
|
|
end_drawing_operation (gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoFill
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_fill\n");
|
|
begin_drawing_operation (gr);
|
|
cairo_fill (gr->cr);
|
|
end_drawing_operation (gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
if (gr == NULL) { gdk_threads_leave (); return; }
|
|
if (gr->debug) printf ("cairo_clip\n");
|
|
begin_drawing_operation (gr);
|
|
cairo_init_clip (gr->cr);
|
|
cairo_clip (gr->cr);
|
|
end_drawing_operation (gr);
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSurfaceSetFilter
|
|
(JNIEnv *env, jobject obj, jint filter)
|
|
{
|
|
struct graphics2d *gr = NULL;
|
|
|
|
gdk_threads_enter();
|
|
if (peer_is_disposed(env, obj)) { gdk_threads_leave(); return; }
|
|
|
|
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
|
|
g_assert (gr != NULL);
|
|
if (gr->debug) printf ("cairo_surface_set_filter %d\n", filter);
|
|
switch ((enum java_awt_rendering_hints_filter) filter)
|
|
{
|
|
case java_awt_rendering_hints_VALUE_INTERPOLATION_NEAREST_NEIGHBOR:
|
|
cairo_surface_set_filter (gr->surface, CAIRO_FILTER_NEAREST);
|
|
break;
|
|
case java_awt_rendering_hints_VALUE_INTERPOLATION_BILINEAR:
|
|
cairo_surface_set_filter (gr->surface, CAIRO_FILTER_BILINEAR);
|
|
break;
|
|
case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_SPEED:
|
|
cairo_surface_set_filter (gr->surface, CAIRO_FILTER_FAST);
|
|
break;
|
|
case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_DEFAULT:
|
|
cairo_surface_set_filter (gr->surface, CAIRO_FILTER_NEAREST);
|
|
break;
|
|
case java_awt_rendering_hints_VALUE_ALPHA_INTERPOLATION_QUALITY:
|
|
cairo_surface_set_filter (gr->surface, CAIRO_FILTER_BEST);
|
|
break;
|
|
}
|
|
gdk_threads_leave();
|
|
}
|