X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=print.c;h=bdebcfe15634fcf0bdda5fbe51e211ab42130495;hp=f612e5666166825576d38577d900df19c2b8d9f2;hb=5487606fda75f133e26900aede1430b8929f8e18;hpb=924ad0e15e0fc5b39b743f393e445655c0b77881

diff --git a/print.c b/print.c
index f612e56..bdebcfe 100644
--- a/print.c
+++ b/print.c
@@ -7,60 +7,17 @@
 #include "display.h"
 #include "display-gtk.h"
 
-/* Why doesn't pango/gtk have these quoting functions? */
-static inline int add_char(char *buffer, size_t size, int len, char c)
-{
-	if (len < size)
-		buffer[len++] = c;
-	return len;
-}
+#define FONT_NORMAL (12)
+#define FONT_SMALL (FONT_NORMAL / 1.2)
+#define FONT_LARGE (FONT_NORMAL * 1.2)
 
-/* Add an escape string "atomically" - all or nothing */
-static int add_str(char *buffer, size_t size, int len, const char *s)
+static void set_font(PangoLayout *layout, PangoFontDescription *font, double size, int align)
 {
-	int oldlen = len;
-	char c;
-	while ((c = *s++) != 0) {
-		if (len >= size)
-			return oldlen;
-		buffer[len++] = c;
-	}
-	return len;
-}
+	pango_font_description_set_size(font, size * PANGO_SCALE);
+	pango_layout_set_font_description(layout, font);
+	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
+	pango_layout_set_alignment(layout, align);
 
