Small changes in definitions. Additional error code.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4417 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/asminc/tgi-error.inc b/asminc/tgi-error.inc
index b52055cfa0d0736cccb749713afc9fb2819a1b24..6daaeab4962f6a459e1d7916e62bc5981c09ec72 100644 (file)
--- a/asminc/tgi-error.inc
+++ b/asminc/tgi-error.inc
@@ -6,10 +6,10 @@
 ;*                                                                           */
 ;*                                                                           */
 ;*                                                                           */
-;* (C) 2002-2004 Ullrich von Bassewitz                                       */
-;*               Römerstraße 52                                              */
-;*               D-70794 Filderstadt                                         */
-;* EMail:        uz@cc65.org                                                 */
+;* (C) 2002-2009, Ullrich von Bassewitz                                      */
+;*                Roemerstrasse 52                                           */
+;*                D-70794 Filderstadt                                        */
+;* EMail:         uz@cc65.org                                                */
 ;*                                                                           */
 ;*                                                                           */
 ;* This software is provided 'as-is', without any expressed or implied       */
@@ -42,6 +42,7 @@
         TGI_ERR_INV_MODE        ; Mode not supported by driver
         TGI_ERR_INV_ARG         ; Invalid function argument
         TGI_ERR_INV_FUNC               ; Function not supported
+        TGI_ERR_INV_FONT        ; Font file is invalid
 
         TGI_ERR_COUNT           ; Special: Number of error messages
 .endenum

diff --git a/include/tgi.h b/include/tgi.h
index c430042a5e7b66a22fe52296a1975d075a5c0f83..2999c1ad0d0bcac0799b6f5708076cc9397baaab 100644 (file)
--- a/include/tgi.h
+++ b/include/tgi.h
@@ -118,16 +118,17 @@ void __fastcall__ tgi_done (void);
 const tgi_vectorfont* __fastcall__ tgi_load_vectorfont (const char* name);
 /* Load a vector font into memory and return it. In case of errors, NULL is
  * returned and an error is set, which can be retrieved using tgi_geterror.
+ * To use the font, it has to be installed using tgi_install_vectorfont.
  */
 
-void __fastcall__ tgi_register_vectorfont (const tgi_vectorfont* font);
-/* Register a vector font for use. More than one vector font can be loaded,
+void __fastcall__ tgi_install_vectorfont (const tgi_vectorfont* font);
+/* Install a vector font for use. More than one vector font can be loaded,
  * but only one can be active. This function is used to tell which one. Call
- * with a NULL pointer to unregister the currently registered font.
+ * with a NULL pointer to uninstall the currently installed font.
  */
 
 void tgi_free_vectorfont (const tgi_vectorfont* font);
-/* Free a vector font that was previously loaded. */
+/* Free a vector font that was previously loaded into memory. */
 
 unsigned char __fastcall__ tgi_geterror (void);
 /* Return the error code for the last operation. This will also clear the

diff --git a/include/tgi/tgi-error.h b/include/tgi/tgi-error.h
index 25365a4d39312827407c6f95a620e5a1e41366b9..30b809a0a6cd750fcad5afcfdb042de66c81ab3c 100644 (file)
--- a/include/tgi/tgi-error.h
+++ b/include/tgi/tgi-error.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2002      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2002-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -46,11 +46,12 @@
 
 #define TGI_ERR_OK              0       /* No error */
 #define TGI_ERR_NO_DRIVER       1       /* No driver available */
-#define TGI_ERR_CANNOT_LOAD     2       /* Error loading driver */
+#define TGI_ERR_CANNOT_LOAD     2       /* Error loading driver or font */
 #define TGI_ERR_INV_DRIVER      3       /* Invalid driver */
 #define TGI_ERR_INV_MODE        4       /* Mode not supported by driver */
 #define TGI_ERR_INV_ARG         5       /* Invalid function argument */
 #define TGI_ERR_INV_FUNC       6       /* Function not supported */
+#define TGI_ERR_INV_FONT        7       /* Font file is invalid */