diff options
| author | Graydon Hoare <graydon@gcc.gnu.org> | 2004-09-02 05:10:34 +0000 |
|---|---|---|
| committer | Graydon Hoare <graydon@gcc.gnu.org> | 2004-09-02 05:10:34 +0000 |
| commit | 57579172585eae4fd6f57c0dbd55ea998ddfb63f (patch) | |
| tree | a420c1005dbef38d790847b62b0d57eb9bc758cb /libjava/gnu | |
| parent | 1e8964cf94aa8b0e7176434d7b31fbf040416764 (diff) | |
| download | gcc-57579172585eae4fd6f57c0dbd55ea998ddfb63f.zip gcc-57579172585eae4fd6f57c0dbd55ea998ddfb63f.tar.gz gcc-57579172585eae4fd6f57c0dbd55ea998ddfb63f.tar.bz2 | |
[multiple changes]
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextAreaUI.java
(create): New method.
* javax/swing/text/DefaultHighlighter.java
(DefaultHighlightPainter.debugRect): Removed.
* javax/swing/text/StyleContext.java
(DEFAULT_STYLE): New field.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initComponentDefaults): Add keybindings for selection.backward and
selection-forward for text components.
* javax/swing/plaf/basic/BasicTextUI.java
(paintSafely): Paint highlight only when something is actually
selected.
* javax/swing/text/DefaultCaret.java
(handleHighlight): New method.
(setSelectionVisible): Don't do anything when nothing changes.
Handle highlight.
(moveDot): Reimplemented. Handle highlight.
(setDot): Set mark too. Handle highlight.
(getSelectionPainter): New method.
* javax/swing/text/DefaultEditorKit.java
(defaultActions): Added new actions for text selection.
* javax/swing/text/DefaultHighlighter.java
(DefaultHighlightPainter): New inner class.
(DefaultPainter): New field.
(paint): Implemented.
* javax/swing/text/PlainView.java
(paint): Don't draw background here again.
* javax/swing/text/Utilities.java
(getTabbedTextWidth): Use width of ' ' instead of 'm' for tabsize.
(drawTabbedText): Likewise.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/JComponent.java
(resetKeyboardActions): Add null checks.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/DefaultButtonModel.java:
Skip group notification when no group is set.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/JColorChooser.java:
Make a couple inner classes static, for jikes.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(RottView.modelToView): New method.
(UpdateHandler): Renamed from EventHandler.
(updateHandler): Renamed from eventHandler.
(modelToView): Implemented.
* javax/swing/text/AbstractDocument.java
(BranchElement.getElement): Return null for non-existing indeces.
(BranchElement.getElementIndex): Return 0 in some corner cases.
* javax/swing/text/FieldView.java
(modelToView): New method.
* javax/swing/text/PlainView.java
(modelToView): Made public.
2004-08-31 Kim Ho <kho@redhat.com>
* Makefile.am: New files.
* Makefile.in: Regenerate.
* gcj/Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
* java/awt/Color.java: Fix documentation.
(RGBtoHSB): Use floats for conversions.
* javax/swing/ButtonGroup.java: Run Jalopy.
(setSelected): Reimplement.
* javax/swing/DefaultButtonModel.java: Run Jalopy.
(changeState): Let ButtonGroup know that the button
is changing state.
* javax/swing/JColorChooser.java: Implement.
* javax/swing/JLabel.java: Run Jalopy.
* javax/swing/JSpinner.java: Run Jalopy.
(setValue): New method.
* javax/swing/JTabbedPane.java: Run Jalopy.
(removeTabAt): Call correct remove method.
* javax/swing/SpinnerNumberModel.java: Run Jalopy.
(getPreviousValue): Compare minimum value.
* javax/swing/Timer.java: Run Jalopy.
(run): Comment out println.
* javax/swing/ToolTipManager.java:
(mouseMoved): Get new tooltip text for location.
* javax/swing/colorchooser/AbstractColorChooserPanel.java:
Jalopy and Javadoc.
* javax/swing/colorchooser/ColorChooserComponentFactory.java:
Implement.
* javax/swing/colorchooser/DefaultColorSelectionModel.java:
Run Jalopy.
(setSelectedColor): Fire ChangeEvent.
* javax/swing/colorchooser/DefaultHSBChooserPanel.java:
New file. Implement.
* javax/swing/colorchooser/DefaultPreviewPanel.java:
Ditto.
* javax/swing/colorchooser/DefaultRGBChooserPanel.java:
Ditto.
* javax/swing/colorchooser/DefaultSwatchChooserPanel.java:
Ditto.
* javax/swing/plaf/basic/BasicArrowButton.java:
(getArrow): Fix size of upward pointing button.
* javax/swing/plaf/basic/BasicColorChooserUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(getWidthOfWidestLabel): Use preferred dimensions.
(getHeightOfTallestLabel): Ditto.
* javax/swing/plaf/basic/BasicSpinnerUI.java:
Run Jalopy.
(mousePressed): Disable changes to spinner if it is not enabled.
* testsuite/Makefile.in: Regenerate.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTableHeaderUI.java,
javax/swing/plaf/basic/BasicTableUI.java:
Added copyright notice.
2004-08-31 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added new files.
* Makefile.in: Regenerate.
* javax/swing/ComboBoxEditor.java: Added javadocs.
* javax/swing/ComboBoxModel.java: Likewise.
* javax/swing/DefaultComboBoxModel.java: Implemented.
* javax/swing/DefaultListCellRenderer.java: Added javadocs
and ran through jalopy to fix formatting style.
(getListCellRendererComponent): Use appropriate border
if renderer has focus and use noFocusBorder when it doesn't.
* javax/swing/JComboBox.java: Implemented.
* javax/swing/JList.java:
(locationToIndex): New Method. Implemented.
(indexToLocation): New Method.
* javax/swing/JPopupMenu.java:
(visible): New field.
(isVisible): Changed to use new field above.
(setVisible): Likewise.
* javax/swing/MutableComboBoxModel.java: Added javadocs.
* javax/swing/plaf/basic/BasicArrowButton.java:
(shadow): Changed default color to Color.gray.
* javax/swing/plaf/basic/BasicComboBoxUI.java: New File.
UI delegate for JComboBox.
* javax/swing/plaf/basic/BasicComboPopup.java: New File.
Popup menu containing list of JComboBox's items.
* javax/swing/plaf/basic/BasicComboBoxEditor.java: New File.
* javax/swing/plaf/basic/BasicComboBoxRenderer.java: New File.
* javax/swing/plaf/basic/BasicComboBoxUI.java: New File.
* javax/swing/plaf/basic/BasicComboPopup.java: New File.
* javax/swing/plaf/basic/BasicPopupMenuUI.java:
(popupMenuWillBecomeVisible): Set selected path to the first
element only if it is of type MenuElement. Also fix formatting
style.
* javax/swing/plaf/basic/ComboPopup.java: Added javadocs and missing
methods signatures.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(createBranchElement): Use new constructor of BranchElement.
(createLeafElement): Renamed arguments.
(getRootElements): Implemented.
(BranchElement.start): Removed.
(BranchElement.end): Likewise.
(BranchElement.BranchElement): Fixed arguments.
(BranchElement.getEndOffset): Reimplemented.
(BranchElement.getStartOffset): Likewis.
* javax/swing/text/DefaultCaret.java
(paint): Draw simple vertical line as caret instead of a rectangle.
* javax/swing/text/JTextComponent.java
(setText): Use doc directly.
* javax/swing/text/PlainView.java
(nextTabStop): Implemented.
* javax/swing/text/Utilities.java
(drawTabbedText): nextTabStop() returns an absolute x position.
(getTabbedTextWidth): Likewise.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* java/awt/Component.java
(isFocusTraversable): Predicate on isLightweight()
(setFocusable): Set isFocusTraversableOverridden.
(requestFocus): Predicate peer dispatch on !isLightweight()
(requestFocusInWindow): Likewise.
(dispatchEventImpl): Coordinate with KeyboardFocusManager.
* java/awt/Container.java
(dispatchEventImpl): Predicate on event mask.
(LightweightDispatcher): Remove focus machinery.
* java/awt/DefaultFocusTraversalPolicy.java
(accept): Expand predicate to include isFocusable().
* java/awt/DefaultKeyboardFocusManager.java:
Globally change c.dispatchEvent(e) to redispatchEvent(c,e)
* java/awt/KeyboardFocusManager.java
(redispatchEvent): Synchronize on event to prevent feedback.
* javax/swing/AbstractButton.java
(ButtonFocusListener): Remove class.
(init): Set focusPainted, focusable.
* javax/swing/ActionMap.java (get): Check parent for null.
* javax/swing/InputMap.java (get): Likewise.
* javax/swing/JComponent.java
(inputMap_whenFocused): New InputMap.
(inputMap_whenAncestorOfFocused): Likewise.
(inputMap_whenInFocusedWindow): Likewise.
(getActionForKeyStroke): Rewrite.
(getConditionForKeystroke): Likewise.
(ActionListenerProxy): New private class.
(setInputMap): Implement.
(getInputMap): Likewise.
(setActionMap): Likewise.
(getActionMap): Likewise.
(processComponentKeyEvent): New empty method.
(processKeyEvent): Implement.
(processKeyBinding): Likewise.
(resetKeyboardActions): Rewrite.
* javax/swing/KeyStroke.java: Rewrite.
* javax/swing/SwingUtilities.java
(notifyAction): Implement.
(replaceUIActionMap): Likewise.
(replaceUIInputMap): Likewise.
* javax/swing/plaf/basic/BasicButtonListener.java
(focusGained): Implement.
(focusLost): Repaint if focusPainted().
(installKeyboardActions): Install pressed / released actions.
(uninstallKeyboardActions): Implement.
* javax/swing/plaf/basic/BasicButtonUI.java
(focusColor): New field.
(installDefaults): Load focus color, install input map.
(installKeyboardActions): Implement.
(uninstallKeyboardActions): Likewise.
(paintFocus): Rewrite.
* javax/swing/plaf/basic/BasicLookAndFeel.java
(Button.focus): New default, midPurple.
* javax/swing/plaf/basic/BasicTextUI.java
(kit): Make static.
(installUI): Get doc from kit, load defaults.
(getKeymapName): Implement.
(createKeymap): Likewise.
(installKeyboardActions): Likewise.
(getInputMap): Likewise.
(getActionMap): Likewise.
(createActionMap): Likewise.
* javax/swing/text/AbstractDocument.java
(getStartPosition): Implement.
(getEndPosition): Likewise.
* javax/swing/text/DefaultEditorKit.java
(CopyAction): New class.
(CutAction): Likewise.
(DefaultKeyTypedAction): Likewise.
(InsertBreakAction): Likewise.
(InsertContentAction): Likewise.
(InsertTabAction): Likewise.
(PasteAction): Likewise.
(defaultActions): New static table.
(createCaret): Implement.
(getActions): Likewise.
* javax/swing/text/JTextComponent.java
(KeymapWrapper): New private class.
(KeymapActionMap): Likewise.
(DefaultKeymap): New class.
(keymaps): New static table.
(keymap): New field.
(getKeymap): Implement.
(removeKeymap): Likewise.
(addKeymap): Likewise.
(setKeymap): Likewise.
(loadKeymap): Likewise.
(getActions): Likewise.
(margin): New field.
(JTextComponent): Build and install default keymap.
* javax/swing/text/TextAction.java
(textAction): Call super properly.
(getTextComponent): Implement.
* javax/swing/text/Utilities.java
(drawTabbedText): Adjust position by ascent.
2004-08-31 David Jee <djee@redhat.com>
PR AWT/17156
* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
(setEnabled): Make it a native method.
* java/awt/DefaultKeyboardFocusManager.java
(postProcessKeyEvent): Only post event if the menu item
is active.
* java/awt/MenuItem.java:
Private field 'enabled' should be true by default.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
(setEnabled): New function.
2004-08-31 David Jee <djee@redhat.com>
PR AWT/17059
* gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
(nativeSetHelpMenu): New native method declaration.
(addHelpMenu): Call nativeSetHelpMenu().
(addMenu): Remove.
* java/awt/MenuBar.java
(setHelpMenu): Call addNotify() on the new help menu.
(add): Call addNotify() on the new menu.
(addNotify): Set the help menu if one exists.
* java/awt/peer/MenuBarPeer.java
(addMenu): Remove.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
(nativeSetHelpMenu): New method.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Regenerate.
* javax/swing/Box.java: Fix setting of layout in ctor.
* javax/swing/JScrollPane.java: Scroll headers as well.
* javax/swing/JTable.java: Reimplement.
* javax/swing/JViewPort.java: Only add non-null children.
* javax/swing/ScrollPaneLayout.java: Correct header calculations.
* javax/swing/Timer.java: Fix stopping null waker.
* javax/swing/plaf/basic/BasicTableHeaderUI.java: New file.
* javax/swing/plaf/basic/BasicTableUI.java: New file.
* javax/swing/table/DefaultTableCellRenderer.java: Configure.
* javax/swing/table/DefaultTableColumnModel.java: Flesh out.
* javax/swing/table/DefaultTableModel.java: Clean up.
* javax/swing/table/JTableHeader.java: Implement.
2004-08-31 Mark Wielaard <mark@klomp.org>
* javax/swing/JSpinner.java (getChangeListeners): Remove double
semi-colon.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Declare variables at top of functions/block.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: Likewise.
2004-08-31 Mark Wielaard <mark@klomp.org>
* java/lang/Rectangle.java (intersects): Check r.width and r.height
first.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/PlainView.java
(selectedColor): New field.
(unselectedColor): Likewise.
(font): Likewise.
(updateMetrics): New method.
(lineToRect): Likewise.
(modelToView): Likewise.
(drawSelectedText): Use color from JTextComponent ad draw with
Utilities class.
(drawUnselectedText): Likewise.
(paint): Initialize helper fields.
* javax/swing/text/View.java
(getChildAllocation): New method.
(getViewIndex): Likewise.
(getToolTipText): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Utilities.java
(drawTabbedText): Reimplemented.
(getTabbedTextWidth): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(installDefaults): Install caret and highlighter.
(modelToView): Use Bias.Forward when calling sibling.
* javax/swing/text/AbstractDocument.java
(ElementEdit): Implements DocumentEvent.ElementChange.
(ElementEdit.ElementEdit): New method.
(ElementEdit.getChildrenAdded): Likewise.
(ElementEdit.getChildrenRemoved): Likewise.
(ElementEdit.getElement): Likewise.
(ElementEdit.getIndex): Likewise.
* javax/swing/text/DefaultCaret.java
(color): Removed.
(textComponent): Renamed from parent, made private.
(selectionVisible): Renamed from vis_sel, made private.
(blinkRate): Renamed from blink, made private.
(magicCaretPosition): Renamed from magic, made private.
(visible): Renamed from vis, made private.
(dot): Made private.
(mark): Likewise.
(deinstall): Remove as MouseMotionListener.
(install): Initialize textComponent first. Add as MouseMotionListener.
(paint): Reimplemented.
* javax/swing/text/JTextComponent.java
(setCaret): Deinstall old caret, install new one and fire property
change after setting property.
(setHighlighter): Deinstall old highlighter, install new one and fire
property change after setting property.
(setCaretColor): Fire property change after setting property.
(setDisabledTextColor): Likewise.
(setSelectedTextColor): Likewise.
(setSelectionColor): Likewise.
(modelToView): New method.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(getText): Simplified.
* javax/swing/text/Segment.java
(current): New field.
(current): Reimplemented.
(first): Likewise.
(getIndex): Likewise.
(last): Likewise.
(next): Likewise.
(previous): Likewise.
(setIndex): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicButtonUI.java
(defaultTextIconGap): Made protected.
(defaultTextShiftOffset): Likewise.
(textShiftOffset): New field.
(clearTextShiftOffset): New method.
(getTextShiftOffset): Likewise.
(setTextShiftOffset): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(installUI): Add eventHandler as property listener.
(uninstallUI): remove eventHandler as propert listener.
(installDefaults): Added comment.
(installListeners): Likewise.
(installKeyboardActions): Likewise.
(uninstallDefaults): Likewise.
(uninstallListeners): Likewise.
(uninstallKeyboardActions): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java:
Fixed some typos in comments.
(insertString): Reimplemented.
(remove): Likewise.
(replace): New method.
(children): Dont use fully qualified class name.
(DefaultDocumentEvent.offset): Renamed from off.
(DefaultDocumentEvent.length): Renamed from len.
(DefaultDocumentEvent.type): New field.
(DefaultDocumentEvent.DefaultDocumentEvent): New constructor.
(DefaultDocumentEvent.getType): Implemented.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(RootView.textComponent): Removed.
(RootView.RootView): Don't initialize textComponent.
(RootView.getViewFactory): New method.
(EventHandler): New inner class.
(rootView): Initialize at instance creation.
(eventHandler): New field.
(installUI): Don't create view hierarchy directly,
call modelChanged() instead.
(modelChanged): New method.
* javax/swing/text/JTextComponent.java
(setDocument): Fire property change event.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicTextUI.java
(RootView.paint): Removed debug output.
(paintSafely): Draw highlighter before text.
(paintBackground): Use background color of text component.
* javax/swing/plaf/basic/BasicToggleButtonUI.java:
Reformatted.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicToolBarUI.java
(BasicToolBarUI): Fixed arguments for constructor.
(createUI): Fixed creation of object.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/DefaultListSelectionModel.java
(fireValueChanged): Renamed from fireSelectionValueChanged,
made protected.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/text/TabSet.java
(TabSet): Implements java.io.Serializable.
* javax/swing/text/TabStop.java
(TabStop): Implements java.io.Serializable.
(TabStop): Made public.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/JComponent.java
(setUI): Fire PropertyChange.
* javax/swing/JLabel.java
(text): Renamed from labelText.
(horizontalAlignment): New default vlaue.
(icon): Renamed from activeIcon.
(displayedMnemonic): Renamed from mnemonicKey, added default value.
(displayedMnemonicIndex): Renamed from underlineChar.
(setDisplayedMnemonic): Reimplemented.
* javax/swing/JRadioButton.java
(JRadioButton): New constructors.
* javax/swing/JTextField.java
(JTextField): Throw exception if colums < 0, initialitialz
this.columns directly and initialize document with text conditionally.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicFormattedTextFieldUI.java,
javax/swing/plaf/basic/BasicPasswordFieldUI.java,
javax/swing/plaf/basic/BasicTextAreaUI.java: New files.
* javax/swing/text/FieldView.java
(paint): Just call super method for now.
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-08-31 Ka-Hing Cheung <kahing@javabsp.org>
* javax/swing/AbstractSpinnerModel.java,
javax/swing/JSpinner.java,
javax/swing/SpinnerNumberModel.java,
javax/swing/plaf/basic/BasicSpinnerUI.java:
New files.
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initClassDefaults): Added defaults for BasicSpinnerUI.
2004-08-31 Michael Koch <konqueror@gmx.de>
* Makefile.am: Added new files.
* Makefile.in: Regenerated.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/TransferHandler.java,
javax/swing/plaf/basic/ComboPopup.java: New files
* Makefile.am: Added javax/swing/TransferHandler.java and
javax/swing/plaf/basic/ComboPopup.java
* Makefile.in: Regenerated.
2004-08-31 Roman Kennke <roman@ontographics.com>
* javax/swing/text/Utilities.java: New file.
2004-08-31 Michael Koch <konqueror@gmx.de>
* Makefile.am: Added javax/swing/text/Utilities.java.
* Makefile.in: Regenerated.
2004-08-31 Graydon Hoare <graydon@redhat.com>
* javax/swing/text/SimpleAttributeSet.java: New file.
* javax/swing/text/StyleConstants.java: New file.
* javax/swing/text/StyleContext.java: New file.
* javax/swing/text/TabSet.java: New file.
* javax/swing/text/TabStop.java: New file.
* javax/swing/text/AbstactDocument.java:
(AbstractElement): Implement attribute support.
* javax/swing/text/AttributeSet.java
(NameAttribute): New static field.
(ResolveAttribute): New static field.
* Makefile.am: Update for new files.
* Makefile.in: Regenerate.
2004-08-31 Craig Black <craig.black@aonix.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(drawImage): Add support for scaling pixmaps.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(copyAndScalePixmap): New native method.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
PR AWT/16121
* jni/gtk-peer/gthread-jni.c: Include stdio.h. Eliminate
type-punning compiler warnings using unions.
(throw): Replace bzero with memset.
2004-08-31 Andreas Tobler <a.tobler@schweiz.ch>
Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c: Move
NSA_PB macros to gtkpeer.h. Include gtkpeer.h.
* jni/gtk-peer/gtkpeer.h: Move NSA_PB macros here.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(nativeSetIconImageFromDecoder): Use NSA_GET_PB_PTR macro.
2004-08-31 Mark Wielaard <mark@klomp.org>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c:
#include gdk.h, not gtk.h. #include jni.h, native_state.h, string.h
and stdlib.h, not gtkpeer.h.
(*vm): New static variable.
(areaPreparedID): Make static.
(areaUpdatedID): Likewise.
(area_prepared): Get and use JNIEnv through stored JavaVM *vm.
(area_prepared): Likewise.
(area_updated): Likewise.
(closed): Likewise.
(initStaticState): Initialize *vm javaVM.
(pumpBytes): Use given env, not global gdk_env.
2004-08-31 Mark Wielaard <mark@klomp.org>
* java/awt/geom/CubicCurve2D.java (solveCubic): Removed duplicate
comments.
2004-08-31 Sven de Marothy <sven@physto.se>
* java/awt/geom/CubicCurve2D.java: Reindent.
(contains): Implemented.
(intersects): Implemented.
* java/awt/geom/QuadCurve2D.java: Likewise.
* java/awt/geom/GeneralPath.java: Reindent and document.
Fully (re)implemented using separate xpoints and ypoints
float[] coords.
* java/awt/geom/RoundRectangle2D.java: Several bugfixes (Bug #6007).
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/JMenuItem.java
(getMenuDragMouseListeners): New method.
(getMenuKeyListeners): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java
(model): Made protected.
(actionListener): Likewise.
(changeListener): Likewise.
(itemListener): Likewise.
(multiClickThreshhold): New field.
(getActionListeners): New method.
(getChangeListeners): Likewise.
(getItemListeners): Likewise.
(fireItemStateChanged): Simplified implementation.
(fireActionPerformed): Likewise.
(fireStateChanged): Likewise.
(getMultiClickThreshhold): New method.
(setMultiClickThreshhold): Likewise.
2004-08-31 Tom Tromey <tromey@redhat.com>
* java/awt/image/Kernel.java (clone): Use super.clone().
2004-08-31 David Jee <djee@redhat.com>
PR AWT/16682
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(nativeSetIconImage): Rename to nativeSetIconImageFromDecoder.
(nativeSetIconImageFromData): New native method declaration.
(setIconImage): Handle images not produced from GdkPixbufDecoder.
* gnu/java/awt/peer/gtk/GtkImage.java
(getPixelCache): New method.
(getColorModel): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(nativeSetIconImage): Rename to nativeSetIconImageFromDecoder.
(free_pixbuf_data): New helper function.
(nativeSetIconImageFromData): New function.
2004-08-31 Graydon Hoare <graydon@redhat.com>
PR SWING/16576
* javax/swing/JLayeredPane.java
(setLayer): Permit changing layer after addition.
(setPosition): Permit over-length positions.
(layerToRange): Compare intValue()s.
* javax/swing/Box.java (createHorizontalBox): Implement.
(createRigidArea): Likewise.
(createVerticalBox): Likewise.
2004-08-31 Kim Ho <kho@redhat.com>
* java/awt/Component.java:
(processMouseEvent): Consume event after
listeners process it.
(processMouseMotionEvent): ditto.
(processMouseWheelEvent): ditto.
* java/awt/Container.java:
(acquireComponentForMouseEvent):
Do not dispatch to events that have been
removed from the Container.
(handleEvent): Consume the MouseEvents.
* javax/swing/RepaintManager.java:
(paintDirtyRegions): Do not add to list of
damaged areas if the component has no root.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicMenuItemUI.java: Clean ip imports.
2004-08-31 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Don't return
null when a MissingResourceException is thrown. Should never happen.
2004-08-31 Mark Wielaard <mark@klomp.org>
* java/awt/EventQueue.java (postEvent): Throw NullPointerException
when argument is null.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter):
Define hid at start of function.
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter):
Likewise.
2004-08-31 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/EmbeddedWindow.java: Reindent.
* javax/swing/JButton.java: Reindent.
* javax/swing/JCheckBox.java: Reindent.
2004-08-31 Mark Wielaard <mark@klomp.org>
* Makefile.am (gtk_c_source_files): Added
jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c.
(gtk_awt_peer_sources): Added
gnu/java/awt/peer/gtk/GThreadMutex.java and
gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java.
* Makefile.in: Regenerated.
2004-08-31 Archie Cobbs <archie@dellroad.org>
* jni/gtk-peer/gthread-jni.c: don't #include nonexistent files
2004-08-31 Steven Augart <augart@watson.ibm.com>
* jni/gtk-peer/gthread-jni.c (c-font-lock-extra-types):
Added jfieldID, jmethodID.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): Initialize
gdk_env before calling any gdk or gtk function.
* gnu/java/awt/peer/gtk/GtkMainThread.java (gtkInitCalled): New field.
(GtkMainThread): Call wait() in while loop waiting for gtkInitCalled.
(run): Set gtkInitCalled.
2004-08-31 Steven Augart <augart@watson.ibm.com>
* gnu/java/awt/peer/gtk/GtkMainThread.java (run): Pass the value of
the gnu.classpath.awt.gtk.portable.native.sync system property to C.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): New argument,
portableNativeSync. Delegate PORTABLE_NATIVE_SYNC work to
init_glib_threads.
(init_glib_threads): New function.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_
PRIORITY when not already defined in header file.
2004-08-31 Mark Wielaard <mark@klomp.org>
* jni/gtk-peer/gthread-jni.c (setup_cache): Call
ExceptionOccurred, not ExceptionCheck, when we don't have JNI 1.2.
2004-08-31 Steven Augart <augart@watson.ibm.com>
* gnu/native/jni/gtk-peer/gthread-jni.c: Indentation fixes.
Implemented missing functions for GTK2.
Added error handling.
Renamed static functions out of the g_ namespace.
Added TRACE_API_CALLS, EXPLAIN_TROUBLE, EXPLAIN_BROKEN,
EXPLAIN_BADLY_BROKEN, and DELETE_LOCAL_REFS options.
Rewrote global-reference code.
Eliminated cascading errors.
(mutex_trylock_jni_impl) Fully implemented.
(cond_timed_wait_jni_impl) Went from millisecond to microsecond
resolution.
(setup_cache) New function.
(mutex_cond_wait_jni_impl, mutex_cond_timed_wait_jni_impl) Fixed
bug where they were not unlocking the GMutex associated with the
condition variable during the wait on that condition variable.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
native/jni/gtk-peer/gthread-jni.c,
native/jni/gtk-peer/gthread-jni.h
(g_thread_jni_functions): Renamed to ...
(portable_native_sync_jni_functions): this name.
(gdk_vm): Renamed to...
(the_vm): this name.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(gdk_vm): Removed duplicate definition.
(gtkInit): Removed stray message to stdout.
(gtkInit): Use g_malloc and g_free instead of malloc and free.
(gtkInit): Fix a const assignment bug.
(gtkInit): Simplified code.
* gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h,
gnu/java/awt/peer/gtk/GThreadMutex.java:
New files.
2004-08-31 Mark Wielaard <mark@klomp.org>
* javax/swing/Box.java: Put FIXME comment above class declaration.
* javax/swing/JButton.java: Remove illegal L&F HTML from comments.
* javax/swing/JCheckBox.java: Likewise.
* javax/swing/JDialog.java: Likewise.
* javax/swing/JRadioButton.java: Likewise.
* javax/swing/JToggleButton.java: Likewise.
* javax/swing/UIManager.java: Likewise.
* javax/swing/border/TitledBorder.java: Likewise.
* javax/swing/plaf/basic/BasicLabelUI.java: Likewise.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise.
* javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java: Likewise.
* javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise.
* javax/swing/plaf/basic/BasicScrollBarUI.java: Likewise.
* javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise.
* javax/swing/text/JTextComponent.java: Likewise.
2004-08-31 David Jee <djee@redhat.com>
PR AWT/16682
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(setIconImage): Add a FIXME for unhandled cases.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
PR AWT/16040
* gnu/awt/LightweightRedirector.java: Call getModifiersEx, not
getModifiers. Replace old button masks with new ones.
* gnu/awt/xlib/XEventLoop.java: Likewise.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
* gnu/java/awt/peer/gtk/GtkListPeer.java: Likewise.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise.
* java/awt/AWTKeyStroke.java: Remove old modifier masks.
* java/awt/Component.java: Replace old modifier masks with new
ones.
* java/awt/Container.java: Call getModifiersEx, not
getModifiers.
* java/awt/DefaultKeyboardFocusManager.java: Likewise. Remove
old modifier masks.
* javax/swing/JMenuItem.java: Replace old button masks with new
ones.
* javax/swing/KeyStroke.java: Call getModifiersEx, not
getModifiers.
* javax/swing/SwingUtilities.java: Likewise.
* javax/swing/plaf/basic/BasicButtonListener.java: Likewise.
* javax/swing/plaf/basic/BasicInternalFrameUI.java: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Replace old
mask macros with new ones.
* jni/gtk-peer/gtkpeer.h: Replace old button and modifier mask
macros with new ones representing new masks.
2004-08-31 Craig Black <craig.black@aonix.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(drawRoundRect): Implemented.
(fillRoundRect): Implemented.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRoundRect): Reimplemented to match GdkGraphics.
(fillRoundRect): Reimplemented to match GdkGraphics.
2004-08-31 Mark Wielaard <mark@klomp.org>
* Makefile.in: Regenerated.
2004-08-31 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/EmbeddedWindow.java
(addNotify): Use AccessController to allow execution of privileged
code.
2004-08-31 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/EmbeddedWindow.java
(static): Removed.
(addNotify): Set peer via reflection.
(setWindowPeer): Removed.
* gnu/java/awt/natEmbeddedWindow.cc: Removed.
* Makefile.am (nat_source_files):
Removed gnu/java/awt/natEmbeddedWindow.cc.
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* Makefile.am: Add gnu/java/security/action/GetPropertyAction.java
and gnu/java/security/action/SetAccessibleAction.java.
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* gnu/java/security/action/GetPropertyAction.java (setParameters):
Renamed from 'setName'. New 2-argument form with default value.
(run): Pass default 'value' parameter to System.getProperty().
* gnu/java/security/action/SetAccessibleAction.java: Fix javadoc
typos.
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* gnu/java/security/action/GetPropertyAction.java: New class.
* gnu/java/security/action/SetAccessibleAction.java: New class.
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(setIconImage): Check if image is null.
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(create): Set the icon image.
(nativeSetIconImage): New native method declaration.
(setIconImage): Implement.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(nativeSetIconImage): New function.
2004-08-31 Dalibor Topic <robilad@kaffe.org>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
(filenameFilterCallback): Declare local variable accepted before use.
2004-08-31 Dalibor Topic <robilad@kaffe.org>
* gnu/java/awt/ComponentDataBlitOp.java:
Cleaned up imports.
2004-08-31 Tom Tromey <tromey@redhat.com>
* gnu/java/awt/peer/GLightweightPeer.java,
gnu/java/awt/peer/gtk/GdkGraphics2D.java,
gnu/java/awt/peer/gtk/GtkComponentPeer.java,
javax/swing/JScrollPane.java: Removed
redundant imports.
2004-08-31 David Jee <djee@redhat.com>
* java/awt/DefaultKeyboardFocusManager.java
(postProcessKeyEvent): Only activate MenuShortcuts on KEY_PRESSED
event. Fix shift modifier checking.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
(accel_attach): Remove.
(setupAccelGroup): Remove calls to accel_attach.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkArg.java: Remove file.
* gnu/java/awt/peer/gtk/GtkArgList.java: Remove file.
* Makefile.am (gtk_awt_peer_sources): Remove GtkArg.java and
GtkArgList.java.
(gtk_c_files): Use CAIRO_CFLAGS and PANGOFT2_CFLAGS, not _LIBS.
* Makefile.in: Regenerate.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
(create(String)): New method.
(create): Call new create method.
(getArgs): Remove method.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(nativeCreate): Rename to create.
(gtkSetLabel): Rename to gtkButtonSetLabel.
(gtkToggleButtonSetActive): New method.
(create): Call gtkToggleButtonSetActive and gtkButtonSetLabel.
(setState): Replace set call with gtkToggleButtonSetActive.
(setLabel): Replace gtkSetLabel call with gtkButtonSetLabel.
(getArgs): Remove method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(gtkWidgetSetSensitive): New method.
(gtkWidgetSetParent): Likewise.
(GtkComponentPeer): Call setParent, setComponentBounds and
setVisibleAndEnabled.
(setParent): New method.
(setComponentBounds): New method.
(setVisibleAndEnabled): New method.
(setEnabled): Call gtkWidgetSetSensitive.
(getArgs): Remove method.
Remove all set methods.
* gnu/java/awt/peer/gtk/GtkDialogPeer.java (create): Call
gtkWindowSetModal, setTitle and setResizable.
(getArgs): Remove method.
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
(setComponentBounds): New method.
* gnu/java/awt/peer/gtk/GtkFramePeer.java (setResizable):
Replace set call with gtkWindowSetResizable.
(getArgs): Remove method.
(create): Call setTitle and setResizable.
* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(gtkWindowSetTitle): New method.
(gtkWindowSetResizable): New method.
(gtkWindowSetModal): New method.
(setParent): New method.
(setVisibleAndEnabled): New method.
(getArgs): Remove method.
(setTitle): Call gtkWindowSetTitle.
(setResizable): Call gtkWindowSetResizable.
* jni/gtk-peer/gtkpeer.h [DEBUG_LOCKING]: New define to turn on
and off locking instrumentation.
2004-08-31 Kim Ho <kho@redhat.com>
* Makefile.am: Add new file.
* Makefile.in: Regenerate.
* gcj/Makefile.in: Regenerate
* include/Makefile.in:
* java/awt/Container.java:
(acquireComponentForMouseEvent): Respect
the event mask when looking for candidate.
* javax/swing/JComponent.java:
Remove toolTip field.
(createToolTip): Create a tooltip on demand.
(setToolTipText): Register with the ToolTipManager.
(getToolTipText(MouseEvent)): Return getToolTipText().
* javax/swing/JToolTip.java: Implement.
* javax/swing/Timer.java: Jalopy.
(restart): Call stop, then start.
(stop): Interrupt the timer rather than wait for
the timer to come to a stop naturally.
* javax/swing/ToolTipManager.java: Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Change ToolTip.background color.
* javax/swing/plaf/basic/BasicToolTipUI.java:
Implement.
* testsuite/Makefile.in: Regenerate
2004-08-31 Jerry Quinn <jlquinn@optonline.net>
* java/awt/image/DirectColorModel.java (DirectColorModel): Fix
constructor param comments.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java: Document AWT 1.0 event handler
methods.
2004-08-31 Roman Kennke <roman@ontographics.com>
* javax/swing/Box.java:
(createGlue): Implemented
(createHorizontalGlue): Implemented
(createHorizontalStrut): Implemented
(createVerticalGlue): Implemented
(createVerticalStrut): Implemented
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkChoicePeer.java
(GtkChoicePeer): Do not automatically select first item.
(getHistory): Remove.
(nativeGetSelected): New method.
(nativeRemoveAll): New method.
(add): Use nativeGetSelected() instead of getHistory().
(remove): Likewise.
(removeAll): Call nativeRemoveAll().
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
(create): Migrate to GtkComboBox.
(append): Likewise.
(nativeAdd): Likewise.
(nativeRemove): Likewise.
(select): Likewise.
(nativeRemoveAll): New method.
(nativeGetSelected): New method.
(selection_changed): New method.
(getHistory): Remove.
(item_activate): Remove.
(item_removed): Remove.
(connect_choice_item_selectable_hook): Remove.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create): Use tf
variable in setEditable call.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
(gtkWidgetSetBackground): New method.
(gtkWidgetSetForeground): Likewise.
(create): Set peer's editable state based on awtComponent's.
* java/awt/Button.java (Button()): Use empty string rather than
null in no-label constructor.
2004-08-31 Roman Kennke <roman@ontographics.com>
* javax/swing/BoxLayout.java: Reimplement.
2004-08-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java,
gnu_java_awt_peer_gtk_GdkGraphics.c
(initState(GtkComponentPeer)): Don't return array of colour
values.
(GdkGraphics(int,int)): Set default font to size 12.
(GdkGraphics(GtkComponentPeer)): Set graphics colour to
component's foreground colour.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java,
gnu_java_awt_peer_gtk_GdkGraphics2D.c
(initState(GtkComponentPeer)): Don't return array of colour
values.
(GdkGraphics2D(GtkComponentPeer)): Set foreground and background
colours to component's colours.
(current_colors_of_widget): Remove function.
* gnu/java/awt/peer/gtk/GtkOffScreenImage.java (getGraphics):
Return a new graphics object.
* java/awt/Font.java (toString): Fix format.
* java/awt/Graphics.java (toString): Likewise.
2004-08-31 Craig Black <craig.black@aonix.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
(addTearOff): New function.
* gnu/java/awt/peer/gtk/GtkMenuPeer.java (addTearOff):
New native method.
(init): Call addTearOff() when menu.isTearOff().
2004-08-31 Bryce McKinlay <mckinlay@redhat.com>
* gnu/java/awt/ClasspathToolkit.java (createImageProducer): New.
Default implementation.
* gnu/java/awt/peer/gtk/GtkToolkit.java (createImageProducer): New.
Implement using GdkPixbufDecoder.
2004-08-31 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(GtkComponentPeer): Use gtkWidgetGetPreferredDimensions() for
setting the size of GtkFileDialogPeers.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(gtkWidgetGetPreferredDimensions): For widgets extending GtkWindow,
use their default sizes rather than their natural requisitions.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/JFormattedTextField.java
(JFormattedTextField): Implemented.
* javax/swing/text/DefaultEditorKit.java
(BeepAction): New inner class.
* javax/swing/text/Segment.java
(partialReturn): New field.
(setPartialReturn): New method.
(isPartialReturn): Likewise.
* javax/swing/text/View.java
(createFragment): Fixed typo.
(getStartOffset): New method.
(getEndOffset): Likewise.
2004-08-31 Michael Koch <konqueror@gmx.de>
* javax/swing/table/DefaultTableColumnModel.java
(serialVersionUID): Made private.
(listenerList): Initialize.
(changeEvent): Initialize.
* javax/swing/table/JTableHeader.java
(JTableHeader): New constructors.
(createDefaultColumnModel): New method.
* javax/swing/table/TableColumn.java
(setHeaderRenderer): Simplified code.
(setCellRenderer): Likewise.
(setWidth): Likewise.
From-SVN: r86956
Diffstat (limited to 'libjava/gnu')
21 files changed, 383 insertions, 208 deletions
diff --git a/libjava/gnu/awt/LightweightRedirector.java b/libjava/gnu/awt/LightweightRedirector.java index a0ea7bc..41dc124 100644 --- a/libjava/gnu/awt/LightweightRedirector.java +++ b/libjava/gnu/awt/LightweightRedirector.java @@ -141,7 +141,7 @@ public class LightweightRedirector MouseEvent redirected = new MouseEvent(source, event.getID(), event.getWhen(), - event.getModifiers(), + event.getModifiersEx(), x, y, event.getClickCount(), event.isPopupTrigger()); @@ -157,20 +157,20 @@ public class LightweightRedirector */ int getButtonNumber(InputEvent event) { - int modifiers = event.getModifiers(); + int modifiers = event.getModifiersEx(); modifiers &= - InputEvent.BUTTON1_MASK | - InputEvent.BUTTON2_MASK | - InputEvent.BUTTON3_MASK; + InputEvent.BUTTON1_DOWN_MASK | + InputEvent.BUTTON2_DOWN_MASK | + InputEvent.BUTTON3_DOWN_MASK; switch (modifiers) { - case InputEvent.BUTTON1_MASK: + case InputEvent.BUTTON1_DOWN_MASK: return 1; - case InputEvent.BUTTON2_MASK: + case InputEvent.BUTTON2_DOWN_MASK: return 2; - case InputEvent.BUTTON3_MASK: + case InputEvent.BUTTON3_DOWN_MASK: return 3; case 0: return 0; diff --git a/libjava/gnu/awt/xlib/XEventLoop.java b/libjava/gnu/awt/xlib/XEventLoop.java index 5f5026b..6687818 100644 --- a/libjava/gnu/awt/xlib/XEventLoop.java +++ b/libjava/gnu/awt/xlib/XEventLoop.java @@ -197,13 +197,13 @@ public class XEventLoop implements Runnable switch (buttonEvt.button) { case 1: - modifiers = InputEvent.BUTTON1_MASK; + modifiers = InputEvent.BUTTON1_DOWN_MASK; break; case 2: - modifiers = InputEvent.BUTTON2_MASK; + modifiers = InputEvent.BUTTON2_DOWN_MASK; break; case 3: - modifiers = InputEvent.BUTTON2_MASK; + modifiers = InputEvent.BUTTON2_DOWN_MASK; break; } diff --git a/libjava/gnu/java/awt/peer/GLightweightPeer.java b/libjava/gnu/java/awt/peer/GLightweightPeer.java index dfd9e1e..643c40f 100644 --- a/libjava/gnu/java/awt/peer/GLightweightPeer.java +++ b/libjava/gnu/java/awt/peer/GLightweightPeer.java @@ -1,5 +1,5 @@ /* GLightweightPeer.java -- - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,6 @@ import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Font; -import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.GraphicsConfiguration; diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java index 8ea6817..c374ba2 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java @@ -64,7 +64,7 @@ public class GdkGraphics extends Graphics static final int GDK_COPY = 0, GDK_XOR = 2; - native int[] initState (GtkComponentPeer component); + native void initState (GtkComponentPeer component); native void initState (int width, int height); native void copyState (GdkGraphics g); @@ -84,15 +84,15 @@ public class GdkGraphics extends Graphics initState (width, height); color = Color.black; clip = new Rectangle (0, 0, width, height); - font = new Font ("Dialog", Font.PLAIN, 10); + font = new Font ("Dialog", Font.PLAIN, 12); } GdkGraphics (GtkComponentPeer component) { this.component = component; - int rgb[] = initState (component); - color = new Color (rgb[0], rgb[1], rgb[2]); - font = component.awtComponent.getFont(); + initState (component); + color = component.awtComponent.getForeground (); + font = component.awtComponent.getFont (); Dimension d = component.awtComponent.getSize (); clip = new Rectangle (0, 0, d.width, d.height); } @@ -126,6 +126,11 @@ public class GdkGraphics extends Graphics native public void dispose (); native void copyPixmap (Graphics g, int x, int y, int width, int height); + native void copyAndScalePixmap (Graphics g, boolean flip_x, boolean flip_y, + int src_x, int src_y, + int src_width, int src_height, + int dest_x, int dest_y, + int dest_width, int dest_height); public boolean drawImage (Image img, int x, int y, Color bgcolor, ImageObserver observer) { @@ -161,7 +166,10 @@ public class GdkGraphics extends Graphics { if (img instanceof GtkOffScreenImage) { - throw new RuntimeException (); + copyAndScalePixmap (img.getGraphics (), false, false, + 0, 0, img.getWidth (null), img.getHeight (null), + x, y, width, height); + return true; } GtkImage image = (GtkImage) img; @@ -186,7 +194,60 @@ public class GdkGraphics extends Graphics { if (img instanceof GtkOffScreenImage) { - throw new RuntimeException (); + int dx_start, dy_start, d_width, d_height; + int sx_start, sy_start, s_width, s_height; + boolean x_flip = false; + boolean y_flip = false; + + if (dx1 < dx2) + { + dx_start = dx1; + d_width = dx2 - dx1; + } + else + { + dx_start = dx2; + d_width = dx1 - dx2; + x_flip ^= true; + } + if (dy1 < dy2) + { + dy_start = dy1; + d_height = dy2 - dy1; + } + else + { + dy_start = dy2; + d_height = dy1 - dy2; + y_flip ^= true; + } + if (sx1 < sx2) + { + sx_start = sx1; + s_width = sx2 - sx1; + } + else + { + sx_start = sx2; + s_width = sx1 - sx2; + x_flip ^= true; + } + if (sy1 < sy2) + { + sy_start = sy1; + s_height = sy2 - sy1; + } + else + { + sy_start = sy2; + s_height = sy1 - sy2; + y_flip ^= true; + } + + copyAndScalePixmap (img.getGraphics (), x_flip, y_flip, + sx_start, sy_start, s_width, s_height, + dx_start, dy_start, d_width, d_height); + return true; } GtkImage image = (GtkImage) img; @@ -238,13 +299,48 @@ public class GdkGraphics extends Graphics public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { - // System.out.println ("drawRoundRect called [UNIMPLEMENTED]"); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + + drawArc (x, y, arcWidth, arcHeight, 90, 90); + drawArc (xx, y, arcWidth, arcHeight, 0, 90); + drawArc (xx, yy, arcWidth, arcHeight, 270, 90); + drawArc (x, yy, arcWidth, arcHeight, 180, 90); + + int y1 = y + arcHeight / 2; + int y2 = y + height - arcHeight / 2; + drawLine (x, y1, x, y2); + drawLine (x + width, y1, x + width, y2); + + int x1 = x + arcWidth / 2; + int x2 = x + width - arcWidth / 2; + drawLine (x1, y, x2, y); + drawLine (x1, y + height, x2, y + height); } public void fillRoundRect (int x, int y, int width, int height, int arcWidth, int arcHeight) { - // System.out.println ("fillRoundRect called [UNIMPLEMENTED]"); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + + fillArc (x, y, arcWidth, arcHeight, 90, 90); + fillArc (xx, y, arcWidth, arcHeight, 0, 90); + fillArc (xx, yy, arcWidth, arcHeight, 270, 90); + fillArc (x, yy, arcWidth, arcHeight, 180, 90); + + fillRect (x, y + arcHeight / 2, width, height - arcHeight + 1); + fillRect (x + arcWidth / 2, y, width - arcWidth + 1, height); } public Shape getClip () diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java index ebff68e..0986960 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java @@ -1,5 +1,5 @@ /* GdkGraphics2D.java - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,6 @@ import java.util.HashMap; import java.util.Map; import java.text.AttributedCharacterIterator; -import java.util.Map; import java.util.Stack; import java.lang.Integer; import gnu.java.awt.ClasspathToolkit; @@ -88,7 +87,7 @@ public class GdkGraphics2D extends Graphics2D private Stack stateStack; - native private int[] initState (GtkComponentPeer component); + native private void initState (GtkComponentPeer component); native private void initState (int width, int height); native private void copyState (GdkGraphics2D g); native public void dispose (); @@ -169,10 +168,10 @@ public class GdkGraphics2D extends Graphics2D GdkGraphics2D (GtkComponentPeer component) { this.component = component; - int rgb[] = initState (component); + initState (component); - setColor (new Color (rgb[0], rgb[1], rgb[2])); - setBackground (new Color (rgb[3], rgb[4], rgb[5])); + setColor (component.awtComponent.getForeground ()); + setBackground (component.awtComponent.getBackground ()); setPaint (getColor()); setFont (new Font("SansSerif", Font.PLAIN, 12)); setTransform (new AffineTransform ()); @@ -1478,14 +1477,28 @@ public class GdkGraphics2D extends Graphics2D public void drawRoundRect(int x, int y, int width, int height, int arcWidth, int arcHeight) { - int x1 = x + arcWidth, x2 = x + width - arcWidth; - int y1 = y + arcHeight, y2 = y + height - arcHeight; - fillRect (x1, y, x2 - x1, height); - fillRect (x, y1, width, y2 - y1); - fillArc (x, y, arcWidth, arcHeight, 90, 90); - fillArc (x1, y, arcWidth, arcHeight, 0, 90); - fillArc (x2, y2, arcWidth, arcHeight, 270, 90); - fillArc (x, y2, arcWidth, arcHeight, 180, 90); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + + drawArc (x, y, arcWidth, arcHeight, 90, 90); + drawArc (xx, y, arcWidth, arcHeight, 0, 90); + drawArc (xx, yy, arcWidth, arcHeight, 270, 90); + drawArc (x, yy, arcWidth, arcHeight, 180, 90); + + int y1 = y + arcHeight / 2; + int y2 = y + height - arcHeight / 2; + drawLine (x, y1, x, y2); + drawLine (x + width, y1, x + width, y2); + + int x1 = x + arcWidth / 2; + int x2 = x + width - arcWidth / 2; + drawLine (x1, y, x2, y); + drawLine (x1, y + height, x2, y + height); } public void drawString (String str, int x, int y) @@ -1527,14 +1540,21 @@ public class GdkGraphics2D extends Graphics2D public void fillRoundRect (int x, int y, int width, int height, int arcWidth, int arcHeight) { - int x1 = x + arcWidth, x2 = x + width - arcWidth; - int y1 = y + arcHeight, y2 = y + height - arcHeight; - fillRect (x1, y, x2 - x1, height); - fillRect (x, y1, width, y2 - y1); + if (arcWidth > width) + arcWidth = width; + if (arcHeight > height) + arcHeight = height; + + int xx = x + width - arcWidth; + int yy = y + height - arcHeight; + fillArc (x, y, arcWidth, arcHeight, 90, 90); - fillArc (x1, y, arcWidth, arcHeight, 0, 90); - fillArc (x2, y2, arcWidth, arcHeight, 270, 90); - fillArc (x, y2, arcWidth, arcHeight, 180, 90); + fillArc (xx, y, arcWidth, arcHeight, 0, 90); + fillArc (xx, yy, arcWidth, arcHeight, 270, 90); + fillArc (x, yy, arcWidth, arcHeight, 180, 90); + + fillRect (x, y + arcHeight / 2, width, height - arcHeight + 1); + fillRect (x + arcWidth / 2, y, width - arcWidth + 1, height); } public Font getFont () diff --git a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java index cdd5f9c..db8aed6 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkButtonPeer.java @@ -50,12 +50,13 @@ import java.awt.peer.ButtonPeer; public class GtkButtonPeer extends GtkComponentPeer implements ButtonPeer { - native void create (); + native void create (String label); + public native void connectJObject (); public native void connectSignals (); native void gtkSetFont (String name, int style, int size); - native void gtkSetLabel(String label); + native void gtkSetLabel (String label); native void gtkWidgetSetForeground (int red, int green, int blue); native void gtkActivate (); @@ -64,6 +65,11 @@ public class GtkButtonPeer extends GtkComponentPeer super (b); } + void create () + { + create (((Button) awtComponent).getLabel ()); + } + public void setLabel (String label) { gtkSetLabel(label); @@ -78,10 +84,10 @@ public class GtkButtonPeer extends GtkComponentPeer p.translate(((Component) me.getSource()).getX(), ((Component) me.getSource()).getY()); if (!me.isConsumed () - && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0 + && (me.getModifiersEx () & MouseEvent.BUTTON1_DOWN_MASK) != 0 && awtComponent.getBounds().contains(p)) postActionEvent (((Button)awtComponent).getActionCommand (), - me.getModifiers ()); + me.getModifiersEx ()); } if (e.getID () == KeyEvent.KEY_PRESSED) @@ -90,18 +96,11 @@ public class GtkButtonPeer extends GtkComponentPeer if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_SPACE) { postActionEvent (((Button) awtComponent).getActionCommand (), - ke.getModifiers ()); + ke.getModifiersEx ()); gtkActivate (); } } super.handleEvent (e); } - - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); - - args.add ("label", ((Button)component).getLabel ()); - } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java index a465798..361136f 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java @@ -52,39 +52,39 @@ public class GtkCheckboxPeer extends GtkComponentPeer // The current state of the GTK checkbox. private boolean currentState; - public native void nativeCreate (GtkCheckboxGroupPeer group, - boolean state); + public native void create (GtkCheckboxGroupPeer group); public native void nativeSetCheckboxGroup (GtkCheckboxGroupPeer group); public native void connectSignals (); native void gtkSetFont (String name, int style, int size); - public native void gtkSetLabel (String label); + native void gtkButtonSetLabel (String label); + native void gtkToggleButtonSetActive (boolean is_active); public GtkCheckboxPeer (Checkbox c) { super (c); } - // We can't fully use the ordinary getArgs code here, due to - // oddities of this particular widget. In particular we must be - // able to switch between a checkbutton and a radiobutton - // dynamically. + // FIXME: we must be able to switch between a checkbutton and a + // radiobutton dynamically. public void create () { - CheckboxGroup g = ((Checkbox) awtComponent).getCheckboxGroup (); + Checkbox checkbox = (Checkbox) awtComponent; + CheckboxGroup g = checkbox.getCheckboxGroup (); old_group = GtkCheckboxGroupPeer.getCheckboxGroupPeer (g); - currentState = ((Checkbox)awtComponent).getState(); - nativeCreate (old_group, currentState); + create (old_group); + gtkToggleButtonSetActive (checkbox.getState ()); + gtkButtonSetLabel (checkbox.getLabel ()); } public void setState (boolean state) { if (currentState != state) - set ("active", state); + gtkToggleButtonSetActive (state); } public void setLabel (String label) { - gtkSetLabel (label); + gtkButtonSetLabel (label); } public void setCheckboxGroup (CheckboxGroup group) @@ -100,13 +100,6 @@ public class GtkCheckboxPeer extends GtkComponentPeer } } - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); - args.add ("active", ((Checkbox) component).getState ()); - args.add ("label", ((Checkbox) component).getLabel ()); - } - // Override the superclass postItemEvent so that the peer doesn't // need information that we have. public void postItemEvent (Object item, int stateChange) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java index a03a410..2ecea5c 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java @@ -58,25 +58,22 @@ public class GtkChoicePeer extends GtkComponentPeer items[i] = c.getItem (i); append (items); - - // Must set our state before notifying listeners - ((Choice) awtComponent).select (c.getItem (0)); - postItemEvent (c.getItem (0), ItemEvent.SELECTED); } } native void create (); native void append (String items[]); - native int getHistory (); + native int nativeGetSelected (); native void nativeAdd (String item, int index); native void nativeRemove (int index); + native void nativeRemoveAll (); native public void select (int position); public void add (String item, int index) { - int before = getHistory(); + int before = nativeGetSelected(); nativeAdd (item, index); @@ -92,11 +89,11 @@ public class GtkChoicePeer extends GtkComponentPeer public void remove (int index) { - int before = getHistory(); + int before = nativeGetSelected(); int after; nativeRemove (index); - after = getHistory(); + after = nativeGetSelected(); /* Generate an ItemEvent if we are removing the currently selected item and there are at least one item left. */ @@ -110,7 +107,7 @@ public class GtkChoicePeer extends GtkComponentPeer public void removeAll () { - nativeRemove (-1); + nativeRemoveAll(); } public void addItem (String item, int position) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 15e73d9..eae5a94 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -61,7 +61,6 @@ import java.awt.Toolkit; import java.awt.Window; import java.awt.event.FocusEvent; import java.awt.event.ItemEvent; -import java.awt.event.FocusEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.PaintEvent; @@ -93,6 +92,8 @@ public class GtkComponentPeer extends GtkGenericPeer native void gtkWidgetSetCursor (int type); native void gtkWidgetSetBackground (int red, int green, int blue); native void gtkWidgetSetForeground (int red, int green, int blue); + native void gtkWidgetSetSensitive (boolean sensitive); + native void gtkWidgetSetParent (ComponentPeer parent); native void gtkWidgetRequestFocus (); native void gtkWidgetDispatchKeyEvent (int id, long when, int mods, int keyCode, int keyLocation); @@ -115,37 +116,59 @@ public class GtkComponentPeer extends GtkGenericPeer this.awtComponent = awtComponent; insets = new Insets (0, 0, 0, 0); - create (); - - GtkArgList args = new GtkArgList (); - getArgs (awtComponent, args); - args.setArgs (this); - - connectJObject (); - connectSignals (); - - if (awtComponent.getForeground () != null) - setForeground (awtComponent.getForeground ()); - if (awtComponent.getBackground () != null) - setBackground (awtComponent.getBackground ()); - if (awtComponent.getFont() != null) - setFont(awtComponent.getFont()); - - setCursor (awtComponent.getCursor ()); - if (this instanceof GtkFileDialogPeer && awtComponent.getHeight() == 0 - && awtComponent.getWidth() == 0) + create (); + + setParent (); + + connectJObject (); + connectSignals (); + + if (awtComponent.getForeground () != null) + setForeground (awtComponent.getForeground ()); + if (awtComponent.getBackground () != null) + setBackground (awtComponent.getBackground ()); + if (awtComponent.getFont() != null) + setFont(awtComponent.getFont()); + + setCursor (awtComponent.getCursor ()); + + setComponentBounds (); + + Rectangle bounds = awtComponent.getBounds (); + setBounds (bounds.x, bounds.y, bounds.width, bounds.height); + setVisibleAndEnabled (); + } + + void setParent () + { + ComponentPeer p; + Component component = awtComponent; + do { - int[] dims = new int[2]; - gtkWidgetGetDimensions(dims); - ((GtkFileDialogPeer) this).setBoundsCallback((Window)awtComponent, - awtComponent.getX(), - awtComponent.getY(), - dims[0], dims[1]); + component = component.getParent (); + p = component.getPeer (); } + while (p instanceof java.awt.peer.LightweightPeer); + + if (p != null) + gtkWidgetSetParent (p); + } + + /* + * Set the bounds of this peer's AWT Component based on dimensions + * returned by the native windowing system. Most Components impose + * their dimensions on the peers so the default implementation does + * nothing. However some peers, like GtkFileDialogPeer, need to + * pass their size back to the AWT Component. + */ + void setComponentBounds () + { + } - Rectangle bounds = awtComponent.getBounds (); - setBounds (bounds.x, bounds.y, bounds.width, bounds.height); + void setVisibleAndEnabled () + { setVisible (awtComponent.isVisible ()); + setEnabled (awtComponent.isEnabled ()); } public int checkImage (Image image, int width, int height, @@ -260,12 +283,12 @@ public class GtkComponentPeer extends GtkGenericPeer break; case KeyEvent.KEY_PRESSED: ke = (KeyEvent) event; - gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (), + gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiersEx (), ke.getKeyCode (), ke.getKeyLocation ()); break; case KeyEvent.KEY_RELEASED: ke = (KeyEvent) event; - gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (), + gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiersEx (), ke.getKeyCode (), ke.getKeyLocation ()); break; } @@ -417,7 +440,7 @@ public class GtkComponentPeer extends GtkGenericPeer public void setEnabled (boolean b) { - set ("sensitive", b); + gtkWidgetSetSensitive (b); } public void setFont (Font f) @@ -506,45 +529,6 @@ public class GtkComponentPeer extends GtkGenericPeer item, stateChange)); } - public void getArgs (Component component, GtkArgList args) - { - args.add ("sensitive", component.isEnabled ()); - - ComponentPeer p; - - do - { - component = component.getParent (); - p = component.getPeer (); - } while (p instanceof java.awt.peer.LightweightPeer); - - if (p != null) - args.add ("parent", p); - } - - native void set (String name, String value); - native void set (String name, boolean value); - native void set (String name, int value); - native void set (String name, float value); - native void set (String name, Object value); - - void set (GtkArg arg) - { - String name = arg.getName (); - Object value = arg.getValue (); - - if (value instanceof Boolean) - set (name, ((Boolean)value).booleanValue ()); - else if (value instanceof Integer) - set (name, ((Integer)value).intValue ()); - else if (value instanceof Float) - set (name, ((Float)value).floatValue ()); - else if (value instanceof String) - set (name, ((String) value)); - else - set (name, value); - } - public GraphicsConfiguration getGraphicsConfiguration () { // FIXME: just a stub for now. diff --git a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java index 4febbef..1d6ce8b 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java @@ -85,17 +85,11 @@ public class GtkDialogPeer extends GtkWindowPeer { // Create a decorated dialog window. create (GDK_WINDOW_TYPE_HINT_DIALOG, true); - } - - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); - Dialog dialog = (Dialog) component; + Dialog dialog = (Dialog) awtComponent; - args.add ("title", dialog.getTitle ()); - args.add ("modal", dialog.isModal ()); - args.add ("allow_shrink", dialog.isResizable ()); - args.add ("allow_grow", dialog.isResizable ()); + gtkWindowSetModal (dialog.isModal ()); + setTitle (dialog.getTitle ()); + setResizable (dialog.isResizable ()); } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java index 712247c..d31e0c5 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java @@ -42,6 +42,7 @@ import java.awt.AWTEvent; import java.awt.Dialog; import java.awt.FileDialog; import java.awt.Graphics; +import java.awt.Window; import java.awt.event.WindowEvent; import java.awt.peer.FileDialogPeer; import java.io.FilenameFilter; @@ -81,6 +82,20 @@ public class GtkFileDialogPeer extends GtkDialogPeer implements FileDialogPeer super (fd); } + void setComponentBounds () + { + if (awtComponent.getHeight () == 0 + && awtComponent.getWidth () == 0) + { + int[] dims = new int[2]; + gtkWidgetGetPreferredDimensions (dims); + ((GtkFileDialogPeer) this).setBoundsCallback ((Window) awtComponent, + awtComponent.getX (), + awtComponent.getY (), + dims[0], dims[1]); + } + } + public void setFile (String fileName) { /* If nothing changed do nothing. This usually happens because diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java index c542b63..e1a877e 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java @@ -47,6 +47,7 @@ import java.awt.MenuBar; import java.awt.Rectangle; import java.awt.Window; import java.awt.event.PaintEvent; +import java.awt.image.ColorModel; import java.awt.peer.FramePeer; import java.awt.peer.MenuBarPeer; @@ -115,10 +116,9 @@ public class GtkFramePeer extends GtkWindowPeer setSize (awtComponent.getWidth() - insets.left - insets.right, awtComponent.getHeight() - insets.top - insets.bottom + menuBarHeight); - set ("allow_shrink", resizable); - set ("allow_grow", resizable); - } - + gtkWindowSetResizable (resizable); + } + protected void postInsetsChangedEvent (int top, int left, int bottom, int right) { @@ -137,24 +137,46 @@ public class GtkFramePeer extends GtkWindowPeer { // Create a normal decorated window. create (GDK_WINDOW_TYPE_HINT_NORMAL, true); - setMenuBar(((Frame) awtComponent).getMenuBar()); - awtComponent.setForeground(java.awt.SystemColor.windowText); - } - public void getArgs (Component component, GtkArgList args) - { - super.getArgs (component, args); + Frame frame = (Frame) awtComponent; - Frame frame = (Frame) component; + setMenuBar (frame.getMenuBar ()); - args.add ("title", frame.getTitle ()); - args.add ("allow_shrink", frame.isResizable ()); - args.add ("allow_grow", frame.isResizable ()); + setTitle (frame.getTitle ()); + setResizable (frame.isResizable ()); + setIconImage(frame.getIconImage()); } + native void nativeSetIconImageFromDecoder (GdkPixbufDecoder decoder); + native void nativeSetIconImageFromData (int[] pixels, int width, int height); public void setIconImage (Image image) { - /* TODO: Waiting on Toolkit Image routines */ + if (image != null) + { + GtkImage img = (GtkImage) image; + // FIXME: Image should be loaded, but if not, do image loading here. + if (img.isLoaded()) + { + if (img.getSource() instanceof GdkPixbufDecoder) + { + nativeSetIconImageFromDecoder((GdkPixbufDecoder) img.getSource()); + } + else + { + int[] pixels = img.getPixelCache(); + ColorModel model = img.getColorModel(); + int[] data = new int[pixels.length * 4]; + for (int i = 0; i < pixels.length; i++) + { + data[i * 4] = model.getRed(pixels[i]); + data[i * 4 + 1] = model.getGreen(pixels[i]); + data[i * 4 + 2] = model.getBlue(pixels[i]); + data[i * 4 + 3] = model.getAlpha(pixels[i]); + } + nativeSetIconImageFromData(data, img.getWidth(null), img.getHeight(null)); + } + } + } } public Graphics getGraphics () diff --git a/libjava/gnu/java/awt/peer/gtk/GtkImage.java b/libjava/gnu/java/awt/peer/gtk/GtkImage.java index 27d3d6a..9234d24 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkImage.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkImage.java @@ -89,6 +89,18 @@ public class GtkImage extends Image implements ImageConsumer this.observer = observer; } + public synchronized int[] + getPixelCache () + { + return pixelCache; + } + + public synchronized ColorModel + getColorModel () + { + return model; + } + public synchronized int getWidth (ImageObserver observer) { diff --git a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java index 9ca30c9..a85aba9 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java @@ -144,7 +144,7 @@ public class GtkListPeer extends GtkComponentPeer // multiple click. MouseEvent me = (MouseEvent) e; if (!me.isConsumed () - && (me.getModifiers () & MouseEvent.BUTTON1_MASK) != 0 + && (me.getModifiersEx () & MouseEvent.BUTTON1_DOWN_MASK) != 0 && me.getClickCount() == 2) { String selectedItem = ((List) awtComponent).getSelectedItem (); @@ -153,7 +153,7 @@ public class GtkListPeer extends GtkComponentPeer // something is selected. if (selectedItem != null) postActionEvent (((List) awtComponent).getSelectedItem (), - me.getModifiers ()); + me.getModifiersEx ()); } } @@ -167,7 +167,7 @@ public class GtkListPeer extends GtkComponentPeer // Enter only generates an Action event if something is // selected. if (selectedItem != null) - postActionEvent (selectedItem, ke.getModifiers ()); + postActionEvent (selectedItem, ke.getModifiersEx ()); } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java b/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java index 6efa841..4cbe190 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMainThread.java @@ -43,7 +43,18 @@ public class GtkMainThread extends GtkGenericPeer implements Runnable private static Thread mainThread = null; private static Object mainThreadLock = new Object(); - static native void gtkInit(); + // Whether the gtk+ subsystem has been initialized. + private boolean gtkInitCalled = false; + + /** + * Call gtk_init. It is very important that this happen before any other + * gtk calls. + * + * @param portableNativeSync 1 if the Java property + * gnu.classpath.awt.gtk.portable.native.sync is set to "true". 0 if it is + * set to "false". -1 if unset. + */ + static native void gtkInit(int portableNativeSync); native void gtkMain(); public GtkMainThread() @@ -59,18 +70,38 @@ public class GtkMainThread extends GtkGenericPeer implements Runnable synchronized (this) { mainThread.start(); - try { - wait(); - } catch (InterruptedException e) { } + + while (!gtkInitCalled) + { + try + { + wait(); + } + catch (InterruptedException e) { } + } } } public void run() { + /* Pass the value of the gnu.classpath.awt.gtk.portable.native.sync system + * property to C. */ + int portableNativeSync; + String portNatSyncProp = + System.getProperty("gnu.classpath.awt.gtk.portable.native.sync"); + + if (portNatSyncProp == null) + portableNativeSync = -1; // unset + else if (Boolean.valueOf(portNatSyncProp).booleanValue()) + portableNativeSync = 1; // true + else + portableNativeSync = 0; // false + synchronized (this) { - gtkInit(); - notify(); + gtkInit(portableNativeSync); + gtkInitCalled = true; + notifyAll(); } gtkMain(); } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java index 4046281..b9cca1a 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java @@ -56,15 +56,12 @@ public class GtkMenuBarPeer extends GtkMenuComponentPeer create (); } + native void nativeSetHelpMenu(MenuPeer menuPeer); + /* In Gnome, help menus are no longer right flushed. */ public void addHelpMenu (Menu menu) { - addMenu (menu); - } - - public void addMenu (Menu menu) - { - addMenu ((MenuPeer) menu.getPeer ()); + nativeSetHelpMenu((MenuPeer) menu.getPeer()); } native public void delMenu (int index); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java index 55581d1..c32839e 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java @@ -89,10 +89,8 @@ public class GtkMenuItemPeer extends GtkMenuComponentPeer setEnabled (true); } - public void setEnabled (boolean b) - { - // do nothing, for now. - } + native public void setEnabled (boolean b); + native public void setLabel (String label); protected void postMenuActionEvent () diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java index 9b3f678..dc170b1 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java @@ -52,11 +52,15 @@ public class GtkMenuPeer extends GtkMenuItemPeer native void create (String label); native void addItem (MenuItemPeer item, int key, boolean shiftModifier); native void setupAccelGroup (GtkGenericPeer container); + native void addTearOff (); public GtkMenuPeer (Menu menu) { super (menu); + if (menu.isTearOff()) + addTearOff(); + MenuContainer parent = menu.getParent (); if (parent instanceof Menu) setupAccelGroup ((GtkGenericPeer)((Menu)parent).getPeer ()); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java b/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java index 22086c5..786c4b4 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkOffScreenImage.java @@ -76,7 +76,10 @@ public class GtkOffScreenImage extends Image public Graphics getGraphics () { - return g; + if (g instanceof GdkGraphics2D) + return new GdkGraphics2D ((GdkGraphics2D) this.g); + else + return new GdkGraphics ((GdkGraphics) this.g); } public Object getProperty (String name, ImageObserver observer) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java index 111c1f9..d4a702d 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java @@ -50,6 +50,8 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer implements TextFieldPeer { native void create (int width); + native void gtkWidgetSetBackground (int red, int green, int blue); + native void gtkWidgetSetForeground (int red, int green, int blue); void create () { @@ -76,6 +78,8 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer int text_width = cols * fm.getMaxAdvance (); create (text_width); + + setEditable (tf.isEditable ()); } native int gtkEntryGetBorderWidth (); @@ -162,7 +166,7 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer if (!ke.isConsumed () && ke.getKeyCode () == KeyEvent.VK_ENTER) - postActionEvent (getText (), ke.getModifiers ()); + postActionEvent (getText (), ke.getModifiersEx ()); } super.handleEvent (e); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java index 7e77e0d..a235769 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java @@ -60,6 +60,10 @@ public class GtkWindowPeer extends GtkContainerPeer private boolean hasBeenShown = false; private int oldState = Frame.NORMAL; + native void gtkWindowSetTitle (String title); + native void gtkWindowSetResizable (boolean resizable); + native void gtkWindowSetModal (boolean modal); + native void create (int type, boolean decorated, int width, int height, GtkWindowPeer parent, @@ -92,6 +96,16 @@ public class GtkWindowPeer extends GtkContainerPeer create (GDK_WINDOW_TYPE_HINT_NORMAL, false); } + void setParent () + { + setVisible (awtComponent.isVisible ()); + setEnabled (awtComponent.isEnabled ()); + } + + void setVisibleAndEnabled () + { + } + native void connectJObject (); native void connectSignals (); @@ -100,12 +114,6 @@ public class GtkWindowPeer extends GtkContainerPeer super (window); } - public void getArgs (Component component, GtkArgList args) - { - args.add ("visible", component.isVisible ()); - args.add ("sensitive", component.isEnabled ()); - } - native public void toBack (); native public void toFront (); @@ -120,7 +128,7 @@ public class GtkWindowPeer extends GtkContainerPeer public void setTitle (String title) { - set ("title", title); + gtkWindowSetTitle (title); } native void setSize (int width, int height); @@ -132,8 +140,7 @@ public class GtkWindowPeer extends GtkContainerPeer // was resizable. setSize (awtComponent.getWidth() - insets.left - insets.right, awtComponent.getHeight() - insets.top - insets.bottom); - set ("allow_shrink", resizable); - set ("allow_grow", resizable); + gtkWindowSetResizable (resizable); } native void setBoundsCallback (Window window, |