5757917258
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
1136 lines
30 KiB
C
1136 lines
30 KiB
C
/* gtkevents.c -- GDK/GTK event handlers
|
|
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 <X11/Xlib.h>
|
|
#include <gdk/gdkkeysyms.h>
|
|
#include <stdarg.h>
|
|
#include <assert.h>
|
|
|
|
/* A widget can be composed of multipled windows, so we need to hook
|
|
events on all of them. */
|
|
struct event_hook_info
|
|
{
|
|
jobject *peer_obj;
|
|
int nwindows;
|
|
/* array of pointers to (GdkWindow *) */
|
|
GdkWindow ***windows;
|
|
};
|
|
|
|
static jint
|
|
button_to_awt_mods (int button)
|
|
{
|
|
switch (button)
|
|
{
|
|
case 1:
|
|
return AWT_BUTTON1_DOWN_MASK;
|
|
case 2:
|
|
return AWT_BUTTON2_DOWN_MASK;
|
|
case 3:
|
|
return AWT_BUTTON3_DOWN_MASK;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static jint
|
|
state_to_awt_mods (guint state)
|
|
{
|
|
jint result = 0;
|
|
|
|
if (state & GDK_SHIFT_MASK)
|
|
result |= AWT_SHIFT_DOWN_MASK;
|
|
if (state & GDK_CONTROL_MASK)
|
|
result |= AWT_CTRL_DOWN_MASK;
|
|
if (state & GDK_MOD1_MASK)
|
|
result |= AWT_ALT_DOWN_MASK;
|
|
|
|
return result;
|
|
}
|
|
|
|
static jint
|
|
state_to_awt_mods_with_button_states (guint state)
|
|
{
|
|
jint result = 0;
|
|
|
|
if (state & GDK_SHIFT_MASK)
|
|
result |= AWT_SHIFT_DOWN_MASK;
|
|
if (state & GDK_CONTROL_MASK)
|
|
result |= AWT_CTRL_DOWN_MASK;
|
|
if (state & GDK_MOD1_MASK)
|
|
result |= AWT_ALT_DOWN_MASK;
|
|
if (state & GDK_BUTTON1_MASK)
|
|
result |= AWT_BUTTON1_DOWN_MASK;
|
|
if (state & GDK_BUTTON2_MASK)
|
|
result |= AWT_BUTTON2_DOWN_MASK;
|
|
if (state & GDK_BUTTON3_MASK)
|
|
result |= AWT_BUTTON3_DOWN_MASK;
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Modifier key events need special treatment. In Sun's peer
|
|
implementation, when a modifier key is pressed, the KEY_PRESSED
|
|
event has that modifier in its modifiers list. The corresponding
|
|
KEY_RELEASED event's modifier list does not contain the modifier.
|
|
For example, pressing and releasing the shift key will produce a
|
|
key press event with modifiers=Shift, and a key release event with
|
|
no modifiers. GDK's key events behave in the exact opposite way,
|
|
so this translation code is needed. */
|
|
jint
|
|
keyevent_state_to_awt_mods (GdkEvent *event)
|
|
{
|
|
jint result = 0;
|
|
guint state;
|
|
|
|
if (event->type == GDK_KEY_PRESS)
|
|
{
|
|
state = event->key.state;
|
|
|
|
if (event->key.keyval == GDK_Shift_L
|
|
|| event->key.keyval == GDK_Shift_R)
|
|
result |= AWT_SHIFT_DOWN_MASK;
|
|
else
|
|
{
|
|
if (state & GDK_SHIFT_MASK)
|
|
result |= AWT_SHIFT_DOWN_MASK;
|
|
}
|
|
|
|
if (event->key.keyval == GDK_Control_L
|
|
|| event->key.keyval == GDK_Control_R)
|
|
result |= AWT_CTRL_DOWN_MASK;
|
|
else
|
|
{
|
|
if (state & GDK_CONTROL_MASK)
|
|
result |= AWT_CTRL_DOWN_MASK;
|
|
}
|
|
|
|
if (event->key.keyval == GDK_Alt_L
|
|
|| event->key.keyval == GDK_Alt_R)
|
|
result |= AWT_ALT_DOWN_MASK;
|
|
else
|
|
{
|
|
if (state & GDK_MOD1_MASK)
|
|
result |= AWT_ALT_DOWN_MASK;
|
|
}
|
|
}
|
|
else if (event->type == GDK_KEY_RELEASE)
|
|
{
|
|
state = event->key.state;
|
|
|
|
if (event->key.keyval != GDK_Shift_L
|
|
&& event->key.keyval != GDK_Shift_R)
|
|
{
|
|
if (state & GDK_SHIFT_MASK)
|
|
result |= AWT_SHIFT_DOWN_MASK;
|
|
}
|
|
if (event->key.keyval != GDK_Control_L
|
|
&& event->key.keyval != GDK_Control_R)
|
|
{
|
|
if (state & GDK_CONTROL_MASK)
|
|
result |= AWT_CTRL_DOWN_MASK;
|
|
}
|
|
|
|
if (event->key.keyval != GDK_Alt_L
|
|
&& event->key.keyval != GDK_Alt_R)
|
|
{
|
|
if (state & GDK_MOD1_MASK)
|
|
result |= AWT_ALT_DOWN_MASK;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Get the first keyval in the keymap for this event's keycode. The
|
|
first keyval corresponds roughly to Java's notion of a virtual
|
|
key. Returns the uppercase version of the first keyval. */
|
|
static guint
|
|
get_first_keyval_from_keymap (GdkEvent *event)
|
|
{
|
|
guint keyval;
|
|
guint *keyvals;
|
|
gint n_entries;
|
|
|
|
if (!gdk_keymap_get_entries_for_keycode (NULL,
|
|
event->key.hardware_keycode,
|
|
NULL,
|
|
&keyvals,
|
|
&n_entries))
|
|
{
|
|
g_warning ("No keyval found for hardware keycode %d\n",
|
|
event->key.hardware_keycode);
|
|
/* Try to recover by using the keyval in the event structure. */
|
|
keyvals = &(event->key.keyval);
|
|
}
|
|
keyval = keyvals[0];
|
|
g_free (keyvals);
|
|
|
|
return gdk_keyval_to_upper (keyval);
|
|
}
|
|
|
|
#ifdef __GNUC__
|
|
__inline
|
|
#endif
|
|
static jint
|
|
keysym_to_awt_keycode (GdkEvent *event)
|
|
{
|
|
guint ukeyval;
|
|
guint state;
|
|
|
|
ukeyval = get_first_keyval_from_keymap (event);
|
|
state = event->key.state;
|
|
|
|
/* VK_A through VK_Z */
|
|
if (ukeyval >= GDK_A && ukeyval <= GDK_Z)
|
|
return ukeyval;
|
|
|
|
/* VK_0 through VK_9 */
|
|
if (ukeyval >= GDK_0 && ukeyval <= GDK_9)
|
|
return ukeyval;
|
|
|
|
switch (ukeyval)
|
|
{
|
|
case GDK_Return:
|
|
case GDK_KP_Enter:
|
|
return VK_ENTER;
|
|
case GDK_BackSpace:
|
|
return VK_BACK_SPACE;
|
|
case GDK_Tab:
|
|
return VK_TAB;
|
|
case GDK_Cancel:
|
|
return VK_CANCEL;
|
|
case GDK_Clear:
|
|
return VK_CLEAR;
|
|
case GDK_Shift_L:
|
|
case GDK_Shift_R:
|
|
return VK_SHIFT;
|
|
case GDK_Control_L:
|
|
case GDK_Control_R:
|
|
return VK_CONTROL;
|
|
case GDK_Alt_L:
|
|
case GDK_Alt_R:
|
|
return VK_ALT;
|
|
case GDK_Pause:
|
|
return VK_PAUSE;
|
|
case GDK_Caps_Lock:
|
|
return VK_CAPS_LOCK;
|
|
case GDK_Escape:
|
|
return VK_ESCAPE;
|
|
case GDK_space:
|
|
return VK_SPACE;
|
|
case GDK_KP_Page_Up:
|
|
/* For keys on the numeric keypad, the JVM produces one of two
|
|
virtual keys, depending on the num lock state. */
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD9;
|
|
else
|
|
return VK_PAGE_UP;
|
|
case GDK_Page_Up:
|
|
return VK_PAGE_UP;
|
|
case GDK_KP_Page_Down:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD3;
|
|
else
|
|
return VK_PAGE_DOWN;
|
|
case GDK_Page_Down:
|
|
return VK_PAGE_DOWN;
|
|
case GDK_KP_End:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD1;
|
|
else
|
|
return VK_END;
|
|
case GDK_End:
|
|
return VK_END;
|
|
case GDK_KP_Home:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD7;
|
|
else
|
|
return VK_HOME;
|
|
case GDK_Home:
|
|
return VK_HOME;
|
|
case GDK_KP_Begin:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD5;
|
|
else
|
|
return VK_UNDEFINED;
|
|
case GDK_Left:
|
|
return VK_LEFT;
|
|
case GDK_Up:
|
|
return VK_UP;
|
|
case GDK_Right:
|
|
return VK_RIGHT;
|
|
case GDK_Down:
|
|
return VK_DOWN;
|
|
case GDK_comma:
|
|
return VK_COMMA;
|
|
case GDK_minus:
|
|
return VK_MINUS;
|
|
case GDK_period:
|
|
return VK_PERIOD;
|
|
case GDK_slash:
|
|
return VK_SLASH;
|
|
/*
|
|
return VK_0;
|
|
return VK_1;
|
|
return VK_2;
|
|
return VK_3;
|
|
return VK_4;
|
|
return VK_5;
|
|
return VK_6;
|
|
return VK_7;
|
|
return VK_8;
|
|
return VK_9;
|
|
*/
|
|
case GDK_semicolon:
|
|
return VK_SEMICOLON;
|
|
case GDK_equal:
|
|
return VK_EQUALS;
|
|
/*
|
|
return VK_A;
|
|
return VK_B;
|
|
return VK_C;
|
|
return VK_D;
|
|
return VK_E;
|
|
return VK_F;
|
|
return VK_G;
|
|
return VK_H;
|
|
return VK_I;
|
|
return VK_J;
|
|
return VK_K;
|
|
return VK_L;
|
|
return VK_M;
|
|
return VK_N;
|
|
return VK_O;
|
|
return VK_P;
|
|
return VK_Q;
|
|
return VK_R;
|
|
return VK_S;
|
|
return VK_T;
|
|
return VK_U;
|
|
return VK_V;
|
|
return VK_W;
|
|
return VK_X;
|
|
return VK_Y;
|
|
return VK_Z;
|
|
*/
|
|
case GDK_bracketleft:
|
|
return VK_OPEN_BRACKET;
|
|
case GDK_backslash:
|
|
return VK_BACK_SLASH;
|
|
case GDK_bracketright:
|
|
return VK_CLOSE_BRACKET;
|
|
case GDK_KP_0:
|
|
return VK_NUMPAD0;
|
|
case GDK_KP_1:
|
|
return VK_NUMPAD1;
|
|
case GDK_KP_2:
|
|
return VK_NUMPAD2;
|
|
case GDK_KP_3:
|
|
return VK_NUMPAD3;
|
|
case GDK_KP_4:
|
|
return VK_NUMPAD4;
|
|
case GDK_KP_5:
|
|
return VK_NUMPAD5;
|
|
case GDK_KP_6:
|
|
return VK_NUMPAD6;
|
|
case GDK_KP_7:
|
|
return VK_NUMPAD7;
|
|
case GDK_KP_8:
|
|
return VK_NUMPAD8;
|
|
case GDK_KP_9:
|
|
return VK_NUMPAD9;
|
|
case GDK_KP_Multiply:
|
|
return VK_MULTIPLY;
|
|
case GDK_KP_Add:
|
|
return VK_ADD;
|
|
/*
|
|
return VK_SEPARATER;
|
|
*/
|
|
case GDK_KP_Separator:
|
|
return VK_SEPARATOR;
|
|
case GDK_KP_Subtract:
|
|
return VK_SUBTRACT;
|
|
case GDK_KP_Decimal:
|
|
return VK_DECIMAL;
|
|
case GDK_KP_Divide:
|
|
return VK_DIVIDE;
|
|
case GDK_KP_Delete:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_DECIMAL;
|
|
else
|
|
return VK_DELETE;
|
|
case GDK_Delete:
|
|
return VK_DELETE;
|
|
case GDK_Num_Lock:
|
|
return VK_NUM_LOCK;
|
|
case GDK_Scroll_Lock:
|
|
return VK_SCROLL_LOCK;
|
|
case GDK_F1:
|
|
return VK_F1;
|
|
case GDK_F2:
|
|
return VK_F2;
|
|
case GDK_F3:
|
|
return VK_F3;
|
|
case GDK_F4:
|
|
return VK_F4;
|
|
case GDK_F5:
|
|
return VK_F5;
|
|
case GDK_F6:
|
|
return VK_F6;
|
|
case GDK_F7:
|
|
return VK_F7;
|
|
case GDK_F8:
|
|
return VK_F8;
|
|
case GDK_F9:
|
|
return VK_F9;
|
|
case GDK_F10:
|
|
return VK_F10;
|
|
case GDK_F11:
|
|
return VK_F11;
|
|
case GDK_F12:
|
|
return VK_F12;
|
|
case GDK_F13:
|
|
return VK_F13;
|
|
case GDK_F14:
|
|
return VK_F14;
|
|
case GDK_F15:
|
|
return VK_F15;
|
|
case GDK_F16:
|
|
return VK_F16;
|
|
case GDK_F17:
|
|
return VK_F17;
|
|
case GDK_F18:
|
|
return VK_F18;
|
|
case GDK_F19:
|
|
return VK_F19;
|
|
case GDK_F20:
|
|
return VK_F20;
|
|
case GDK_F21:
|
|
return VK_F21;
|
|
case GDK_F22:
|
|
return VK_F22;
|
|
case GDK_F23:
|
|
return VK_F23;
|
|
case GDK_F24:
|
|
return VK_F24;
|
|
case GDK_Print:
|
|
return VK_PRINTSCREEN;
|
|
case GDK_KP_Insert:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD0;
|
|
else
|
|
return VK_INSERT;
|
|
case GDK_Insert:
|
|
return VK_INSERT;
|
|
case GDK_Help:
|
|
return VK_HELP;
|
|
case GDK_Meta_L:
|
|
case GDK_Meta_R:
|
|
return VK_META;
|
|
case GDK_grave:
|
|
return VK_BACK_QUOTE;
|
|
case GDK_apostrophe:
|
|
return VK_QUOTE;
|
|
case GDK_KP_Up:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD8;
|
|
else
|
|
return VK_KP_UP;
|
|
case GDK_KP_Down:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD2;
|
|
else
|
|
return VK_KP_DOWN;
|
|
case GDK_KP_Left:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD4;
|
|
else
|
|
return VK_KP_LEFT;
|
|
case GDK_KP_Right:
|
|
if (state & GDK_MOD2_MASK)
|
|
return VK_NUMPAD6;
|
|
else
|
|
return VK_KP_RIGHT;
|
|
case GDK_dead_grave:
|
|
return VK_DEAD_GRAVE;
|
|
case GDK_dead_acute:
|
|
return VK_DEAD_ACUTE;
|
|
case GDK_dead_circumflex:
|
|
return VK_DEAD_CIRCUMFLEX;
|
|
case GDK_dead_tilde:
|
|
return VK_DEAD_TILDE;
|
|
case GDK_dead_macron:
|
|
return VK_DEAD_MACRON;
|
|
case GDK_dead_breve:
|
|
return VK_DEAD_BREVE;
|
|
case GDK_dead_abovedot:
|
|
return VK_DEAD_ABOVEDOT;
|
|
case GDK_dead_diaeresis:
|
|
return VK_DEAD_DIAERESIS;
|
|
case GDK_dead_abovering:
|
|
return VK_DEAD_ABOVERING;
|
|
case GDK_dead_doubleacute:
|
|
return VK_DEAD_DOUBLEACUTE;
|
|
case GDK_dead_caron:
|
|
return VK_DEAD_CARON;
|
|
case GDK_dead_cedilla:
|
|
return VK_DEAD_CEDILLA;
|
|
case GDK_dead_ogonek:
|
|
return VK_DEAD_OGONEK;
|
|
case GDK_dead_iota:
|
|
return VK_DEAD_IOTA;
|
|
case GDK_dead_voiced_sound:
|
|
return VK_DEAD_VOICED_SOUND;
|
|
case GDK_dead_semivoiced_sound:
|
|
return VK_DEAD_SEMIVOICED_SOUND;
|
|
case GDK_ampersand:
|
|
return VK_AMPERSAND;
|
|
case GDK_asterisk:
|
|
return VK_ASTERISK;
|
|
case GDK_quotedbl:
|
|
return VK_QUOTEDBL;
|
|
case GDK_less:
|
|
return VK_LESS;
|
|
case GDK_greater:
|
|
return VK_GREATER;
|
|
case GDK_braceleft:
|
|
return VK_BRACELEFT;
|
|
case GDK_braceright:
|
|
return VK_BRACERIGHT;
|
|
case GDK_at:
|
|
return VK_AT;
|
|
case GDK_colon:
|
|
return VK_COLON;
|
|
case GDK_asciicircum:
|
|
return VK_CIRCUMFLEX;
|
|
case GDK_dollar:
|
|
return VK_DOLLAR;
|
|
case GDK_EuroSign:
|
|
return VK_EURO_SIGN;
|
|
case GDK_exclam:
|
|
return VK_EXCLAMATION_MARK;
|
|
case GDK_exclamdown:
|
|
return VK_INVERTED_EXCLAMATION_MARK;
|
|
case GDK_parenleft:
|
|
return VK_LEFT_PARENTHESIS;
|
|
case GDK_numbersign:
|
|
return VK_NUMBER_SIGN;
|
|
case GDK_plus:
|
|
return VK_PLUS;
|
|
case GDK_parenright:
|
|
return VK_RIGHT_PARENTHESIS;
|
|
case GDK_underscore:
|
|
return VK_UNDERSCORE;
|
|
/*
|
|
return VK_FINAL;
|
|
return VK_CONVERT;
|
|
return VK_NONCONVERT;
|
|
return VK_ACCEPT;
|
|
*/
|
|
case GDK_Mode_switch:
|
|
return VK_MODECHANGE;
|
|
/*
|
|
return VK_KANA;
|
|
*/
|
|
case GDK_Kanji:
|
|
return VK_KANJI;
|
|
/*
|
|
return VK_ALPHANUMERIC;
|
|
*/
|
|
case GDK_Katakana:
|
|
return VK_KATAKANA;
|
|
case GDK_Hiragana:
|
|
return VK_HIRAGANA;
|
|
/*
|
|
return VK_FULL_WIDTH;
|
|
return VK_HALF_WIDTH;
|
|
return VK_ROMAN_CHARACTERS;
|
|
return VK_ALL_CANDIDATES;
|
|
*/
|
|
case GDK_PreviousCandidate:
|
|
return VK_PREVIOUS_CANDIDATE;
|
|
case GDK_Codeinput:
|
|
return VK_CODE_INPUT;
|
|
/*
|
|
return VK_JAPANESE_KATAKANA;
|
|
return VK_JAPANESE_HIRAGANA;
|
|
return VK_JAPANESE_ROMAN;
|
|
*/
|
|
case GDK_Kana_Lock:
|
|
return VK_KANA_LOCK;
|
|
/*
|
|
return VK_INPUT_METHOD_ON_OFF;
|
|
return VK_CUT;
|
|
return VK_COPY;
|
|
return VK_PASTE;
|
|
return VK_UNDO;
|
|
return VK_AGAIN;
|
|
return VK_FIND;
|
|
return VK_PROPS;
|
|
return VK_STOP;
|
|
return VK_COMPOSE;
|
|
return VK_ALT_GRAPH;
|
|
*/
|
|
default:
|
|
return VK_UNDEFINED;
|
|
}
|
|
}
|
|
|
|
static jint
|
|
keysym_to_awt_keylocation (GdkEvent *event)
|
|
{
|
|
guint ukeyval;
|
|
|
|
ukeyval = get_first_keyval_from_keymap (event);
|
|
|
|
/* VK_A through VK_Z */
|
|
if (ukeyval >= GDK_A && ukeyval <= GDK_Z)
|
|
return AWT_KEY_LOCATION_STANDARD;
|
|
|
|
/* VK_0 through VK_9 */
|
|
if (ukeyval >= GDK_0 && ukeyval <= GDK_9)
|
|
return AWT_KEY_LOCATION_STANDARD;
|
|
|
|
switch (ukeyval)
|
|
{
|
|
case GDK_Shift_L:
|
|
case GDK_Control_L:
|
|
case GDK_Alt_L:
|
|
case GDK_Meta_L:
|
|
return AWT_KEY_LOCATION_LEFT;
|
|
|
|
case GDK_Shift_R:
|
|
case GDK_Control_R:
|
|
case GDK_Alt_R:
|
|
case GDK_Meta_R:
|
|
return AWT_KEY_LOCATION_RIGHT;
|
|
|
|
case GDK_Return:
|
|
case GDK_BackSpace:
|
|
case GDK_Tab:
|
|
case GDK_Cancel:
|
|
case GDK_Clear:
|
|
case GDK_Pause:
|
|
case GDK_Caps_Lock:
|
|
case GDK_Escape:
|
|
case GDK_space:
|
|
case GDK_Page_Up:
|
|
case GDK_Page_Down:
|
|
case GDK_End:
|
|
case GDK_Home:
|
|
case GDK_Left:
|
|
case GDK_Up:
|
|
case GDK_Right:
|
|
case GDK_Down:
|
|
case GDK_comma:
|
|
case GDK_minus:
|
|
case GDK_period:
|
|
case GDK_slash:
|
|
case GDK_semicolon:
|
|
case GDK_equal:
|
|
case GDK_bracketleft:
|
|
case GDK_backslash:
|
|
case GDK_bracketright:
|
|
case GDK_Delete:
|
|
case GDK_Scroll_Lock:
|
|
case GDK_F1:
|
|
case GDK_F2:
|
|
case GDK_F3:
|
|
case GDK_F4:
|
|
case GDK_F5:
|
|
case GDK_F6:
|
|
case GDK_F7:
|
|
case GDK_F8:
|
|
case GDK_F9:
|
|
case GDK_F10:
|
|
case GDK_F11:
|
|
case GDK_F12:
|
|
case GDK_F13:
|
|
case GDK_F14:
|
|
case GDK_F15:
|
|
case GDK_F16:
|
|
case GDK_F17:
|
|
case GDK_F18:
|
|
case GDK_F19:
|
|
case GDK_F20:
|
|
case GDK_F21:
|
|
case GDK_F22:
|
|
case GDK_F23:
|
|
case GDK_F24:
|
|
case GDK_Print:
|
|
case GDK_Insert:
|
|
case GDK_Help:
|
|
case GDK_grave:
|
|
case GDK_apostrophe:
|
|
case GDK_dead_grave:
|
|
case GDK_dead_acute:
|
|
case GDK_dead_circumflex:
|
|
case GDK_dead_tilde:
|
|
case GDK_dead_macron:
|
|
case GDK_dead_breve:
|
|
case GDK_dead_abovedot:
|
|
case GDK_dead_diaeresis:
|
|
case GDK_dead_abovering:
|
|
case GDK_dead_doubleacute:
|
|
case GDK_dead_caron:
|
|
case GDK_dead_cedilla:
|
|
case GDK_dead_ogonek:
|
|
case GDK_dead_iota:
|
|
case GDK_dead_voiced_sound:
|
|
case GDK_dead_semivoiced_sound:
|
|
case GDK_ampersand:
|
|
case GDK_asterisk:
|
|
case GDK_quotedbl:
|
|
case GDK_less:
|
|
case GDK_greater:
|
|
case GDK_braceleft:
|
|
case GDK_braceright:
|
|
case GDK_at:
|
|
case GDK_colon:
|
|
case GDK_asciicircum:
|
|
case GDK_dollar:
|
|
case GDK_EuroSign:
|
|
case GDK_exclam:
|
|
case GDK_exclamdown:
|
|
case GDK_parenleft:
|
|
case GDK_numbersign:
|
|
case GDK_plus:
|
|
case GDK_parenright:
|
|
case GDK_underscore:
|
|
case GDK_Mode_switch:
|
|
case GDK_Kanji:
|
|
case GDK_Katakana:
|
|
case GDK_Hiragana:
|
|
case GDK_PreviousCandidate:
|
|
case GDK_Codeinput:
|
|
case GDK_Kana_Lock:
|
|
return AWT_KEY_LOCATION_STANDARD;
|
|
|
|
case GDK_KP_Enter:
|
|
case GDK_KP_Page_Up:
|
|
case GDK_KP_Page_Down:
|
|
case GDK_KP_End:
|
|
case GDK_KP_Home:
|
|
case GDK_KP_Begin:
|
|
case GDK_KP_0:
|
|
case GDK_KP_1:
|
|
case GDK_KP_2:
|
|
case GDK_KP_3:
|
|
case GDK_KP_4:
|
|
case GDK_KP_5:
|
|
case GDK_KP_6:
|
|
case GDK_KP_7:
|
|
case GDK_KP_8:
|
|
case GDK_KP_9:
|
|
case GDK_KP_Multiply:
|
|
case GDK_KP_Add:
|
|
case GDK_KP_Separator:
|
|
case GDK_KP_Subtract:
|
|
case GDK_KP_Decimal:
|
|
case GDK_KP_Divide:
|
|
case GDK_KP_Delete:
|
|
case GDK_Num_Lock:
|
|
case GDK_KP_Insert:
|
|
case GDK_KP_Up:
|
|
case GDK_KP_Down:
|
|
case GDK_KP_Left:
|
|
case GDK_KP_Right:
|
|
return AWT_KEY_LOCATION_NUMPAD;
|
|
|
|
default:
|
|
return AWT_KEY_LOCATION_UNKNOWN;
|
|
}
|
|
}
|
|
|
|
static jchar
|
|
keyevent_to_awt_keychar (GdkEvent *event)
|
|
{
|
|
if (event->key.length > 0)
|
|
{
|
|
/* Translate GDK carriage return to Java linefeed. */
|
|
if (event->key.string[0] == 13)
|
|
return VK_ENTER;
|
|
else
|
|
return event->key.string[0];
|
|
}
|
|
else
|
|
{
|
|
switch (event->key.keyval)
|
|
{
|
|
case GDK_BackSpace:
|
|
return VK_BACK_SPACE;
|
|
case GDK_Tab:
|
|
return VK_TAB;
|
|
case GDK_Delete:
|
|
case GDK_KP_Delete:
|
|
return VK_DELETE;
|
|
default:
|
|
return AWT_KEY_CHAR_UNDEFINED;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
awt_event_handler (GdkEvent *event)
|
|
{
|
|
/* keep synthetic AWT events from being processed recursively */
|
|
if (event->type & SYNTHETIC_EVENT_MASK && event->type != GDK_NOTHING)
|
|
{
|
|
event->type ^= SYNTHETIC_EVENT_MASK;
|
|
}
|
|
|
|
gtk_main_do_event (event);
|
|
}
|
|
|
|
gboolean
|
|
pre_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
|
|
{
|
|
GtkWidget *event_widget;
|
|
static guint32 button_click_time = 0;
|
|
static GdkWindow *button_window = NULL;
|
|
static guint button_number = -1;
|
|
static jint click_count = 1;
|
|
static int hasBeenDragged;
|
|
|
|
/* If it is not a focus change event, the widget must be realized already.
|
|
If not, ignore the event (Gtk+ will do the same). */
|
|
if (!(event->type == GDK_FOCUS_CHANGE || GTK_WIDGET_REALIZED(widget)))
|
|
return FALSE;
|
|
|
|
/* Do not handle propagated events. AWT has its own propagation rules */
|
|
gdk_window_get_user_data (event->any.window, (void **) &event_widget);
|
|
if (event_widget != widget)
|
|
return FALSE;
|
|
|
|
/* We only care about input events */
|
|
if (!(event->type == GDK_BUTTON_PRESS
|
|
|| event->type == GDK_BUTTON_RELEASE
|
|
|| event->type == GDK_ENTER_NOTIFY
|
|
|| event->type == GDK_LEAVE_NOTIFY
|
|
|| event->type == GDK_CONFIGURE
|
|
|| event->type == GDK_EXPOSE
|
|
|| event->type == GDK_KEY_PRESS
|
|
|| event->type == GDK_KEY_RELEASE
|
|
|| event->type == GDK_FOCUS_CHANGE
|
|
|| event->type == GDK_MOTION_NOTIFY))
|
|
{
|
|
return FALSE;
|
|
}
|
|
/* g_print("event %u widget %s peer %p\n",
|
|
event->type, gtk_widget_get_name (widget), peer); */
|
|
|
|
/* If it has no jobject associated we can send no AWT event */
|
|
if (!peer)
|
|
return FALSE;
|
|
|
|
/* for all input events, which have a window with a jobject attached,
|
|
send the AWT input event corresponding to the Gtk event off to Java */
|
|
|
|
/* keep track of clickCount ourselves, since the AWT allows more
|
|
than a triple click to occur */
|
|
if (event->type == GDK_BUTTON_PRESS)
|
|
{
|
|
if ((event->button.time < (button_click_time + MULTI_CLICK_TIME))
|
|
&& (event->button.window == button_window)
|
|
&& (event->button.button == button_number))
|
|
click_count++;
|
|
else
|
|
click_count = 1;
|
|
|
|
button_click_time = event->button.time;
|
|
button_window = event->button.window;
|
|
button_number = event->button.button;
|
|
}
|
|
|
|
switch (event->type)
|
|
{
|
|
case GDK_BUTTON_PRESS:
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postMouseEventID,
|
|
AWT_MOUSE_PRESSED,
|
|
(jlong)event->button.time,
|
|
state_to_awt_mods (event->button.state)
|
|
| button_to_awt_mods (event->button.button),
|
|
(jint)event->button.x,
|
|
(jint)event->button.y,
|
|
click_count,
|
|
(event->button.button == 3) ? JNI_TRUE :
|
|
JNI_FALSE);
|
|
hasBeenDragged = FALSE;
|
|
break;
|
|
case GDK_BUTTON_RELEASE:
|
|
{
|
|
int width, height;
|
|
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postMouseEventID,
|
|
AWT_MOUSE_RELEASED,
|
|
(jlong)event->button.time,
|
|
state_to_awt_mods (event->button.state)
|
|
| button_to_awt_mods (event->button.button),
|
|
(jint)event->button.x,
|
|
(jint)event->button.y,
|
|
click_count,
|
|
JNI_FALSE);
|
|
|
|
/* Generate an AWT click event only if the release occured in the
|
|
window it was pressed in, and the mouse has not been dragged since
|
|
the last time it was pressed. */
|
|
gdk_window_get_size (event->any.window, &width, &height);
|
|
if (! hasBeenDragged
|
|
&& event->button.x >= 0
|
|
&& event->button.y >= 0
|
|
&& event->button.x <= width
|
|
&& event->button.y <= height)
|
|
{
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postMouseEventID,
|
|
AWT_MOUSE_CLICKED,
|
|
(jlong)event->button.time,
|
|
state_to_awt_mods (event->button.state)
|
|
| button_to_awt_mods (event->button.button),
|
|
(jint)event->button.x,
|
|
(jint)event->button.y,
|
|
click_count,
|
|
JNI_FALSE);
|
|
}
|
|
}
|
|
break;
|
|
case GDK_MOTION_NOTIFY:
|
|
if (event->motion.state & (GDK_BUTTON1_MASK
|
|
| GDK_BUTTON2_MASK
|
|
| GDK_BUTTON3_MASK
|
|
| GDK_BUTTON4_MASK
|
|
| GDK_BUTTON5_MASK))
|
|
{
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postMouseEventID,
|
|
AWT_MOUSE_DRAGGED,
|
|
(jlong)event->motion.time,
|
|
state_to_awt_mods_with_button_states (event->motion.state),
|
|
(jint)event->motion.x,
|
|
(jint)event->motion.y,
|
|
0,
|
|
JNI_FALSE);
|
|
hasBeenDragged = TRUE;
|
|
}
|
|
else
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID,
|
|
AWT_MOUSE_MOVED,
|
|
(jlong)event->motion.time,
|
|
state_to_awt_mods (event->motion.state),
|
|
(jint)event->motion.x,
|
|
(jint)event->motion.y,
|
|
0,
|
|
JNI_FALSE);
|
|
break;
|
|
case GDK_ENTER_NOTIFY:
|
|
/* We are not interested in enter events that are due to
|
|
grab/ungrab and not to actually crossing boundaries */
|
|
if (event->crossing.mode == GDK_CROSSING_NORMAL)
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer, postMouseEventID,
|
|
AWT_MOUSE_ENTERED,
|
|
(jlong)event->crossing.time,
|
|
state_to_awt_mods_with_button_states (event->crossing.state),
|
|
(jint)event->crossing.x,
|
|
(jint)event->crossing.y,
|
|
0,
|
|
JNI_FALSE);
|
|
break;
|
|
case GDK_LEAVE_NOTIFY:
|
|
/* We are not interested in leave events that are due to
|
|
grab/ungrab and not to actually crossing boundaries */
|
|
if (event->crossing.mode == GDK_CROSSING_NORMAL)
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postMouseEventID,
|
|
AWT_MOUSE_EXITED,
|
|
(jlong)event->crossing.time,
|
|
state_to_awt_mods_with_button_states (event->crossing.state),
|
|
(jint)event->crossing.x,
|
|
(jint)event->crossing.y,
|
|
0,
|
|
JNI_FALSE);
|
|
break;
|
|
case GDK_CONFIGURE:
|
|
{
|
|
/* Only send configure events to visible top-level windows. */
|
|
if (widget && GTK_WIDGET_TOPLEVEL (widget)
|
|
&& GTK_WIDGET_VISIBLE (widget))
|
|
{
|
|
/* Configure events are not posted to the AWT event
|
|
queue, and as such, the gdk/gtk peer functions will
|
|
be called back before postConfigureEvent
|
|
returns. */
|
|
gdk_threads_leave ();
|
|
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postConfigureEventID,
|
|
(jint) event->configure.x,
|
|
(jint) event->configure.y,
|
|
(jint) event->configure.width,
|
|
(jint) event->configure.height);
|
|
gdk_threads_enter ();
|
|
}
|
|
}
|
|
break;
|
|
case GDK_EXPOSE:
|
|
{
|
|
/* This filters out unwanted feedback expose events from gtk/X
|
|
when we explictly invalidate and update heavyweight components,
|
|
thus avoiding an infinite loop.
|
|
FIXME: I'm not quite sure why we're getting these expose events.
|
|
Maybe there is a way to avoid them? */
|
|
if((event->any.window == widget->window && event->any.send_event)
|
|
|| GTK_IS_LAYOUT(widget))
|
|
{
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postExposeEventID,
|
|
(jint)event->expose.area.x,
|
|
(jint)event->expose.area.y,
|
|
(jint)event->expose.area.width,
|
|
(jint)event->expose.area.height);
|
|
}
|
|
}
|
|
break;
|
|
|
|
case GDK_FOCUS_CHANGE:
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postFocusEventID,
|
|
(jint) (event->focus_change.in) ?
|
|
AWT_FOCUS_GAINED : AWT_FOCUS_LOST,
|
|
JNI_FALSE);
|
|
break;
|
|
case GDK_KEY_PRESS:
|
|
if (GTK_IS_WINDOW (widget))
|
|
{
|
|
/* GdkEventKey *keyevent = (GdkEventKey *) event; */
|
|
/* g_printerr ("key press 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); */
|
|
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postKeyEventID,
|
|
(jint) AWT_KEY_PRESSED,
|
|
(jlong) event->key.time,
|
|
keyevent_state_to_awt_mods (event),
|
|
keysym_to_awt_keycode (event),
|
|
keyevent_to_awt_keychar (event),
|
|
keysym_to_awt_keylocation (event));
|
|
/* FIXME: generation of key typed events needs to be moved
|
|
to GtkComponentPeer.postKeyEvent. If the key in a key
|
|
press event is not an "action" key
|
|
(KeyEvent.isActionKey) and is not a modifier key, then
|
|
it should generate a key typed event. */
|
|
return TRUE;
|
|
}
|
|
else
|
|
return FALSE;
|
|
break;
|
|
case GDK_KEY_RELEASE:
|
|
if (GTK_IS_WINDOW (widget))
|
|
{
|
|
(*gdk_env)->CallVoidMethod (gdk_env, peer,
|
|
postKeyEventID,
|
|
(jint) AWT_KEY_RELEASED,
|
|
(jlong) event->key.time,
|
|
keyevent_state_to_awt_mods (event),
|
|
keysym_to_awt_keycode (event),
|
|
keyevent_to_awt_keychar (event),
|
|
keysym_to_awt_keylocation (event));
|
|
return TRUE;
|
|
}
|
|
else
|
|
return FALSE;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
static void
|
|
attach_jobject (GdkWindow *window, jobject *obj)
|
|
{
|
|
GdkAtom addr_atom = gdk_atom_intern ("_GNU_GTKAWT_ADDR", FALSE);
|
|
GdkAtom type_atom = gdk_atom_intern ("CARDINAL", FALSE);
|
|
|
|
gdk_window_set_events (window,
|
|
gdk_window_get_events (window)
|
|
| GDK_POINTER_MOTION_MASK
|
|
| GDK_BUTTON_MOTION_MASK
|
|
| GDK_BUTTON_PRESS_MASK
|
|
| GDK_BUTTON_RELEASE_MASK
|
|
| GDK_KEY_PRESS_MASK
|
|
| GDK_KEY_RELEASE_MASK
|
|
| GDK_ENTER_NOTIFY_MASK
|
|
| GDK_LEAVE_NOTIFY_MASK
|
|
| GDK_STRUCTURE_MASK
|
|
| GDK_KEY_PRESS_MASK
|
|
| GDK_FOCUS_CHANGE_MASK);
|
|
|
|
gdk_property_change (window,
|
|
addr_atom,
|
|
type_atom,
|
|
8,
|
|
GDK_PROP_MODE_REPLACE,
|
|
(guchar *)obj,
|
|
sizeof (jobject));
|
|
}
|
|
|
|
void
|
|
connect_awt_hook (JNIEnv *env, jobject peer_obj, int nwindows, ...)
|
|
{
|
|
va_list ap;
|
|
jobject *obj;
|
|
|
|
obj = NSA_GET_GLOBAL_REF (env, peer_obj);
|
|
g_assert (obj);
|
|
|
|
va_start (ap, nwindows);
|
|
{
|
|
int i;
|
|
for (i = 0; i < nwindows; i++)
|
|
{
|
|
GdkWindow* attach = (va_arg (ap, GdkWindow *));
|
|
attach_jobject(attach, obj);
|
|
}
|
|
}
|
|
va_end (ap);
|
|
}
|
|
|