[patch] implement getAllFonts and getAvailableFontFamilyNames

[Andreas Tobler <toa at pop dot agri dot ch>]

Hi all,

this is my attempt to implement some missing stuff in libgcj:)

It is my first patch in this direction, so please correct me if I do 
things not 'java' like.

It is also the first one which contains (*env)->SetObjectArrayElement.
Took me a while to understand this thing.

Although, I'm not quite convinced if I do fill the Font array correctly 
I post this patch to review and to get some feedback.

Having this methods allows to play a bit more easily with fonts :)

Here you see a snapshot of such an app. (mainly stolen code from everywhere)

surf.agri.ch/toa/FontDemo.png

Andreas

P.S, please check it on your system. The patch is relative to the gui 
branch.


2004-10-18  Andreas Tobler  <a.tobler@schweiz.ch>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c:
	New File.
	(nativeGetAllFonts) New function.
	(getNumFontFamilies) Likewise.
	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java (getAllFonts),
	(getAvailableFontFamilyNames): Implement.
	* Makefile.am (gtk_c_source_files): Add GdkGraphicsEnvironment.c.
	* Makefile.in: Regenerate.

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.361.2.50
diff -u -r1.361.2.50 Makefile.am
--- Makefile.am	7 Oct 2004 01:32:52 -0000	1.361.2.50
+++ Makefile.am	18 Oct 2004 19:58:25 -0000
@@ -191,6 +191,7 @@
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c \
+jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c \
 jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c \
Index: gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 GdkGraphicsEnvironment.java
--- gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java	7 Oct 2004 07:20:31 -0000	1.1.2.3
+++ gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java	18 Oct 2004 19:58:25 -0000
@@ -68,16 +68,38 @@
   {
     return new GdkGraphics2D (image);
   }
+    native private int getNumFontFamilies();
+    native void nativeGetAllFonts (String[] family_names);
 
-  public Font[] getAllFonts ()
-  {
-    throw new java.lang.UnsupportedOperationException ();
-  }
+    public Font[] getAllFonts ()
+    {
+	String[] family_names;
+	int array_size = -1;
+	Font fonts[];
 
-  public String[] getAvailableFontFamilyNames ()
-  {
-    throw new java.lang.UnsupportedOperationException ();
-  }
+	array_size = getNumFontFamilies();
+	family_names = new String[array_size];
+
+	nativeGetAllFonts(family_names);
+	fonts = new Font [family_names.length];
+	for ( int i = 0; i < family_names.length; i++)
+	    {
+		fonts[i] = new Font(family_names[i], Font.PLAIN, 10);
+	    }
+	return fonts;
+    }
+
+    public String[] getAvailableFontFamilyNames ()
+    {
+	String[] family_names;
+	int array_size = -1;
+
+	array_size = getNumFontFamilies();
+	family_names = new String[array_size];
+
+	nativeGetAllFonts(family_names);
+	return family_names;
+    }
 
   public String[] getAvailableFontFamilyNames (Locale l)
   {

/* gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c
   Copyright (C) 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 "gdkfont.h"
#include "gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h"


static gint
cmp_families (const void *a, const void *b)
{
  const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
  const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);

  return g_utf8_collate (a_name, b_name);
}


JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetAllFonts
(JNIEnv *env, jobject  self __attribute__((unused)), jobjectArray family_name)
{
  PangoContext *context;
  PangoFontFamily **families;
  gint n_families, i;

  gdk_threads_enter ();

  context = gdk_pango_context_get();
  g_assert (context != NULL);

  pango_context_list_families (context, &families, &n_families);

  qsort (families, n_families, sizeof (PangoFontFamily *), cmp_families);

  for (i = 0;  i < n_families;  i++)
    {
      gchar * name_tmp =  pango_font_family_get_name (families[i]);
      jstring name = (*env)->NewStringUTF (env, name_tmp);
      (*env)->SetObjectArrayElement (env, family_name, i, name);
    }
  gdk_threads_leave ();
  g_free (families);
}

JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_getNumFontFamilies
(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)))
{
  PangoContext *context;
  PangoFontFamily **families;
  gint n_families;
  jint num;

  gdk_threads_enter ();

  context = gdk_pango_context_get();
  g_assert (context != NULL);

  pango_context_list_families (context, &families, &n_families);

  num = n_families;

  gdk_threads_leave ();
  g_free (families);
  return num;
}