X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Ftext.h;h=87bacfae68888e8f7310ee1559a294975db0c310;hb=6496d5108fc5168470155e4ae0db52a0af562054;hp=4f603061896be9e971cd0d1996ee5abe9f3d0279;hpb=81ba34ccf5b8be398101bbcf54d5e6cc9d2eda05;p=bertos.git

diff --git a/gfx/text.h b/gfx/text.h
old mode 100755
new mode 100644
index 4f603061..87bacfae
--- a/gfx/text.h
+++ b/gfx/text.h
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief Text graphic routines (interface)
@@ -15,6 +40,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/09/13 13:58:55  bernie
+ *#* text_moveTo(): Swap parameters.
+ *#*
+ *#* Revision 1.7  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
  *#* Revision 1.6  2006/04/27 05:39:24  bernie
  *#* Enhance text rendering to arbitrary x,y coords.
  *#*
@@ -70,12 +101,12 @@
 
 #include <cfg/compiler.h>
 #include <cfg/macros.h> /* BV() */
-#include <cfg/cpu.h> /* CPU_HARVARD */
+#include <cpu/cpu.h> /* CPU_HARVARD */
 #include <gfx/gfx.h> /* coord_t */
 
 #include <stdarg.h>
 
-/*!
+/**
  * \name Style flags
  * \see text_style()
  * \{
@@ -95,18 +126,18 @@
 	| STYLEF_STRIKEOUT | STYLEF_TALL)
 /*\}*/
 
-/*!
+/**
  * \name Formatting flags for text rendering
  * \see text_xprintf()
  * \{
  */
-#define TEXT_NORMAL   0       /*!< Normal mode */
-#define TEXT_FILL     BV(13)  /*!< Fill rest of line with spaces */
-#define TEXT_CENTER   BV(14)  /*!< Center string in line */
-#define TEXT_RIGHT    BV(15)  /*!< Right aligned */
+#define TEXT_NORMAL   0       /**< Normal mode */
+#define TEXT_FILL     BV(13)  /**< Fill rest of line with spaces */
+#define TEXT_CENTER   BV(14)  /**< Center string in line */
+#define TEXT_RIGHT    BV(15)  /**< Right aligned */
 /*\}*/
 
-/*! Escape sequences codes */
+/** Escape sequences codes */
 #define ANSI_ESC_CLEARSCREEN 'c'
 
 
@@ -114,7 +145,7 @@
 struct Bitmap;
 
 /* Low-level text functions (mware/text.c) */
-void text_moveTo(struct Bitmap *bm, int col, int row);
+void text_moveTo(struct Bitmap *bm, int row, int col);
 void text_setCoord(struct Bitmap *bm, int x, int y);
 int text_putchar(char c, struct Bitmap *bm);
 uint8_t text_style(struct Bitmap *bm, uint8_t flags, uint8_t mask);