FYI: Small Pango dpi_conversion_factor patch from libgcj

[Mark Wielaard]

Hi,

Another small patch for a Pango dpi_conversion_factor issue from libgcj.

2004-06-27  Andreas Tobler  <address@hidden>

       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
       (init_dpi_conversion_factor): Check for int_dpi < 0 in case gtk-xft-dpi
       can not calculate the right value.
       (dpi_changed_cb): Likewise. Mark *pspec as unused.

Works fine for me with the wonka-vte.
Committed.

Cheers,

Mark

Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
===================================================================
RCS file: 
/cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c  17 Jun 2004 23:43:16 
-0000      1.13
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c  26 Jun 2004 03:44:38 
-0000      1.14
@@ -231,9 +231,15 @@
     {
       int int_dpi;
       g_object_get (settings, "gtk-xft-dpi", &int_dpi, NULL);
-      dpi_conversion_factor = PANGO_SCALE * 72.0 / (int_dpi / PANGO_SCALE);
+      /* If int_dpi == -1 gtk-xft-dpi returns the default value. So we
+        have to do approximate calculation here.  */
+      if (int_dpi < 0)
+       dpi_conversion_factor = PANGO_SCALE * 72.0 / 96.;
+      else
+       dpi_conversion_factor = PANGO_SCALE * 72.0 / (int_dpi / PANGO_SCALE);
+
       g_signal_connect (settings, "notify::gtk-xft-dpi",
-                        G_CALLBACK (dpi_changed_cb), NULL);
+                       G_CALLBACK (dpi_changed_cb), NULL);
     }
   else
     /* Approximate. */
@@ -242,9 +248,12 @@
 
 static void
 dpi_changed_cb (GtkSettings  *settings,
-                GParamSpec   *pspec)
+               GParamSpec *pspec __attribute__((unused)))
 {
   int int_dpi;
   g_object_get (settings, "gtk-xft-dpi", &int_dpi, NULL);
-  dpi_conversion_factor = PANGO_SCALE * 72.0 / (int_dpi / PANGO_SCALE);
+  if (int_dpi < 0)
+    dpi_conversion_factor = PANGO_SCALE * 72.0 / 96.;
+  else
+    dpi_conversion_factor = PANGO_SCALE * 72.0 / (int_dpi / PANGO_SCALE);
 }

signature.asc
Description: This is a digitally signed message part