From 045cc3cac75c7dcd0be8343cdd53c10610271eb0 Mon Sep 17 00:00:00 2001
From: Tectu <joel@unormal.org>
Date: Tue, 29 May 2012 22:24:49 +0200
Subject: [PATCH] added lcdDrawRectString()

---
 glcd.c | 24 ++++++++++++++++++------
 glcd.h |  5 +++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/glcd.c b/glcd.c
index bb2c8956..b7104ba8 100755
--- a/glcd.c
+++ b/glcd.c
@@ -4,6 +4,7 @@
 
 static uint8_t orientation;
 static uint16_t DeviceCode;
+static uint8_t font_width = 8, font_height = 16;
 uint16_t lcd_width, lcd_height;
 
 static __inline void lcdWriteIndex(uint16_t index) {
@@ -251,7 +252,7 @@ void lcdDrawLine(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t co
    }
 }
 
-void lcdChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkcolor) {
+void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkcolor) {
   uint16_t i = 0;
   uint16_t j = 0;
   unsigned char buffer[16];
@@ -274,12 +275,12 @@ void lcdChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16
   }
 }
 
-void lcdString(uint16_t x, uint16_t y, uint8_t *str, uint16_t color, uint16_t bkcolor) {
+void lcdDrawString(uint16_t x, uint16_t y, uint8_t *str, uint16_t color, uint16_t bkcolor) {
 	uint8_t TempChar;
 
 	do {
 		TempChar=*str++;  
-		lcdChar(x,y,TempChar,color,bkcolor);    
+		lcdDrawChar(x,y,TempChar,color,bkcolor);    
 		if (x<232) {
 			x+=8;
 		} else if (y<304) {
@@ -306,9 +307,8 @@ uint16_t lcdBGR2RGB(uint16_t color) {
 
 void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) {
 	uint16_t i;
- 
-	for(i = y0; i < y1; i++)
-		lcdDrawLine(x0, i, x1, i, color);
+
+	lcdDrawRect(x0, y0, x1, y1, 1, color);
 }
 
 void lcdFillArea2(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color) {
@@ -352,6 +352,18 @@ void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t fil
 	}
 }
 
+void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t *str, uint16_t fontColor, uint16_t bkColor) {
+	if(((strlen(str)*8) < (x1-x0)) && ((y1-y0) > font_height)) {
+		uint16_t off_left, off_up;
+
+		off_left = ((x1-x0) - (strlen(str) * font_width)) / 2;
+		off_up = ((y1-y0) - font_height) / 2;
+
+		lcdDrawRect(x0, y0, x1, y1, 1, bkColor);
+		lcdDrawString(x0 + off_left, y0 + off_up, str, fontColor, bkColor);
+	}
+}
+
 void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color) {
 	int16_t a, b, P;
 	a = 0;
diff --git a/glcd.h b/glcd.h
index f2202319..811b5179 100755
--- a/glcd.h
+++ b/glcd.h
@@ -51,12 +51,13 @@ void lcdSetOrientation(uint8_t newOrientation);
 void lcdDrawPixel(uint16_t x,uint16_t y,uint16_t point);
 void lcdDrawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
 void lcdDrawRect(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t filled, uint16_t color);
+void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint8_t* str, uint16_t fontColor, uint16_t bkColor);
 void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color);
 void lcdFillArea(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
 void lcdFillArea2(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint16_t color);
 void lcdSetWindows(uint16_t xStart,uint16_t yStart,uint16_t xLong,uint16_t yLong);
-void lcdString(uint16_t x, uint16_t y, uint8_t *str,uint16_t color, uint16_t bkcolor);
-void lcdChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkcolor);
+void lcdDrawString(uint16_t x, uint16_t y, uint8_t *str,uint16_t color, uint16_t bkColor);
+void lcdDrawChar(uint16_t x, uint16_t y, unsigned char c, uint16_t charcolor, uint16_t bkColor);
 uint16_t lcdGetHeight(void);
 uint16_t lcdGetWidth(void);
 uint16_t lcdBGR2RGB(uint16_t color);