[teklib-general] changeset in /hg/teklib/current: Visual module: Headers updated, ...

[Timm S. Mueller]

changeset 5be013aa04f1 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=5be013aa04f1
description:
	Visual module: Headers updated, commentary improved

diffs (157 lines):

diff -r 48fd9d1f5b92 -r 5be013aa04f1 src/visual/tests/fonts.c
--- a/src/visual/tests/fonts.c	Sat Sep 01 17:08:06 2007 +0200
+++ b/src/visual/tests/fonts.c	Sat Sep 01 23:41:43 2007 +0200
@@ -27,18 +27,6 @@ TAPTR vismod;
 
 /*****************************************************************************/
 
-#define TVisualOpenFont(visual,tags) \
-	(*(((TMODCALL TAPTR(**)(TAPTR,TTAGITEM *))(vismod))[-30]))(visual,tags)
-#define TVisualCloseFont(visual,font) \
-	(*(((TMODCALL TVOID(**)(TAPTR,TAPTR))(vismod))[-31]))(visual,font)
-#define TVisualSetFont(visual,font) \
-	(*(((TMODCALL TVOID(**)(TAPTR,TAPTR))(vismod))[-32]))(visual,font)
-#define TVisualTextSize(visual,font,text) \
-	(*(((TMODCALL TINT(**)(TAPTR,TAPTR,TSTRPTR))(vismod))[-33]))(visual,font,text)
-#define TVisualGetFAttrs(visual,font,text) \
-	(*(((TMODCALL TINT(**)(TAPTR,TAPTR,TTAGITEM *))(vismod))[-34]))(visual,font,tags)
-
-
 TVOID fonttest(TAPTR v, TVPEN *pentab)
 {
 	TINT fh = 0;
@@ -50,11 +38,11 @@ TVOID fonttest(TAPTR v, TVPEN *pentab)
 	if (!init_done)
 	{
 		ftags[0].tti_Tag = TVisual_FontName;
-		ftags[0].tti_Value = (TTAG) "utopia";
+		ftags[0].tti_Value = (TTAG) "helvetica";
 		ftags[1].tti_Tag = TVisual_FontPxSize;
-		ftags[1].tti_Value = (TTAG) 24;
+		ftags[1].tti_Value = (TTAG) 10;
 		ftags[2].tti_Tag = TVisual_FontItalic;
-		ftags[2].tti_Value = (TTAG) TTRUE;
+		ftags[2].tti_Value = (TTAG) TFALSE;
 		ftags[3].tti_Tag = TVisual_FontBold;
 		ftags[3].tti_Value = (TTAG) TTRUE;
 		ftags[4].tti_Tag = TTAG_DONE;
@@ -69,7 +57,7 @@ TVOID fonttest(TAPTR v, TVPEN *pentab)
 			tags[1].tti_Tag = TTAG_DONE;
 
 			TVisualGetFAttrs(v, font, tags);
-			
+
 			TVisualSetFont(v, font);
 			TVisualText(v, 10, 10, buf, TStrLen(buf), pentab[0], TVPEN_UNDEFINED);
 			printf("size of text: %d\n", TVisualTextSize(v, font, buf));
@@ -118,7 +106,7 @@ TTASKENTRY TVOID TEKMain(TAPTR task)
 				TAPTR iport;
 				TINT i = 0;
 				TVPEN pentab[NUMPENS];
-				
+
 				pentab[0] = TVisualAllocPen(v, 0xffffff);
 				pentab[1] = TVisualAllocPen(v, 0x000000);
 				pentab[2] = TVisualAllocPen(v, 0xff00ff);
diff -r 48fd9d1f5b92 -r 5be013aa04f1 src/visual/visual_mod.h
--- a/src/visual/visual_mod.h	Sat Sep 01 17:08:06 2007 +0200
+++ b/src/visual/visual_mod.h	Sat Sep 01 23:41:43 2007 +0200
@@ -130,7 +130,7 @@ typedef struct
 		struct { TAPTR Font; } SetFont;
 		struct { TINT Len; TAPTR Font; TSTRPTR Text; } TextSize;
 		struct { TAPTR Font; TTAGITEM *Tags; TINT Num; } GetFAttrs;
-		
+
 	} vis_Op;
 
 } VISREQ;
@@ -159,25 +159,34 @@ typedef struct
 #define VISCMD_GETFATTRS	0x1015
 
 /*****************************************************************************/
