X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fgtk2%2Fproducer_pango.c;h=4756213eef8e22deed81af2c990fb3b08c85e3cc;hb=e8cb811d00abe2b31e1e6591da9e3c13799228eb;hp=69b1c2527b5cb8d4f4e4fb7da95efcd56a15fd43;hpb=78ec0be16e9f71b47ab640004da2a4fbc949415b;p=melted

diff --git a/src/modules/gtk2/producer_pango.c b/src/modules/gtk2/producer_pango.c
index 69b1c25..4756213 100644
--- a/src/modules/gtk2/producer_pango.c
+++ b/src/modules/gtk2/producer_pango.c
@@ -3,22 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Dan Dennedy <dan@dennedy.org>
  *
- * This program 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 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "producer_pango.h"
+#include <framework/mlt_producer.h>
 #include <framework/mlt_frame.h>
 #include <framework/mlt_geometry.h>
 #include <stdlib.h>
@@ -28,6 +28,16 @@
 #include <freetype/freetype.h>
 #include <iconv.h>
 #include <pthread.h>
+#include <ctype.h>
+
+typedef struct producer_pango_s *producer_pango;
+
+typedef enum
+{
+	pango_align_left = 0,
+	pango_align_center,
+	pango_align_right
+} pango_align;
 
 static pthread_mutex_t pango_mutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -432,8 +442,8 @@ static void refresh_image( mlt_frame frame, int width, int height )
 		else if ( strcmp( interps, "hyper" ) == 0 )
 			interp = GDK_INTERP_HYPER;
 
-//		fprintf( stderr, "SCALING PANGO from %dx%d to %dx%d was %dx%d\n", gdk_pixbuf_get_width( pixbuf ), gdk_pixbuf_get_height( pixbuf ), width, height, this->width, this->height );
-			
+// fprintf(stderr,"%s: scaling from %dx%d to %dx%d\n", __FILE__, this->width, this->height, width, height);
+
 		// Note - the original pixbuf is already safe and ready for destruction
 		pixbuf = gdk_pixbuf_scale_simple( pixbuf, width, height, interp );
 
@@ -543,7 +553,7 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	producer_pango this = producer->child;
 
 	// Generate a frame
-	*frame = mlt_frame_init( );
+	*frame = mlt_frame_init( MLT_PRODUCER_SERVICE( producer ) );
 
 	// Obtain properties of frame and producer
 	mlt_properties properties = MLT_FRAME_PROPERTIES( *frame );
@@ -628,18 +638,43 @@ static GdkPixbuf *pango_get_pixbuf( const char *markup, const char *text, const
 	pango_layout_set_width( layout, -1 ); // set wrapping constraints
 	pango_font_description_set_weight( desc, ( PangoWeight ) weight  );
 	if ( size != 0 )
-		pango_font_description_set_size( desc, PANGO_SCALE * size );
+		pango_font_description_set_absolute_size( desc, PANGO_SCALE * size );
 	pango_layout_set_font_description( layout, desc );
 //	pango_layout_set_spacing( layout, space );
 	pango_layout_set_alignment( layout, ( PangoAlignment ) align  );
 	if ( markup != NULL && strcmp( markup, "" ) != 0 )
+	{
 		pango_layout_set_markup( layout, markup, strlen( markup ) );
+	}
 	else if ( text != NULL && strcmp( text, "" ) != 0 )
-		pango_layout_set_text( layout, text, strlen( text ) );
+	{
+		// Replace all ~'s with a line feed (silly convention, but handy)
+		char *copy = strdup( text );
+		while ( strchr( copy, '~' ) )
+			( *strchr( copy, '~' ) ) = '\n';
+		pango_layout_set_text( layout, copy, strlen( copy ) );
+		free( copy );
+	}
 	else
+	{
+		// Pango doesn't like empty strings
 		pango_layout_set_text( layout, "  ", 2 );
+	}
 	pango_layout_get_pixel_size( layout, &w, &h );
 
+	// Interpret size property as an absolute pixel height and compensate for
+	// freetype's "interpretation" of our absolute size request. This gives
+	// precise control over compositing and better quality by reducing scaling
+	// artifacts with composite geometries that constrain the dimensions.
+	// If you do not want this, then put the size in the font property or in
+	// the pango markup.
+	if ( size != 0 )
+	{
+		pango_font_description_set_absolute_size( desc, PANGO_SCALE * size * size/h );
+		pango_layout_set_font_description( layout, desc );
+		pango_layout_get_pixel_size( layout, &w, &h );
+	}
+
 	pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, TRUE /* has alpha */, 8, w + 2 * pad, h + 2 * pad );
 	pango_draw_background( pixbuf, bg );