[teklib-general] changeset in /hg/teklib/current: added font matching

[Franciska Schulze]

changeset 11c0320856f0 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=11c0320856f0
description:
	added font matching

diffs (125 lines):

diff -r ddfca52d2d68 -r 11c0320856f0 src/visual/visual_api.c
--- a/src/visual/visual_api.c	Tue Sep 11 19:07:06 2007 +0200
+++ b/src/visual/visual_api.c	Tue Sep 11 19:09:44 2007 +0200
@@ -332,6 +332,14 @@ vis_openfont(TMOD_VIS *mod, TTAGITEM *ta
 
 /*****************************************************************************/
 
+EXPORT TAPTR
+vis_queryfonts(TMOD_VIS *mod, TTAGITEM *tags)
+{
+	return vis_hostqueryfonts(mod, tags);
+}
+
+/*****************************************************************************/
+
 EXPORT TVOID
 vis_closefont(TMOD_VIS *mod, TAPTR font)
 {
@@ -344,6 +352,14 @@ vis_textsize(TMOD_VIS *mod, TAPTR font, 
 vis_textsize(TMOD_VIS *mod, TAPTR font, TSTRPTR t)
 {
 	return vis_hosttextsize(mod, font, t);
+}
+
+/*****************************************************************************/
+
+EXPORT TTAGITEM *
+vis_getnextfont(TMOD_VIS *mod, TAPTR fqhandle)
+{
+	return vis_hostgetnextfont(mod, fqhandle);
 }
 
 /*****************************************************************************/
diff -r ddfca52d2d68 -r 11c0320856f0 src/visual/visual_mod.c
--- a/src/visual/visual_mod.c	Tue Sep 11 19:07:06 2007 +0200
+++ b/src/visual/visual_mod.c	Tue Sep 11 19:09:44 2007 +0200
@@ -111,7 +111,8 @@ vis_vectors[VISUAL_NUMVECTORS] =
 	(TMFPTR) vis_setfont,
 	(TMFPTR) vis_textsize,
 	(TMFPTR) vis_getfattrs,
-	//(TMFPTR) vis_queryfonts,
+	(TMFPTR) vis_queryfonts,
+	(TMFPTR) vis_getnextfont,
 };
 
 /*****************************************************************************/
diff -r ddfca52d2d68 -r 11c0320856f0 src/visual/visual_mod.h
--- a/src/visual/visual_mod.h	Tue Sep 11 19:07:06 2007 +0200
+++ b/src/visual/visual_mod.h	Tue Sep 11 19:09:44 2007 +0200
@@ -23,7 +23,7 @@
 
 #define VISUAL_VERSION		1
 #define VISUAL_REVISION		1
-#define VISUAL_NUMVECTORS	35
+#define VISUAL_NUMVECTORS	36
 
 #define VISUAL_MAXREQPERINSTANCE	1024
 
@@ -41,7 +41,7 @@ typedef struct Visual
 {
 	/* Module header: */
 	struct TModule vis_Module;
-	
+
 	/* Ptr to host-specific global data: */
 	TAPTR vis_HostGlobal;
 	/* Ptr to host-specific visual: */
@@ -197,10 +197,11 @@ LOCAL TVOID vis_prepareimsg(TMOD_VIS *mo
 LOCAL TVOID vis_prepareimsg(TMOD_VIS *mod, TIMSG *imsg);
 
 LOCAL TAPTR vis_hostopenfont(TMOD_VIS *mod, TTAGITEM *tags);
+LOCAL TAPTR vis_hostqueryfonts(TMOD_VIS *mod, TTAGITEM *tags);
 LOCAL TVOID vis_hostclosefont(TMOD_VIS *mod, TAPTR font);
 LOCAL TINT  vis_hosttextsize(TMOD_VIS *mod, TAPTR font, TSTRPTR text);
 LOCAL THOOKENTRY TTAG vis_hostgetfattrfunc(struct THook *hook, TAPTR obj, TTAG msg);
-
+LOCAL TTAGITEM *vis_hostgetnextfont(TMOD_VIS *mod, TAPTR fqhandle);
 
 /*
 **	API:
@@ -230,6 +231,8 @@ EXPORT TUINT vis_setattrs(TMOD_VIS *mod,
 
 EXPORT TAPTR vis_openfont(TMOD_VIS *mod, TTAGITEM *tags);
 EXPORT TVOID vis_closefont(TMOD_VIS *mod, TAPTR font);
+EXPORT TAPTR vis_queryfonts(TMOD_VIS *mod, TTAGITEM *tags);
+EXPORT TTAGITEM *vis_getnextfont(TMOD_VIS *mod, TAPTR fqhandle);
 
 EXPORT TVOID vis_setfont(TMOD_VIS *mod, TAPTR font);
 EXPORT TINT  vis_textsize(TMOD_VIS *mod, TAPTR font, TSTRPTR t);
diff -r ddfca52d2d68 -r 11c0320856f0 tek/ansicall/visual.h
--- a/tek/ansicall/visual.h	Tue Sep 11 19:07:06 2007 +0200
+++ b/tek/ansicall/visual.h	Tue Sep 11 19:09:44 2007 +0200
@@ -86,4 +86,10 @@
 #define TVisualGetFAttrs(visual,font,tags) \
 	(*(((TMODCALL TINT(**)(TAPTR,TAPTR,TTAGITEM *))(visual))[-34]))(visual,font,tags)
 
+#define TVisualQueryFonts(visual,tags) \
+	(*(((TMODCALL TAPTR(**)(TAPTR,TTAGITEM *))(visual))[-35]))(visual,tags)
+
+#define TVisualGetNextFont(visual,fqhandle) \
+	(*(((TMODCALL TTAGITEM *(**)(TAPTR,TAPTR))(visual))[-36]))(visual,fqhandle)
+
 #endif /* _TEK_ANSICALL_VISUAL_H */
diff -r ddfca52d2d68 -r 11c0320856f0 tek/idf/visual.idf
--- a/tek/idf/visual.idf	Tue Sep 11 19:07:06 2007 +0200
+++ b/tek/idf/visual.idf	Tue Sep 11 19:09:44 2007 +0200
@@ -45,4 +45,7 @@ TVOID SetFont(TAPTR font)
 TVOID SetFont(TAPTR font)
 TINT TextSize(TAPTR font, TSTRPTR text)
 TINT GetFAttrs(TAPTR font, TTAGITEM *tags)
+TAPTR QueryFonts(TTAGITEM *tags)
+TTAGITEM *GetNextFont(TAPTR fqhandle)
+
 .end
diff -r ddfca52d2d68 -r 11c0320856f0 tek/mod/visual.h
--- a/tek/mod/visual.h	Tue Sep 11 19:07:06 2007 +0200
+++ b/tek/mod/visual.h	Tue Sep 11 19:09:44 2007 +0200
@@ -52,6 +52,7 @@ typedef TTAG TVPEN;
 #define TVisual_FontDescent			(TVISTAGS_ + 20)
 #define	TVisual_FontUlPosition		(TVISTAGS_ + 21)
 #define	TVisual_FontUlThickness		(TVISTAGS_ + 22)
+#define TVisual_FontNumResults		(TVISTAGS_ + 23)
 
 /*****************************************************************************/
 /*