8e99fb4f70
2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java (setLineWrap): Fire property change event after new value is set. (setTabSize): Likewise. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JTable.java (autoCreateColumnsFromModel): New field. (autoResizeMode): Likewise. (cellEditor): Likewise. (cellSelectionEnabled): Likewise. (columnModel): Likewise. (dataModel): Likewise. (defaultEditorsByColumnClass): Likewise. (defaultRenderersByColumnClass): Likewise. (editingColumn): Likewise. (editingRow): Likewise. (gridColor): Likewise. (preferredViewportSize): Likewise. (rowHeight): Likewise. (rowMargin): Likewise. (rowSelectionAllowed): Likewise. (selectionBackground): Likewise. (selectionForeground): Likewise. (selectionModel): Likewise. (showHorizontalLines): Likewise. (showVerticalLines): Likewise. (tableHeader): Likewise. (JTable): Implemented. (getColumnModel): Likewise. (getSelectedRow): Likewise. (getSelectionModel): Likewise. (setModel): Likewise. (setSelectionModel): Likewise. (createScrollPaneForTable): New method. (createDefaultDataModel): Likewise. (createDefaultListSelectionModel): Likewise. (getModel): Likewise. (getTableHeader): Likewise. (setTableHeader): Likewise. (getColumnSelectionAllowed): Likewise. (setColumnSelectionAllowed): Likewise. (getRowSelectionAllowed): Likewise. (setRowSelectionAllowed): Likewise. (getAutoResizeMode): Likewise. (setAutoResizeMode): Likewise. (getColumnCount): Likewise. (getRowCount): Likewise. (getCellRenderer): Likewise. * javax/swing/JTree.java (cellRenderer): New field. (editable): Likewise. (rootVisible): Likewise. (showsRootHandles): Likewise. (getModel): New method. (setModel): Likewise. (isEditable): Likewise. (setEditable): Likewise. (isRootVisbile): Likewise. (setRootVisible): Likewise. (getShowsRootHandles): Likewise. (setShowRootHandles): Likewise. (getCellRenderer): Likewise. (setCellRenderer): Likewise. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java (setDocument): Implemented. * javax/swing/JRootPane.java: Fixed javadocs. * javax/swing/JTable.java (getDefaultRenderer): New method. * javax/swing/JTextField.java (setFont): Likewise. (getPreferredSize): Likewise. * javax/swing/JToggleButton.java (getAccessibleContext): Fix javadoc. * javax/swing/JTree.java: Add some javadocs. * javax/swing/JViewport.java: Likewise. 2004-07-21 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java: Collect all native method declaration at the top. (create): Set the filename filter if necessary. (setDirectory): Call nativeSetDirectory(). (setFilenameFilter): Implement. (filenameFilterCallback): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (create): Configure dialog to show hidden files. (filenameFilterCallback): New function. (nativeSetFilenameFilter): New function. (nativeSetDirectory): New function. 2004-07-21 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicSliderUI.java: Ran Jalopy. (paintTrack): Fill the track before painting the borders. 2004-07-21 Graydon Hoare <graydon@redhat.com> patch from Roman Kennke <roman@ontographics.com> * javax/swing/Spring.java: New file. * javax/swing/SpringLayout.java: New file. * Makefile.am: Add new files. * Makefile.in: Regenerate. 2004-07-21 Graydon Hoare <graydon@redhat.com> * javax/swing/plaf/basic/BasicSplitPaneUI.java: Minor layout fixes. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: Likewise. * javax/swing/ScrollPaneLayout.java: Likewise. 2004-07-21 Kim Ho <kho@redhat.com> * javax/swing/DefaultDesktopManager.java: (findMinimum): Removed. (resizeFrame): Trust the UI to pass valid bounds. * javax/swing/JOptionPane.java: Implemented showInternalXXXDialog methods. (startModal): New method. * javax/swing/plaf/basic/BasicInternalFrameUI.java: (BorderListener::mouseDragged): Verify that the new bounds are valid before passing them to the DesktopManager. (preferredLayoutSize): Delegate to getSize. (minimumLayoutSize): Ditto. (getSize): New method. (GlassPaneDispatcher): Reimplemented by copying a stripped down LightweightDispatcher from Container. (getMinimumSize): Call minimumLayoutSize. * javax/swing/plaf/basic/BasicOptionPaneUI.java: Ran Jalopy. (mousePressed): Add ability to properly close JInternalFrames. * javax/swing/plaf/basic/BasicToolBarUI.java: (DragWindow): Set owner for DragWindow. 2004-07-21 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/ShortLookupTable.java: New file. * java/awt/image/ByteLookupTable.java: New file. * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-07-21 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java (create(GtkContainerPeer)): New native method. (create()): Call native create(), passing in the parent frame as the paramter. Natively set the current file and directory. (setFile): Construct an absolute filename before passing it to the native peer. (nativeGetDirectory): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (window_closed): Removed. (ok_clicked): Likewise. (cancel_clicked): Likewise. (handle_response): New method. (create): Use GtkFileChooserDialog. (connectSignals): Connect to handle_response. (nativeGetDirectory): New method. (nativeSetFile): Use GtkFileChooserDialog. 2004-07-21 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/LookupTable.java: New file. * Makefile.am: Added new file. * Makefile.in: Regenerated. 2004-07-21 Jerry Quinn <jlquinn@optonline.net> * java/awt/image/Kernel.java: New file. * Makefile.am: Added new file. * Makefile.in: Regenerated. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/JCheckBoxMenuItem.java: Fixed Javadocs. * javax/swing/JMenu.java: Likewise. * javax/swing/JMenuBar.java: Likewise. (MARGIN_CHANGED_PROPERTY): New property. (setMargin): Implemented. * javax/swing/JMenuItem.java: Fixed javadocs. * javax/swing/JPopupMenuUI.java: Fixed javadocs. (LABEL_CHANGED_PROPERTY): New property. (add): changed to use createActionComponent. (createActionComponent): Implemented. (setLabel): Fire PropertyChangeEvent if label property changes. * javax/swing/JRadioButtonMenuItem.java: Fixed javadocs. * javax/swing/plaf/basic/BasicMenuBarUI.java: Likewise. (ContainerHandler): Repaint if margin property has changed. * javax/swing/plaf/basic/BasicMenuItemUI.java: (installUI): Call installComponents(). (uninstallUI): Call uinstallComponents(). * javax/swing/plaf/basic/BasicMenuUI.java: Fixed javadocs. * javax/swing/plaf/basic/BasicPopupMenuUI.java: Likewise. 2004-07-21 Kim Ho <kho@redhat.com> * javax/swing/plaf/basic/BasicToolBarUI.java: (DragWindow): Use the right constructor. 2004-07-21 Kim Ho <kho@redhat.com> * javax/swing/JToolBar.java: (layoutContainer): Use getComponents. * javax/swing/plaf/basic/BasicToolBarUI.java: (DragWindow): Don't use SwingUtilities' getOwnerFrame (ToolBarDialog): ditto. 2004-07-21 Kim Ho <kho@redhat.com> * javax/swing/JRootPane.java: Ran jalopy. (layoutContainer): Set the glasspane's size to be the same as the content pane. (createGlassPane): Set opaque property to false. 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java (requestFocus()): Don't handle Panels specially. (requestFocus(boolean)): Likewise. (requestFocusInWindow(boolean)): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (create): Set GTK_CAN_FOCUS flag. 2004-07-21 Kim Ho <kho@redhat.com> * Makefile.am: Added new file. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * javax/swing/AbstractButton.java: Add rollOverEnabled property. (setRolloverEnabled): Use new property. (isRolloverEnabled): Use new property. * javax/swing/JTabbedPane.java: (setComponent): Remove useless JTabbedPane.this. * javax/swing/JToolBar.java: Finish implementation. * javax/swing/plaf/basic/BasicArrowButton.java: (paint): Moved border painting to a border. * javax/swing/plaf/basic/BasicLookAndFeel.java: Change JToolBar look and feel defaults. * javax/swing/plaf/basic/BasicOptionPaneUI.java (actionPerformed): Return Integer index instead of name. (addButtonComponents): Check to see if component is JButton last. (createMessageArea): Don't use components that are not completed yet. (getIconForType): Use temporary icons. * javax/swing/plaf/basic/BasicSliderUI.java: (mousePressed): Do not return if it's on thumb. (paintMinorTickForHorizSlider): Use BLACK to paint ticks. (paintMinorTickForVertSlider): ditto. (paintMajorTickForHorizSlider): ditto. (paintMajorTickForVertSlider): ditto. * javax/swing/plaf/basic/BasicSplitPaneDivider.java: Add a border around the SplitPaneDivider. * javax/swing/plaf/basic/BasicSplitPaneUI.java: Remove comments. * javax/swing/plaf/basic/BasicToolBarSeparatorUI.java: New file. Implemented. * javax/swing/plaf/basic/BasicToolBarUI.java: Implemented. * testsuite/Makefile.in: Regenerated. 2004-07-21 Graydon Hoare <graydon@redhat.com> * javax/swing/Timer.java (run): Queue events each time cycle. 2004-07-21 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkImagePainter.java (imageComplete): Call image.imageComplete(). * java/awt/image/MemoryImageSource.java: Reimplement consumers as a Vector instead of a Hashtable. This is because enumeration on a Hashtable is not thread-safe. (addConsumer): Adapt to Vector consumers. (isConsumer): Adapt to Vector consumers. (removeConsumer): Adapt to Vector consumers. (startProduction): Adapt to Vector consumers. Call imageComplete() with STATICIMAGEDONE flag instead of SINGLEFRAME flag. (newPixels): Adapt to Vector consumers. (sendPicture): Set the color model of the image consumer. (newPixels(IIII)): Adapt to Vector consumers. (newPixels(IIIIB)): Adapt to Vector consumers. 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java (deliverEvent): Implement. (postEvent): Implement. (handleEvent): Implement. (translateEvent): New method. (dispatchEventImpl): Document. Add AWT 1.0 event handling. * java/awt/Container.java (deliverEvent): Implement. * java/awt/Event.java (paramString): Fix formatting. * java/awt/Font.java (toString): Likewise. * java/awt/Window.java (postEvent): Implement. 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/DefaultKeyboardFocusManager.java (dispatchEvent): Set window's focus owner upon receiving a FOCUS_LOST event. * java/awt/Window.java (Window()): Refocus the previously focused component within the window when the window regains the top-level focus. (setFocusOwner): New method. * java/awt/Component.java (requestFocus): Add FIXME. * libgcj.pc.in: Remove library flags. 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkPanelPeer.java (handleEvent): Handle MOUSE_PRESSED event. * java/awt/Component.java (requestFocus()): Handle Panel specially. Post FOCUS_LOST event on opposite component. (requestFocus(boolean)): Likewise. (requestFocusInWindow(boolean)): Likewise. (paramString): Reorder dimension fields. * java/awt/Container.java (paramString): Fix string format. * java/awt/DefaultKeyboardFocusManager.java (dispatchEvent): Handle FOCUS_LOST events. Don't handle Windows specially. Only process key events if the focus owner is non-null. (dispatchKeyEvent): Likewise. * java/awt/Frame.java (paramString): Fix formatting. (generateName): New method. (getUniqueLong): Likewise. * java/awt/KeyboardFocusManager.java (getFocusOwner): Check if the temporary focus owner is null. If so, return the permanent focus owner. * java/awt/Panel.java (generateName): New method. (getUniqueLong): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Rework signal handling to make callbacks more specific. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/text/Position.java (Bias): Implemented. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/LookAndFeel.java (provideErrorFeedback): New method. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JTextArea.java (tabSize): New field. (getTabSize): New method. (setTabSize): Likewise. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/ActionMap.java: Fixed javadocs all over. (serialVersionUID): Made private. (parent): Don't explicitely initialize with default value. (get): SImplified. (keys): Reimplemented. (allKeys): Likewise. (convertSet): Removed. * javax/swing/ComponentInputMap.java: Fixed javadocs all over. (ComponentInputMap): Implemented. (put): Likewise. (clear): Likewise. (remove): Likewise. (SetParent): Likewise. (getComponent): Likewise. * javax/swing/InputMap.java: Fixed javadocs all over. (serialVersionUID): Made private. (parent): Don't explicitely initialize with default value. (get): SImplified. (keys): Reimplemented. (allKeys): Likewise. (convertSet): Removed. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/ActionMap.java, javax/swing/ComponentInputMap.java, javax/swing/InputMap.java, javax/swing/table/DefaultTableColumnModel.java, javax/swing/table/TableColumn.java, javax/swing/table/TableColumnModel.java, javax/swing/table/TableModel.java, javax/swing/text/AbstractDocument.java, javax/swing/text/TextAction.java: Reformated. 2004-07-21 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GtkToolkit.java (bufferedImageOrError): Make method non-static. * javax/swing/AbstractButton.java: Rename fields to match property names where possible. (iconTextGap): New property. * javax/swing/JCheckBox.java: Match AbstractButton changes. (init) New method, call from after various constructors. * javax/swing/JComponent.java (revalidate): Invalidate before queueing repair. * javax/swing/JList.java (getPreferredScrollableViewportSize): Reimplement in terms of visibleRowCount property. * javax/swing/JMenuButton.java: Match AbstractButton changes. * javax/swing/JScrollPane.java (createScrollListener): Remove tracing chatter. * javax/swing/JToggleButton.java: Match AbstractButton changes. * javax/swing/RepaintManager.java (addInvalidComponent): Don't invalidate. * javax/swing/ScrollPaneLayout.java: Various corrections to layout calculations. * javax/swing/SwingUtilities.java (layoutCompoundLabel): Mimic sun behavior on top left/right positioning. * javax/swing/ViewportLayout.java (preferredLayoutSize): Remove mistaken use of preferredScrollableViewportSize here. (layoutContainer): Use view's preferred size as basis. * javax/swing/plaf/basic/BasicButtonUI.java: Set, get, and use textIconGap property. (paint) Paint text returned from layout (with ellipsis). * javax/swing/plaf/basic/BasicListUI.java: Remove tracing chatter, correct various minor calculations. (getCellBounds): Update layout state before calculating. * javax/swing/plaf/basic/BasicLookAndFeel.java (Button.Margin): Use margin default similar to sun's. * javax/swing/plaf/basic/BasicScrollBarUI.java (ArrowIcon): (createIncreaseIcon): Center icon, minimize margins. (createDecreaseIcon): Likewise. * javax/swing/plaf/basic/BasicScrollPaneUI.java (installDefaults): Implement. (installUI): Call it. (uninstallDefaults): Implement. (uninstallUI): Call it. * javax/swing/plaf/basic/BasicToolBarUI.java (DragWindow): Call existing Window constructor. * javax/swing/plaf/basic/BasicViewportUI.java (paint): Set clip before painting. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenuItem.java: (processMouseEvent): Reimplemented to deal with mouse drag events. (createMenuDragMouseEvent): New private helper method. Creates MenuDragMouseEvent. * javax/swing/MenuSelectionManager.java (componentForPoint): Implemented. (isComponentPartOfCurrentMenu): Made public. (processMouseEvent): Reimplemented to deal with mouse drag events. (setSelectedPath): Corrected small mistake that caused path to be set incorrectly. (getPath): If given component is JMenu then also add this menu's popup menu to the selected path. * javax/swing/plaf/basic/BasicMenuItemUI.java: (getPath): Ditto. (getPreferredSize): Call getPreferredMenuItemSize(). (getPreferredItemSize): Moved code from getPreferredSize to here. (installListeners): Install MouseMotionListeners. (MouseInputHandler): Pass mouse release event to MenuSelectionManager if mouse wasn't released in the bounds of this menu item. (MenuDragMouseHandler): Implemented. * javax/swing/plaf/basic/BasicMenuUI.java: (installListeners): Install MouseMotionListener and MenuDrageMouseListener. (MenuDragMouseHandler): Implemented. * javax/swing/plaf/basic/BasicPopupMenuUI.java: (uninstallListeners): Implemented. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JCheckBox.java: Reformated. (JCheckBox): Fixed all constructors. (isBorderPaintedFlat): New method. (setBorderPaintedFlat): New method. * javax/swing/JEditorPane.java (createEditorKitForContentType): Made public. (scrollToReference): Likewise. * javax/swing/JTextArea.java (setLineWrap): Fire property change. * javax/swing/JToggleButton.java (JToggleButton): New constructor. (JToggleButton): Simplified. * javax/swing/text/AttributeSet.java (FontAttribute): Renamed from FontCharacterAttribute. * javax/swing/text/JTextComponent.java (KeyBinBinding): Added javadoc. (JTextComponent): Likewise. (getAccessibleContext): Fixed javadoc. * javax/swing/text/View.java (View): Added javadoc. * javax/swing/text/TabableView.java: New file. * Makefile.am: Added javax/swing/text/TabableView.java. * Makefile.in: Regenerated. 2004-07-21 Graydon Hoare <graydon@redhat.com> * java/awt/image/BufferedImage.java (getSource): Remove tracing chatter. * gnu/java/awt/peer/gtk/GtkToolkit.java (GtkErrorImage): New helper class. (bufferedImageOrError): New helper method. (createImage): Use it. 2004-07-21 David Jee <djee@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c (setCaretPosition): Scroll the text view so the new caret position is visible on screen. 2004-07-21 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setBounds): Do not validate awtComponent here. * gnu/java/awt/peer/gtk/GtkScrollPanePeer.java (getPreferredSize): New method. * java/awt/ScrollPane.java (ScrollPane): Set default size to 100x100. (addNotify): If child is not a Panel, wrap it with a new Panel. (paramString): Implement. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/JMenu.java: (setSelected): Display popup menu only if this menu is showing on the screen. * javax/swing/JPopupMenu.java: (processMouseEvent): Added comment. (processKeyEvent): Likewise. * javax/swing/MenuSelectionManager.java: (clearSelectedPath): Only fireStateChanged() after selected path was changed, not before. (setSelectedPath): Likewise. * javax/swing/plaf/basic/BasicMenuItemUI.java: (paintMenuItem): Corrected position of menu item's icon. * javax/swing/plaf/basic/BasicPopupMenuUI.java: (installUI): Correct setDefaultLightWeightPopupEnabled call. (popupMenuCanceled): Reimplemented. (popupMenuWillBecomeVisible): Select first menu item by default when displaying free floating popup menus. (TopWindowListener): Reimplemented. 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Panel.java (dispatchEventImpl): Override to prevent Panel from being painted twice when it is first shown. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * java/awt/Window.java: Reverted changes from my previous patch for creating window without an owner. * javax/swing/SwingUtilities.java: (SwingUtilities.OwnerFrame): made static. (OwnerFrame.setVisible): New method. Overridden with empty implementation. (OwnerFrame.isShowing): New method. Ovverridden to return always true. 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (GtkComponentPeer): Remove temporary try/catch block. (setVisible): Call show and hide. (show): Make native. (hide): Likewise. (getArgs): Don't add "visible" argument. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (property_notify_predicate): Return Bool instead of int. (find_layout): New function. (connectJObject): Call find_layout. (connectSignals): Likewise. (moveLayout): Likewise. (gtkLayoutSetVisible): Likewise. 2004-07-21 Mark Wielaard <mark@klomp.org> * java/awt/event/InvocationEvent.java (dispatch): Synchronize on notifier object before calling notifyAll(). 2004-07-21 Olga Rodimina <rodimina@redhat.com> * java/awt/Window.java: Changed constructors to use new method that is described below. Constructors call this methods only if newly created window should have an owner. (setWindowOwner): New method. Implementation for this method is moved from this(owner,configuration). * javax/swing/JWindow.java: (JWindow): Reimplement to use SwingUtilities.ownerFrame instead of owner. * javax/swing/SwingUtilities.java: (ownerFrame): Change type of this field to OwnerFrame. (getOwnerFrame): Changed to return object of type OwnerFrame. (SwingUtilities.OwnerFrame): New class. Represents owner of a Window that is not provided with one. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/AbstractButton.java: (configurePropertiesFromAction): Set action command to button's text by default if action command is not explicitely specified. * javax/swing/JMenu.java: Remove unnecessary listener and methods relevant to it. (setSelected): Reimplemented. (menuSelectionChanged): Moved most part of implementation to setSelected() and call it instead. * javax/swing/JMenuItem.java: (init): Comment out statement that sets paint_border to false. (configurePropertiesFromAction): Do not set accelerator for JMenu. (menuSelectionChanged): Change selected index in the selection model of menu item's parent. * javax/swing/JPopupMenu.java: (remove): Set constraints.fill field to GridBagConstraints.BOTH instead of GridBagConstraints.HORIZONTAL. (insert): Likewise. (createActionChangeListener): Implemented. (setVisible): Correct location of HeavyWeightMenu and don't firePopupMenuCanceled(). (menuSelectionChanged): Implemented. (ActionChangeListener): New Listener. Implemented. * javax/swing/plaf/basic/BasicMenuBarUI.java: (BasicMenuBarUI.ContainerHandler): Implemented. * javax/swing/plaf/basic/BasicMenuItemUI.java: (paintMenuItem): Uncommented out code that paints icon, now that icons are working properly. (PropertyChangeListener): Implemented. * javax/swing/plaf/basic/BasicPopupMenuUI.java: Added javadocs. (topWindowListener): New field. (Constructor): initialize topWindowListener. (BasicPopupMenuUI.TopWindowListener): Implemented. (BasicPopupMenuUI.PopupMenuHandler): Implemented. (BasicPopupMenuUI.TopWindowListener): New ComponentListener. Implemented. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicButtonUI.java (paintFocus): Fixed method signature. (paintButtonPressed): Likewise. (paintButtonNormal): Likewise. (paintText): New method. * javax/swing/plaf/basic/BasicLabelUI.java (paint): Re-indented. * javax/swing/plaf/basic/BasicTextUI.java (installUI): Set parent textComponent to opaque. * javax/swing/text/DefaultHighlighter.java (checkPositions): New helper method. (addHighlight): Throws BadLocationException, check positions. (changeHighlight): Likewise. * javax/swing/text/EditorKit.java (EditorKit): Implements Serializable. * javax/swing/text/JTextComponent.java (getUI): Added javadoc. (setUI): Likewise. (upadteUI): Added javadoc, don't revalidate and repaint. 2004-07-21 David Jee <djee@redhat.com> * java/awt/GridBagLayout.java (ArrangeGrid): Use PREFERREDSIZE instead of MINSIZE. * javax/swing/AbstractButton.java (setText): Reindent. * javax/swing/RepaintManager.java (addInvalidComponent): Find the first ancestor that isValidateRoot(). 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JFormattedTextField.java (value): New field. (JFormattedTextField): Implemented. (getValue): Likewise. (setValue): Likewise. * javax/swing/LookAndFeel.java (getSupportsWindowDecorations): New method. * javax/swing/UIDefaults.java: Use java.beans.PropertyChangeSupport instead of doing all ourself. (addPropertyChangeListener): Made public. (addResourceBundle): Likewise. (removeResourceBundle): Likewise. (setDefaultLocale): Likewise. * javax/swing/plaf/basic/BasicRootPaneUI.java (BasicRootPaneUI): Implements PropertyChangeListener. (propertyChange): New method. * javax/swing/plaf/basic/BasicTextUI.java (BasicHighlighter): New inner class. (createHighlighter): New method. * javax/swing/plaf/basic/BasicToolBarUI.java (DragWindow): Extends java.awt.Window. * javax/swing/text/JTextComponent.java (getDocument): Removed debug output. * javax/swing/plaf/basic/BasicTextFieldUI.java, javax/swing/text/DefaultHighlighter.java, javax/swing/text/FieldView.java, javax/swing/text/PlainView.java: New files. * Makefile.am: Added new files. * Makefile.in: Regenerated. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JEditorPane.java (createDefaultEditorKit): Use javax.swing.text.DefaultEditorKit. (createEditorKitForContentType): Likewise. * javax/swing/text/DefaultEditorKit.java (serialVersionUID): Added constant field. (EndOfLineStringPropery): Fixed typo. (DefaultEditorKit): New constructor. * javax/swing/text/Segment.java: Import java.text.CharacterIterator. * javax/swing/text/CharacterIterator.java, javax/swing/text/PlainEditorKit.java: Removed. * Makefile.am: Removed javax/swing/text/CharacterIterator.java and javax/swing/text/PlainEditorKit.java. * Makefile.in: Regenerated. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JButton.java, javax/swing/text/DefaultEditorKit.java, javax/swing/text/EditorKit.java, javax/swing/text/Segment.java, javax/swing/text/StyledEditorKit.java: Reformatted. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/ImageIcon.java (file): Removed. (description): Renamed from descr. (ImageIcon): Added missing constructors. (setParent): Removed. (setImageObserver): New method. (getImageObserver): New method. (paintIcon): Handle observer = null. * javax/swing/JButton.java (removeNotify): Fixed javadoc. (updateUI): Simplified. * javax/swing/JRootPane.java (serialVersionUID): New constant field. * javax/swing/UIManager.java: Fixed javadocs all over. (setLookAndFeel): Throws UnsupportedLookAndFeelException. * javax/swing/text/AbstractDocument.java (createPosition): Throws BadLocationException. (getText): Likewise. (remove): Likewise. * javax/swing/text/ComponentView.java (modelToView): Likewise. * javax/swing/text/DefaultEditorKit.java: Made all public methods public. (read): Throws BadLocationException and IOException. (write): Likewise. * javax/swing/text/EditorKit.java: Made all public methods public. (serialVersionUID): New constant field. (clone): New method. (read): Throws BadLocationException and IOException. (write): Likewise. * javax/swing/text/Segment.java (array): Made public. (count): Likewise. (offset): Likewise. (Segment): New constructors. (clone): Reimplemented. * javax/swing/text/StyledEditorKit.java (serialVersionUID): New constant field. 2004-07-21 Graydon Hoare <graydon@redhat.com> * java/awt/image/BufferedImage.java (getSource): Implement. * javax/swing/ImageIcon.java (ImageIcon): Implement ctor. * javax/swing/ScrollPaneLayout.java (preferredLayoutSize): Be more careful about nulls. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/text/AttributeSet.java (CharacterAttribute): New interface (ColorAttribute): Likewise. (FontCharacterAttribute): Likewise. (ParagraphAttribute): Likewise. * javax/swing/text/DefaultCaret.java (moveCaret): New method. (positionCaret): Likewise. (repaint): Made protected. * javax/swing/text/JTextComponent.java (KeyBinding): Made it static. * javax/swing/text/View.java (getContainer): Honor parent == null. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java: Reformatted. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicRootPaneUI.java: Import javax.swing.UIManager explicitely. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (ScrollingButton): Made it static. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/UIDefaults.java (ActiveValue): Made public. (LazyValue): Likewise. * javax/swing/plaf/basic/BasicTextUI.java (RootView): Reintroduced. (view): Removed. (rootView): New field. (installUI): Create document if needed, initialize rootView. (uninstallUI): Hanle rootView. (paint): Likewise. (getRootView): Likewise. (setView): Likewise. * javax/swing/text/DefaultCaret.java: Renamed all "evt" variables to "event". 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * libgcj.spec.in: Add -l-java-util-logging. 2004-07-21 Andreas Tobler <a.tobler@schweiz.ch> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (init_dpi_conversion_factor): Check for int_dpi < 0 in case gtk-xft-dpi can no calculate the right value. (dpi_changed_cb): Mark *pspec as unsused. 2004-07-21 David Jee <djee@redhat.com> * java/awt/Component.java (move): Delegate to setBounds(). (resize): Likewise. (reshape): Fix so it repaints parent and self only when necessary. 2004-07-21 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (GtkComponentPeer): Revert previous patch from 2004-06-22. (setVisible): Likewise. (show): Likewise. (hide): Likewise. (getArgs): Likewise. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (property_notify_predicate): Likewise. (find_layout): Likewise. (connectJObject): Likewise. (connectSignals): Likewise. (moveLayout): Likewise. (gtkLayoutSetVisible): Likewise. 2004-07-21 Graydon Hoare <graydon@redhat.com> * Makefile.am (jv_convert_LDADD): (gij_LDADD): (rmic_LDADD): (rmiregistry_LDADD): Add lib-java-util-logging.la * Makefile.in: Regenerate. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (replace): Dont use protected method of java.util.Vector directly. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (installUI): Call specialized install methods. (installDefaults): New method. (installListeners): Likewise. (installKeyboardActions): Likewise. (uninstallUI): Likewise. (uninstallDefaults): New method. (uninstallListeners): Likewise. (uninstallKeyboardActions): Likewise. (getPropertyPrefix): New abstract method. (paint): Made final, just call paintSafely(). (paintSavely): New method. (paintBackground): Likewise. (getVisibleEditorRect): Likewise. * javax/swing/text/LayeredHighlighter.java, javax/swing/text/TabExpander.java: New files. * Makefile.am: Added javax/swing/text/LayeredHighlighter.java and javax/swing/text/TabExpander.java. * Makefile.in: Regenerated. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicTextUI.java (BasicTextUI): Made abstract. (BasicCaret): New inner class. (view): Don't explicitely initialize with "null". (textComponent): New field. (textColor): Removed. (disabledTextColor): Removed. (normalBackgroundColor): Removed. (RootView): Removed commented out inner class. (createUI): Removed. (createCaret): New method. (getComponent): Likewise. (installUI): Initialize textComponent only. (getPreferredSize): Use installed JTextComponent. (setView): New method. (create): Likewise. * javax/swing/text/JTextComponent.java (highlighter): New field. (caretColor): Likewise. (disabledTextColor): Likewise. (seletedTextColor): Likewise. (selectionColor): Likewise. (setUI): New method. (getCaretColor): Likewise. (setCaretColor): Likewise. (getDisabledColor): Likewise. (setDisabledColor): Likewise. (getSelectedTextColor): Likewise. (setSelectedTextColor): Likewise. (getSelectionColor): Likewise. (setSelectionColor): Likewise. (getHighlighter): Likewise. (setHighlighter): Likewise. (replaceSelection): Likewise. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/plaf/basic/BasicScrollPaneUI.java (BasicScrollPaneUI): Implements ScrollPaneConstants. * javax/swing/plaf/basic/BasicToolBarUI.java (BasicToolBarUI): Implements SwingConstants. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JPopupMenu.java: Removed CVS tags. * javax/swing/UIDefaults.java: Reformatted. * javax/swing/plaf/basic/BasicRootPaneUI.java: Explicitely import used classes. 2004-07-21 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (GtkComponentPeer): Remove temporary try/catch block. (setVisible): Call show and hide. (show): Make native. (hide): Likewise. (getArgs): Don't add "visible" argument. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (property_notify_predicate): Return Bool instead of int. (find_layout): New function. (connectJObject): Call find_layout. (connectSignals): Likewise. (moveLayout): Likewise. (gtkLayoutSetVisible): Likewise. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/AbstractButton.java: (setDisplayedMnemonicIndex): Check if button text is not null before checking its length. * javax/swing/JMenuItem.java: (processMouseEvent): Disarm menu item if mouse has exited it. * javax/swing/plaf/basic/BasicMenuUI.java: (MouseInputHandler.mouseEntered): Do not raise popup menu if this menu is already selected. (MouseInputHandler.mousePressed): Do not fire MenuEvents. (MenuHandler): Implemented. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/JCheckBoxMenuItem.java: Added Javadoc. (getSelectedObjects): Implemented. * javax/swing/JRadioButtonMenuItem.java: Added Javadoc. * javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java: Added javadoc for few methods. (processMouseEvent): Made public. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java (processMouseEvent): Likewise. 2004-07-21 Olga Rodimina <rodimina@redhat.com> * javax/swing/AbstractButton.java: (init): Set display mnemonic index to -1. (setMnemonic(char)): Use setMnemonic(int). (setMnemonic(int)): Set display mnemonic index. (getDisplayedMnemonicIndex): Change method signature by removing 'index' parameter. * javax/swing/plaf/basic/BasicLookAndFeel.java: Added default for Menu.selectionBackground. * javax/swing/plaf/basic/BasicMenuItemUI.java: (paintMenuItem): Change background color of the selected menu item. (paintText): Paint differently when menu item is disabled. Also paint mnemonic if it appears in the menu item's label. (paintAccelerator): Paint accelerator differently if menu item is disabled. * javax/swing/plaf/basic/BasicMenuUI.java: (installDefaults): Install defaults for selectionForeground and selectionBackground. (uninstallDefaults): Uninstall defauls for selectionForeground and selectionBackground. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/text/AbstractDocument.java (BranchElement): Implemented. (LeafElement): Implemented. * javax/swing/text/DefaultCaret.java: Import used classes. (serialVersionUID): New constant. * javax/swing/text/JTextComponent.java (AccessibleJTextComponent): Removed dead declaration. (caretPos): Removed. (setCaret): New method. * javax/swing/text/PlainDocument.java (rootElement): New field. (PlainDocument): Initialize rootElement. (createDefaultRoot): New method. (getDefaultRootElement): Implemented. * javax/swing/text/View.java: Reformatted. * javax/swing/text/ViewFactory.java (create): Added javadoc. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/ToolTipManager.java: Reformatted. 2004-07-21 Rodimina Olga <rodimina@redhat.com> * javax/swing/AbstractButton.java (changeEvent): New field. (fireItemStateChanged): Change source of the event to 'this' before firing it to button listeners. (fireActionPerformed): Likewise. (fireStateChanged): Likewise. (createActionListener): Do not set source of the event to AbstractButton. * javax/swing/plaf/basic/BasicMenuBarUI.java: (ContainerHandler.componentAdded): Removed print out statement. (ContainerHandler.componentRemoved): Likewise. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/text/Highlighter.java: New file. * Makefile.am: Added javax/swing/text/Highlighter.java. * Makefile.in: Regenerated. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/ToolTipManager.java (stillInsideTimerAction): Fixed constructor arguments. (outsideTimerAction): Likewise. (insideTimerAction): Likewise. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JButton.java: Reformatted. * javax/swing/JFormattedTextField.java (getUIClassID): Implemented. * javax/swing/JRootPane.java (serialVersionUID): New constant. * javax/swing/JTextField.java (align): New field. (JTextField): Simplified. (getUIClassID): New method. (getActionListeners): Added @since tag. (setColumns): Invalidate layout and repaint. (getHorizontalAlignment): New method. (setHorizontalAlignment): New method. (selectAll): Removed. * javax/swing/SwingUtilities.java (getAncestorOfClass): Removed redundant @see tag. (isLeftMouseButton): Fixed implementation. (isMiddleMouseButton): Likewise. (isRightMouseButton): Likewise. * javax/swing/text/AbstractDocument.java (AttributeContext.addAttribute): New method. (AttributeContext.addAttributes): New method. (AttributeContext.getEmptySet): New method. (AttributeContext.reclaim): New method. (AttributeContext.removeAttribute): New method. (AttributeContext.removeAttributes): New method. * javax/swing/text/Document.java (createPosition): Throws BadLocationException. (getText): Likewise. (remove): Likewise. * javax/swing/text/JTextComponent.java (getText): Return null if no document is set. Catch BadLocationException. (getUI): Return ui. (updateUI): Simplified. 2004-07-21 Michael Koch <konqueror@gmx.de> * javax/swing/JButton.java (removeNotify): Fixed javadoc. (updateUI): Simplified. 2004-07-21 David Jee <djee@redhat.com> * gnu/java/awt/image/ImageDecoder.java (startProduction): Only add consumer if it's not added yet. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (GdkPixbufDecoder): Don't call initState() here. (produce): Call initState() here, to ensure area_prepared and area_updated signals are properly connected. * gnu/java/awt/peer/gtk/GtkImage.java (setColorModel): Use equals() to compare ColorModel objects. (setPixels): Likewise. * java/awt/image/ColorModel.java (equals): Fix typo. Use Arrays.equals() to compare int arrays. * java/awt/image/RGBImageFilter.java (setColorModel): Set consumer's color model. (setPixels): Use equals() to compare ColorModel objects. From-SVN: r85051
1344 lines
35 KiB
C
1344 lines
35 KiB
C
/* gtkcomponentpeer.c -- Native implementation of GtkComponentPeer
|
|
Copyright (C) 1998, 1999, 2002, 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 "gtkpeer.h"
|
|
#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
|
|
#include <gtk/gtkprivate.h>
|
|
#include <gdk/gdkkeysyms.h>
|
|
|
|
static GtkWidget *find_fg_color_widget (GtkWidget *widget);
|
|
static GtkWidget *find_bg_color_widget (GtkWidget *widget);
|
|
static gboolean focus_in_cb (GtkWidget *widget,
|
|
GdkEventFocus *event,
|
|
jobject peer);
|
|
static gboolean focus_out_cb (GtkWidget *widget,
|
|
GdkEventFocus *event,
|
|
jobject peer);
|
|
/*
|
|
* This method returns a GDK keyval that corresponds to one of the
|
|
* keysyms in the X keymap table. The return value is only used to
|
|
* determine the keyval's corresponding hardware keycode, and doesn't
|
|
* reflect an accurate translation of a Java virtual key value to a
|
|
* GDK keyval.
|
|
*/
|
|
#ifdef __GNUC__
|
|
__inline
|
|
#endif
|
|
static guint
|
|
awt_keycode_to_keysym (jint keyCode, jint keyLocation)
|
|
{
|
|
/* GDK_A through GDK_Z */
|
|
if (keyCode >= VK_A && keyCode <= VK_Z)
|
|
return gdk_keyval_to_lower (keyCode);
|
|
|
|
/* GDK_0 through GDK_9 */
|
|
if (keyCode >= VK_0 && keyCode <= VK_9)
|
|
return keyCode;
|
|
|
|
switch (keyCode)
|
|
{
|
|
case VK_ENTER:
|
|
return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Enter : GDK_Return;
|
|
case VK_BACK_SPACE:
|
|
return GDK_BackSpace;
|
|
case VK_TAB:
|
|
return GDK_Tab;
|
|
case VK_CANCEL:
|
|
return GDK_Cancel;
|
|
case VK_CLEAR:
|
|
return GDK_Clear;
|
|
case VK_SHIFT:
|
|
return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Shift_L : GDK_Shift_R;
|
|
case VK_CONTROL:
|
|
return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Control_L : GDK_Control_R;
|
|
case VK_ALT:
|
|
return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Alt_L : GDK_Alt_R;
|
|
case VK_PAUSE:
|
|
return GDK_Pause;
|
|
case VK_CAPS_LOCK:
|
|
return GDK_Caps_Lock;
|
|
case VK_ESCAPE:
|
|
return GDK_Escape;
|
|
case VK_SPACE:
|
|
return GDK_space;
|
|
case VK_PAGE_UP:
|
|
return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Page_Up : GDK_Page_Up;
|
|
case VK_PAGE_DOWN:
|
|
return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Page_Down : GDK_Page_Down;
|
|
case VK_END:
|
|
return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_End : GDK_End;
|
|
case VK_HOME:
|
|
return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Home : GDK_Home;
|
|
case VK_LEFT:
|
|
return GDK_Left;
|
|
case VK_UP:
|
|
return GDK_Up;
|
|
case VK_RIGHT:
|
|
return GDK_Right;
|
|
case VK_DOWN:
|
|
return GDK_Down;
|
|
case VK_COMMA:
|
|
return GDK_comma;
|
|
case VK_MINUS:
|
|
return GDK_minus;
|
|
case VK_PERIOD:
|
|
return GDK_period;
|
|
case VK_SLASH:
|
|
return GDK_slash;
|
|
/*
|
|
case VK_0:
|
|
case VK_1:
|
|
case VK_2:
|
|
case VK_3:
|
|
case VK_4:
|
|
case VK_5:
|
|
case VK_6:
|
|
case VK_7:
|
|
case VK_8:
|
|
case VK_9:
|
|
*/
|
|
case VK_SEMICOLON:
|
|
return GDK_semicolon;
|
|
case VK_EQUALS:
|
|
return GDK_equal;
|
|
/*
|
|
case VK_A:
|
|
case VK_B:
|
|
case VK_C:
|
|
case VK_D:
|
|
case VK_E:
|
|
case VK_F:
|
|
case VK_G:
|
|
case VK_H:
|
|
case VK_I:
|
|
case VK_J:
|
|
case VK_K:
|
|
case VK_L:
|
|
case VK_M:
|
|
case VK_N:
|
|
case VK_O:
|
|
case VK_P:
|
|
case VK_Q:
|
|
case VK_R:
|
|
case VK_S:
|
|
case VK_T:
|
|
case VK_U:
|
|
case VK_V:
|
|
case VK_W:
|
|
case VK_X:
|
|
case VK_Y:
|
|
case VK_Z:
|
|
*/
|
|
case VK_OPEN_BRACKET:
|
|
return GDK_bracketleft;
|
|
case VK_BACK_SLASH:
|
|
return GDK_backslash;
|
|
case VK_CLOSE_BRACKET:
|
|
return GDK_bracketright;
|
|
case VK_NUMPAD0:
|
|
return GDK_KP_0;
|
|
case VK_NUMPAD1:
|
|
return GDK_KP_1;
|
|
case VK_NUMPAD2:
|
|
return GDK_KP_2;
|
|
case VK_NUMPAD3:
|
|
return GDK_KP_3;
|
|
case VK_NUMPAD4:
|
|
return GDK_KP_4;
|
|
case VK_NUMPAD5:
|
|
return GDK_KP_5;
|
|
case VK_NUMPAD6:
|
|
return GDK_KP_6;
|
|
case VK_NUMPAD7:
|
|
return GDK_KP_7;
|
|
case VK_NUMPAD8:
|
|
return GDK_KP_8;
|
|
case VK_NUMPAD9:
|
|
return GDK_KP_9;
|
|
case VK_MULTIPLY:
|
|
return GDK_KP_Multiply;
|
|
case VK_ADD:
|
|
return GDK_KP_Add;
|
|
/*
|
|
case VK_SEPARATER:
|
|
*/
|
|
case VK_SEPARATOR:
|
|
return GDK_KP_Separator;
|
|
case VK_SUBTRACT:
|
|
return GDK_KP_Subtract;
|
|
case VK_DECIMAL:
|
|
return GDK_KP_Decimal;
|
|
case VK_DIVIDE:
|
|
return GDK_KP_Divide;
|
|
case VK_DELETE:
|
|
return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Delete : GDK_Delete;
|
|
case VK_NUM_LOCK:
|
|
return GDK_Num_Lock;
|
|
case VK_SCROLL_LOCK:
|
|
return GDK_Scroll_Lock;
|
|
case VK_F1:
|
|
return GDK_F1;
|
|
case VK_F2:
|
|
return GDK_F2;
|
|
case VK_F3:
|
|
return GDK_F3;
|
|
case VK_F4:
|
|
return GDK_F4;
|
|
case VK_F5:
|
|
return GDK_F5;
|
|
case VK_F6:
|
|
return GDK_F6;
|
|
case VK_F7:
|
|
return GDK_F7;
|
|
case VK_F8:
|
|
return GDK_F8;
|
|
case VK_F9:
|
|
return GDK_F9;
|
|
case VK_F10:
|
|
return GDK_F10;
|
|
case VK_F11:
|
|
return GDK_F11;
|
|
case VK_F12:
|
|
return GDK_F12;
|
|
case VK_F13:
|
|
return GDK_F13;
|
|
case VK_F14:
|
|
return GDK_F14;
|
|
case VK_F15:
|
|
return GDK_F15;
|
|
case VK_F16:
|
|
return GDK_F16;
|
|
case VK_F17:
|
|
return GDK_F17;
|
|
case VK_F18:
|
|
return GDK_F18;
|
|
case VK_F19:
|
|
return GDK_F19;
|
|
case VK_F20:
|
|
return GDK_F20;
|
|
case VK_F21:
|
|
return GDK_F21;
|
|
case VK_F22:
|
|
return GDK_F22;
|
|
case VK_F23:
|
|
return GDK_F23;
|
|
case VK_F24:
|
|
return GDK_F24;
|
|
case VK_PRINTSCREEN:
|
|
return GDK_Print;
|
|
case VK_INSERT:
|
|
return keyLocation == AWT_KEY_LOCATION_NUMPAD ? GDK_KP_Insert : GDK_Insert;
|
|
case VK_HELP:
|
|
return GDK_Help;
|
|
case VK_META:
|
|
return keyLocation == AWT_KEY_LOCATION_LEFT ? GDK_Meta_L : GDK_Meta_R;
|
|
case VK_BACK_QUOTE:
|
|
return GDK_grave;
|
|
case VK_QUOTE:
|
|
return GDK_apostrophe;
|
|
case VK_KP_UP:
|
|
return GDK_KP_Up;
|
|
case VK_KP_DOWN:
|
|
return GDK_KP_Down;
|
|
case VK_KP_LEFT:
|
|
return GDK_KP_Left;
|
|
case VK_KP_RIGHT:
|
|
return GDK_KP_Right;
|
|
case VK_DEAD_GRAVE:
|
|
return GDK_dead_grave;
|
|
case VK_DEAD_ACUTE:
|
|
return GDK_dead_acute;
|
|
case VK_DEAD_CIRCUMFLEX:
|
|
return GDK_dead_circumflex;
|
|
case VK_DEAD_TILDE:
|
|
return GDK_dead_tilde;
|
|
case VK_DEAD_MACRON:
|
|
return GDK_dead_macron;
|
|
case VK_DEAD_BREVE:
|
|
return GDK_dead_breve;
|
|
case VK_DEAD_ABOVEDOT:
|
|
return GDK_dead_abovedot;
|
|
case VK_DEAD_DIAERESIS:
|
|
return GDK_dead_diaeresis;
|
|
case VK_DEAD_ABOVERING:
|
|
return GDK_dead_abovering;
|
|
case VK_DEAD_DOUBLEACUTE:
|
|
return GDK_dead_doubleacute;
|
|
case VK_DEAD_CARON:
|
|
return GDK_dead_caron;
|
|
case VK_DEAD_CEDILLA:
|
|
return GDK_dead_cedilla;
|
|
case VK_DEAD_OGONEK:
|
|
return GDK_dead_ogonek;
|
|
case VK_DEAD_IOTA:
|
|
return GDK_dead_iota;
|
|
case VK_DEAD_VOICED_SOUND:
|
|
return GDK_dead_voiced_sound;
|
|
case VK_DEAD_SEMIVOICED_SOUND:
|
|
return GDK_dead_semivoiced_sound;
|
|
case VK_AMPERSAND:
|
|
return GDK_ampersand;
|
|
case VK_ASTERISK:
|
|
return GDK_asterisk;
|
|
case VK_QUOTEDBL:
|
|
return GDK_quotedbl;
|
|
case VK_LESS:
|
|
return GDK_less;
|
|
case VK_GREATER:
|
|
return GDK_greater;
|
|
case VK_BRACELEFT:
|
|
return GDK_braceleft;
|
|
case VK_BRACERIGHT:
|
|
return GDK_braceright;
|
|
case VK_AT:
|
|
return GDK_at;
|
|
case VK_COLON:
|
|
return GDK_colon;
|
|
case VK_CIRCUMFLEX:
|
|
return GDK_asciicircum;
|
|
case VK_DOLLAR:
|
|
return GDK_dollar;
|
|
case VK_EURO_SIGN:
|
|
return GDK_EuroSign;
|
|
case VK_EXCLAMATION_MARK:
|
|
return GDK_exclam;
|
|
case VK_INVERTED_EXCLAMATION_MARK:
|
|
return GDK_exclamdown;
|
|
case VK_LEFT_PARENTHESIS:
|
|
return GDK_parenleft;
|
|
case VK_NUMBER_SIGN:
|
|
return GDK_numbersign;
|
|
case VK_PLUS:
|
|
return GDK_plus;
|
|
case VK_RIGHT_PARENTHESIS:
|
|
return GDK_parenright;
|
|
case VK_UNDERSCORE:
|
|
return GDK_underscore;
|
|
/*
|
|
case VK_FINAL:
|
|
case VK_CONVERT:
|
|
case VK_NONCONVERT:
|
|
case VK_ACCEPT:
|
|
*/
|
|
case VK_MODECHANGE:
|
|
return GDK_Mode_switch;
|
|
/*
|
|
case VK_KANA:
|
|
*/
|
|
case VK_KANJI:
|
|
return GDK_Kanji;
|
|
/*
|
|
case VK_ALPHANUMERIC:
|
|
*/
|
|
case VK_KATAKANA:
|
|
return GDK_Katakana;
|
|
case VK_HIRAGANA:
|
|
return GDK_Hiragana;
|
|
/*
|
|
case VK_FULL_WIDTH:
|
|
case VK_HALF_WIDTH:
|
|
case VK_ROMAN_CHARACTERS:
|
|
case VK_ALL_CANDIDATES:
|
|
*/
|
|
case VK_PREVIOUS_CANDIDATE:
|
|
return GDK_PreviousCandidate;
|
|
case VK_CODE_INPUT:
|
|
return GDK_Codeinput;
|
|
/*
|
|
case VK_JAPANESE_KATAKANA:
|
|
case VK_JAPANESE_HIRAGANA:
|
|
case VK_JAPANESE_ROMAN:
|
|
*/
|
|
case VK_KANA_LOCK:
|
|
return GDK_Kana_Lock;
|
|
/*
|
|
case VK_INPUT_METHOD_ON_OFF:
|
|
case VK_CUT:
|
|
case VK_COPY:
|
|
case VK_PASTE:
|
|
case VK_UNDO:
|
|
case VK_AGAIN:
|
|
case VK_FIND:
|
|
case VK_PROPS:
|
|
case VK_STOP:
|
|
case VK_COMPOSE:
|
|
case VK_ALT_GRAPH:
|
|
*/
|
|
default:
|
|
return GDK_VoidSymbol;
|
|
}
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor
|
|
(JNIEnv *env, jobject obj, jint type)
|
|
{
|
|
void *ptr;
|
|
GtkWidget *widget;
|
|
GdkCursorType gdk_cursor_type;
|
|
GdkCursor *gdk_cursor;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
switch (type)
|
|
{
|
|
case AWT_CROSSHAIR_CURSOR:
|
|
gdk_cursor_type = GDK_CROSSHAIR;
|
|
break;
|
|
case AWT_TEXT_CURSOR:
|
|
gdk_cursor_type = GDK_XTERM;
|
|
break;
|
|
case AWT_WAIT_CURSOR:
|
|
gdk_cursor_type = GDK_WATCH;
|
|
break;
|
|
case AWT_SW_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_BOTTOM_LEFT_CORNER;
|
|
break;
|
|
case AWT_SE_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_BOTTOM_RIGHT_CORNER;
|
|
break;
|
|
case AWT_NW_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_TOP_LEFT_CORNER;
|
|
break;
|
|
case AWT_NE_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_TOP_RIGHT_CORNER;
|
|
break;
|
|
case AWT_N_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_TOP_SIDE;
|
|
break;
|
|
case AWT_S_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_BOTTOM_SIDE;
|
|
break;
|
|
case AWT_W_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_LEFT_SIDE;
|
|
break;
|
|
case AWT_E_RESIZE_CURSOR:
|
|
gdk_cursor_type = GDK_RIGHT_SIDE;
|
|
break;
|
|
case AWT_HAND_CURSOR:
|
|
gdk_cursor_type = GDK_HAND2;
|
|
break;
|
|
case AWT_MOVE_CURSOR:
|
|
gdk_cursor_type = GDK_FLEUR;
|
|
break;
|
|
default:
|
|
gdk_cursor_type = GDK_LEFT_PTR;
|
|
}
|
|
|
|
gdk_threads_enter ();
|
|
|
|
widget = GTK_WIDGET(ptr);
|
|
|
|
gdk_cursor = gdk_cursor_new (gdk_cursor_type);
|
|
gdk_window_set_cursor (widget->window, gdk_cursor);
|
|
gdk_cursor_destroy (gdk_cursor);
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRequestFocus
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter ();
|
|
gtk_widget_grab_focus (GTK_WIDGET (ptr));
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
/*
|
|
* Translate a Java KeyEvent object into a GdkEventKey event, then
|
|
* pass it to the GTK main loop for processing.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetDispatchKeyEvent
|
|
(JNIEnv *env, jobject obj, jint id, jlong when, jint mods,
|
|
jint keyCode, jint keyLocation)
|
|
{
|
|
void *ptr;
|
|
GdkEvent *event = NULL;
|
|
GdkKeymapKey *keymap_keys = NULL;
|
|
gint n_keys = 0;
|
|
guint lookup_keyval = 0;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
if (id == AWT_KEY_PRESSED)
|
|
event = gdk_event_new (GDK_KEY_PRESS);
|
|
else if (id == AWT_KEY_RELEASED)
|
|
event = gdk_event_new (GDK_KEY_RELEASE);
|
|
else
|
|
{
|
|
gdk_threads_leave ();
|
|
/* Don't send AWT KEY_TYPED events to GTK. */
|
|
return;
|
|
}
|
|
|
|
if (GTK_IS_BUTTON (ptr))
|
|
event->key.window = GTK_BUTTON (ptr)->event_window;
|
|
else if (GTK_IS_SCROLLED_WINDOW (ptr))
|
|
event->key.window = GTK_WIDGET (GTK_SCROLLED_WINDOW (ptr)->container.child)->window;
|
|
else
|
|
event->key.window = GTK_WIDGET (ptr)->window;
|
|
|
|
event->key.send_event = 0;
|
|
event->key.time = (guint32) when;
|
|
|
|
if (mods & AWT_SHIFT_MASK)
|
|
event->key.state |= GDK_SHIFT_MASK;
|
|
if (mods & AWT_CTRL_MASK)
|
|
event->key.state |= GDK_CONTROL_MASK;
|
|
if (mods & AWT_ALT_MASK)
|
|
event->key.state |= GDK_MOD1_MASK;
|
|
|
|
/* This hack is needed because the AWT has no notion of num lock.
|
|
It infers numlock state from the only Java virtual keys that are
|
|
affected by it. */
|
|
if (keyCode == VK_NUMPAD9
|
|
|| keyCode == VK_NUMPAD8
|
|
|| keyCode == VK_NUMPAD7
|
|
|| keyCode == VK_NUMPAD6
|
|
|| keyCode == VK_NUMPAD5
|
|
|| keyCode == VK_NUMPAD4
|
|
|| keyCode == VK_NUMPAD3
|
|
|| keyCode == VK_NUMPAD2
|
|
|| keyCode == VK_NUMPAD1
|
|
|| keyCode == VK_NUMPAD0
|
|
|| keyCode == VK_DECIMAL)
|
|
event->key.state |= GDK_MOD2_MASK;
|
|
|
|
/* These values don't need to be filled in since GTK doesn't use
|
|
them. */
|
|
event->key.length = 0;
|
|
event->key.string = NULL;
|
|
|
|
lookup_keyval = awt_keycode_to_keysym (keyCode, keyLocation);
|
|
|
|
if (!gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default (),
|
|
lookup_keyval,
|
|
&keymap_keys,
|
|
&n_keys))
|
|
{
|
|
/* No matching keymap entry was found. */
|
|
g_printerr ("No matching keymap entries were found\n");
|
|
gdk_threads_leave ();
|
|
return;
|
|
}
|
|
|
|
/* Note: if n_keys > 1 then there are multiple hardware keycodes
|
|
that translate to lookup_keyval. We arbitrarily choose the first
|
|
hardware keycode from the list returned by
|
|
gdk_keymap_get_entries_for_keyval. */
|
|
|
|
event->key.hardware_keycode = keymap_keys[0].keycode;
|
|
event->key.group = keymap_keys[0].group;
|
|
|
|
g_free (keymap_keys);
|
|
|
|
if (!gdk_keymap_translate_keyboard_state (gdk_keymap_get_default (),
|
|
event->key.hardware_keycode,
|
|
event->key.state,
|
|
event->key.group,
|
|
&event->key.keyval,
|
|
NULL, NULL, NULL))
|
|
{
|
|
/* No matching keyval was found. */
|
|
g_printerr ("No matching keyval was found\n");
|
|
gdk_threads_leave ();
|
|
return;
|
|
}
|
|
|
|
/* keyevent = (GdkEventKey *) event; */
|
|
/* g_printerr ("generated event: sent: %d time: %d state: %d keyval: %d length: %d string: %s hardware_keycode: %d group: %d\n", keyevent->send_event, keyevent->time, keyevent->state, keyevent->keyval, keyevent->length, keyevent->string, keyevent->hardware_keycode, keyevent->group); */
|
|
|
|
/* We already received the original key event on the window itself,
|
|
so we don't want to resend it. */
|
|
if (!GTK_IS_WINDOW (ptr))
|
|
{
|
|
if (GTK_IS_SCROLLED_WINDOW (ptr))
|
|
gtk_widget_event (GTK_WIDGET (GTK_SCROLLED_WINDOW (ptr)->container.child), event);
|
|
else
|
|
gtk_widget_event (GTK_WIDGET (ptr), event);
|
|
}
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
/*
|
|
* Find the origin of a widget's window.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen
|
|
(JNIEnv * env, jobject obj, jintArray jpoint)
|
|
{
|
|
void *ptr;
|
|
jint *point;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
point = (*env)->GetIntArrayElements (env, jpoint, 0);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
gdk_window_get_origin (GTK_WIDGET (ptr)->window, point, point+1);
|
|
|
|
if (!GTK_IS_CONTAINER (ptr))
|
|
{
|
|
*point += GTK_WIDGET(ptr)->allocation.x;
|
|
*(point+1) += GTK_WIDGET(ptr)->allocation.y;
|
|
}
|
|
|
|
gdk_threads_leave ();
|
|
|
|
(*env)->ReleaseIntArrayElements(env, jpoint, point, 0);
|
|
}
|
|
|
|
/*
|
|
* Find this widget's current size.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions
|
|
(JNIEnv *env, jobject obj, jintArray jdims)
|
|
{
|
|
void *ptr;
|
|
jint *dims;
|
|
GtkRequisition requisition;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
dims = (*env)->GetIntArrayElements (env, jdims, 0);
|
|
dims[0] = dims[1] = 0;
|
|
|
|
gdk_threads_enter ();
|
|
|
|
gtk_widget_size_request (GTK_WIDGET (ptr), &requisition);
|
|
|
|
dims[0] = requisition.width;
|
|
dims[1] = requisition.height;
|
|
|
|
gdk_threads_leave ();
|
|
|
|
(*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
|
|
}
|
|
|
|
/*
|
|
* Find this widget's preferred size.
|
|
*/
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetPreferredDimensions
|
|
(JNIEnv *env, jobject obj, jintArray jdims)
|
|
{
|
|
void *ptr;
|
|
jint *dims;
|
|
GtkRequisition current_req;
|
|
GtkRequisition natural_req;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
dims = (*env)->GetIntArrayElements (env, jdims, 0);
|
|
dims[0] = dims[1] = 0;
|
|
|
|
gdk_threads_enter ();
|
|
|
|
/* Save the widget's current size request. */
|
|
gtk_widget_size_request (GTK_WIDGET (ptr), ¤t_req);
|
|
|
|
/* Get the widget's "natural" size request. */
|
|
gtk_widget_set_size_request (GTK_WIDGET (ptr), -1, -1);
|
|
gtk_widget_size_request (GTK_WIDGET (ptr), &natural_req);
|
|
|
|
/* Reset the widget's size request. */
|
|
gtk_widget_set_size_request (GTK_WIDGET (ptr),
|
|
current_req.width, current_req.height);
|
|
|
|
dims[0] = natural_req.width;
|
|
dims[1] = natural_req.height;
|
|
|
|
gdk_threads_leave ();
|
|
|
|
(*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds
|
|
(JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
|
|
{
|
|
GtkWidget *widget;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
widget = GTK_WIDGET (ptr);
|
|
|
|
/* We assume that -1 is a width or height and not a request for the
|
|
widget's natural size. */
|
|
width = width < 0 ? 0 : width;
|
|
height = height < 0 ? 0 : height;
|
|
|
|
if (GTK_IS_VIEWPORT (widget->parent))
|
|
gtk_widget_set_size_request (widget, width, height);
|
|
else
|
|
{
|
|
gtk_widget_set_size_request (widget, width, height);
|
|
gtk_layout_move (GTK_LAYOUT (widget->parent), widget, x, y);
|
|
}
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT jintArray JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr;
|
|
jintArray array;
|
|
int *rgb;
|
|
GdkColor bg;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter ();
|
|
bg = GTK_WIDGET (ptr)->style->bg[GTK_STATE_NORMAL];
|
|
gdk_threads_leave ();
|
|
|
|
array = (*env)->NewIntArray (env, 3);
|
|
rgb = (*env)->GetIntArrayElements (env, array, NULL);
|
|
/* convert color data from 16 bit values down to 8 bit values */
|
|
rgb[0] = bg.red >> 8;
|
|
rgb[1] = bg.green >> 8;
|
|
rgb[2] = bg.blue >> 8;
|
|
(*env)->ReleaseIntArrayElements (env, array, rgb, 0);
|
|
|
|
return array;
|
|
}
|
|
|
|
JNIEXPORT jintArray JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr;
|
|
jintArray array;
|
|
jint *rgb;
|
|
GdkColor fg;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter ();
|
|
fg = GTK_WIDGET (ptr)->style->fg[GTK_STATE_NORMAL];
|
|
gdk_threads_leave ();
|
|
|
|
array = (*env)->NewIntArray (env, 3);
|
|
rgb = (*env)->GetIntArrayElements (env, array, NULL);
|
|
/* convert color data from 16 bit values down to 8 bit values */
|
|
rgb[0] = fg.red >> 8;
|
|
rgb[1] = fg.green >> 8;
|
|
rgb[2] = fg.blue >> 8;
|
|
(*env)->ReleaseIntArrayElements (env, array, rgb, 0);
|
|
|
|
return array;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground
|
|
(JNIEnv *env, jobject obj, jint red, jint green, jint blue)
|
|
{
|
|
GdkColor normal_color;
|
|
GdkColor active_color;
|
|
GtkWidget *widget;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
normal_color.red = (red / 255.0) * 65535;
|
|
normal_color.green = (green / 255.0) * 65535;
|
|
normal_color.blue = (blue / 255.0) * 65535;
|
|
|
|
/* This calculation only approximates the active colors produced by
|
|
Sun's AWT. */
|
|
active_color.red = 0.85 * (red / 255.0) * 65535;
|
|
active_color.green = 0.85 * (green / 255.0) * 65535;
|
|
active_color.blue = 0.85 * (blue / 255.0) * 65535;
|
|
|
|
gdk_threads_enter ();
|
|
|
|
widget = find_bg_color_widget (GTK_WIDGET (ptr));
|
|
|
|
gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &normal_color);
|
|
gtk_widget_modify_bg (widget, GTK_STATE_ACTIVE, &active_color);
|
|
gtk_widget_modify_bg (widget, GTK_STATE_PRELIGHT, &normal_color);
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground
|
|
(JNIEnv *env, jobject obj, jint red, jint green, jint blue)
|
|
{
|
|
GdkColor color;
|
|
GtkWidget *widget;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
color.red = (red / 255.0) * 65535;
|
|
color.green = (green / 255.0) * 65535;
|
|
color.blue = (blue / 255.0) * 65535;
|
|
|
|
gdk_threads_enter ();
|
|
|
|
widget = find_fg_color_widget (GTK_WIDGET (ptr));
|
|
|
|
gtk_widget_modify_fg (widget, GTK_STATE_NORMAL, &color);
|
|
gtk_widget_modify_fg (widget, GTK_STATE_ACTIVE, &color);
|
|
gtk_widget_modify_fg (widget, GTK_STATE_PRELIGHT, &color);
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont
|
|
(JNIEnv *env, jobject obj, jstring name, jint style, jint size)
|
|
{
|
|
const char *font_name;
|
|
void *ptr;
|
|
PangoFontDescription *font_desc;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
font_name = (*env)->GetStringUTFChars (env, name, NULL);
|
|
|
|
gdk_threads_enter();
|
|
|
|
font_desc = pango_font_description_from_string (font_name);
|
|
pango_font_description_set_size (font_desc, size * dpi_conversion_factor);
|
|
|
|
if (style & AWT_STYLE_BOLD)
|
|
pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
|
|
|
|
if (style & AWT_STYLE_ITALIC)
|
|
pango_font_description_set_style (font_desc, PANGO_STYLE_OBLIQUE);
|
|
|
|
gtk_widget_modify_font (GTK_WIDGET(ptr), font_desc);
|
|
|
|
pango_font_description_free (font_desc);
|
|
|
|
gdk_threads_leave();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, name, font_name);
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_show
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter();
|
|
gtk_widget_show (GTK_WIDGET (ptr));
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_hide
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter();
|
|
gtk_widget_hide (GTK_WIDGET (ptr));
|
|
gdk_threads_leave();
|
|
}
|
|
|
|
GtkLayout *
|
|
find_gtk_layout (GtkWidget *parent)
|
|
{
|
|
if (GTK_IS_WINDOW (parent))
|
|
{
|
|
GList *children = gtk_container_children
|
|
(GTK_CONTAINER (GTK_BIN (parent)->child));
|
|
|
|
if (GTK_IS_MENU_BAR (children->data))
|
|
return GTK_LAYOUT (children->next->data);
|
|
else /* GTK_IS_LAYOUT (children->data) */
|
|
return GTK_LAYOUT (children->data);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
#define WIDGET_CLASS(w) GTK_WIDGET_CLASS (GTK_OBJECT (w)->klass)
|
|
|
|
void
|
|
set_parent (GtkWidget *widget, GtkContainer *parent)
|
|
{
|
|
if (GTK_IS_WINDOW (parent))
|
|
{
|
|
GList *children = gtk_container_children
|
|
(GTK_CONTAINER (GTK_BIN (parent)->child));
|
|
|
|
if (GTK_IS_MENU_BAR (children->data))
|
|
gtk_layout_put (GTK_LAYOUT (children->next->data), widget, 0, 0);
|
|
else /* GTK_IS_LAYOUT (children->data) */
|
|
gtk_layout_put (GTK_LAYOUT (children->data), widget, 0, 0);
|
|
}
|
|
else
|
|
if (GTK_IS_SCROLLED_WINDOW (parent))
|
|
{
|
|
/* if (WIDGET_CLASS (widget)->set_scroll_adjustments_signal) */
|
|
/* gtk_container_add (GTK_CONTAINER (parent), widget); */
|
|
/* else */
|
|
/* { */
|
|
gtk_scrolled_window_add_with_viewport
|
|
(GTK_SCROLLED_WINDOW (parent), widget);
|
|
gtk_viewport_set_shadow_type (GTK_VIEWPORT (widget->parent),
|
|
GTK_SHADOW_NONE);
|
|
/* } */
|
|
|
|
}
|
|
/* gtk_layout_put */
|
|
/* (GTK_LAYOUT (GTK_BIN (parent)->child), widget, 0, 0); */
|
|
|
|
/* if (GTK_IS_SCROLLED_WINDOW (parent)) */
|
|
/* gtk_layout_put */
|
|
/* (GTK_LAYOUT (GTK_BIN (GTK_BIN (parent)->child)->child), widget, 0, 0); */
|
|
else
|
|
gtk_layout_put (GTK_LAYOUT (parent), widget, 0, 0);
|
|
}
|
|
|
|
JNIEXPORT jboolean JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr;
|
|
jboolean ret_val;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter ();
|
|
ret_val = GTK_WIDGET_IS_SENSITIVE (GTK_WIDGET (ptr));
|
|
gdk_threads_leave ();
|
|
|
|
return ret_val;
|
|
}
|
|
|
|
JNIEXPORT jboolean JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab
|
|
(JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused)))
|
|
{
|
|
GtkWidget *widget;
|
|
jboolean retval;
|
|
|
|
gdk_threads_enter ();
|
|
widget = gtk_grab_get_current ();
|
|
retval = (widget && GTK_IS_WINDOW (widget) && GTK_WINDOW (widget)->modal);
|
|
gdk_threads_leave ();
|
|
|
|
return retval;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2
|
|
(JNIEnv *env, jobject obj, jstring jname, jstring jvalue)
|
|
{
|
|
const char *name;
|
|
const char *value;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
name = (*env)->GetStringUTFChars (env, jname, NULL);
|
|
value = (*env)->GetStringUTFChars (env, jvalue, NULL);
|
|
|
|
gdk_threads_enter();
|
|
g_object_set(ptr, name, value, NULL);
|
|
gdk_threads_leave();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, jname, name);
|
|
(*env)->ReleaseStringUTFChars (env, jvalue, value);
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z
|
|
(JNIEnv *env, jobject obj, jstring jname, jboolean value)
|
|
{
|
|
const char *name;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
name = (*env)->GetStringUTFChars (env, jname, NULL);
|
|
|
|
gdk_threads_enter();
|
|
g_object_set(ptr, name, value, NULL);
|
|
gdk_threads_leave();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, jname, name);
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I
|
|
(JNIEnv *env, jobject obj, jstring jname, jint value)
|
|
{
|
|
const char *name;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
name = (*env)->GetStringUTFChars (env, jname, NULL);
|
|
|
|
gdk_threads_enter();
|
|
g_object_set(ptr, name, value, NULL);
|
|
gdk_threads_leave();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, jname, name);
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F
|
|
(JNIEnv *env, jobject obj, jstring jname, jfloat value)
|
|
{
|
|
const char *name;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
name = (*env)->GetStringUTFChars (env, jname, NULL);
|
|
|
|
gdk_threads_enter();
|
|
g_object_set(ptr, name, value, NULL);
|
|
gdk_threads_leave();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, jname, name);
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2
|
|
(JNIEnv *env, jobject obj1, jstring jname, jobject obj2)
|
|
{
|
|
const char *name;
|
|
void *ptr1, *ptr2;
|
|
|
|
ptr1 = NSA_GET_PTR (env, obj1);
|
|
ptr2 = NSA_GET_PTR (env, obj2);
|
|
|
|
name = (*env)->GetStringUTFChars (env, jname, NULL);
|
|
|
|
/* special case to catch where we need to set the parent */
|
|
if (!strcmp (name, "parent"))
|
|
{
|
|
gdk_threads_enter ();
|
|
set_parent (GTK_WIDGET (ptr1), GTK_CONTAINER (ptr2));
|
|
gdk_threads_leave ();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, jname, name);
|
|
return;
|
|
}
|
|
|
|
gdk_threads_enter();
|
|
g_object_set(ptr1, name, ptr2, NULL);
|
|
gdk_threads_leave();
|
|
|
|
(*env)->ReleaseStringUTFChars (env, jname, name);
|
|
}
|
|
|
|
static gboolean
|
|
filter_expose_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
|
|
{
|
|
/*
|
|
* Prevent the default event handler from getting this signal if applicable
|
|
* FIXME: I came up with these filters by looking for patterns in the unwanted
|
|
* expose events that are fed back to us from gtk/X. Perhaps there is
|
|
* a way to prevent them from occuring in the first place.
|
|
*/
|
|
if (event->type == GDK_EXPOSE && (!GTK_IS_LAYOUT(widget)
|
|
|| event->any.window != widget->window))
|
|
{
|
|
g_signal_stop_emission_by_name(GTK_OBJECT(widget), "event");
|
|
return FALSE;
|
|
}
|
|
else
|
|
{
|
|
/* There may be non-expose events that are triggered while we're
|
|
painting a heavyweight peer. */
|
|
return pre_event_handler(widget, event, peer);
|
|
}
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
GtkObject *filterobj;
|
|
GtkWidget *vbox, *layout;
|
|
GList *children;
|
|
void *ptr = NSA_GET_PTR (env, obj);
|
|
jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
|
|
|
|
g_assert (gref);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
/* GtkFramePeer is built as a GtkLayout inside a GtkVBox inside a GtkWindow.
|
|
Events go to the GtkLayout layer, so we filter them there. */
|
|
if (GTK_IS_WINDOW(ptr))
|
|
{
|
|
children = gtk_container_get_children(GTK_CONTAINER(ptr));
|
|
vbox = children->data;
|
|
g_assert (GTK_IS_VBOX(vbox));
|
|
|
|
children = gtk_container_get_children(GTK_CONTAINER(vbox));
|
|
do
|
|
{
|
|
layout = children->data;
|
|
children = children->next;
|
|
}
|
|
while (!GTK_IS_LAYOUT (layout) && children != NULL);
|
|
g_assert (GTK_IS_LAYOUT(layout));
|
|
|
|
filterobj = GTK_OBJECT(layout);
|
|
}
|
|
else if (GTK_IS_SCROLLED_WINDOW(ptr))
|
|
{
|
|
/* The event will go to the parent GtkLayout. */
|
|
filterobj = GTK_OBJECT(GTK_WIDGET(ptr)->parent);
|
|
}
|
|
else
|
|
{
|
|
filterobj = GTK_OBJECT(ptr);
|
|
}
|
|
|
|
gulong hid = g_signal_handler_find(filterobj,
|
|
G_SIGNAL_MATCH_FUNC,
|
|
0, 0, NULL, *pre_event_handler, NULL);
|
|
if (hid > 0)
|
|
{
|
|
g_signal_handler_block(filterobj, hid);
|
|
}
|
|
g_signal_connect( filterobj, "event",
|
|
G_CALLBACK(filter_expose_event_handler), *gref);
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
GtkObject *filterobj;
|
|
GtkWidget *vbox, *layout;
|
|
GList *children;
|
|
void *ptr = NSA_GET_PTR (env, obj);
|
|
jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
|
|
|
|
g_assert (gref);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
/* GtkFramePeer is built as a GtkLayout inside a GtkVBox inside a GtkWindow.
|
|
Events go to the GtkLayout layer, so we filter them there. */
|
|
if (GTK_IS_WINDOW(ptr))
|
|
{
|
|
children = gtk_container_get_children(GTK_CONTAINER(ptr));
|
|
vbox = children->data;
|
|
g_assert (GTK_IS_VBOX(vbox));
|
|
|
|
children = gtk_container_get_children(GTK_CONTAINER(vbox));
|
|
do
|
|
{
|
|
layout = children->data;
|
|
children = children->next;
|
|
}
|
|
while (!GTK_IS_LAYOUT (layout) && children != NULL);
|
|
g_assert (GTK_IS_LAYOUT(layout));
|
|
|
|
filterobj = GTK_OBJECT(layout);
|
|
}
|
|
else if (GTK_IS_SCROLLED_WINDOW(ptr))
|
|
{
|
|
/* The event will go to the parent GtkLayout. */
|
|
filterobj = GTK_OBJECT(GTK_WIDGET(ptr)->parent);
|
|
}
|
|
else
|
|
{
|
|
filterobj = GTK_OBJECT(ptr);
|
|
}
|
|
|
|
g_signal_handlers_disconnect_by_func (filterobj,
|
|
*filter_expose_event_handler, *gref);
|
|
gulong hid = g_signal_handler_find(filterobj,
|
|
G_SIGNAL_MATCH_FUNC,
|
|
0, 0, NULL, *pre_event_handler, NULL);
|
|
if (hid > 0)
|
|
{
|
|
g_signal_handler_unblock(filterobj, hid);
|
|
}
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea
|
|
(JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
|
|
{
|
|
GdkRectangle rect;
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
rect.x = x + GTK_WIDGET(ptr)->allocation.x;
|
|
rect.y = y + GTK_WIDGET(ptr)->allocation.y;
|
|
rect.width = width;
|
|
rect.height = height;
|
|
|
|
gdk_threads_enter ();
|
|
|
|
gdk_window_invalidate_rect (GTK_WIDGET (ptr)->window, &rect, 0);
|
|
gdk_window_process_all_updates();
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr;
|
|
|
|
ptr = NSA_GET_PTR (env, obj);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
gtk_widget_realize (GTK_WIDGET (ptr));
|
|
|
|
connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals
|
|
(JNIEnv *env, jobject obj)
|
|
{
|
|
void *ptr = NSA_GET_PTR (env, obj);
|
|
jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
|
|
g_assert (gref);
|
|
|
|
gdk_threads_enter ();
|
|
|
|
gtk_widget_realize (GTK_WIDGET (ptr));
|
|
|
|
/* FIXME: We could check here if this is a scrolled window with a
|
|
single child that does not have an associated jobject. This
|
|
means that it is one of our wrapped widgets like List or TextArea
|
|
and thus we could connect the signal to the child without having
|
|
to specialize this method. */
|
|
|
|
/* Connect EVENT signal, which happens _before_ any specific signal. */
|
|
|
|
g_signal_connect (GTK_OBJECT (ptr), "event",
|
|
G_CALLBACK (pre_event_handler), *gref);
|
|
|
|
g_signal_connect (G_OBJECT (ptr), "focus-in-event",
|
|
G_CALLBACK (focus_in_cb), *gref);
|
|
|
|
g_signal_connect (G_OBJECT (ptr), "focus-out-event",
|
|
G_CALLBACK (focus_out_cb), *gref);
|
|
|
|
gdk_threads_leave ();
|
|
}
|
|
|
|
static GtkWidget *
|
|
find_fg_color_widget (GtkWidget *widget)
|
|
{
|
|
GtkWidget *fg_color_widget;
|
|
|
|
if (GTK_IS_EVENT_BOX (widget)
|
|
|| (GTK_IS_BUTTON (widget)
|
|
&& !GTK_IS_OPTION_MENU (widget)))
|
|
fg_color_widget = gtk_bin_get_child (GTK_BIN(widget));
|
|
else
|
|
fg_color_widget = widget;
|
|
|
|
return fg_color_widget;
|
|
}
|
|
|
|
static GtkWidget *
|
|
find_bg_color_widget (GtkWidget *widget)
|
|
{
|
|
GtkWidget *bg_color_widget;
|
|
|
|
if (GTK_IS_WINDOW (widget))
|
|
{
|
|
GtkWidget *vbox;
|
|
GList* children;
|
|
|
|
children = gtk_container_get_children(GTK_CONTAINER(widget));
|
|
vbox = children->data;
|
|
|
|
children = gtk_container_get_children(GTK_CONTAINER(vbox));
|
|
bg_color_widget = children->data;
|
|
}
|
|
else
|
|
bg_color_widget = widget;
|
|
|
|
return bg_color_widget;
|
|
}
|
|
|
|
static gboolean
|
|
focus_in_cb (GtkWidget *widget __attribute((unused)),
|
|
GdkEventFocus *event __attribute((unused)),
|
|
jobject peer)
|
|
{
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postFocusEventID,
|
|
AWT_FOCUS_GAINED,
|
|
JNI_FALSE);
|
|
return FALSE;
|
|
}
|
|
|
|
static gboolean
|
|
focus_out_cb (GtkWidget *widget __attribute((unused)),
|
|
GdkEventFocus *event __attribute((unused)),
|
|
jobject peer)
|
|
{
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postFocusEventID,
|
|
AWT_FOCUS_LOST,
|
|
JNI_FALSE);
|
|
return FALSE;
|
|
}
|