Commit c4bcf141 by Graydon Hoare Committed by Graydon Hoare

ClasspathToolkit.java: New abstract class.

2003-10-14  Graydon Hoare  <graydon@redhat.com>

	* gnu/java/awt/ClasspathToolkit.java: New abstract class.
	* gnu/java/awt/peer/ClasspathFontPeer.java: New abstract class.
	* gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c:
	New concrete implementation of ClasspathFontPeer, with native part.
	* gnu/java/awt/peer/gtk/GdkGlyphVector.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
	New class, with native part.
	* gnu/java/awt/peer/gtk/GdkGraphics2D.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
	implement setFont, cairoSetFont, drawGlyphVector, cairoShowGlyphs.

From-SVN: r72931
parent 11f9a0ed
2003-10-25 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/ClasspathToolkit.java: New abstract class.
* gnu/java/awt/peer/ClasspathFontPeer.java: New abstract class.
* gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c:
New concrete implementation of ClasspathFontPeer, with native part.
* gnu/java/awt/peer/gtk/GdkGlyphVector.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
New class, with native part.
* gnu/java/awt/peer/gtk/GdkGraphics2D.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
implement setFont, cairoSetFont, drawGlyphVector, cairoShowGlyphs.
2003-10-25 Bryce McKinlay <bryce@mckinlay.net.nz>
* java/lang/reflect/Method.java (toString): Avoid extra whitespace
......
/* GdkClasspathFontPeer.java -- backend implementation for Font object
Copyright (C) 2003 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. */
package gnu.java.awt.peer.gtk;
import java.awt.*;
import java.awt.font.*;
import java.awt.geom.*;
import java.io.InputStream;
import java.io.IOException;
import java.io.Serializable;
import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
import java.text.CharacterIterator;
import java.text.AttributedCharacterIterator;
import java.awt.font.TextAttribute;
import gnu.classpath.Configuration;
import gnu.java.awt.peer.ClasspathFontPeer;
/**
* This class represents a windowing system font using the Pango
* unicode/glyph/font library and the Cairo rendering library.
*
* @author Graydon Hoare (graydon@redhat.com)
*/
public class GdkClasspathFontPeer extends ClasspathFontPeer
{
static
{
if (Configuration.INIT_LOAD_LIBRARY)
{
System.loadLibrary("gtkpeer");
}
initStaticState ();
}
native static void initStaticState ();
private final int native_state = GtkGenericPeer.getUniqueInteger ();
/* Instance Variables */
private native void initState ();
private native void dispose ();
private native void setFont (String family, int style, int size);
protected void sync ()
{
this.setFont (this.familyName, this.style, (int)this.size);
}
protected void finalize ()
{
dispose ();
}
/*
* Helpers for the 3-way overloading that this class seems to suffer
* from. Remove them if you feel like they're a performance bottleneck,
* for the time being I prefer my code not be written and debugged in
* triplicate.
*/
private String buildString(CharacterIterator i) {
String s = new String ();
for(char c = i.first(); c != CharacterIterator.DONE; c = i.next())
s += c;
return s;
}
private String buildString(CharacterIterator iter, int begin, int limit) {
String s = new String ();
int i = 0;
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++)
{
if (begin <= i)
s += c;
if (limit <= i)
break;
}
return s;
}
private String buildString(char[] chars, int begin, int limit) {
String s = new String ();
for(int i = begin; i <= limit; i++)
s += chars[i];
return s;
}
/* Public API */
public GdkClasspathFontPeer (String name, int style, int size)
{
super(name, style, size);
initState ();
setFont (this.familyName, this.style, (int)this.size);
}
public GdkClasspathFontPeer (String name, Map attributes)
{
super(name, attributes);
initState ();
setFont (this.familyName, this.style, (int)this.size);
}
public String getSubFamilyName(Font font, Locale locale)
{
return null;
}
public String getPostScriptName(Font font)
{
return null;
}
public boolean canDisplay (Font font, char c)
{
throw new UnsupportedOperationException ();
}
public int canDisplayUpTo (Font font, CharacterIterator i, int start, int limit)
{
throw new UnsupportedOperationException ();
}
public GlyphVector createGlyphVector (Font font,
FontRenderContext ctx,
CharacterIterator i)
{
return new GdkGlyphVector(font, this, ctx, buildString (i));
}
public GlyphVector createGlyphVector (Font font,
FontRenderContext ctx,
int[] glyphCodes)
{
return new GdkGlyphVector (font, this, ctx, glyphCodes);
}
public byte getBaselineFor (Font font, char c)
{
throw new UnsupportedOperationException ();
}
public LineMetrics getLineMetrics (Font font, CharacterIterator ci,
int begin, int limit, FontRenderContext rc)
{
throw new UnsupportedOperationException ();
}
public Rectangle2D getMaxCharBounds (Font font, FontRenderContext rc)
{
throw new UnsupportedOperationException ();
}
public int getMissingGlyphCode (Font font)
{
throw new UnsupportedOperationException ();
}
public String getGlyphName (Font font, int glyphIndex)
{
throw new UnsupportedOperationException ();
}
public int getNumGlyphs (Font font)
{
throw new UnsupportedOperationException ();
}
public Rectangle2D getStringBounds (Font font, CharacterIterator ci,
int begin, int limit, FontRenderContext frc)
{
throw new UnsupportedOperationException ();
}
public boolean hasUniformLineMetrics (Font font)
{
throw new UnsupportedOperationException ();
}
public GlyphVector layoutGlyphVector (Font font, FontRenderContext frc,
char[] chars, int start, int limit,
int flags)
{
throw new UnsupportedOperationException ();
}
public LineMetrics getLineMetrics (Font font, String str,
FontRenderContext frc)
{
throw new UnsupportedOperationException();
}
public FontMetrics getFontMetrics (Font font)
{
throw new UnsupportedOperationException();
}
}
......@@ -48,6 +48,8 @@ import java.awt.image.renderable.*;
import java.text.AttributedCharacterIterator;
import java.util.Map;
import java.lang.Integer;
import gnu.java.awt.ClasspathToolkit;
import gnu.java.awt.peer.ClasspathFontPeer;
import gnu.classpath.Configuration;
public class GdkGraphics2D extends Graphics2D
......@@ -75,8 +77,8 @@ public class GdkGraphics2D extends Graphics2D
private Shape clip;
private AffineTransform transform;
private GtkComponentPeer component;
private GdkFont font;
private Font font;
native private int[] initState (GtkComponentPeer component);
native private void initState (int width, int height);
native private void copyState (GdkGraphics2D g);
......@@ -172,6 +174,10 @@ public class GdkGraphics2D extends Graphics2D
private native void cairoSetMatrix (double m00, double m10,
double m01, double m11,
double m02, double m12);
private native void cairoSetFont (GdkClasspathFontPeer peer);
private native void cairoShowGlyphs (int codes[],
float positions[],
int nglyphs);
private native void cairoSetOperator (int cairoOperator);
private native void cairoSetRGBColor (double red, double green, double blue);
private native void cairoSetAlpha (double alpha);
......@@ -1024,8 +1030,14 @@ public class GdkGraphics2D extends Graphics2D
}
public void drawGlyphVector (GlyphVector g, float x, float y)
{
throw new java.lang.UnsupportedOperationException ();
{
cairoSave ();
cairoTranslate ((double)x, (double)y);
int nglyphs = g.getNumGlyphs ();
int codes[] = g.getGlyphCodes (0, nglyphs, (int []) null);
float posns[] = g.getGlyphPositions (0, nglyphs, (float []) null);
cairoShowGlyphs (codes, posns, nglyphs);
cairoRestore ();
}
public void copyArea (int x, int y, int width, int height, int dx, int dy)
......@@ -1132,10 +1144,16 @@ public class GdkGraphics2D extends Graphics2D
public void setFont (Font f)
{
if (f instanceof GdkFont)
font = (GdkFont) f;
if (f.getPeer() instanceof GdkClasspathFontPeer)
font = f;
else
font = new GdkFont (f.getAttributes ());
font =
((ClasspathToolkit)(Toolkit.getDefaultToolkit ()))
.getFont (f.getName(), f.getAttributes ());
if (f != null &&
f.getPeer() instanceof GdkClasspathFontPeer)
cairoSetFont ((GdkClasspathFontPeer) f.getPeer());
}
public String toString()
......
/* gnu_java_awt_GdkFont.c
Copyright (C) 2003 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 "gdkfont.h"
#include "gnu_java_awt_peer_gtk_GdkClasspathFontPeer.h"
struct state_table *native_font_state_table;
/*
rough sketch of the mapping between java and
pango text objects:
Font <-> - PangoFont
- PangoFontDescription
- PangoContext
GlyphVector <-> - GList of PangoGlyphItem
- PangoFontDescription
- PangoContext
FontRenderContext <-> stays in plain java
*/
enum java_awt_font_style {
java_awt_font_PLAIN = 0,
java_awt_font_BOLD = 1,
java_awt_font_ITALIC = 2
};
enum java_awt_font_baseline {
java_awt_font_ROMAN_BASELINE = 0,
java_awt_font_CENTER_BASELINE = 1,
java_awt_font_HANGING_BASELINE = 2
};
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_initStaticState
(JNIEnv *env, jclass clazz)
{
NSA_FONT_INIT (env, clazz);
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_initState
(JNIEnv *env, jobject self)
{
struct peerfont *pfont = NULL;
gdk_threads_enter ();
g_assert (self != NULL);
pfont = (struct peerfont *) g_malloc0 (sizeof (struct peerfont));
g_assert (pfont != NULL);
NSA_SET_FONT_PTR (env, self, pfont);
gdk_threads_leave ();
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_dispose
(JNIEnv *env, jobject self)
{
struct peerfont *pfont = NULL;
gdk_threads_enter ();
pfont = (struct peerfont *)NSA_DEL_FONT_PTR (env, self);
g_assert (pfont != NULL);
if (pfont->ctx != NULL)
g_object_unref (pfont->ctx);
if (pfont->font != NULL)
g_object_unref (pfont->font);
if (pfont->desc != NULL)
pango_font_description_free (pfont->desc);
g_free (pfont);
gdk_threads_leave ();
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkClasspathFontPeer_setFont
(JNIEnv *env, jobject self, jstring family_name_str, jint style_int, jint size)
{
struct peerfont *pfont = NULL;
PangoFontMap *map = NULL;
char const *family_name = NULL;
gdk_threads_enter ();
enum java_awt_font_style style = (enum java_awt_font_style) style_int;
g_assert (self != NULL);
pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, self);
g_assert (pfont != NULL);
pfont->desc = pango_font_description_new ();
g_assert (pfont->desc != NULL);
family_name = (*env)->GetStringUTFChars(env, family_name_str, 0);
g_assert (family_name != NULL);
pango_font_description_set_family (pfont->desc, family_name);
(*env)->ReleaseStringUTFChars(env, family_name_str, family_name);
pango_font_description_set_size (pfont->desc, size * PANGO_SCALE);
if (style & java_awt_font_BOLD)
pango_font_description_set_weight (pfont->desc, PANGO_WEIGHT_BOLD);
if (style & java_awt_font_ITALIC)
pango_font_description_set_style (pfont->desc, PANGO_STYLE_ITALIC);
/*
FIXME: these are possibly wrong, and should in any case
probably be cached between calls.
*/
map = pango_ft2_font_map_for_display ();
g_assert (map != NULL);
if (pfont->ctx == NULL)
pfont->ctx = pango_ft2_font_map_create_context (PANGO_FT2_FONT_MAP (map));
g_assert (pfont->ctx != NULL);
if (pfont->font != NULL)
g_object_unref (pfont->font);
pfont->font = pango_font_map_load_font (map, pfont->ctx, pfont->desc);
g_assert (pfont->font != NULL);
gdk_threads_leave ();
}
......@@ -36,6 +36,7 @@
exception statement from your version. */
#include "gtkpeer.h"
#include "gdkfont.h"
#include "gnu_java_awt_peer_gtk_GdkGraphics2D.h"
#include <gdk/gdktypes.h>
#include <gdk/gdkprivate.h>
......@@ -45,6 +46,8 @@
#include <gdk-pixbuf/gdk-pixdata.h>
#include <cairo.h>
#include <cairo-xlib.h>
#include <stdio.h>
#include <stdlib.h>
......@@ -198,9 +201,9 @@ init_graphics2d_as_renderable (struct graphics2d *gr)
vis = gdk_x11_visual_get_xvisual (gdk_drawable_get_visual (gr->drawable));
g_assert (vis != NULL);
gr->surface = cairo_surface_create_for_drawable (dpy, draw, vis,
CAIRO_FORMAT_ARGB32,
DefaultColormap (dpy, DefaultScreen (dpy)));
gr->surface = cairo_xlib_surface_create (dpy, draw, vis,
CAIRO_FORMAT_ARGB32,
DefaultColormap (dpy, DefaultScreen (dpy)));
g_assert (gr->surface != NULL);
g_assert (gr->cr != NULL);
cairo_set_target_surface (gr->cr, gr->surface);
......@@ -378,8 +381,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable
gc = gdk_gc_new (dst->drawable);
g_assert (gc != NULL);
gdk_draw_drawable(dst->drawable, gc, src->drawable,
0, 0, x, y, width, height);
gdk_draw_drawable(dst->drawable, gc, src->drawable,
0, 0, x, y, width, height);
g_object_unref (gc);
......@@ -474,7 +477,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose
g_object_unref (gr->drawbuf);
g_object_unref (gr->drawable);
free (gr);
if (gr->pattern)
cairo_surface_destroy (gr->pattern);
......@@ -483,6 +485,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_dispose
free (gr->pattern_pixels);
if (gr->debug) printf ("disposed of graphics2d\n");
free (gr);
gdk_threads_leave ();
}
......@@ -662,6 +665,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels
begin_drawing_operation (gr);
{
cairo_surface_t *surf = cairo_surface_create_for_image ((char *)jpixels,
CAIRO_FORMAT_ARGB32,
......@@ -670,8 +674,9 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_drawPixels
cairo_show_surface (gr->cr, surf, w, h);
cairo_surface_destroy (surf);
}
end_drawing_operation (gr);
end_drawing_operation (gr);
(*env)->ReleaseIntArrayElements (env, jarr, jpixels, 0);
......@@ -723,6 +728,82 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetMatrix
update_pattern_transform (gr);
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetFont
(JNIEnv *env, jobject obj, jobject font)
{
struct graphics2d *gr = NULL;
struct peerfont *pfont = NULL;
cairo_font_t *ft = NULL;
FT_Face face = NULL;
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
g_assert (gr != NULL);
pfont = (struct peerfont *)NSA_GET_FONT_PTR (env, font);
g_assert (pfont != NULL);
gdk_threads_enter ();
face = pango_ft2_font_get_face (pfont->font);
g_assert (face != NULL);
ft = cairo_ft_font_create_for_ft_face (face);
g_assert (ft != NULL);
if (gr->debug) printf ("cairo_set_font '%s'\n",
face->family_name);
cairo_set_font (gr->cr, ft);
cairo_scale_font (gr->cr,
pango_font_description_get_size (pfont->desc) /
(double)PANGO_SCALE);
cairo_font_destroy (ft);
gdk_threads_leave ();
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoShowGlyphs
(JNIEnv *env, jobject obj, jintArray jcodes, jfloatArray jposns, jint nglyphs)
{
struct graphics2d *gr = NULL;
cairo_glyph_t *glyphs = NULL;
jfloat *posns = NULL;
jint *codes = NULL;
jint i;
gr = (struct graphics2d *) NSA_GET_G2D_PTR (env, obj);
g_assert (gr != NULL);
if (gr->debug) printf ("cairo_show_glyphs (%d glyphs)\n", nglyphs);
glyphs = malloc (sizeof(cairo_glyph_t) * nglyphs);
g_assert (glyphs);
codes = (*env)->GetIntArrayElements (env, jcodes, NULL);
g_assert (codes != NULL);
posns = (*env)->GetFloatArrayElements (env, jposns, NULL);
g_assert (posns != NULL);
for (i = 0; i < nglyphs; ++i)
{
glyphs[i].index = codes[i];
glyphs[i].x = (double) posns[2*i];
glyphs[i].y = (double) posns[2*i + 1];
}
(*env)->ReleaseIntArrayElements (env, jcodes, codes, 0);
(*env)->ReleaseFloatArrayElements (env, jposns, posns, 0);
begin_drawing_operation (gr);
cairo_show_glyphs (gr->cr, glyphs, nglyphs);
end_drawing_operation (gr);
free(glyphs);
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoSetOperator
(JNIEnv *env, jobject obj, jint op)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment