From 14511e3ad21013e92c6399b2bd2ec09a8263e33a Mon Sep 17 00:00:00 2001 From: graydon Date: Fri, 16 Apr 2004 18:44:45 +0000 Subject: 2004-04-09 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals): Remove method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c: Remove unused code. 2004-04-02 Olga Rodimina * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/ImageIcon.java: (ImageIcon(file)): set description of the icon to the file name * javax/swing/JCheckBoxMenuItem.java: Mostly Implemented. Work in progress. * javax/swing/JRadioButtonMenuItem.java: Reimplement constructors to use JToggleButtonModel. * javax/swing/plaf/basic/BasicIconFactory.java: (getCheckBoxMenuItemIcon): return check box icon. * javax/swing/plaf/basic/BasicMenuItemUI.java: paint menu item selected only when it is armed and pressed. 2004-04-02 David Jee * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (GtkMenuItemPeer): Only connect signals if this isn't a Menu peer. * java/awt/Component.java (add): Set the parent of the popup as this component. * java/awt/PopupMenu.java (addNotify): Create popup menu when peer is null. (show): Call addNotify() if peer is null. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c (Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show): Set the button argument for gtk_menu_popup() as zero. This causes the popup menu to respond to any mouse button. 2004-03-31 Olga Rodimina * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JRadioButtonMenuItem.java: Implemented. * javax/swing/plaf/basic/BasicIconFactory.java: (getRadioButtonMenuItemIcon): Return radio button icon. * javax/swing/plaf/basic/BasicMenuItemUI.java: (getPreferredSize): Add size of checkIcon if it exists. (installDefaults): Don't initialize checkIcon. It's value will be set in subclasses. (uninstallDefaults): remove uninstallation of checkIcon. (paint): Moved code to paintMenuItem(). (paintMenuItem): Implemented. * javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: UI delegate for JRadioButtonMenuItem. 2004-03-29 Olga Rodimina * javax/swing/plaf/basic/BasicMenuItemUI.java: Corrected position of the accelerator. 2004-03-29 Olga Rodimina * Makefile.am: Added new file. * Makefile.in: Regenerate. * javax/swing/JMenuItem.java: Partly implemented. Work in progress * javax/swing/plaf/basic/BasicLookAndFeel.java: Changed default value of acceleratorDelimiter. * javax/swing/plaf/basic/BasicMenuItemUI.java: New class. Partly implemented. 2004-03-26 Mark Wielaard * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (item_activate): Declare label before use. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkSetFont): Removed unused variable label. (addExposeFilter): Declare variables before use. (removeExposeFilter): Likewise. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (ok_clicked): Declare str_fileName before use. 2004-03-26 David Jee * gnu/java/awt/peer/gtk/GtkMenuPeer.java (addSeparator): Remove. * java/awt/Menu.java (separator): Remove static final MenuItem field. (separatorLabel): New static final String field. (addSeparator): Do not use peer method; use add(MenuItem) instead. Use separatorLabel to denote that it is a separator. (insertSeparator): Create a new MenuItem with separatorLabel, instead of reusing the static separator instance, because a MenuItem instance can't be added more than once without being cloned. * java/awt/peer/MenuPeer.java (addSeparator): Remove from interface. 2004-03-26 David Jee * gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (connectSignals): New native method declaration. (GtkMenuItemPeer): Connect signals if the parent is a Menu. * java/awt/MenuItem.java (getActionCommand): Return the label if the action command is not set. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c (Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu): Use gtk_menu_shell_append(). * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c (item_activate): Fix argument type. (Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create): Do not connect signal here. (Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c (Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create): Check if a label is given. Add the menu widget's top-level GtkWindow to the global window group, so it can grab the pointer. (Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem): Use gtk_menu_shell_append(). 2004-03-23 Graydon Hoare * java/text/AttributedString.java (addAttribute): Fix off-by-one. (getIterator): Likewise. * java/text/AttributedStringIterator.java (getRunLimit): Correct logic. (getRunStart): Likewise. (getAttribute): Fix inequality. (getAttributes): Likewise. * testsuite/libjava.mauve/xfails: Remove AttributedString xfail. 2004-03-23 Kim Ho * javax/swing/plaf/basic/BasicTabbedPaneUI.java: (calculateSizes): Return real width and height. 2004-03-23 Kim Ho * javax/swing/plaf/basic/BasicTabbedPaneUI.java (calculateTabRects): Set the selectedRun before trying to rotate tabs. 2004-03-23 Kim Ho * Makefile.am: New file * Makefile.in: Regenerate * java/awt/Graphics.java: (drawRect): Draw to the correct point. * javax/swing/DefaultSingleSelectionModel.java (isSelected): Return true if the selected index is not -1. * javax/swing/JLabel.java: Do not change mnemonic index if text is null. * javax/swing/JProgressBar.java: Use JComponent's EventListenerList. * javax/swing/JScrollBar.java: Ditto. * javax/swing/JSlider.java: Ditto. * javax/swing/JTabbedPane.java: Reimplement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add defaults for TabbedPane. * javax/swing/plaf/basic/BasicArrowButton.java: Implement * javax/swing/plaf/basic/BasicProgressBarUI.java: (paintDeterminate): Don't paint String if it's empty. (paintIndeterminate): ditto. * javax/swing/plaf/basic/BasicTabbedPaneUI.java: Reimplement. 2004-03-19 Michael Koch * java/awt/image/AffineTransformOp.java (AffineTransformOp): Made public. * javax/swing/JComponent.java (listenerList): Made protected. (accessibleContext): Likewise. * javax/swing/JList.java (valueChanged): Dont use internal fields of ListSelectionEvent. * javax/swing/JViewport.java (getView): Dont use internal fields of Component. (addImpl): Likewise. * javax/swing/Timer.java (isRunning): Made public. (start): Likewise. (stop): Likewise. * javax/swing/UIDefaults.java (getInt): Made public. * javax/swing/plaf/basic/BasicListUI.java (mousePressed): Dont use internal fields of MouseEvent. (propertyChanged): Dont use internal fields of PropertyChangeEvent. * javax/swing/plaf/basic/BasicScrollBarUI.java (arrowIcon): Made static. * javax/swing/plaf/basic/BasicViewportUI.java (stateChanged): Dont use internal field on ChangeEvent. * javax/swing/text/JTextComponent.java (getUI): Call UIManager.getUI(). (updateUI): Use getUI(). 2004-03-19 Graydon Hoare * javax/swing/JComponent.java: Turn off double buffer by default. * javax/swing/plaf/basic/BasicViewportUI.java: Clear rects before painting. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable): Use cairo to copy areas. (Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip): Initialize and set clip region. 2004-03-15 Thomas Fitzsimmons * java/applet/Applet.java (preferredSize): Override deprecated variant of getPreferredSize. (minimumSize): Override deprecated variant of getMinimumSize. 2004-03-15 Olga Rodimina * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawImage(img,xform,bgcolor,obs)): New Method. Helper function that every drawImage method will use. (drawRaster): Added new parameter, bgcolor. All transparent pixels are changed to bgcolor before image is drawn. (drawRenderedImage): Fixed to use changed drawRaster(). (drawImage(image,xform,obs): Fixed to use new helper function (drawImage(image,op,x,y)): Ditto. (drawImage (img,x,y,observer)): Ditto. ((PainterThread) bgcolor): New Field. ((PainterThread) (setPixels)): Changed all transparent pixels to bgcolor. (drawImage(img,x,y,width,height,bgcolor,observer)): Fixed FIXME - all the transparent pixels are changed to the specified bgcolor. (drawImage(img, x, y, width, height, observer): Changed to use function above. (drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,bgcolor,observer)): Fixed FIXME- changed all transparent pixels to bgcolor. (drawImage (img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer)): Changed to use function above. 2004-03-14 Thomas Fitzsimmons * java/applet/Applet.java (dimensions): New field. (getDimensions): New method. (getPreferredSize): Call getDimensions. (getMinimumSize): Likewise. 2004-03-13 Thomas Fitzsimmons * jni/classpath/jcl.c: Include stdlib.h, not malloc.h. * jni/classpath/jnilink.c: Likewise. * java/applet/Applet.java (getPreferredSize): New method. (getMinimumSize): New method. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80762 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java | 199 ++++++++++++--------- libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java | 4 + libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java | 5 - libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java | 1 - 4 files changed, 121 insertions(+), 88 deletions(-) (limited to 'libjava/gnu/java/awt/peer') diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java index 8bae336c4de..633eb096483 100644 --- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java +++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java @@ -201,7 +201,7 @@ public class GdkGraphics2D extends Graphics2D // draw current buffered image to the pixmap associated // with it. - drawImage (bimage, new AffineTransform (1,0,0,1,0,0), null); + drawImage (bimage, new AffineTransform (1,0,0,1,0,0), bg, null); } @@ -440,6 +440,69 @@ public class GdkGraphics2D extends Graphics2D } + private boolean drawImage(Image img, + AffineTransform xform, + Color bgcolor, + ImageObserver obs) + { + if (img instanceof GtkOffScreenImage && + img.getGraphics () instanceof GdkGraphics2D && + (xform == null + || xform.getType () == AffineTransform.TYPE_IDENTITY + || xform.getType () == AffineTransform.TYPE_TRANSLATION) + ) + { + // we are being asked to flush a double buffer from Gdk + GdkGraphics2D g2 = (GdkGraphics2D) img.getGraphics (); + gdkDrawDrawable (g2, (int)xform.getTranslateX(), (int)xform.getTranslateY()); + + if (isBufferedImageGraphics ()) + updateBufferedImage(); + + return true; + } + else + { + + // In this case, xform is an AffineTransform that transforms bounding + // box of the specified image from image space to user space. However + // when we pass this transform to cairo, cairo will use this transform + // to map "user coordinates" to "pixel" coordinates, which is the + // other way around. Therefore to get the "user -> pixel" transform + // that cairo wants from "image -> user" transform that we currently + // have, we will need to invert the transformation matrix. + + AffineTransform invertedXform = new AffineTransform(); + + try + { + invertedXform = xform.createInverse(); + if (img instanceof BufferedImage) + { + // draw an image which has actually been loaded + // into memory fully + + BufferedImage b = (BufferedImage) img; + return drawRaster (b.getColorModel (), + b.getData (), + invertedXform, + bgcolor); + } + else + { + // begin progressive loading in a separate thread + new PainterThread (this, img, invertedXform, bgcolor); + return false; + } + } + catch (NoninvertibleTransformException e) + { + throw new ImagingOpException("Unable to invert transform " + + xform.toString()); + } + } + } + ////////////////////////////////////////////////// ////// Implementation of Graphics2D Methods ////// @@ -965,7 +1028,8 @@ public class GdkGraphics2D extends Graphics2D } private boolean drawRaster (ColorModel cm, Raster r, - AffineTransform imageToUser) + AffineTransform imageToUser, + Color bgcolor) { if (r == null) return false; @@ -1012,6 +1076,18 @@ public class GdkGraphics2D extends Graphics2D pixels = pixels2; } + // change all transparent pixels in the image to the + // specified bgcolor + + if (bgcolor != null) + { + for (int i = 0; i < pixels.length; i++) + { + if (cm.getAlpha (pixels[i]) == 0) + pixels[i] = bgcolor.getRGB (); + } + } + stateSave (); translate (x, y); drawPixels (pixels, r.getWidth (), r.getHeight (), r.getWidth (), i2u); @@ -1026,7 +1102,7 @@ public class GdkGraphics2D extends Graphics2D public void drawRenderedImage(RenderedImage image, AffineTransform xform) { - drawRaster (image.getColorModel(), image.getData(), xform); + drawRaster (image.getColorModel(), image.getData(), xform, bg); } public void drawRenderableImage(RenderableImage image, @@ -1039,60 +1115,7 @@ public class GdkGraphics2D extends Graphics2D AffineTransform xform, ImageObserver obs) { - if (img instanceof GtkOffScreenImage && - img.getGraphics () instanceof GdkGraphics2D && - (xform == null - || xform.getType () == AffineTransform.TYPE_IDENTITY - || xform.getType () == AffineTransform.TYPE_TRANSLATION) - ) - { - // we are being asked to flush a double buffer from Gdk - GdkGraphics2D g2 = (GdkGraphics2D) img.getGraphics (); - gdkDrawDrawable (g2, (int)xform.getTranslateX(), (int)xform.getTranslateY()); - - if (isBufferedImageGraphics ()) - updateBufferedImage(); - - return true; - } - else - { - - // In this case, xform is an AffineTransform that transforms bounding - // box of the specified image from image space to user space. However - // when we pass this transform to cairo, cairo will use this transform - // to map "user coordinates" to "pixel" coordinates, which is the - // other way around. Therefore to get the "user -> pixel" transform - // that cairo wants from "image -> user" transform that we currently - // have, we will need to invert the transformation matrix. - - AffineTransform invertedXform = new AffineTransform(); - - try - { - invertedXform = xform.createInverse(); - if (img instanceof BufferedImage) - { - // draw an image which has actually been loaded - // into memory fully - BufferedImage b = (BufferedImage) img; - return drawRaster (b.getColorModel (), - b.getData (), - invertedXform); - } - else - { - // begin progressive loading in a separate thread - new PainterThread (this, img, invertedXform); - return false; - } - } - catch (NoninvertibleTransformException e) - { - throw new ImagingOpException("Unable to invert transform " - + xform.toString()); - } - } + return drawImage(img, xform, bg, obs); } public void drawImage(BufferedImage image, @@ -1101,13 +1124,13 @@ public class GdkGraphics2D extends Graphics2D int y) { Image filtered = op.filter(image, null); - drawImage(filtered, new AffineTransform(1f,0f,0f,1f,x,y), null); + drawImage(filtered, new AffineTransform(1f,0f,0f,1f,x,y), bg, null); } public boolean drawImage (Image img, int x, int y, ImageObserver observer) { - return drawImage(img, new AffineTransform(1f,0f,0f,1f,x,y), observer); + return drawImage(img, new AffineTransform(1f,0f,0f,1f,x,y), bg, observer); } @@ -1130,11 +1153,14 @@ public class GdkGraphics2D extends Graphics2D Image image; ColorModel defaultModel; AffineTransform xform; + Color bgcolor; - public PainterThread (GdkGraphics2D g, Image im, AffineTransform xf) + public PainterThread (GdkGraphics2D g, Image im, + AffineTransform xf, Color bg) { image = im; xform = xf; + bgcolor = bg; this.gr = (GdkGraphics2D) g.create (); new Thread (this).start (); } @@ -1184,6 +1210,18 @@ public class GdkGraphics2D extends Graphics2D else pixels2 = pixels; + // change all transparent pixels in the image to the + // specified bgcolor + + if (bgcolor != null) + { + for (int i = 0; i < pixels2.length; i++) + { + if (model.getAlpha (pixels2[i]) == 0) + pixels2[i] = bgcolor.getRGB (); + } + } + double[] xf = new double[6]; xform.getMatrix(xf); gr.drawPixels (pixels2, w, h, scansize, xf); @@ -1347,40 +1385,27 @@ public class GdkGraphics2D extends Graphics2D Color bgcolor, ImageObserver observer) { - // FIXME: change all the transparent pixels in the image to - // bgcolor. - - return drawImage (img, x, y, width, height, observer); - } - - public boolean drawImage (Image img, int x, int y, int width, int height, - ImageObserver observer) - { - double scaleX = width / (double) img.getWidth (observer); double scaleY = height / (double) img.getHeight (observer); return drawImage (img, new AffineTransform(scaleX, 0f, 0f, scaleY, x, y), + bgcolor, observer); } - public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage (Image img, int x, int y, int width, int height, + ImageObserver observer) { - - // FIXME: change all transparent pixels in the image to - // bgcolor - - return drawImage (img, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, observer); + + return drawImage (img, x, y, width, height, bg, observer); + } public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, - ImageObserver observer) + Color bgcolor, ImageObserver observer) { Image subImage; @@ -1420,8 +1445,18 @@ public class GdkGraphics2D extends Graphics2D } return drawImage(subImage, new AffineTransform(scaleX, 0, 0, - scaleY, dx1, dy1), - observer); + scaleY, dx1, dy1), + bgcolor, + observer); + } + + public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + ImageObserver observer) + { + + return drawImage (img, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, bg, observer); } public void drawOval(int x, int y, int width, int height) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java index 4e338f64967..55581d1c64e 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java @@ -50,6 +50,7 @@ public class GtkMenuItemPeer extends GtkMenuComponentPeer implements MenuItemPeer { native void create (String label); + public native void connectSignals (); public GtkMenuItemPeer (MenuItem item) { @@ -57,6 +58,9 @@ public class GtkMenuItemPeer extends GtkMenuComponentPeer create (item.getLabel ()); setEnabled (item.isEnabled ()); setParent (item); + + if (item.getParent() instanceof Menu && ! (item instanceof Menu)) + connectSignals(); } void setParent (MenuItem item) diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java index a5fcae720c3..9b3f678856e 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java @@ -95,10 +95,5 @@ public class GtkMenuPeer extends GtkMenuItemPeer addItem (item, key, shiftModifier); } - public void addSeparator () - { - addItem (new MenuItem ("-")); - } - native public void delItem (int index); } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java index 4f77994931d..70aab2ca59d 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java @@ -46,7 +46,6 @@ public class GtkPanelPeer extends GtkContainerPeer { native void create (); native void connectJObject (); - native void connectSignals (); public GtkPanelPeer (Panel p) { -- cgit v1.2.3