-static int add_quoted_string(char *buffer, size_t size, int len, const char *s)
-{
-	if (!s)
-		return len;
-
-	/* Room for '\0' */
-	size--;
-	for (;;) {
-		const char *escape;
-		unsigned char c = *s++;
-		switch(c) {
-		default:
-			len = add_char(buffer, size, len, c);
-			continue;
-		case 0:
-			escape = "\n";
-			break;
-		case '&':
-			escape = "&amp;";
-			break;
-		case '>':
-			escape = "&gt;";
-			break;
-		case '<':
-			escape = "&lt;";
-			break;
-		}
-		len = add_str(buffer, size, len, escape);
-		if (c)
-			continue;
-		buffer[len] = 0;
-		return len;
-	}
 }
 
 /*
@@ -69,86 +26,114 @@ static int add_quoted_string(char *buffer, size_t size, int len, const char *s)
  */
 static void show_dive_text(struct dive *dive, cairo_t *cr, double w, double h, PangoFontDescription *font)
 {
-	int len;
+	double depth;
+	const char *unit;
+	int len, decimals, width, height, maxwidth, maxheight;
 	PangoLayout *layout;
 	struct tm *tm;
-	char buffer[1024], divenr[20];
+	char buffer[80], divenr[20], *people;
+
+	maxwidth = w * PANGO_SCALE;
+	maxheight = h * PANGO_SCALE * 0.9;
 
 	layout = pango_cairo_create_layout(cr);
-	pango_layout_set_font_description(layout, font);
-	pango_layout_set_width(layout, w * PANGO_SCALE);
-	pango_layout_set_height(layout, h * PANGO_SCALE * 0.9);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+	pango_layout_set_width(layout, maxwidth);
+	pango_layout_set_height(layout, maxheight);
 
 	*divenr = 0;
 	if (dive->number)
 		snprintf(divenr, sizeof(divenr), "Dive #%d - ", dive->number);
 
-
 	tm = gmtime(&dive->when);
 	len = snprintf(buffer, sizeof(buffer),
-		"<span size=\"large\">"
-		"%s%s, %s %d, %d   %d:%02d"
-		"</span>\n",
+		"%s%s, %s %d, %d   %d:%02d",
 		divenr,
 		weekday(tm->tm_wday),
 		monthname(tm->tm_mon),
 		tm->tm_mday, tm->tm_year + 1900,
 		tm->tm_hour, tm->tm_min);
 
-	/*
-	 * Leave an empty line even if no location: otherwise the notes can
-	 * overrun the depth/duration information.
-	 */
-	if (dive->location)
-		len = add_quoted_string(buffer, sizeof(buffer), len, dive->location);
-	else
-		len = add_char(buffer, sizeof(buffer), len, '\n');
+	set_font(layout, font, FONT_LARGE, PANGO_ALIGN_LEFT);
+	pango_layout_set_text(layout, buffer, len);
+	pango_layout_get_size(layout, &width, &height);
 
-	if (dive->notes) {
-		len = add_char(buffer, sizeof(buffer), len, '\n');
-		len = add_quoted_string(buffer, sizeof(buffer), len, dive->notes);
+	cairo_move_to(cr, 0, 0);
+	pango_cairo_show_layout(cr, layout);
+
+	people = dive->buddy;
+	if (!people || !*people) {
+		people = dive->divemaster;
+		if (!people)
+			people = "";
 	}
 
-	pango_layout_set_justify(layout, 1);
-	pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-	pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
-	pango_layout_set_markup(layout, buffer, len);
+	depth = get_depth_units(dive->maxdepth.mm, &decimals, &unit);
+	snprintf(buffer, sizeof(buffer),
+		"Max depth: %.*f %s\n"
+		"Duration: %d min\n"
+		"%s",
+		decimals, depth, unit,
+		(dive->duration.seconds+59) / 60,
+		people);
+
+	set_font(layout, font, FONT_SMALL, PANGO_ALIGN_RIGHT);
+	pango_layout_set_text(layout, buffer, -1);
 
 	cairo_move_to(cr, 0, 0);
 	pango_cairo_show_layout(cr, layout);
 
 	/*
-	 * This is still problematic: a long dive location will clash
-	 * with the depth/duration information. Need to mask that or
-	 * create a box or something.
+	 * Show the dive location
+	 *
+	 * .. or at least a space to get the size.
+	 *
+	 * Move down by the size of the date, and limit the
+	 * width to the same width as the date string.
 	 */
-	snprintf(buffer, sizeof(buffer),
-		"<span size=\"small\">"
-		"Max depth: %d ft\n"
-		"Duration: %d:%02d"
-		"</span>",
-		to_feet(dive->maxdepth),
-		dive->duration.seconds / 60,
-		dive->duration.seconds % 60);
+	cairo_translate(cr, 0, height / (double) PANGO_SCALE);
+	maxheight -= height;
+	pango_layout_set_height(layout, 1);
+	pango_layout_set_width(layout, width);
 
-	pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT);
-	pango_layout_set_markup(layout, buffer, -1);
+	set_font(layout, font, FONT_NORMAL, PANGO_ALIGN_LEFT);
+	pango_layout_set_text(layout, dive->location ? : " ", -1);
 
 	cairo_move_to(cr, 0, 0);
 	pango_cairo_show_layout(cr, layout);
 
+	pango_layout_get_size(layout, &width, &height);
+
+	/*
+	 * Show the dive notes
+	 */
+	if (dive->notes) {
+		/* Move down by the size of the location (x2) */
+		height = height * 2;
+		cairo_translate(cr, 0, height / (double) PANGO_SCALE);
+		maxheight -= height;
+
+		/* Use the full width and remaining height for notes */
+		pango_layout_set_height(layout, maxheight);
+		pango_layout_set_width(layout, maxwidth);
+		pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+		pango_layout_set_justify(layout, 1);
+		pango_layout_set_text(layout, dive->notes, -1);
+
+		cairo_move_to(cr, 0, 0);
+		pango_cairo_show_layout(cr, layout);
+	}
 	g_object_unref(layout);
 }
 
 static void show_dive_profile(struct dive *dive, cairo_t *cr, double w, double h)
 {
+	cairo_rectangle_int_t drawing_area = { w/20.0, h/20.0, w, h};
 	struct graphics_context gc = {
 		.printer = 1,
 		.cr = cr
 	};
 	cairo_save(cr);
-	plot(&gc, w, h, dive);
+	plot(&gc, &drawing_area, dive);
 	cairo_restore(cr);
 }