gcc/libjava ChangeLog Makefile.am Makefile.in ...

graydon@gcc.gnu.org graydon@gcc.gnu.org
Mon Oct 4 16:45:00 GMT 2004 

CVSROOT:	/cvs/gcc
Module name:	gcc
Branch: 	java-gui-branch
Changes by:	graydon@gcc.gnu.org	2004-10-04 16:45:50

Modified files:
	libjava        : ChangeLog Makefile.am Makefile.in 
	libjava/gnu/awt/xlib: XToolkit.java 
	libjava/gnu/java/awt: ClasspathToolkit.java 
	libjava/gnu/java/awt/peer: ClasspathFontPeer.java 
	libjava/gnu/java/awt/peer/gtk: GdkFontMetrics.java 
	                               GdkGlyphVector.java 
	                               GdkGraphics.java 
	                               GdkGraphics2D.java 
	                               GtkComponentPeer.java 
	                               GtkTextAreaPeer.java 
	                               GtkTextFieldPeer.java 
	                               GtkToolkit.java 
	libjava/java/awt: Font.java 
	libjava/java/awt/font: TextLayout.java 
	libjava/javax/swing/plaf/basic: BasicGraphicsUtils.java 
	                                BasicSliderUI.java 
	libjava/javax/swing/text: Utilities.java 
	libjava/jni/gtk-peer: gdkfont.h 
	                      gnu_java_awt_peer_gtk_GdkFontMetrics.c 
	                      gnu_java_awt_peer_gtk_GdkGraphics.c 
	                      gnu_java_awt_peer_gtk_GdkGraphics2D.c 
	                      gtkpeer.h 
Added files:
	libjava/gnu/java/awt/peer: ClasspathTextLayoutPeer.java 
	libjava/gnu/java/awt/peer/gtk: GdkFontPeer.java 
	                               GdkTextLayout.java 
	libjava/jni/gtk-peer: gnu_java_awt_peer_gtk_GdkFontPeer.c 
	                      gnu_java_awt_peer_gtk_GdkTextLayout.c 
Removed files:
	libjava/gnu/java/awt/peer/gtk: GdkClasspathFontPeer.java 
	                               GdkClasspathFontPeerMetrics.java 
	libjava/jni/gtk-peer: 
	                      gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c 
	                      gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c 

