[teklib-general] teklib: Merge

[hg-notify at neoscientists.org]

details:   http://hg.teklib.org/teklib/rev/ee196ea7e71c
changeset: 152:ee196ea7e71c
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Tue Jan 15 18:01:44 2008 +0100
description:
Merge

diffs (truncated from 180 to 100 lines):

diff -r e95c48c87d1f -r ee196ea7e71c src/display_x11/display_x11_api.c
--- a/src/display_x11/display_x11_api.c	Tue Jan 15 03:44:45 2008 +0100
+++ b/src/display_x11/display_x11_api.c	Tue Jan 15 18:01:44 2008 +0100
@@ -481,6 +481,23 @@ x11_drawarc(TMOD_X11 *mod, struct TVRequ
 
 	setfgpen(mod, v, req->tvr_Op.Arc.Pen);
 	XDrawArc(mod->x11_Display, v->window, v->gc, x, y, w, h, a1, a2);
+}
+
+/*****************************************************************************/
+
+LOCAL void
+x11_drawfarc(TMOD_X11 *mod, struct TVRequest *req)
+{
+	VISUAL *v = req->tvr_Op.Arc.Instance;
+	TINT x = req->tvr_Op.Arc.Rect[0];
+	TINT y = req->tvr_Op.Arc.Rect[1];
+	TINT w = req->tvr_Op.Arc.Rect[2];
+	TINT h = req->tvr_Op.Arc.Rect[3];
+	TINT a1 = req->tvr_Op.Arc.Angle1*64;
+	TINT a2 = req->tvr_Op.Arc.Angle2*64;
+
+	setfgpen(mod, v, req->tvr_Op.Arc.Pen);
+	XFillArc(mod->x11_Display, v->window, v->gc, x, y, w, h, a1, a2);
 }
 
 /*****************************************************************************/
diff -r e95c48c87d1f -r ee196ea7e71c src/display_x11/display_x11_inst.c
--- a/src/display_x11/display_x11_inst.c	Tue Jan 15 03:44:45 2008 +0100
+++ b/src/display_x11/display_x11_inst.c	Tue Jan 15 18:01:44 2008 +0100
@@ -369,6 +369,9 @@ x11_docmd(TMOD_X11 *inst, struct TVReque
 			break;
 		case TVCMD_DRAWARC:
 			x11_drawarc(inst, req);
+			break;
+		case TVCMD_DRAWFARC:
+			x11_drawfarc(inst, req);
 			break;
 		case TVCMD_COPYAREA:
 			x11_copyarea(inst, req);
diff -r e95c48c87d1f -r ee196ea7e71c src/display_x11/display_x11_mod.h
--- a/src/display_x11/display_x11_mod.h	Tue Jan 15 03:44:45 2008 +0100
+++ b/src/display_x11/display_x11_mod.h	Tue Jan 15 18:01:44 2008 +0100
@@ -211,6 +211,7 @@ LOCAL void x11_copyarea(TMOD_X11 *mod, s
 LOCAL void x11_copyarea(TMOD_X11 *mod, struct TVRequest *req);
 LOCAL void x11_setcliprect(TMOD_X11 *mod, struct TVRequest *req);
 LOCAL void x11_unsetcliprect(TMOD_X11 *mod, struct TVRequest *req);
+LOCAL void x11_drawfarc(TMOD_X11 *mod, struct TVRequest *req);
 
 LOCAL void x11_wake(TMOD_X11 *inst);
 
diff -r e95c48c87d1f -r ee196ea7e71c src/visual/build/tmkmakefile
--- a/src/visual/build/tmkmakefile	Tue Jan 15 03:44:45 2008 +0100
+++ b/src/visual/build/tmkmakefile	Tue Jan 15 18:01:44 2008 +0100
@@ -41,6 +41,7 @@
 	[embed body="tools"]
 		bashing
 		fonts
+		display
 	[/embed]
 
 	[embed body="tooldep"]
@@ -61,6 +62,15 @@
 		$(OBJDIR)/fonts.to
 	[/embed]
 
+	[embed body="tooldep"]
+		$(OBJDIR)/display.to
+		tests/display.c
+	[/embed]
+	[embed body="toollink"]
+		display
+		$(OBJDIR)/display.to
+	[/embed]
+
 [/body]
 
 [include name="BUILD:builds.tmk"/]
diff -r e95c48c87d1f -r ee196ea7e71c src/visual/tests/fonts.c
--- a/src/visual/tests/fonts.c	Tue Jan 15 03:44:45 2008 +0100
+++ b/src/visual/tests/fonts.c	Tue Jan 15 18:01:44 2008 +0100
@@ -158,6 +158,7 @@ TVOID fonttest(TAPTR v, TVPEN *pentab)
 		TVisualDrawStrip(v, a2, 4, stags);
 
 		TVisualDrawFan(v, fan, 6, stags);
+		TVisualDrawFArc(v, 100, 200, 120, 100, 90, -360, pentab[3]);
 	}
 
 	TVisualText(v, 10, 10+fh, buf, TStrLen(buf), pentab[0], TVPEN_UNDEFINED);
diff -r e95c48c87d1f -r ee196ea7e71c src/visual/visual_api.c
--- a/src/visual/visual_api.c	Tue Jan 15 03:44:45 2008 +0100
+++ b/src/visual/visual_api.c	Tue Jan 15 18:01:44 2008 +0100
@@ -488,6 +488,24 @@ EXPORT void vis_drawarc(TMOD_VIS *inst, 
 
 /*****************************************************************************/
 
+EXPORT void vis_drawfarc(TMOD_VIS *inst, TINT x, TINT y, TINT w, TINT h,
+	TINT angle1, TINT angle2, TVPEN pen)
+{
+	struct TVRequest *req = visi_getreq(inst, TVCMD_DRAWFARC,