uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

fix for console when x0 != 0 or y0 != 0

Browse source
This commit is contained in:
trsaunders 2012-07-25 23:38:32 +01:00
parent 447c618ccc
commit 637d92d5d5
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
glcd/console.c
View file

@ -87,7 +87,7 @@ msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t wi
/* read font, get height */ /* read font, get height */
console->fy = font[FONT_TABLE_HEIGHT_IDX]; console->fy = font[FONT_TABLE_HEIGHT_IDX];
/* calculate the size of the console as an integer multiple of characters */ /* calculate the size of the console as an integer multiple of characters height*/
console->sx = width; console->sx = width;
console->sy = (((int16_t)(height/console->fy))-1)*console->fy; console->sy = (((int16_t)(height/console->fy))-1)*console->fy;
@ -101,7 +101,7 @@ msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t wi
console->font = font; console->font = font;
lcdFillArea(x0, y0, width, height, console->bkcolor); lcdFillArea(x0, y0, x0+width, y0+height, console->bkcolor);
} }
msg_t lcdConsolePut(GLCDConsole *console, char c) { msg_t lcdConsolePut(GLCDConsole *console, char c) {
@ -110,8 +110,9 @@ msg_t lcdConsolePut(GLCDConsole *console, char c) {
if(c == '\n') { if(c == '\n') {
/* clear the text at the end of the line */ /* clear the text at the end of the line */
if(console->cx < console->sx) if(console->cx < console->sx)
lcdFillArea(console->cx, console->cy, console->sx, console->cy + console->fy, lcdFillArea(console->x0 + console->cx, console->y0 + console->cy,
console->bkcolor); console->x0 + console->sx, console->y0 + console->cy + console->fy,
console->bkcolor);
console->cx = 0; console->cx = 0;
console->cy += console->fy; console->cy += console->fy;
} else if(c == '\r') { } else if(c == '\r') {
@ -121,7 +122,8 @@ msg_t lcdConsolePut(GLCDConsole *console, char c) {
width = lcdMeasureChar(c, console->font); width = lcdMeasureChar(c, console->font);
if((console->cx + width) >= console->sx) { if((console->cx + width) >= console->sx) {
/* clear the text at the end of the line */ /* clear the text at the end of the line */
lcdFillArea(console->cx, console->cy, console->cx + width, console->cy + console->fy, lcdFillArea(console->x0 + console->cx, console->y0 + console->cy,
console->x0 + console->cx + width, console->y0 + console->cy + console->fy,
console->bkcolor); console->bkcolor);
console->cx = 0; console->cx = 0;
console->cy += console->fy; console->cy += console->fy;