[teklib-general] changeset in /hg/teklib/current: re-enabled matching test

[Franciska Schulze]

changeset bc7d55da0f74 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=bc7d55da0f74
description:
	re-enabled matching test

diffs (70 lines):

diff -r 45dc4d743529 -r bc7d55da0f74 src/visual/tests/fonts.c
--- a/src/visual/tests/fonts.c	Thu Sep 27 16:56:22 2007 +0200
+++ b/src/visual/tests/fonts.c	Thu Sep 27 16:57:47 2007 +0200
@@ -32,7 +32,7 @@ TVOID fonttest(TAPTR v, TVPEN *pentab)
 	TINT fh = 0;
 	TAPTR cfont = TNULL;
 	TAPTR dfont = TNULL;
-	TSTRPTR buf = "hallo";
+	TSTRPTR buf = "ABCDEFG.^'!$%&/()=?`|";
 	TTAGITEM ftags[6];
 	static TBOOL init_done = TFALSE;
 
@@ -47,19 +47,19 @@ TVOID fonttest(TAPTR v, TVPEN *pentab)
 		ftags[1].tti_Tag = TTAG_DONE;
 		dfont = TVisualOpenFont(v, ftags);
 
-#if 0
+#if 1
 		/* query fonts */
 		ftags[0].tti_Tag = TVisual_FontName;
-		ftags[0].tti_Value = (TTAG) "helvetica,utopia,fixed";
+		ftags[0].tti_Value = (TTAG) "arial";
 		ftags[1].tti_Tag = TVisual_FontPxSize;
-		ftags[1].tti_Value = (TTAG) 18;
-		ftags[2].tti_Tag = TVisual_FontBold;
+		ftags[1].tti_Value = (TTAG) 48;
+
+		ftags[2].tti_Tag = TVisual_FontScaleable;
 		ftags[2].tti_Value = (TTAG) TTRUE;
-		ftags[3].tti_Tag = TVisual_FontItalic;
-		ftags[3].tti_Value = (TTAG) TFALSE;
-		ftags[4].tti_Tag = TVisual_FontNumResults;
-		ftags[4].tti_Value = (TTAG) 1024;
-		ftags[5].tti_Tag = TTAG_DONE;
+
+		ftags[3].tti_Tag = TVisual_FontNumResults;
+		ftags[3].tti_Value = (TTAG) 1024;
+		ftags[4].tti_Tag = TTAG_DONE;
 
 		fq = TVisualQueryFonts(v, ftags);
 		if (fq)
@@ -83,14 +83,14 @@ TVOID fonttest(TAPTR v, TVPEN *pentab)
 #else
 		/* open custom font */
 		ftags[0].tti_Tag = TVisual_FontName;
-		ftags[0].tti_Value = (TTAG) "comic ms sans";
+		ftags[0].tti_Value = (TTAG) "arial";
 		ftags[1].tti_Tag = TVisual_FontPxSize;
-		ftags[1].tti_Value = (TTAG) 32;
-/*		ftags[2].tti_Tag = TVisual_FontItalic;
+		ftags[1].tti_Value = (TTAG) 57;
+		ftags[2].tti_Tag = TVisual_FontItalic;
 		ftags[2].tti_Value = (TTAG) TFALSE;
 		ftags[3].tti_Tag = TVisual_FontBold;
-		ftags[3].tti_Value = (TTAG) TTRUE;*/
-		ftags[3].tti_Tag = TTAG_DONE;
+		ftags[3].tti_Value = (TTAG) TTRUE;
+		ftags[4].tti_Tag = TTAG_DONE;
 		cfont = TVisualOpenFont(v, ftags);
 #endif
 
@@ -109,7 +109,7 @@ TVOID fonttest(TAPTR v, TVPEN *pentab)
 			printf("UL pos: %d\n", ul);
 
 			TVisualSetFont(v, cfont);
-			TVisualText(v, 10, 10, buf, TStrLen(buf), pentab[0], pentab[3]);
+			TVisualText(v, 10, 10, buf, TStrLen(buf), pentab[0], pentab[3]/*TVPEN_UNDEFINED*/);
 			printf("size of text: %d\n", TVisualTextSize(v, cfont, buf));
 			TVisualSetFont(v, dfont);
 			TVisualCloseFont(v, cfont);