Merge lp:~macslow/notify-osd/fix-fractional-point-size into lp:notify-osd/karmic

[Mirco Müller]

[Mirco Müller (macslow)]

This branch fixes extracting a fonts point-size with a fractional part and thus addresses LP: #396736, LP: #457655, LP: #458413, LP: #459290, LP: #459689. The lack of this fix causes notification bubbles to be really tiny (see http://launchpadlibrarian.net/34315070/screenshot_001.png), should the user have set a font point-size of e.g. 8,5. I regard this fix to be critical within the scope of immediate user-experience of Karmic and taking into account a users system setup, which might not be the default "Sans 10"-case.

[Ted Gould (ted)]

review: Approve

=== modified file 'src/defaults.c'
--- src/defaults.c	2009-10-19 17:59:53 +0000
+++ src/defaults.c	2009-10-25 10:15:22 +0000
@@ -172,13 +172,14 @@
 static void
 _get_font_size_dpi (Defaults* self)
 {
-	GString*    string        = NULL;
-	GError*     error         = NULL;
-	guint       points        = 0;
-	GString*    font_face     = NULL;
-	gdouble     dpi           = 0.0f;
-	gdouble     pixels_per_em = 0;
-	gchar*      font_name     = NULL;
+	GString*              string        = NULL;
+	GError*               error         = NULL;
+	gdouble               points        = 0.0f;
+	GString*              font_face     = NULL;
+	gdouble               dpi           = 0.0f;
+	gdouble               pixels_per_em = 0;
+	gchar*                font_name     = NULL;
+	PangoFontDescription* desc          = NULL;
 
 	if (!IS_DEFAULTS (self))
 		return;
@@ -198,11 +199,17 @@
 		           error->message);
 		g_error_free (error);
 	}
+
+	// extract text point-size
+	desc = pango_font_description_from_string (font_name);
+	if (pango_font_description_get_size_is_absolute (desc))
+		points = (gdouble) pango_font_description_get_size (desc); 
+	else
+		points = (gdouble) pango_font_description_get_size (desc) /
+			 (gdouble) PANGO_SCALE;
+	pango_font_description_free (desc);
 	g_free ((gpointer) font_name);
 
-	// extract text point-size
-	points = extract_point_size (string->str);
-
 	// extract font-face-name/style
 	font_face = extract_font_face (string->str);
 
@@ -233,12 +240,12 @@
 	}
 
 	/* update stored DPI-value */
-	pixels_per_em = (gdouble) points * dpi / 72.0f;
+	pixels_per_em = points * dpi / 72.0f;
 	g_object_set (self, "pixels-per-em", pixels_per_em, NULL);
 	g_object_set (self, "screen-dpi", dpi, NULL);
 
 	if (g_getenv ("DEBUG"))
-		g_print ("font-size: %dpt\ndpi: %3.1f\npixels/EM: %2.2f\nwidth: %d px\ntitle-height: %2.2f pt\nbody-height: %2.2f pt\n\n",
+		g_print ("font-size: %fpt\ndpi: %3.1f\npixels/EM: %2.2f\nwidth: %d px\ntitle-height: %2.2f pt\nbody-height: %2.2f pt\n\n",
 			 points,
 			 defaults_get_screen_dpi (self),
 			 pixels_per_em,

=== modified file 'src/util.c'
--- src/util.c	2009-10-19 04:57:25 +0000
+++ src/util.c	2009-10-25 10:15:22 +0000
@@ -258,45 +258,6 @@
 	return (gchar*) buffer;
 }
 
-guint
-extract_point_size (const gchar* string)
-{
-	guint       point_size = 0;
-	GRegex*     regex      = NULL;
-	GMatchInfo* match_info = NULL;
-
-	// sanity check
-	if (!string)
-		return 0;
-
-	// setup regular expression to extract an integer from the end of string
-	regex = g_regex_new ("\\d+$", 0, 0, NULL);
-	if (!regex)
-		return 0;
-
-	// walk the string
-	g_regex_match (regex, string, 0, &match_info);
-	while (g_match_info_matches (match_info))
-	{
-		gchar* word = NULL;
-
-		word = g_match_info_fetch (match_info, 0);
-		if (word)
-		{
-			sscanf (word, "%d", &point_size);
-			g_free (word);
-		}
-
-		g_match_info_next (match_info, NULL);
-	}
-
-	// clean up
-	g_match_info_free (match_info);
-	g_regex_unref (regex);
-
-	return point_size;
-}
-
 GString*
 extract_font_face (const gchar* string)
 {

=== modified file 'src/util.h'
--- src/util.h	2009-10-19 04:57:25 +0000
+++ src/util.h	2009-10-25 10:15:22 +0000
@@ -52,8 +52,5 @@
 gchar*
 get_wm_name (Display* dpy);
 
-guint
-extract_point_size (const gchar* string);
-
 GString*
 extract_font_face (const gchar* string);

=== modified file 'tests/test-text-filtering.c'
--- tests/test-text-filtering.c	2009-10-19 04:57:25 +0000
+++ tests/test-text-filtering.c	2009-10-25 10:15:22 +0000
@@ -103,28 +103,6 @@
 }
 
 static void
-test_extract_point_size ()
-{
-	static const IntegerExtraction tests[] = {
-		{ "", 0 },
-		{ "foobar", 0 },
-		{ "Bla Fasel -12.0", 0 },
-		{ "Sans 10", 10 },
-		{ "Candara 9", 9 },
-		{ "Bitstream Vera Serif Italic 1", 1 },
-		{ "Calibri Italic 100", 100 },
-		{ "Century Schoolbook L Italic 42", 42 },
-		{ NULL, 0 }
-	};
-
-	for (int i = 0; tests[i].before != NULL; i++)
-	{
-		guint extracted = extract_point_size (tests[i].before);
-		g_assert_cmpuint (extracted, ==, tests[i].expected);
-	}
-}
-
-static void
 test_extract_font_face ()
 {
 	static const TextComparisons tests[] = {
@@ -156,7 +134,6 @@
 
 	g_test_suite_add(ts, TC(test_text_filter));
 	g_test_suite_add(ts, TC(test_newline_to_space));
-	g_test_suite_add(ts, TC(test_extract_point_size));
 	g_test_suite_add(ts, TC(test_extract_font_face));
 
 	return ts;