Log message:
	2004-09-30  Graydon Hoare  <graydon@redhat.com>
	
	* Makefile.am
	(jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c)
	(jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c)
	(gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java)
	(gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java): Remove.
	(jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c)
	(jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c)
	(gnu/java/awt/peer/gtk/GdkTextLayout.java)
	(gnu/java/awt/peer/gtk/GdkFontPeer.java)
	(gnu/java/awt/peer/ClasspathTextLayoutPeer.java): Add
	* Makefile.in: Regenerate.
	* gnu/awt/xlib/XToolkit.java
	(getClasspathTextLayoutPeer): Add stub.
	* gnu/java/awt/ClasspathToolkit.java
	(getClasspathTextLayoutPeer) Add.
	* gnu/java/awt/peer/ClasspathFontPeer.java
	(copyStyleToAttrs)
	(copySizeToAttrs): Make public.
	* gnu/java/awt/peer/ClasspathTextLayoutPeer.java: New file.
	* gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java: Remove.
	* gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java: Remove.
	* gnu/java/awt/peer/gtk/GdkFontMetrics.java: Rewrite.
	* gnu/java/awt/peer/gtk/GdkFontPeer.java: New file.
	* gnu/java/awt/peer/gtk/GdkGlyphVector.java: Adjust type names.
	* gnu/java/awt/peer/gtk/GdkGraphics.java
	(getFontPeer): New function.
	(drawString): Pass font peer to native side.
	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(cairoSetFont)
	(cairoShowGlyphs)
	(PainterThread): Remove.
	(GdkGraphics2D): Set hints during construction.
	(shifted)
	(walkPath)
	(draw)
	(setRenderingHint)
	(setRenderingHints): Reimplement normalization logic.
	(getDefaultHints)
	(updateBufferedImage)
	(isBufferedImageGraphics)
	(updateImagePixels)
	(drawImage): Make final.
	(drawImage): Always paint synchronously.
	(drawString)
	(drawGlyphVector): Rewrite.
	(releasePeerGraphicResource)
	(getPeerTextMetrics)
	(getPeerFontMetrics)
	(drawGdkGlyphVector)
	(drawGdkTextLayout)
	(cairoDrawGdkGlyphVector)
	(cairoDrawGdkTextLayout)
	(cairoDrawString)
	(getFontPeer): New functions.
	* gnu/java/awt/peer/gtk/GdkTextLayout.java: New file.
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(getFontMetrics): Get metrics via toolkit, to hit cache.
	* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Use getFontMetrics.
	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Likewise.
	* gnu/java/awt/peer/gtk/GtkToolkit.java (LRUCache): New class.
	(fontCache)
	(metricsCache)
	(imageCache): New members.
	(getFontMetrics)
	(getImage)
	(getClasspathFontPeer): Use caches.
	(getFontPeer): Route through getClasspathFontPeer.
	* java/awt/Font.java (attrsToMap): Remove, adjust ctors.
	* java/awt/font/TextLayout.java: Implement in terms of peer.
	* javax/swing/plaf/basic/BasicSliderUI.java
	(paintThumb): Use polyline rather than polygon.
	* javax/swing/plaf/basic/BasicGraphicsUtils.java:
	Update comment but, alas, still do not switch to using TextLayouts.
	* javax/swing/text/Utilities.java (drawTabbedText):
	Draw text run-at-a-time, not char-at-a-time.
	* jni/gtk-peer/gdkfont.h: Publicize some of the font interface, add
	layout table.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c:
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
	Remove files.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Rewrite to
	incorporate brains of old GdkClasspathFontPeerMetrics.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c: Rewrite to
	incorporate brains of old GdkClasspathFontPeer.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: New file.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
	(drawString): Rewrite to use persistent layout in peer font.
	Comment out extraneous gdk_flush calls.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
	(metrics_cairo)
	(metrics_surface): New static variables.
	(paint_glyph_run)
	(install_font_peer): New helper functions.
	(releasePeerGraphicResource)
	(getPeerTextMetrics)
	(getPeerFontMetrics)
	(cairoDrawGdkTextLayout)
	(cairoDrawGdkGlyphVector): New native methods.
	(cairoDrawString): Rewrite, leaving layout-based version
	commented out for the time being.
	* jni/gtk-peer/gtkpeer.h (graphics): Add fields for pango stuff.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/ChangeLog.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.2660.2.435&r2=1.2660.2.436
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/Makefile.am.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.361.2.48&r2=1.361.2.49
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/Makefile.in.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.385.2.48&r2=1.385.2.49
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/awt/xlib/XToolkit.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.7&r2=1.7.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/ClasspathToolkit.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.1.18.1&r2=1.1.18.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/ClasspathTextLayoutPeer.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=NONE&r2=1.1.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/ClasspathFontPeer.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.2.2.1&r2=1.2.2.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=NONE&r2=1.1.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkTextLayout.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=NONE&r2=1.1.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkFontMetrics.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.3.8.1&r2=1.3.8.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkGlyphVector.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.3&r2=1.3.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkGraphics.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.4.16.8&r2=1.4.16.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.7.2.16&r2=1.7.2.17
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.16.2.19&r2=1.16.2.20
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.7.8.6&r2=1.7.8.7
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.9.4.6&r2=1.9.4.7
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.8.2.9&r2=1.8.2.10
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.4&r2=NONE
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.1&r2=NONE
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/java/awt/Font.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.16.8.5&r2=1.16.8.6
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/java/awt/font/TextLayout.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.2.8.1&r2=1.2.8.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/javax/swing/plaf/basic/BasicGraphicsUtils.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.7.2.3&r2=1.7.2.4
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/javax/swing/plaf/basic/BasicSliderUI.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.1.2.13&r2=1.1.2.14
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/javax/swing/text/Utilities.java.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.1.2.5&r2=1.1.2.6
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=NONE&r2=1.1.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=NONE&r2=1.1.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gdkfont.h.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.2&r2=1.2.14.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.3.8.2&r2=1.3.8.3
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.5.2.7&r2=1.5.2.8
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.5.8.8&r2=1.5.8.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gtkpeer.h.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.12.8.9&r2=1.12.8.10
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.2.12.2&r2=NONE
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c.diff?cvsroot=gcc&only_with_tag=java-gui-branch&r1=1.2.10.2&r2=NONE

More information about the Gcc-cvs mailing list