X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=drawing.c;h=a10a7f06d68553c827347c7e249c704cc8fea272;hb=3aa4516a680f52e2e6c8a16234a7ecca0ec77233;hp=9dbcea930ae33beb65d3f39e2e7e99aecbca02b6;hpb=0564211167adbea5a5ad1c83ad6f244956ed5b72;p=sgt-puzzles.git

diff --git a/drawing.c b/drawing.c
index 9dbcea9..a10a7f0 100644
--- a/drawing.c
+++ b/drawing.c
@@ -87,6 +87,36 @@ void draw_line(drawing *dr, int x1, int y1, int x2, int y2, int colour)
     dr->api->draw_line(dr->handle, x1, y1, x2, y2, colour);
 }
 
+void draw_thick_line(drawing *dr, float thickness,
+		     float x1, float y1, float x2, float y2, int colour)
+{
+    if (thickness < 1.0)
+        thickness = 1.0;
+    if (dr->api->draw_thick_line) {
+	dr->api->draw_thick_line(dr->handle, thickness,
+				 x1, y1, x2, y2, colour);
+    } else {
+	/* We'll fake it up with a filled polygon.  The tweak to the
+	 * thickness empirically compensates for rounding errors, because
+	 * polygon rendering uses integer coordinates.
+	 */
+	float len = sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
+	float tvhatx = (x2 - x1)/len * (thickness/2 - 0.2);
+	float tvhaty = (y2 - y1)/len * (thickness/2 - 0.2);
+	int p[8];
+
+	p[0] = x1 - tvhaty;
+	p[1] = y1 + tvhatx;
+	p[2] = x2 - tvhaty;
+	p[3] = y2 + tvhatx;
+	p[4] = x2 + tvhaty;
+	p[5] = y2 - tvhatx;
+	p[6] = x1 + tvhaty;
+	p[7] = y1 - tvhatx;
+	dr->api->draw_polygon(dr->handle, p, 4, colour, colour);
+    }
+}
+
 void draw_polygon(drawing *dr, int *coords, int npoints,
                   int fillcolour, int outlinecolour)
 {
@@ -127,6 +157,39 @@ void end_draw(drawing *dr)
     dr->api->end_draw(dr->handle);
 }
 
+char *text_fallback(drawing *dr, const char *const *strings, int nstrings)
+{
+    int i;
+
+    /*
+     * If the drawing implementation provides one of these, use it.
+     */
+    if (dr && dr->api->text_fallback)
+	return dr->api->text_fallback(dr->handle, strings, nstrings);
+
+    /*
+     * Otherwise, do the simple thing and just pick the first string
+     * that fits in plain ASCII. It will then need no translation
+     * out of UTF-8.
+     */
+    for (i = 0; i < nstrings; i++) {
+	const char *p;
+
+	for (p = strings[i]; *p; p++)
+	    if (*p & 0x80)
+		break;
+	if (!*p)
+	    return dupstr(strings[i]);
+    }
+
+    /*
+     * The caller was responsible for making sure _some_ string in
+     * the list was in plain ASCII.
+     */
+    assert(!"Should never get here");
+    return NULL;		       /* placate optimiser */
+}
+
 void status_bar(drawing *dr, char *text)
 {
     char *rewritten;
@@ -281,5 +344,10 @@ void print_line_width(drawing *dr, int width)
      * _square root_ of the main puzzle scale. Double the puzzle
      * size, and the line width multiplies by 1.4.
      */
-    dr->api->line_width(dr->handle, sqrt(dr->scale) * width);
+    dr->api->line_width(dr->handle, (float)sqrt(dr->scale) * width);
+}
+
+void print_line_dotted(drawing *dr, int dotted)
+{
+    dr->api->line_dotted(dr->handle, dotted);
 }