-/*
-**	protos
-*/
-
-LOCAL TBOOL vis_init(TMOD_VIS *mod);
-LOCAL TVOID vis_exit(TMOD_VIS *mod);
-LOCAL TVOID vis_docmd(TMOD_VIS *mod, VISREQ *req);
-LOCAL TVOID vis_wait(TMOD_VIS *mod);
-LOCAL TVOID vis_wake(TMOD_VIS *mod);
+
+/*
+**	protos, platform-indpendent:
+*/
 
 LOCAL VISREQ *vis_getreq(TMOD_VIS *mod);
 LOCAL TVOID vis_ungetreq(TMOD_VIS *mod, VISREQ *req);
 LOCAL TVOID vis_sendimsg(TMOD_VIS *mod, TIMSG *imsg);
-LOCAL TVOID vis_prepareimsg(TMOD_VIS *mod, TIMSG *imsg);
 
 EXPORT TVOID vis_beginio(TMOD_VIS *mod, VISREQ *msg);
 EXPORT TINT vis_abortio(TMOD_VIS *mod, VISREQ *msg);
 
 /*
+**	protos, platform-specific:
+*/
+
+LOCAL TBOOL vis_init(TMOD_VIS *mod);
+LOCAL TVOID vis_exit(TMOD_VIS *mod);
+
+/* LOCAL TBOOL vis_open(TMOD_VIS *mod); TODO */
+/* LOCAL TVOID vis_close(TMOD_VIS *mod); TODO */
+
+LOCAL TVOID vis_wait(TMOD_VIS *mod);
+LOCAL TVOID vis_wake(TMOD_VIS *mod);
+LOCAL TVOID vis_docmd(TMOD_VIS *mod, VISREQ *req);
+LOCAL TVOID vis_prepareimsg(TMOD_VIS *mod, TIMSG *imsg);
+
+/*
 **	Module:
 */
 
@@ -185,7 +194,7 @@ EXPORT TVOID vis_close(TMOD_VIS *mod, TA
 EXPORT TVOID vis_close(TMOD_VIS *mod, TAPTR inst);
 
 /*
-**	Visual:
+**	API:
 */
 
 EXPORT TAPTR vis_getport(TMOD_VIS *mod);
diff -r 48fd9d1f5b92 -r 5be013aa04f1 tek/ansicall/visual.h
--- a/tek/ansicall/visual.h	Sat Sep 01 17:08:06 2007 +0200
+++ b/tek/ansicall/visual.h	Sat Sep 01 23:41:43 2007 +0200
@@ -71,4 +71,19 @@
 #define TVisualClose(visual,inst) \
 	(*(((TMODCALL TAPTR(**)(TAPTR,TAPTR))(visual))[-29]))(visual,inst)
 
+#define TVisualOpenFont(visual,tags) \
+	(*(((TMODCALL TAPTR(**)(TAPTR,TTAGITEM *))(visual))[-30]))(visual,tags)
+
+#define TVisualCloseFont(visual,font) \
+	(*(((TMODCALL TVOID(**)(TAPTR,TAPTR))(visual))[-31]))(visual,font)
+
+#define TVisualSetFont(visual,font) \
+	(*(((TMODCALL TVOID(**)(TAPTR,TAPTR))(visual))[-32]))(visual,font)
+
+#define TVisualTextSize(visual,font,text) \
+	(*(((TMODCALL TINT(**)(TAPTR,TAPTR,TSTRPTR))(visual))[-33]))(visual,font,text)
+
+#define TVisualGetFAttrs(visual,font,tags) \
+	(*(((TMODCALL TINT(**)(TAPTR,TAPTR,TTAGITEM *))(visual))[-34]))(visual,font,tags)
+
 #endif /* _TEK_ANSICALL_VISUAL_H */
diff -r 48fd9d1f5b92 -r 5be013aa04f1 tek/idf/visual.idf
--- a/tek/idf/visual.idf	Sat Sep 01 17:08:06 2007 +0200
+++ b/tek/idf/visual.idf	Sat Sep 01 23:41:43 2007 +0200
@@ -40,4 +40,9 @@ TUINT SetAttrs(TTAGITEM *tags)
 TUINT SetAttrs(TTAGITEM *tags)
 TAPTR Open(TTAGITEM *tags)
 TAPTR Close(TAPTR inst)
+TAPTR OpenFont(TTAGITEM *tags)
+TVOID CloseFont(TAPTR font)
+TVOID SetFont(TAPTR font)
+TINT TextSize(TAPTR font, TSTRPTR text)
+TINT GetFAttrs(TAPTR font, TTAGITEM *tags)
 .end